From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 00:08:26 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF5C3106566B; Sun, 7 Feb 2010 00:08:26 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A6AD58FC15; Sun, 7 Feb 2010 00:08:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1708Q4F079533; Sun, 7 Feb 2010 00:08:26 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1708Qoi079530; Sun, 7 Feb 2010 00:08:26 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002070008.o1708Qoi079530@svn.freebsd.org> From: Kip Macy Date: Sun, 7 Feb 2010 00:08:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203582 - user/kmacy/head_flowtable_v6/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 00:08:26 -0000 Author: kmacy Date: Sun Feb 7 00:08:26 2010 New Revision: 203582 URL: http://svn.freebsd.org/changeset/base/203582 Log: add function for printing tuple Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 00:07:37 2010 (r203581) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 00:08:26 2010 (r203582) @@ -451,6 +451,27 @@ flow_to_route(struct flentry *fle, struc } #ifdef INET +#ifdef FLOWTABLE_DEBUG +static void +ipv4_flow_print_tuple(int flags, int proto, struct sockaddr_in *ssin, + struct sockaddr_in *dsin) +{ + char saddr[4*sizeof "123"], daddr[4*sizeof "123"]; + + if (flags & FL_HASH_ALL) { + inet_ntoa_r(*(struct in_addr *) &dsin->sin_addr, daddr); + inet_ntoa_r(*(struct in_addr *) &ssin->sin_addr, saddr); + printf("proto=%d %s:%d->%s:%d\n", + proto, saddr, ntohs(ssin->sin_port), daddr, + ntohs(dsin->sin_port)); + } else { + inet_ntoa_r(*(struct in_addr *) &dsin->sin_addr, daddr); + printf("proto=%d %s\n", proto, daddr); + } + +} +#endif + static int ipv4_mbuf_demarshal(struct flowtable *ft, struct mbuf *m, struct sockaddr_in *ssin, struct sockaddr_in *dsin, uint16_t *flags) @@ -513,17 +534,8 @@ skipports: ssin->sin_port = sport; dsin->sin_port = dport; #ifdef FLOWTABLE_DEBUG - if (*flags & (FL_HASH_ALL|FL_DEBUG_ALL)) { - char saddr[4*sizeof "123"], daddr[4*sizeof "123"]; - inet_ntoa_r(*(struct in_addr *) &ip->ip_dst, daddr); - inet_ntoa_r(*(struct in_addr *) &ip->ip_src, saddr); - FLDPRINTF(ft, FL_DEBUG_ALL, "proto=%d %s:%d->%s:%d\n", - proto, saddr, ntohs(sport), daddr, ntohs(dport)); - } else { - char daddr[4*sizeof "123"]; - inet_ntoa_r(*(struct in_addr *) &ip->ip_dst, daddr); - FLDPRINTF(ft, FL_DEBUG_ALL, "proto=%d %s\n", proto, daddr); - } + if (*flags & FL_DEBUG_ALL) + ipv4_flow_print_tuple(*flags, proto, ssin, dsin); #endif return (0); } @@ -954,6 +966,11 @@ kern_flowtable_insert(struct flowtable * FLDPRINTF(ft, FL_DEBUG, "kern_flowtable_insert: hash=0x%x fibnum=%d flags=0x%x\n", hash, fibnum, flags); +#ifdef FLOWTABLE_DEBUG + if (*flags & FL_DEBUG) + ipv4_flow_print_tuple(flags, flags_to_proto(flags), + (struct sockaddr_in *)&ssa, (struct sockaddr_in *)&dsa); +#endif return (flowtable_insert(ft, hash, key, fibnum, ro, flags)); } From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 00:26:48 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 15770106566B; Sun, 7 Feb 2010 00:26:48 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 067738FC0A; Sun, 7 Feb 2010 00:26:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o170QlcE083601; Sun, 7 Feb 2010 00:26:47 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o170Qlux083599; Sun, 7 Feb 2010 00:26:47 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002070026.o170Qlux083599@svn.freebsd.org> From: Kip Macy Date: Sun, 7 Feb 2010 00:26:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203583 - user/kmacy/head_flowtable_v6/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 00:26:48 -0000 Author: kmacy Date: Sun Feb 7 00:26:47 2010 New Revision: 203583 URL: http://svn.freebsd.org/changeset/base/203583 Log: simplify print_tuple fix call Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 00:08:26 2010 (r203582) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 00:26:47 2010 (r203583) @@ -459,8 +459,8 @@ ipv4_flow_print_tuple(int flags, int pro char saddr[4*sizeof "123"], daddr[4*sizeof "123"]; if (flags & FL_HASH_ALL) { - inet_ntoa_r(*(struct in_addr *) &dsin->sin_addr, daddr); - inet_ntoa_r(*(struct in_addr *) &ssin->sin_addr, saddr); + inet_ntoa_r(ssin->sin_addr, saddr); + inet_ntoa_r(dsin->sin_addr, daddr); printf("proto=%d %s:%d->%s:%d\n", proto, saddr, ntohs(ssin->sin_port), daddr, ntohs(dsin->sin_port)); @@ -967,9 +967,9 @@ kern_flowtable_insert(struct flowtable * "kern_flowtable_insert: hash=0x%x fibnum=%d flags=0x%x\n", hash, fibnum, flags); #ifdef FLOWTABLE_DEBUG - if (*flags & FL_DEBUG) + if (flags & FL_DEBUG) ipv4_flow_print_tuple(flags, flags_to_proto(flags), - (struct sockaddr_in *)&ssa, (struct sockaddr_in *)&dsa); + (struct sockaddr_in *)ssa, (struct sockaddr_in *)dsa); #endif return (flowtable_insert(ft, hash, key, fibnum, ro, flags)); } From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 00:46:18 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21FC81065679; Sun, 7 Feb 2010 00:46:18 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 12FB68FC1C; Sun, 7 Feb 2010 00:46:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o170kHUa087957; Sun, 7 Feb 2010 00:46:17 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o170kHv2087955; Sun, 7 Feb 2010 00:46:17 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002070046.o170kHv2087955@svn.freebsd.org> From: Kip Macy Date: Sun, 7 Feb 2010 00:46:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203585 - user/kmacy/head_flowtable_v6/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 00:46:18 -0000 Author: kmacy Date: Sun Feb 7 00:46:17 2010 New Revision: 203585 URL: http://svn.freebsd.org/changeset/base/203585 Log: print hash and tuple on lookup Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 00:38:31 2010 (r203584) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 00:46:17 2010 (r203585) @@ -533,10 +533,6 @@ ipv4_mbuf_demarshal(struct flowtable *ft skipports: ssin->sin_port = sport; dsin->sin_port = dport; -#ifdef FLOWTABLE_DEBUG - if (*flags & FL_DEBUG_ALL) - ipv4_flow_print_tuple(*flags, proto, ssin, dsin); -#endif return (0); } @@ -1041,6 +1037,11 @@ flowtable_lookup(struct flowtable *ft, s ssin = (struct sockaddr_in *)ssa; hash = ipv4_flow_lookup_hash_internal(ssin, dsin, key, flags); +#ifdef FLOWTABLE_DEBUG + if (*flags & FL_DEBUG_ALL){ + printf("lookup: hash=0x%x ", hash); + ipv4_flow_print_tuple(*flags, proto, ssin, dsin); +#endif } #endif #ifdef INET6 From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 01:39:42 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98C0C1065670; Sun, 7 Feb 2010 01:39:42 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 897428FC18; Sun, 7 Feb 2010 01:39:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o171dgNA099872; Sun, 7 Feb 2010 01:39:42 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o171dguQ099871; Sun, 7 Feb 2010 01:39:42 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002070139.o171dguQ099871@svn.freebsd.org> From: Kip Macy Date: Sun, 7 Feb 2010 01:39:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203591 - user/kmacy/head_flowtable_v6/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 01:39:42 -0000 Author: kmacy Date: Sun Feb 7 01:39:42 2010 New Revision: 203591 URL: http://svn.freebsd.org/changeset/base/203591 Log: - ignore offset + port if we're hashing 4-tuple - fix nits in debug output Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 01:35:28 2010 (r203590) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 01:39:42 2010 (r203591) @@ -186,6 +186,7 @@ static struct cv flowclean_cv; static struct mtx flowclean_lock; static uint32_t flowclean_cycles; + #ifdef FLOWTABLE_DEBUG #define FLDPRINTF(ft, flags, fmt, ...) \ do { \ @@ -493,13 +494,13 @@ ipv4_mbuf_demarshal(struct flowtable *ft ssin->sin_len = sizeof(*dsin); ssin->sin_addr = ip->ip_dst; + proto = ip->ip_p; if ((*flags & FL_HASH_ALL) == 0) { FLDPRINTF(ft, FL_DEBUG_ALL, "skip port check flags=0x%x ", *flags); goto skipports; } - proto = ip->ip_p; iphlen = ip->ip_hl << 2; /* XXX options? */ switch (proto) { @@ -529,8 +530,8 @@ ipv4_mbuf_demarshal(struct flowtable *ft } - *flags |= proto_to_flags(proto); skipports: + *flags |= proto_to_flags(proto); ssin->sin_port = sport; dsin->sin_port = dport; return (0); @@ -543,6 +544,7 @@ ipv4_flow_lookup_hash_internal( { uint16_t sport, dport; uint8_t proto; + int offset = 0; if ((V_flowtable_enable == 0) || (V_flowtable_ready == 0)) return (0); @@ -560,9 +562,10 @@ ipv4_flow_lookup_hash_internal( if (flags & FL_HASH_ALL) { ((uint16_t *)key)[0] = sport; ((uint16_t *)key)[1] = dport; - } + } else + offset = V_flow_hashjitter + proto; - return (jenkins_hashword(key, 3, V_flow_hashjitter + proto)); + return (jenkins_hashword(key, 3, offset)); } static struct flentry * @@ -728,6 +731,7 @@ ipv6_flow_lookup_hash_internal( { uint16_t sport, dport; uint8_t proto; + int offset = 0; if ((V_flowtable_enable == 0) || (V_flowtable_ready == 0)) return (0); @@ -746,9 +750,10 @@ ipv6_flow_lookup_hash_internal( if (flags & FL_HASH_ALL) { ((uint16_t *)key)[0] = sport; ((uint16_t *)key)[1] = dport; - } + } else + offset = V_flow_hashjitter + proto; - return (jenkins_hashword(key, 9, V_flow_hashjitter + proto)); + return (jenkins_hashword(key, 9, offset)); } static struct flentry * @@ -1029,6 +1034,7 @@ flowtable_lookup(struct flowtable *ft, s ro->ro_dst = *dsa; hash = 0; flags |= ft->ft_flags; + proto = flags_to_proto(flags); #ifdef INET if (ssa->sa_family == AF_INET) { struct sockaddr_in *ssin, *dsin; @@ -1038,9 +1044,10 @@ flowtable_lookup(struct flowtable *ft, s hash = ipv4_flow_lookup_hash_internal(ssin, dsin, key, flags); #ifdef FLOWTABLE_DEBUG - if (*flags & FL_DEBUG_ALL){ + if (flags & FL_DEBUG_ALL){ printf("lookup: hash=0x%x ", hash); - ipv4_flow_print_tuple(*flags, proto, ssin, dsin); + ipv4_flow_print_tuple(flags, proto, ssin, dsin); + } #endif } #endif @@ -1072,7 +1079,6 @@ flowtable_lookup(struct flowtable *ft, s keycheck: FLDPRINTF(ft, FL_DEBUG, "doing keycheck on fle=%p hash=0x%x\n", fle, fle->f_fhash); - proto = flags_to_proto(flags); rt = __DEVOLATILE(struct rtentry *, fle->f_rt); lle = __DEVOLATILE(struct llentry *, fle->f_lle); if ((rt != NULL) @@ -1550,7 +1556,8 @@ flow_show(struct flowtable *ft, struct f inet_ntoa_r(*(struct in_addr *) &hashkey[1], saddr); sport = ntohs(((uint16_t *)hashkey)[0]); dport = ntohs(((uint16_t *)hashkey)[1]); - db_printf("%s:%d->%s:%d\n", saddr, sport, daddr, dport); + db_printf("proto=%d %s:%d->%s:%d\n", fle->f_proto, + saddr, sport, daddr, dport); } else db_printf("%s:\n", daddr); From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 01:54:14 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 992B3106566B; Sun, 7 Feb 2010 01:54:14 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 707588FC14; Sun, 7 Feb 2010 01:54:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o171sEFX003220; Sun, 7 Feb 2010 01:54:14 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o171sEHb003218; Sun, 7 Feb 2010 01:54:14 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002070154.o171sEHb003218@svn.freebsd.org> From: Kip Macy Date: Sun, 7 Feb 2010 01:54:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203592 - user/kmacy/head_flowtable_v6/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 01:54:14 -0000 Author: kmacy Date: Sun Feb 7 01:54:14 2010 New Revision: 203592 URL: http://svn.freebsd.org/changeset/base/203592 Log: print key value Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 01:39:42 2010 (r203591) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 01:54:14 2010 (r203592) @@ -186,7 +186,7 @@ static struct cv flowclean_cv; static struct mtx flowclean_lock; static uint32_t flowclean_cycles; - +#define FLOWTABLE_DEBUG #ifdef FLOWTABLE_DEBUG #define FLDPRINTF(ft, flags, fmt, ...) \ do { \ @@ -965,8 +965,8 @@ kern_flowtable_insert(struct flowtable * return (EINVAL); FLDPRINTF(ft, FL_DEBUG, - "kern_flowtable_insert: hash=0x%x fibnum=%d flags=0x%x\n", - hash, fibnum, flags); + "kern_flowtable_insert: key=%x:%x:%x hash=%x fibnum=%d flags=%x\n", + key[0], key[1], key[2], hash, fibnum, flags); #ifdef FLOWTABLE_DEBUG if (flags & FL_DEBUG) ipv4_flow_print_tuple(flags, flags_to_proto(flags), @@ -1045,7 +1045,8 @@ flowtable_lookup(struct flowtable *ft, s hash = ipv4_flow_lookup_hash_internal(ssin, dsin, key, flags); #ifdef FLOWTABLE_DEBUG if (flags & FL_DEBUG_ALL){ - printf("lookup: hash=0x%x ", hash); + printf("lookup: key=%x:%x:%x hash=%x ", + key[0], key[1], key[2], hash); ipv4_flow_print_tuple(flags, proto, ssin, dsin); } #endif @@ -1077,7 +1078,7 @@ flowtable_lookup(struct flowtable *ft, s goto uncached; } keycheck: - FLDPRINTF(ft, FL_DEBUG, "doing keycheck on fle=%p hash=0x%x\n", + FLDPRINTF(ft, FL_DEBUG, "doing keycheck on fle=%p hash=%x\n", fle, fle->f_fhash); rt = __DEVOLATILE(struct rtentry *, fle->f_rt); lle = __DEVOLATILE(struct llentry *, fle->f_lle); @@ -1547,10 +1548,10 @@ flow_show(struct flowtable *ft, struct f idle_time = (int)(time_uptime - fle->f_uptime); rt_valid = fle->f_rt != NULL; + hashkey = flowtable_get_hashkey(fle); if (fle->f_flags & FL_IPV6) goto skipaddr; - hashkey = flowtable_get_hashkey(fle); inet_ntoa_r(*(struct in_addr *) &hashkey[2], daddr); if (ft->ft_flags & FL_HASH_ALL) { inet_ntoa_r(*(struct in_addr *) &hashkey[1], saddr); @@ -1562,8 +1563,8 @@ flow_show(struct flowtable *ft, struct f db_printf("%s:\n", daddr); skipaddr: - db_printf("\thash=0x%08x idle_time=%03d rt=%p ifp=%p", - fle->f_fhash, idle_time, + db_printf("\tkey=%x:%x:%x hash=%08x idle_time=%03d rt=%p ifp=%p", + hashkey[0], hashkey[1], hashkey[2], fle->f_fhash, idle_time, fle->f_rt, rt_valid ? fle->f_rt->rt_ifp : NULL); if (rt_valid && (fle->f_rt->rt_flags & RTF_UP)) db_printf(" RTF_UP "); From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 03:58:32 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C21F2106568B; Sun, 7 Feb 2010 03:58:32 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 97D4A8FC15; Sun, 7 Feb 2010 03:58:32 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o173wWjW030822; Sun, 7 Feb 2010 03:58:32 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o173wWFB030820; Sun, 7 Feb 2010 03:58:32 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002070358.o173wWFB030820@svn.freebsd.org> From: Kip Macy Date: Sun, 7 Feb 2010 03:58:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203595 - user/kmacy/head_flowtable_v6/sys/amd64/conf X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 03:58:32 -0000 Author: kmacy Date: Sun Feb 7 03:58:32 2010 New Revision: 203595 URL: http://svn.freebsd.org/changeset/base/203595 Log: - remove wireless - set printf buffer size Modified: user/kmacy/head_flowtable_v6/sys/amd64/conf/GENERIC Modified: user/kmacy/head_flowtable_v6/sys/amd64/conf/GENERIC ============================================================================== --- user/kmacy/head_flowtable_v6/sys/amd64/conf/GENERIC Sun Feb 7 02:04:58 2010 (r203594) +++ user/kmacy/head_flowtable_v6/sys/amd64/conf/GENERIC Sun Feb 7 03:58:32 2010 (r203595) @@ -25,10 +25,8 @@ makeoptions DEBUG=-g # Build kernel wit options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption -options INET # InterNETworking -options INET6 # IPv6 communications protocols -options SCTP # Stream Control Transmission Protocol options FFS # Berkeley Fast Filesystem +options INET options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists options UFS_DIRHASH # Improve performance on big directories @@ -77,6 +75,9 @@ options INVARIANT_SUPPORT # Extra sanit options WITNESS # Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed + +options PRINTF_BUFR_SIZE=128 + # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel @@ -245,23 +246,6 @@ device fe # Fujitsu MB8696x based card device sn # SMC's 9000 series of Ethernet chips device xe # Xircom pccard Ethernet -# Wireless NIC cards -device wlan # 802.11 support -options IEEE80211_DEBUG # enable debug msgs -options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's -options IEEE80211_SUPPORT_MESH # enable 802.11s draft support -device wlan_wep # 802.11 WEP support -device wlan_ccmp # 802.11 CCMP support -device wlan_tkip # 802.11 TKIP support -device wlan_amrr # AMRR transmit rate control algorithm -device an # Aironet 4500/4800 802.11 wireless NICs. -device ath # Atheros pci/cardbus NIC's -device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors -device ath_rate_sample # SampleRate tx rate control for ath -device ral # Ralink Technology RT2500 wireless NICs. -device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. - # Pseudo devices. device loop # Network loopback device random # Entropy device @@ -308,11 +292,6 @@ device cue # CATC USB Ethernet device kue # Kawasaki LSI USB Ethernet device rue # RealTek RTL8150 USB Ethernet device udav # Davicom DM9601E USB -# USB Wireless -device rum # Ralink Technology RT2501USB wireless NICs -device uath # Atheros AR5523 wireless NICs -device ural # Ralink Technology RT2500USB wireless NICs -device zyd # ZyDAS zb1211/zb1211b wireless NICs # FireWire support device firewire # FireWire bus code From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 04:13:36 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C070E106566C; Sun, 7 Feb 2010 04:13:36 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AF5368FC0C; Sun, 7 Feb 2010 04:13:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o174Dana034179; Sun, 7 Feb 2010 04:13:36 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o174DaO8034177; Sun, 7 Feb 2010 04:13:36 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002070413.o174DaO8034177@svn.freebsd.org> From: Kip Macy Date: Sun, 7 Feb 2010 04:13:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203596 - user/kmacy/head_flowtable_v6/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 04:13:36 -0000 Author: kmacy Date: Sun Feb 7 04:13:36 2010 New Revision: 203596 URL: http://svn.freebsd.org/changeset/base/203596 Log: fix flow_to_route to set the right dst Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 03:58:32 2010 (r203595) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 04:13:36 2010 (r203596) @@ -431,7 +431,7 @@ flow_to_route(struct flentry *fle, struc sin6->sin6_family = AF_INET6; sin6->sin6_len = sizeof(*sin6); hashkey = ((struct flentry_v6 *)fle)->fl_flow.ipf_key; - memcpy(&sin6->sin6_addr, &hashkey[1], sizeof (struct in6_addr)); + memcpy(&sin6->sin6_addr, &hashkey[2], sizeof (struct in6_addr)); } else #endif #ifdef INET @@ -443,7 +443,7 @@ flow_to_route(struct flentry *fle, struc sin->sin_family = AF_INET; sin->sin_len = sizeof(*sin); hashkey = ((struct flentry_v4 *)fle)->fl_flow.ipf_key; - sin->sin_addr.s_addr = hashkey[1]; + sin->sin_addr.s_addr = hashkey[2]; } #endif ; /* terminate INET6 else if no INET4 */ From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 04:24:11 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A750106566C; Sun, 7 Feb 2010 04:24:11 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 497498FC14; Sun, 7 Feb 2010 04:24:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o174OBJU036546; Sun, 7 Feb 2010 04:24:11 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o174OBeS036544; Sun, 7 Feb 2010 04:24:11 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002070424.o174OBeS036544@svn.freebsd.org> From: Kip Macy Date: Sun, 7 Feb 2010 04:24:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203597 - user/kmacy/head_flowtable_v6/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 04:24:11 -0000 Author: kmacy Date: Sun Feb 7 04:24:10 2010 New Revision: 203597 URL: http://svn.freebsd.org/changeset/base/203597 Log: point ssin at src_addr Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 04:13:36 2010 (r203596) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 04:24:10 2010 (r203597) @@ -491,8 +491,8 @@ ipv4_mbuf_demarshal(struct flowtable *ft dsin->sin_len = sizeof(*dsin); dsin->sin_addr = ip->ip_dst; ssin->sin_family = AF_INET; - ssin->sin_len = sizeof(*dsin); - ssin->sin_addr = ip->ip_dst; + ssin->sin_len = sizeof(*ssin); + ssin->sin_addr = ip->ip_src; proto = ip->ip_p; if ((*flags & FL_HASH_ALL) == 0) { From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 04:51:29 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 932FD1065679; Sun, 7 Feb 2010 04:51:29 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 683EC8FC13; Sun, 7 Feb 2010 04:51:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o174pTsK043021; Sun, 7 Feb 2010 04:51:29 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o174pT3n043019; Sun, 7 Feb 2010 04:51:29 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002070451.o174pT3n043019@svn.freebsd.org> From: Kip Macy Date: Sun, 7 Feb 2010 04:51:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203599 - user/kmacy/head_flowtable_v6/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 04:51:29 -0000 Author: kmacy Date: Sun Feb 7 04:51:29 2010 New Revision: 203599 URL: http://svn.freebsd.org/changeset/base/203599 Log: - improve show flowtables - move debug output to keycheck Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 04:27:18 2010 (r203598) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 04:51:29 2010 (r203599) @@ -1043,13 +1043,6 @@ flowtable_lookup(struct flowtable *ft, s ssin = (struct sockaddr_in *)ssa; hash = ipv4_flow_lookup_hash_internal(ssin, dsin, key, flags); -#ifdef FLOWTABLE_DEBUG - if (flags & FL_DEBUG_ALL){ - printf("lookup: key=%x:%x:%x hash=%x ", - key[0], key[1], key[2], hash); - ipv4_flow_print_tuple(flags, proto, ssin, dsin); - } -#endif } #endif #ifdef INET6 @@ -1078,8 +1071,15 @@ flowtable_lookup(struct flowtable *ft, s goto uncached; } keycheck: - FLDPRINTF(ft, FL_DEBUG, "doing keycheck on fle=%p hash=%x\n", - fle, fle->f_fhash); +#ifdef FLOWTABLE_DEBUG + if (flags & FL_DEBUG_ALL){ + printf("keycheck: key=%x:%x:%x hash=%x ", + key[0], key[1], key[2], hash); + ipv4_flow_print_tuple(flags, proto, + (struct sockaddr_in *)ssa, + (struct sockaddr_in *)dsa); + } +#endif rt = __DEVOLATILE(struct rtentry *, fle->f_rt); lle = __DEVOLATILE(struct llentry *, fle->f_lle); if ((rt != NULL) @@ -1557,19 +1557,25 @@ flow_show(struct flowtable *ft, struct f inet_ntoa_r(*(struct in_addr *) &hashkey[1], saddr); sport = ntohs(((uint16_t *)hashkey)[0]); dport = ntohs(((uint16_t *)hashkey)[1]); - db_printf("proto=%d %s:%d->%s:%d\n", fle->f_proto, - saddr, sport, daddr, dport); + db_printf("%s:%d->%s:%d", + saddr, sport, daddr, + dport); } else - db_printf("%s:\n", daddr); + db_printf("%s ", daddr); skipaddr: - db_printf("\tkey=%x:%x:%x hash=%08x idle_time=%03d rt=%p ifp=%p", - hashkey[0], hashkey[1], hashkey[2], fle->f_fhash, idle_time, - fle->f_rt, rt_valid ? fle->f_rt->rt_ifp : NULL); - if (rt_valid && (fle->f_rt->rt_flags & RTF_UP)) - db_printf(" RTF_UP "); if (fle->f_flags & FL_STALE) db_printf(" FL_STALE "); + if (fle->f_flags & FL_TCP) + db_printf(" FL_TCP "); + if (fle->f_flags & FL_UDP) + db_printf(" FL_UDP "); + if (rt_valid && (fle->f_rt->rt_flags & RTF_UP)) + db_printf(" RTF_UP "); + + db_printf("\tkey=%x:%x:%x hash=%08x idle_time=%03d\n\trt=%p ifp=%p", + hashkey[0], hashkey[1], hashkey[2], fle->f_fhash, idle_time, + fle->f_rt, rt_valid ? fle->f_rt->rt_ifp : NULL); db_printf("\n"); } From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 05:01:02 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E76A4106566B; Sun, 7 Feb 2010 05:01:02 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D5FAB8FC13; Sun, 7 Feb 2010 05:01:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o17512FW045206; Sun, 7 Feb 2010 05:01:02 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o17512aA045204; Sun, 7 Feb 2010 05:01:02 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002070501.o17512aA045204@svn.freebsd.org> From: Kip Macy Date: Sun, 7 Feb 2010 05:01:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203600 - user/kmacy/head_flowtable_v6/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 05:01:03 -0000 Author: kmacy Date: Sun Feb 7 05:01:02 2010 New Revision: 203600 URL: http://svn.freebsd.org/changeset/base/203600 Log: fix debug output formatting Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 04:51:29 2010 (r203599) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 05:01:02 2010 (r203600) @@ -1072,7 +1072,7 @@ flowtable_lookup(struct flowtable *ft, s } keycheck: #ifdef FLOWTABLE_DEBUG - if (flags & FL_DEBUG_ALL){ + if (flags & FL_DEBUG){ printf("keycheck: key=%x:%x:%x hash=%x ", key[0], key[1], key[2], hash); ipv4_flow_print_tuple(flags, proto, @@ -1573,9 +1573,10 @@ skipaddr: if (rt_valid && (fle->f_rt->rt_flags & RTF_UP)) db_printf(" RTF_UP "); - db_printf("\tkey=%x:%x:%x hash=%08x idle_time=%03d\n\trt=%p ifp=%p", - hashkey[0], hashkey[1], hashkey[2], fle->f_fhash, idle_time, - fle->f_rt, rt_valid ? fle->f_rt->rt_ifp : NULL); + db_printf("\n\tkey=%x:%x:%x hash=%08x idle_time=%03d" + "\n\trt=%p ifp=%p", + hashkey[0], hashkey[1], hashkey[2], fle->f_fhash, + idle_time, fle->f_rt, rt_valid ? fle->f_rt->rt_ifp : NULL); db_printf("\n"); } From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 05:16:39 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4B7A11065676; Sun, 7 Feb 2010 05:16:39 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 205418FC0A; Sun, 7 Feb 2010 05:16:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o175Gdjt048643; Sun, 7 Feb 2010 05:16:39 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o175GdPk048641; Sun, 7 Feb 2010 05:16:39 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002070516.o175GdPk048641@svn.freebsd.org> From: Kip Macy Date: Sun, 7 Feb 2010 05:16:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203601 - user/kmacy/head_flowtable_v6/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 05:16:39 -0000 Author: kmacy Date: Sun Feb 7 05:16:38 2010 New Revision: 203601 URL: http://svn.freebsd.org/changeset/base/203601 Log: clean up ddb output further Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 05:01:02 2010 (r203600) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Sun Feb 7 05:16:38 2010 (r203601) @@ -1073,8 +1073,11 @@ flowtable_lookup(struct flowtable *ft, s keycheck: #ifdef FLOWTABLE_DEBUG if (flags & FL_DEBUG){ - printf("keycheck: key=%x:%x:%x hash=%x ", - key[0], key[1], key[2], hash); + printf("keycheck: key=%x:%x:%x hash=%x fibnum=%02d " + "keyequal=%d hashequal=%d", + key[0], key[1], key[2], hash, fibnum, + flowtable_key_equal(fle, key), + (fle->f_fhash == hash)); ipv4_flow_print_tuple(flags, proto, (struct sockaddr_in *)ssa, (struct sockaddr_in *)dsa); @@ -1573,10 +1576,11 @@ skipaddr: if (rt_valid && (fle->f_rt->rt_flags & RTF_UP)) db_printf(" RTF_UP "); - db_printf("\n\tkey=%x:%x:%x hash=%08x idle_time=%03d" - "\n\trt=%p ifp=%p", + db_printf("\n\tkey=%08x:%08x:%08x hash=%08x idle_time=%03d" + "\n\tfibnum=%02d rt=%p ifp=%p", hashkey[0], hashkey[1], hashkey[2], fle->f_fhash, - idle_time, fle->f_rt, rt_valid ? fle->f_rt->rt_ifp : NULL); + idle_time, fle->f_fibnum, + fle->f_rt, rt_valid ? fle->f_rt->rt_ifp : NULL); db_printf("\n"); } @@ -1587,7 +1591,8 @@ flowtable_show(struct flowtable *ft, int struct flentry *fle, **flehead; bitstr_t *mask, *tmpmask; - db_printf("cpu: %d\n", cpuid); + if (cpuid != -1) + db_printf("cpu: %d\n", cpuid); mask = flowtable_mask_pcpu(ft, cpuid); tmpmask = ft->ft_tmpmask; memcpy(tmpmask, mask, ft->ft_size/8); @@ -1632,7 +1637,7 @@ flowtable_show_vnet(void) flowtable_show(ft, i); } } else { - flowtable_show(ft, 0); + flowtable_show(ft, -1); } ft = ft->ft_next; } From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 17:50:14 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 082661065670; Sun, 7 Feb 2010 17:50:14 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id ED58D8FC08; Sun, 7 Feb 2010 17:50:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o17HoDtV090360; Sun, 7 Feb 2010 17:50:13 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o17HoDo9090358; Sun, 7 Feb 2010 17:50:13 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201002071750.o17HoDo9090358@svn.freebsd.org> From: Luigi Rizzo Date: Sun, 7 Feb 2010 17:50:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203614 - user/luigi/ipfw3-head/sys/netinet/ipfw X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 17:50:14 -0000 Author: luigi Date: Sun Feb 7 17:50:13 2010 New Revision: 203614 URL: http://svn.freebsd.org/changeset/base/203614 Log: fix a panic on lock recursion when doing "ipfw set XXX ...". I moved the lock/unlock around the entire switch and forgot to remove the calls internally. Submitted by: Marta Carbone Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_sockopt.c Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_sockopt.c ============================================================================== --- user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_sockopt.c Sun Feb 7 17:05:22 2010 (r203613) +++ user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_sockopt.c Sun Feb 7 17:50:13 2010 (r203614) @@ -343,27 +343,22 @@ del_entry(struct ip_fw_chain *chain, u_i break; case 2: /* move rules with given number to new set */ - IPFW_UH_WLOCK(chain); for (i = 0; i < chain->n_rules; i++) { rule = chain->map[i]; if (rule->rulenum == rulenum) rule->set = new_set; } - IPFW_UH_WUNLOCK(chain); break; case 3: /* move rules with given set number to new set */ - IPFW_UH_WLOCK(chain); for (i = 0; i < chain->n_rules; i++) { rule = chain->map[i]; if (rule->set == rulenum) rule->set = new_set; } - IPFW_UH_WUNLOCK(chain); break; case 4: /* swap two sets */ - IPFW_UH_WLOCK(chain); for (i = 0; i < chain->n_rules; i++) { rule = chain->map[i]; if (rule->set == rulenum) @@ -371,7 +366,6 @@ del_entry(struct ip_fw_chain *chain, u_i else if (rule->set == new_set) rule->set = rulenum; } - IPFW_UH_WUNLOCK(chain); break; } rule = chain->reap; From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 17:51:20 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1DE57106566B; Sun, 7 Feb 2010 17:51:20 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0F1308FC0A; Sun, 7 Feb 2010 17:51:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o17HpJHs090629; Sun, 7 Feb 2010 17:51:19 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o17HpJ5B090627; Sun, 7 Feb 2010 17:51:19 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201002071751.o17HpJ5B090627@svn.freebsd.org> From: Luigi Rizzo Date: Sun, 7 Feb 2010 17:51:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203615 - user/luigi/ipfw3-head/sys/netinet/ipfw X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 17:51:20 -0000 Author: luigi Date: Sun Feb 7 17:51:19 2010 New Revision: 203615 URL: http://svn.freebsd.org/changeset/base/203615 Log: avoid a compiler warning on a function that does not return a value. Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c ============================================================================== --- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c Sun Feb 7 17:50:13 2010 (r203614) +++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c Sun Feb 7 17:51:19 2010 (r203615) @@ -107,11 +107,13 @@ static inline void remove_queue_q(struct rr_queue *q, struct rr_si *si) { struct rr_queue *prev; - + if (q->status != 1) return; - if (q == si->head) - return rr_remove_head(si); + if (q == si->head) { + rr_remove_head(si); + return; + } for (prev = si->head; prev; prev = prev->qnext) { if (prev->qnext != q) From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 17:51:54 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F3321065741; Sun, 7 Feb 2010 17:51:54 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3EF498FC14; Sun, 7 Feb 2010 17:51:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o17HpsH9090795; Sun, 7 Feb 2010 17:51:54 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o17HpsBb090793; Sun, 7 Feb 2010 17:51:54 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201002071751.o17HpsBb090793@svn.freebsd.org> From: Luigi Rizzo Date: Sun, 7 Feb 2010 17:51:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203616 - user/luigi/ipfw3-head/sys/netinet/ipfw X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 17:51:54 -0000 Author: luigi Date: Sun Feb 7 17:51:53 2010 New Revision: 203616 URL: http://svn.freebsd.org/changeset/base/203616 Log: correct a comment and other whitespace changes Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched.h Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched.h ============================================================================== --- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched.h Sun Feb 7 17:51:19 2010 (r203615) +++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched.h Sun Feb 7 17:51:53 2010 (r203616) @@ -44,11 +44,11 @@ struct dn_alg { uint32_t flags; /* DN_MULTIQUEUE if supports multiple queues */ /* - * The following define the size of 4 optional data structures + * The following define the size of 3 optional data structures * that may need to be allocated at runtime, and are appended - * to each of the base data structures. + * to each of the base data structures: scheduler, sched.inst, + * and queue. We don't have a per-flowset structure. */ - /* + parameters attached to the template, e.g. * default queue sizes, weights, quantum size, and so on; */ @@ -128,6 +128,7 @@ struct dn_alg { * Additionally, dummynet exports some functions and macros * to be used by schedulers: */ + void dn_free_pkts(struct mbuf *mnext); int dn_enqueue(struct dn_queue *q, struct mbuf* m, int drop); /* bound a variable between min and max */ From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 17:53:10 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77D9D1065672; Sun, 7 Feb 2010 17:53:10 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 692978FC15; Sun, 7 Feb 2010 17:53:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o17HrAjl091098; Sun, 7 Feb 2010 17:53:10 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o17HrASW091096; Sun, 7 Feb 2010 17:53:10 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201002071753.o17HrASW091096@svn.freebsd.org> From: Luigi Rizzo Date: Sun, 7 Feb 2010 17:53:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203617 - user/luigi/ipfw3-head/sys/netinet/ipfw X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 17:53:10 -0000 Author: luigi Date: Sun Feb 7 17:53:10 2010 New Revision: 203617 URL: http://svn.freebsd.org/changeset/base/203617 Log: add fls for a platform that does not have it Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_qfq.c Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_qfq.c ============================================================================== --- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_qfq.c Sun Feb 7 17:51:53 2010 (r203616) +++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_qfq.c Sun Feb 7 17:53:10 2010 (r203617) @@ -57,6 +57,16 @@ typedef unsigned long bitmap; * bitmaps ops are critical. Some linux versions have __fls * and the bitmap ops. Some machines have ffs */ +#if defined(_WIN32) +static int fls(unsigned long n) +{ + int i = 0; + for (i = 0; n > 0; n >>= 1, i++) + ; + return i; +} +#endif + #if !defined(_KERNEL) || defined( __FreeBSD__ ) || defined(_WIN32) static inline unsigned long __fls(unsigned long word) { From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 18:01:19 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9A9C5106566C; Sun, 7 Feb 2010 18:01:19 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8A0158FC08; Sun, 7 Feb 2010 18:01:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o17I1JQC092984; Sun, 7 Feb 2010 18:01:19 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o17I1J4S092978; Sun, 7 Feb 2010 18:01:19 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201002071801.o17I1J4S092978@svn.freebsd.org> From: Luigi Rizzo Date: Sun, 7 Feb 2010 18:01:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203619 - in user/luigi/ipfw3-head: sbin/ipfw sys/netinet sys/netinet/ipfw X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 18:01:19 -0000 Author: luigi Date: Sun Feb 7 18:01:19 2010 New Revision: 203619 URL: http://svn.freebsd.org/changeset/base/203619 Log: Several bugfixes from Riccardo Panicucci, including: - fix handling of queue hash tables when we have both flowset and scheduler mask; - add a flag in kernel/userland messages to tell whether we issue a "pipe config" or "sched config", and preserve mask configuration for the latter. - compute the space correctly when copying information to userland. Include a detailed explanation on how the computation is made. On passing, also move the initializationn of dn_cfg to ip_dn_init(). Modified: user/luigi/ipfw3-head/sbin/ipfw/altq.c user/luigi/ipfw3-head/sbin/ipfw/dummynet.c user/luigi/ipfw3-head/sys/netinet/ip_dummynet.h user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dn_io.c user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c Modified: user/luigi/ipfw3-head/sbin/ipfw/altq.c ============================================================================== --- user/luigi/ipfw3-head/sbin/ipfw/altq.c Sun Feb 7 18:00:13 2010 (r203618) +++ user/luigi/ipfw3-head/sbin/ipfw/altq.c Sun Feb 7 18:01:19 2010 (r203619) @@ -39,6 +39,7 @@ #include /* IFNAMSIZ */ #include +#include /* in_addr */ #include /* Modified: user/luigi/ipfw3-head/sbin/ipfw/dummynet.c ============================================================================== --- user/luigi/ipfw3-head/sbin/ipfw/dummynet.c Sun Feb 7 18:00:13 2010 (r203618) +++ user/luigi/ipfw3-head/sbin/ipfw/dummynet.c Sun Feb 7 18:01:19 2010 (r203619) @@ -780,7 +780,7 @@ ipfw_config_pipe(int ac, char **av) struct dn_profile *pf = NULL; struct ipfw_flow_id *mask = NULL; int lmax; - uint32_t _foo = 0, *flags = &_foo; + uint32_t _foo = 0, *flags = &_foo , *buckets = &_foo; /* * allocate space for 1 header, @@ -823,6 +823,8 @@ ipfw_config_pipe(int ac, char **av) sch->oid.subtype = 0; /* defaults to WF2Q+ */ mask = &sch->sched_mask; flags = &sch->flags; + buckets = &sch->buckets; + *flags |= DN_PIPE_CMD; p->link_nr = i; @@ -836,6 +838,7 @@ ipfw_config_pipe(int ac, char **av) fs->fs_nr = i; mask = &fs->flow_mask; flags = &fs->flags; + buckets = &fs->buckets; break; case 3: /* "sched N config ..." */ @@ -844,6 +847,7 @@ ipfw_config_pipe(int ac, char **av) sch->sched_nr = i; mask = &sch->sched_mask; flags = &sch->flags; + buckets = &sch->buckets; /* fs is used only with !MULTIQUEUE schedulers */ fs->fs_nr = i + DN_MAX_ID; fs->sched_nr = i; @@ -899,7 +903,7 @@ ipfw_config_pipe(int ac, char **av) case TOK_BUCKETS: NEED(fs, "buckets is only for pipes or flowsets"); NEED1("buckets needs argument\n"); - fs->buckets = strtoul(av[0], NULL, 0); + *buckets = strtoul(av[0], NULL, 0); ac--; av++; break; Modified: user/luigi/ipfw3-head/sys/netinet/ip_dummynet.h ============================================================================== --- user/luigi/ipfw3-head/sys/netinet/ip_dummynet.h Sun Feb 7 18:00:13 2010 (r203618) +++ user/luigi/ipfw3-head/sys/netinet/ip_dummynet.h Sun Feb 7 18:01:19 2010 (r203619) @@ -90,10 +90,12 @@ enum { /* subtype for schedulers, flowse enum { /* user flags */ DN_HAVE_MASK = 0x0001, /* fs or sched has a mask */ DN_NOERROR = 0x0002, /* do not report errors */ + DN_QHT_HASH = 0x0004, /* qht is a hash table */ DN_QSIZE_BYTES = 0x0008, /* queue size is in bytes */ DN_HAS_PROFILE = 0x0010, /* a link has a profile */ DN_IS_RED = 0x0020, DN_IS_GENTLE_RED= 0x0040, + DN_PIPE_CMD = 0x1000, /* pipe config... */ }; /* @@ -122,7 +124,7 @@ struct dn_link { struct dn_fs { struct dn_id oid; uint32_t fs_nr; /* the flowset number */ - int flags; /* userland flags */ + uint32_t flags; /* userland flags */ int qsize; /* queue size in slots or bytes */ int32_t plr; /* PLR, pkt loss rate (2^31-1 means 100%) */ uint32_t buckets; /* buckets used for the queue hash table */ Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dn_io.c ============================================================================== --- user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dn_io.c Sun Feb 7 18:00:13 2010 (r203618) +++ user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dn_io.c Sun Feb 7 18:01:19 2010 (r203619) @@ -68,16 +68,7 @@ __FBSDID("$FreeBSD$"); */ static uint64_t curr_time = 0; /* current simulation time */ -struct dn_parms dn_cfg = { - .slot_limit = 100, /* Foot shooting limit for queues. */ - .byte_limit = 1024 * 1024, - - .red_lookup_depth = 256, /* RED - default lookup table depth */ - .red_avg_pkt_size = 512, /* RED - default medium packet size */ - .red_max_pkt_size = 1500, /* RED - default max packet size */ - .max_hash_size = 1024, /* max in the hash tables */ - .hash_size = 64, /* default hash size */ -}; +struct dn_parms dn_cfg; static long tick_last; /* Last tick duration (usec). */ static long tick_delta; /* Last vs standard tick diff (usec). */ Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c ============================================================================== --- user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c Sun Feb 7 18:00:13 2010 (r203618) +++ user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c Sun Feb 7 18:01:19 2010 (r203619) @@ -76,6 +76,16 @@ static struct callout dn_timeout; static struct task dn_task; static struct taskqueue *dn_tq = NULL; +/* + * XXX max_qlen is used as a temporary measure to store the + * max size of 'struct dn_queue' plus scheduler-specific extensions. + * This is used to determine how much space is needed on a + * getsockopt() to copy queues up. + * Eventually this h should go away as we only want to copy the + * basic dn_queue. + */ +static int max_qlen = 0; + static void dummynet(void * __unused unused) { @@ -295,7 +305,7 @@ q_new(uintptr_t key, int flags, void *ar } set_oid(&q->ni.oid, DN_QUEUE, size); - if (fs->fs.flags & DN_HAVE_MASK) + if (fs->fs.flags & DN_QHT_HASH) q->ni.fid = *(struct ipfw_flow_id *)key; q->fs = fs; q->_si = template->_si; @@ -779,6 +789,11 @@ copy_obj(char **start, char *end, void * } ND("type %d %s %d len %d", o->type, msg, i, o->len); bcopy(_o, *start, o->len); + if (o->type == DN_LINK) { + /* Adjust burst parameter for link */ + struct dn_link *l = (struct dn_link *)*start; + l->burst = div64(l->burst, 8 * hz); + } *start += o->len; return 0; } @@ -1152,6 +1167,11 @@ config_sched(struct dn_sch *_nsch, struc struct schk_new_arg a; /* argument for schk_new */ int i; struct dn_link p; /* copy of oldlink */ + /* Used to preserv mask parameter */ + struct ipfw_flow_id new_mask; + int new_buckets = 0; + int new_flags = 0; + int pipe_cmd; a.sch = _nsch; if (a.sch->oid.len != sizeof(*a.sch)) { @@ -1167,6 +1187,15 @@ config_sched(struct dn_sch *_nsch, struc 1, dn_cfg.max_hash_size, "sched buckets"); /* XXX other sanity checks */ bzero(&p, sizeof(p)); + + pipe_cmd = a.sch->flags & DN_PIPE_CMD; + a.sch->flags &= ~DN_PIPE_CMD; //XXX do it even if is not set? + if (pipe_cmd) { + /* Copy mask parameter */ + new_mask = a.sch->sched_mask; + new_buckets = a.sch->buckets; + new_flags = a.sch->flags; + } DN_BH_WLOCK(); again: /* run twice, for wfq and fifo */ /* @@ -1183,7 +1212,21 @@ again: /* run twice, for wfq and fifo */ s = dn_ht_find(dn_cfg.schedhash, i, 0, &a); if (s != NULL) { a.fp = s->fp; + /* Scheduler exists, skip to FIFO scheduler + * if command was pipe config... + */ + if (pipe_cmd) + goto next; } else { + /* New scheduler, create a wf2q+ with no mask + * if command was pipe config... + */ + if (pipe_cmd) { + /* clear mask parameter */ + bzero(&a.sch->sched_mask, sizeof(new_mask)); + a.sch->buckets = 0; + a.sch->flags &= ~DN_HAVE_MASK; + } a.sch->oid.subtype = DN_SCHED_WF2QP; goto again; } @@ -1258,8 +1301,22 @@ again: /* run twice, for wfq and fifo */ if (s->fp->config) s->fp->config(s); update_fs(s); +next: if (i < DN_MAX_ID) { /* now configure the FIFO instance */ i += DN_MAX_ID; + if (pipe_cmd) { + /* Restore mask parameter for FIFO */ + a.sch->sched_mask = new_mask; + a.sch->buckets = new_buckets; + a.sch->flags = new_flags; + } else { + /* sched config shouldn't modify the FIFO scheduler */ + if (dn_ht_find(dn_cfg.schedhash, i, 0, &a) != NULL) { + /* FIFO already exist, don't touch it */ + DN_BH_WUNLOCK(); + return 0; + } + } a.sch->sched_nr = i; a.sch->oid.subtype = DN_SCHED_FIFO; bzero(a.sch->name, sizeof(a.sch->name)); @@ -1453,14 +1510,45 @@ compute_space(struct dn_id *cmd, int *to { int x = 0, need = 0; + /* NOTE about compute space: + * NP = dn_cfg.schk_count + * NSI = dn_cfg.si_count + * NF = dn_cfg.fsk_count + * NQ = dn_cfg.queue_count + * - ipfw pipe show + * (NP/2)*(dn_link + dn_sch + dn_id + dn_fs) only half scheduler + * link, scheduler template, flowset + * integrated in scheduler and header + * for flowset list + * (NSI)*(dn_flow + dn_queue) all scheduler instance + one + * queue per instance + * - ipfw sched show + * (NP/2)*(dn_link + dn_sch + dn_id + dn_fs) only half scheduler + * link, scheduler template, flowset + * integrated in scheduler and header + * for flowset list + * (NSI * dn_flow) all scheduler instances + * (NF * sizeof(uint_32)) space for flowset list linked to scheduler + * (NQ * dn_queue) all queue [XXXfor now not listed] + * - ipfw queue show + * (NF * dn_fs) all flowset + * (NQ * dn_queue) all queues + * I use 'max_qlen' instead of sizeof(dn_queue) because + * a queue can be of variable size, so use the max queue size. + */ switch (cmd->subtype) { default: return -1; case DN_LINK: /* pipe show */ - x = DN_C_LINK | DN_C_FS | DN_SCH | DN_C_FLOW; + x = DN_C_LINK /*| DN_C_FS*/ | DN_C_SCH | DN_C_FLOW; + need += dn_cfg.schk_count * sizeof(struct dn_fs) / 2; + need += dn_cfg.si_count * max_qlen; + need += dn_cfg.fsk_count * sizeof(uint32_t); break; case DN_SCH: /* sched show */ - x = DN_C_SCH | DN_C_LINK | DN_C_FLOW; + need += dn_cfg.schk_count * sizeof(struct dn_fs) / 2; + need += dn_cfg.fsk_count * sizeof(uint32_t); + x = DN_C_SCH | DN_C_LINK | DN_C_FLOW /*|| DN_C_QUEUE*/; break; case DN_FS: /* queue show */ x = DN_C_FS | DN_C_QUEUE; @@ -1468,20 +1556,20 @@ compute_space(struct dn_id *cmd, int *to } *to_copy = x; if (x & DN_C_SCH) { - need += dn_cfg.schk_count * sizeof(struct dn_sch); - /* also, each fs might be attached to a sched */ - need += dn_cfg.fsk_count * - (sizeof(struct dn_id) + 4); + need += dn_cfg.schk_count * sizeof(struct dn_sch) / 2; + /* NOT also, each fs might be attached to a sched */ + need += dn_cfg.schk_count * sizeof(struct dn_id) / 2; } if (x & DN_C_FS) need += dn_cfg.fsk_count * sizeof(struct dn_fs); - if (x & DN_C_LINK) - need += dn_cfg.schk_count * sizeof(struct dn_link); + if (x & DN_C_LINK) { + need += dn_cfg.schk_count * sizeof(struct dn_link) / 2; + } /* XXX queue space might be variable */ if (x & DN_C_QUEUE) - need += dn_cfg.queue_count * sizeof(struct dn_queue); + need += dn_cfg.queue_count * max_qlen; if (x & DN_C_FLOW) - need += dn_cfg.si_count * sizeof(struct dn_flow); + need += dn_cfg.si_count * (sizeof(struct dn_flow)); return need; } @@ -1532,7 +1620,7 @@ dummynet_get(struct sockopt *sopt) "%d:%d si %d, %d:%d queues %d", dn_cfg.schk_count, sizeof(struct dn_sch), DN_SCH, dn_cfg.schk_count, sizeof(struct dn_link), DN_LINK, - dn_cfg.fsk_count, sizeof(struct new_fs), DN_FS, + dn_cfg.fsk_count, sizeof(struct dn_fs), DN_FS, dn_cfg.si_count, sizeof(struct dn_flow), DN_SCH_I, dn_cfg.queue_count, sizeof(struct dn_queue), DN_QUEUE); sopt->sopt_valsize = sopt_valsize; @@ -1622,6 +1710,20 @@ ip_dn_init(void) if (bootverbose) printf("DUMMYNET with IPv6 initialized (100131)\n"); + /* init defaults here, MSVC does not accept initializers */ + /* queue limits */ + dn_cfg.slot_limit = 100; /* Foot shooting limit for queues. */ + dn_cfg.byte_limit = 1024 * 1024; + + /* RED parameters */ + dn_cfg.red_lookup_depth = 256; /* default lookup table depth */ + dn_cfg.red_avg_pkt_size = 512; /* default medium packet size */ + dn_cfg.red_max_pkt_size = 1500; /* default max packet size */ + + /* hash tables */ + dn_cfg.max_hash_size = 1024; /* max in the hash tables */ + dn_cfg.hash_size = 64; /* default hash size */ + /* create hash tables for schedulers and flowsets. * In both we search by key and by pointer. */ @@ -1702,11 +1804,17 @@ static int load_dn_sched(struct dn_alg *d) { struct dn_alg *s; + int q_len = 0; if (d == NULL) return 1; /* error */ ip_dn_init(); /* just in case, we need the lock */ + /* check the max queue lenght */ + q_len = sizeof(struct dn_queue) + d->q_datalen; + if (max_qlen <= q_len) { + max_qlen = q_len; + } /* Check that mandatory funcs exists */ if (d->enqueue == NULL || d->dequeue == NULL) { D("missing enqueue or dequeue for %s", d->name); From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 19:04:13 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9DC251065692; Sun, 7 Feb 2010 19:04:13 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 896D88FC15; Sun, 7 Feb 2010 19:04:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o17J4Dja007153; Sun, 7 Feb 2010 19:04:13 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o17J4CtL007110; Sun, 7 Feb 2010 19:04:12 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201002071904.o17J4CtL007110@svn.freebsd.org> From: Warner Losh Date: Sun, 7 Feb 2010 19:04:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203623 - in user/imp/tbemd: . bin/pax bin/sh contrib/binutils/bfd etc etc/defaults etc/rc.d games/morse gnu/lib/libgomp gnu/usr.bin/binutils gnu/usr.bin/binutils/gdb gnu/usr.bin/binuti... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 19:04:13 -0000 Author: imp Date: Sun Feb 7 19:04:12 2010 New Revision: 203623 URL: http://svn.freebsd.org/changeset/base/203623 Log: merge from base/head Added: user/imp/tbemd/etc/rc.d/rtsold - copied unchanged from r203622, head/etc/rc.d/rtsold user/imp/tbemd/tools/regression/bin/sh/parameters/mail1.0 - copied unchanged from r203622, head/tools/regression/bin/sh/parameters/mail1.0 user/imp/tbemd/tools/regression/bin/sh/parameters/mail2.0 - copied unchanged from r203622, head/tools/regression/bin/sh/parameters/mail2.0 user/imp/tbemd/usr.bin/tar/err.c - copied unchanged from r203622, head/usr.bin/tar/err.c user/imp/tbemd/usr.bin/tar/err.h - copied unchanged from r203622, head/usr.bin/tar/err.h user/imp/tbemd/usr.bin/tar/line_reader.c - copied unchanged from r203622, head/usr.bin/tar/line_reader.c user/imp/tbemd/usr.bin/tar/line_reader.h - copied unchanged from r203622, head/usr.bin/tar/line_reader.h user/imp/tbemd/usr.bin/tar/matching.h - copied unchanged from r203622, head/usr.bin/tar/matching.h user/imp/tbemd/usr.bin/tar/pathmatch.c - copied unchanged from r203622, head/usr.bin/tar/pathmatch.c user/imp/tbemd/usr.bin/tar/pathmatch.h - copied unchanged from r203622, head/usr.bin/tar/pathmatch.h Deleted: user/imp/tbemd/gnu/usr.bin/binutils/gdb/Makefile.alpha user/imp/tbemd/gnu/usr.bin/binutils/ld/Makefile.alpha user/imp/tbemd/gnu/usr.bin/binutils/libbfd/Makefile.alpha user/imp/tbemd/gnu/usr.bin/binutils/libopcodes/Makefile.alpha user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h user/imp/tbemd/usr.bin/tar/siginfo.c Modified: user/imp/tbemd/Makefile.inc1 user/imp/tbemd/bin/pax/Makefile user/imp/tbemd/bin/pax/cpio.h user/imp/tbemd/bin/pax/tar.h user/imp/tbemd/bin/sh/main.c user/imp/tbemd/bin/sh/var.c user/imp/tbemd/contrib/binutils/bfd/elf32-mips.c user/imp/tbemd/etc/defaults/rc.conf user/imp/tbemd/etc/network.subr user/imp/tbemd/etc/rc.d/Makefile user/imp/tbemd/etc/services user/imp/tbemd/games/morse/Makefile user/imp/tbemd/games/morse/morse.c user/imp/tbemd/gnu/lib/libgomp/Makefile user/imp/tbemd/gnu/usr.bin/binutils/Makefile.inc user/imp/tbemd/gnu/usr.bin/binutils/libbfd/Makefile user/imp/tbemd/lib/libc/gen/getutxent.3 user/imp/tbemd/lib/libc/mips/sys/ptrace.S user/imp/tbemd/lib/libc/string/memccpy.3 user/imp/tbemd/lib/libc/string/memchr.3 user/imp/tbemd/lib/libc/string/memcmp.3 user/imp/tbemd/lib/libc/string/memset.3 user/imp/tbemd/lib/msun/amd64/fenv.c user/imp/tbemd/lib/msun/amd64/fenv.h user/imp/tbemd/lib/msun/i387/fenv.c user/imp/tbemd/lib/msun/i387/fenv.h user/imp/tbemd/release/doc/en_US.ISO8859-1/hardware/article.sgml user/imp/tbemd/sbin/dump/itime.c user/imp/tbemd/sbin/dump/main.c user/imp/tbemd/sbin/geom/class/multipath/geom_multipath.c user/imp/tbemd/sbin/ifconfig/ifcarp.c user/imp/tbemd/sbin/iscontrol/iscontrol.h user/imp/tbemd/sbin/iscontrol/pdu.c user/imp/tbemd/sbin/mount_nfs/mount_nfs.c user/imp/tbemd/sbin/newfs/newfs.c user/imp/tbemd/sbin/sysctl/sysctl.8 user/imp/tbemd/sbin/umount/umount.c user/imp/tbemd/share/man/man4/acpi_sony.4 user/imp/tbemd/share/man/man4/vr.4 user/imp/tbemd/share/man/man9/mtx_pool.9 user/imp/tbemd/share/misc/committers-src.dot user/imp/tbemd/sys/boot/arm/uboot/ldscript.arm user/imp/tbemd/sys/cam/ata/ata_all.c user/imp/tbemd/sys/cam/ata/ata_xpt.c user/imp/tbemd/sys/cam/cam_xpt.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c user/imp/tbemd/sys/conf/Makefile.mips user/imp/tbemd/sys/conf/NOTES user/imp/tbemd/sys/conf/files user/imp/tbemd/sys/conf/files.mips user/imp/tbemd/sys/conf/kern.mk user/imp/tbemd/sys/conf/kern.pre.mk user/imp/tbemd/sys/conf/kmod.mk user/imp/tbemd/sys/dev/acpi_support/acpi_sony.c user/imp/tbemd/sys/dev/acpica/acpi_cpu.c user/imp/tbemd/sys/dev/ahci/ahci.c user/imp/tbemd/sys/dev/ata/atapi-cam.c user/imp/tbemd/sys/dev/ata/chipsets/ata-siliconimage.c user/imp/tbemd/sys/dev/ciss/ciss.c user/imp/tbemd/sys/dev/fb/vesa.c user/imp/tbemd/sys/dev/isp/isp.c user/imp/tbemd/sys/dev/isp/isp_freebsd.c user/imp/tbemd/sys/dev/isp/isp_library.c user/imp/tbemd/sys/dev/isp/isp_library.h user/imp/tbemd/sys/dev/isp/isp_pci.c user/imp/tbemd/sys/dev/isp/isp_sbus.c user/imp/tbemd/sys/dev/isp/ispmbox.h user/imp/tbemd/sys/dev/isp/ispvar.h user/imp/tbemd/sys/dev/mpt/mpt_cam.c user/imp/tbemd/sys/dev/mpt/mpt_raid.c user/imp/tbemd/sys/dev/pci/pci.c user/imp/tbemd/sys/dev/pci/pcivar.h user/imp/tbemd/sys/dev/siis/siis.c user/imp/tbemd/sys/dev/usb/serial/u3g.c user/imp/tbemd/sys/dev/usb/usbdevs user/imp/tbemd/sys/geom/geom_redboot.c user/imp/tbemd/sys/geom/virstor/g_virstor.c user/imp/tbemd/sys/ia64/ia64/trap.c user/imp/tbemd/sys/kern/kern_shutdown.c user/imp/tbemd/sys/kern/kern_sysctl.c user/imp/tbemd/sys/kern/kern_umtx.c user/imp/tbemd/sys/kern/subr_bus.c user/imp/tbemd/sys/kern/tty_inq.c user/imp/tbemd/sys/kern/tty_outq.c user/imp/tbemd/sys/kern/vfs_lookup.c user/imp/tbemd/sys/mips/conf/SWARM user/imp/tbemd/sys/mips/include/proc.h user/imp/tbemd/sys/mips/mips/exception.S user/imp/tbemd/sys/mips/mips/swtch.S user/imp/tbemd/sys/mips/mips/trap.c user/imp/tbemd/sys/mips/sibyte/sb_asm.S user/imp/tbemd/sys/mips/sibyte/sb_machdep.c user/imp/tbemd/sys/mips/sibyte/sb_scd.c user/imp/tbemd/sys/mips/sibyte/sb_scd.h user/imp/tbemd/sys/mips/sibyte/sb_zbbus.c user/imp/tbemd/sys/mips/sibyte/sb_zbpci.c user/imp/tbemd/sys/net/if_lagg.c user/imp/tbemd/sys/net/if_lagg.h user/imp/tbemd/sys/net/vnet.c user/imp/tbemd/sys/net/vnet.h user/imp/tbemd/sys/net80211/ieee80211_adhoc.c user/imp/tbemd/sys/net80211/ieee80211_hostap.c user/imp/tbemd/sys/net80211/ieee80211_mesh.c user/imp/tbemd/sys/net80211/ieee80211_sta.c user/imp/tbemd/sys/net80211/ieee80211_wds.c user/imp/tbemd/sys/netinet/in.c user/imp/tbemd/sys/netinet/sctp_input.c user/imp/tbemd/sys/sys/ata.h user/imp/tbemd/sys/vm/default_pager.c user/imp/tbemd/tools/build/mk/OptionalObsoleteFiles.inc user/imp/tbemd/usr.bin/bc/Makefile user/imp/tbemd/usr.bin/bc/bc.y user/imp/tbemd/usr.bin/bc/extern.h user/imp/tbemd/usr.bin/bc/scan.l user/imp/tbemd/usr.bin/dc/Makefile user/imp/tbemd/usr.bin/dc/bcode.c user/imp/tbemd/usr.bin/dc/bcode.h user/imp/tbemd/usr.bin/dc/dc.c user/imp/tbemd/usr.bin/dc/inout.c user/imp/tbemd/usr.bin/dc/mem.c user/imp/tbemd/usr.bin/dc/stack.c user/imp/tbemd/usr.bin/gcore/extern.h user/imp/tbemd/usr.bin/gcore/gcore.c user/imp/tbemd/usr.bin/kdump/kdump.c user/imp/tbemd/usr.bin/procstat/procstat.1 user/imp/tbemd/usr.bin/tar/Makefile user/imp/tbemd/usr.bin/tar/bsdtar.c user/imp/tbemd/usr.bin/tar/bsdtar.h user/imp/tbemd/usr.bin/tar/bsdtar_platform.h user/imp/tbemd/usr.bin/tar/cmdline.c user/imp/tbemd/usr.bin/tar/config_freebsd.h user/imp/tbemd/usr.bin/tar/getdate.c user/imp/tbemd/usr.bin/tar/matching.c user/imp/tbemd/usr.bin/tar/read.c user/imp/tbemd/usr.bin/tar/subst.c user/imp/tbemd/usr.bin/tar/util.c user/imp/tbemd/usr.bin/tar/write.c user/imp/tbemd/usr.bin/truss/mips-fbsd.c user/imp/tbemd/usr.sbin/powerd/Makefile user/imp/tbemd/usr.sbin/powerd/powerd.c user/imp/tbemd/usr.sbin/rpcbind/rpcb_svc_com.c Directory Properties: user/imp/tbemd/ (props changed) Modified: user/imp/tbemd/Makefile.inc1 ============================================================================== --- user/imp/tbemd/Makefile.inc1 Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/Makefile.inc1 Sun Feb 7 19:04:12 2010 (r203623) @@ -605,7 +605,7 @@ _zoneinfo= zic tzsetup .endif ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ - date echo egrep find grep ${_install-info} \ + install date echo egrep find grep ${_install-info} \ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ test true uname wc ${_zoneinfo} Modified: user/imp/tbemd/bin/pax/Makefile ============================================================================== --- user/imp/tbemd/bin/pax/Makefile Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/bin/pax/Makefile Sun Feb 7 19:04:12 2010 (r203623) @@ -33,9 +33,4 @@ SRCS= ar_io.c ar_subs.c buf_subs.c cache #MAN= pax.1 tar.1 cpio.1 #LINKS= ${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio -# This is verboten -.if ${MACHINE_CPUARCH} == "arm" -WARNS?= 3 -.endif - .include Modified: user/imp/tbemd/bin/pax/cpio.h ============================================================================== --- user/imp/tbemd/bin/pax/cpio.h Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/bin/pax/cpio.h Sun Feb 7 19:04:12 2010 (r203623) @@ -67,7 +67,7 @@ typedef struct { char c_mtime[11]; /* modification time */ char c_namesize[6]; /* length of pathname */ char c_filesize[11]; /* length of file in bytes */ -} HD_CPIO; +} HD_CPIO __aligned(1); #define MAGIC 070707 /* transportable archive id */ @@ -98,7 +98,7 @@ typedef struct { u_char h_namesize[2]; u_char h_filesize_1[2]; u_char h_filesize_2[2]; -} HD_BCPIO; +} HD_BCPIO __aligned(1); #ifdef _PAX_ /* @@ -136,7 +136,7 @@ typedef struct { char c_rmin[8]; /* special file minor # */ char c_namesize[8]; /* length of pathname */ char c_chksum[8]; /* 0 OR CRC of bytes of FILE data */ -} HD_VCPIO; +} HD_VCPIO __aligned(1); #define VMAGIC 070701 /* sVr4 new portable archive id */ #define VCMAGIC 070702 /* sVr4 new portable archive id CRC */ Modified: user/imp/tbemd/bin/pax/tar.h ============================================================================== --- user/imp/tbemd/bin/pax/tar.h Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/bin/pax/tar.h Sun Feb 7 19:04:12 2010 (r203623) @@ -96,7 +96,7 @@ typedef struct { char chksum[CHK_LEN]; /* checksum */ char linkflag; /* norm, hard, or sym. */ char linkname[TNMSZ]; /* linked to name */ -} HD_TAR; +} HD_TAR __aligned(1); #ifdef _PAX_ /* @@ -142,4 +142,4 @@ typedef struct { char devmajor[8]; /* major device number */ char devminor[8]; /* minor device number */ char prefix[TPFSZ]; /* linked to name */ -} HD_USTAR; +} HD_USTAR __aligned(1); Modified: user/imp/tbemd/bin/sh/main.c ============================================================================== --- user/imp/tbemd/bin/sh/main.c Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/bin/sh/main.c Sun Feb 7 19:04:12 2010 (r203623) @@ -157,6 +157,8 @@ main(int argc, char *argv[]) out2fmt_flush("sh: cannot determine working directory\n"); if (getpwd() != NULL) setvar ("PWD", getpwd(), VEXPORT); + if (iflag) + chkmail(1); if (argv[0] && argv[0][0] == '-') { state = 1; read_profile("/etc/profile"); Modified: user/imp/tbemd/bin/sh/var.c ============================================================================== --- user/imp/tbemd/bin/sh/var.c Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/bin/sh/var.c Sun Feb 7 19:04:12 2010 (r203623) @@ -337,8 +337,13 @@ setvareq(char *s, int flags) /* * We could roll this to a function, to handle it as * a regular variable function callback, but why bother? + * + * Note: this assumes iflag is not set to 1 initially. + * As part of init(), this is called before arguments + * are looked at. */ - if (vp == &vmpath || (vp == &vmail && ! mpathset())) + if ((vp == &vmpath || (vp == &vmail && ! mpathset())) && + iflag == 1) chkmail(1); if ((vp->flags & VEXPORT) && localevar(s)) { change_env(s, 1); Modified: user/imp/tbemd/contrib/binutils/bfd/elf32-mips.c ============================================================================== --- user/imp/tbemd/contrib/binutils/bfd/elf32-mips.c Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/contrib/binutils/bfd/elf32-mips.c Sun Feb 7 19:04:12 2010 (r203623) @@ -1611,7 +1611,7 @@ static const struct ecoff_debug_swap mip /* The SVR4 MIPS ABI says that this should be 0x10000, and Linux uses page sizes of up to that limit, so we need to respect it. */ -#define ELF_MAXPAGESIZE 0x10000 +#define ELF_MAXPAGESIZE 0x1000 #define elf32_bed elf32_tradbed /* Include the target file again for this target. */ Modified: user/imp/tbemd/etc/defaults/rc.conf ============================================================================== --- user/imp/tbemd/etc/defaults/rc.conf Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/etc/defaults/rc.conf Sun Feb 7 19:04:12 2010 (r203623) @@ -460,6 +460,10 @@ ipv6_default_interface="NO" # Default ou # Now this works only for IPv6 link local # multicast addrs. rtsol_flags="" # Flags to IPv6 router solicitation. +rtsold_enable="NO" # Set to YES to enable an IPv6 router + # solicitation daemon. +rtsold_flags="-a" # Flags to an IPv6 router solicitation + # daemon. rtadvd_enable="NO" # Set to YES to enable an IPv6 router # advertisement daemon. If set to YES, # this router becomes a possible candidate Modified: user/imp/tbemd/etc/network.subr ============================================================================== --- user/imp/tbemd/etc/network.subr Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/etc/network.subr Sun Feb 7 19:04:12 2010 (r203623) @@ -882,7 +882,9 @@ ipv6_accept_rtadv_up() { if ipv6_autoconfif $1; then ifconfig $1 inet6 accept_rtadv up - rtsol ${rtsol_flags} $1 + if ! checkyesno rtsold_enable; then + rtsol ${rtsol_flags} $1 + fi fi } Modified: user/imp/tbemd/etc/rc.d/Makefile ============================================================================== --- user/imp/tbemd/etc/rc.d/Makefile Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/etc/rc.d/Makefile Sun Feb 7 19:04:12 2010 (r203623) @@ -30,7 +30,7 @@ FILES= DAEMON FILESYSTEMS LOGIN NETWORKI powerd power_profile ppp pppoed pwcheck \ quota \ random rarpd resolv rfcomm_pppd_server root \ - route6d routed routing rpcbind rtadvd rwho \ + route6d routed routing rpcbind rtadvd rtsold rwho \ savecore sdpd securelevel sendmail \ serial sppp statd static_arp stf swap1 \ syscons sysctl syslogd \ Copied: user/imp/tbemd/etc/rc.d/rtsold (from r203622, head/etc/rc.d/rtsold) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/imp/tbemd/etc/rc.d/rtsold Sun Feb 7 19:04:12 2010 (r203623, copy of r203622, head/etc/rc.d/rtsold) @@ -0,0 +1,26 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: rtsold +# REQUIRE: netif +# BEFORE: NETWORKING +# KEYWORD: nojail + +. /etc/rc.subr + +name="rtsold" +rcvar=`set_rcvar` +command="/usr/sbin/${name}" +pidfile="/var/run/${name}.pid" +start_postcmd="rtsold_poststart" + +rtsold_poststart() +{ + # wait for DAD + sleep $(($(${SYSCTL_N} net.inet6.ip6.dad_count) + 1)) +} + +load_rc_config $name +run_rc_command "$1" Modified: user/imp/tbemd/etc/services ============================================================================== --- user/imp/tbemd/etc/services Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/etc/services Sun Feb 7 19:04:12 2010 (r203623) @@ -2340,6 +2340,8 @@ sge_execd 6445/tcp #Grid Engine Execut sge_execd 6445/udp #Grid Engine Execution Service xdsxdm 6558/tcp xdsxdm 6558/udp +sane-port 6566/tcp #Scanner Access Now Easy (SANE) Control Port +sane-port 6566/udp #Scanner Access Now Easy (SANE) Control Port ircd 6667/tcp #Internet Relay Chat (unoffical) acmsoda 6969/tcp acmsoda 6969/udp Modified: user/imp/tbemd/games/morse/Makefile ============================================================================== --- user/imp/tbemd/games/morse/Makefile Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/games/morse/Makefile Sun Feb 7 19:04:12 2010 (r203623) @@ -4,8 +4,4 @@ PROG= morse MAN= morse.6 -.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" -CFLAGS += -DSPEAKER=\"/dev/speaker\" -.endif - .include Modified: user/imp/tbemd/games/morse/morse.c ============================================================================== --- user/imp/tbemd/games/morse/morse.c Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/games/morse/morse.c Sun Feb 7 19:04:12 2010 (r203623) @@ -63,6 +63,9 @@ static const char rcsid[] = #include #include +/* Always use the speaker, let the open fail if -p is selected */ +#define SPEAKER "/dev/speaker" + #ifdef SPEAKER #include #endif Modified: user/imp/tbemd/gnu/lib/libgomp/Makefile ============================================================================== --- user/imp/tbemd/gnu/lib/libgomp/Makefile Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/gnu/lib/libgomp/Makefile Sun Feb 7 19:04:12 2010 (r203623) @@ -25,7 +25,7 @@ VERSION_MAP= ${SRCDIR}/libgomp.map # Target-specific OpenMP configuration .if ${MACHINE_CPUARCH} == arm || ${MACHINE_CPUARCH} == i386 || \ ${MACHINE_ARCH} == mipsel || ${MACHINE_ARCH} == mipseb || \ - ${MACHINE_ARCH} == powerpc || + ${MACHINE_ARCH} == powerpc OMP_LOCK_ALIGN = 4 OMP_LOCK_KIND= 4 OMP_LOCK_SIZE= 4 Modified: user/imp/tbemd/gnu/usr.bin/binutils/Makefile.inc ============================================================================== --- user/imp/tbemd/gnu/usr.bin/binutils/Makefile.inc Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/gnu/usr.bin/binutils/Makefile.inc Sun Feb 7 19:04:12 2010 (r203623) @@ -1,9 +1,5 @@ # $FreeBSD$ -.if (${TARGET_ARCH} == "alpha") -WARNS?= 2 -.else WARNS?= 3 -.endif .include "../Makefile.inc" Modified: user/imp/tbemd/gnu/usr.bin/binutils/libbfd/Makefile ============================================================================== --- user/imp/tbemd/gnu/usr.bin/binutils/libbfd/Makefile Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/gnu/usr.bin/binutils/libbfd/Makefile Sun Feb 7 19:04:12 2010 (r203623) @@ -11,8 +11,7 @@ SRCS+= archive.c archive64.c archures.c section.c srec.c stab-syms.c stabs.c syms.c targets.c tekhex.c \ targmatch.h dwarf1.c dwarf2.c config.h bfdver.h bfdio.c simple.c WARNS?= 0 -.if (${TARGET_ARCH} == "alpha" || ${TARGET_ARCH} == "ia64" || \ - ${TARGET_ARCH} == "sparc64") +.if (${TARGET_ARCH} == "ia64" || ${TARGET_ARCH} == "sparc64") WARNS?= 2 .endif CFLAGS+= -D_GNU_SOURCE Modified: user/imp/tbemd/lib/libc/gen/getutxent.3 ============================================================================== --- user/imp/tbemd/lib/libc/gen/getutxent.3 Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/lib/libc/gen/getutxent.3 Sun Feb 7 19:04:12 2010 (r203623) @@ -426,8 +426,10 @@ database files, depending on its .Fa ut_type . This prevents the need for special utility functions to update the other databases, such as the +.Fn updlastlogx +and .Fn updwtmpx -function which is often available in other implementations. +functions which are available in other implementations. It also tries to replace .Dv DEAD_PROCESS entries in the active sessions database when storing Modified: user/imp/tbemd/lib/libc/mips/sys/ptrace.S ============================================================================== --- user/imp/tbemd/lib/libc/mips/sys/ptrace.S Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/lib/libc/mips/sys/ptrace.S Sun Feb 7 19:04:12 2010 (r203623) @@ -42,14 +42,26 @@ __FBSDID("$FreeBSD$"); #endif /* LIBC_SCCS and not lint */ LEAF(ptrace) + .frame sp, 40, ra + .mask 0x80000000, -8 #ifdef __ABICALLS__ .set noreorder .cpload t9 .set reorder #endif + subu sp, sp, 40 + sw ra, 32(sp) +#ifdef __ABICALLS__ + .cprestore 16 +#endif la t9, _C_LABEL(__error) # locate address of errno jalr t9 +#ifdef __ABICALLS__ + lw gp, 16(sp) +#endif sw zero, 0(v0) + lw ra, 32(sp) + addu sp, sp, 40 li v0, SYS_ptrace syscall bne a3, zero, 1f Modified: user/imp/tbemd/lib/libc/string/memccpy.3 ============================================================================== --- user/imp/tbemd/lib/libc/string/memccpy.3 Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/lib/libc/string/memccpy.3 Sun Feb 7 19:04:12 2010 (r203623) @@ -50,7 +50,9 @@ to string .Fa dst . If the character .Fa c -(as converted to an unsigned char) occurs in the string +(as converted to an +.Vt "unsigned char" ) +occurs in the string .Fa src , the copy stops and a pointer to the byte after the copy of .Fa c Modified: user/imp/tbemd/lib/libc/string/memchr.3 ============================================================================== --- user/imp/tbemd/lib/libc/string/memchr.3 Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/lib/libc/string/memchr.3 Sun Feb 7 19:04:12 2010 (r203623) @@ -52,7 +52,8 @@ The function locates the first occurrence of .Fa c -(converted to an unsigned char) +(converted to an +.Vt "unsigned char" ) in string .Fa b . .Pp Modified: user/imp/tbemd/lib/libc/string/memcmp.3 ============================================================================== --- user/imp/tbemd/lib/libc/string/memcmp.3 Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/lib/libc/string/memcmp.3 Sun Feb 7 19:04:12 2010 (r203623) @@ -61,7 +61,9 @@ The function returns zero if the two strings are identical, otherwise returns the difference between the first two differing bytes -(treated as unsigned char values, so that +(treated as +.Vt "unsigned char" +values, so that .Sq Li \e200 is greater than .Sq Li \&\e0 , Modified: user/imp/tbemd/lib/libc/string/memset.3 ============================================================================== --- user/imp/tbemd/lib/libc/string/memset.3 Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/lib/libc/string/memset.3 Sun Feb 7 19:04:12 2010 (r203623) @@ -52,7 +52,9 @@ writes .Fa len bytes of value .Fa c -(converted to an unsigned char) to the string +(converted to an +.Vt "unsigned char" ) +to the string .Fa b . .Sh RETURN VALUES The Modified: user/imp/tbemd/lib/msun/amd64/fenv.c ============================================================================== --- user/imp/tbemd/lib/msun/amd64/fenv.c Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/lib/msun/amd64/fenv.c Sun Feb 7 19:04:12 2010 (r203623) @@ -86,7 +86,7 @@ fegetenv(fenv_t *envp) int feholdexcept(fenv_t *envp) { - int mxcsr; + __uint32_t mxcsr; __stmxcsr(&mxcsr); __fnstenv(&envp->__x87); @@ -101,7 +101,8 @@ feholdexcept(fenv_t *envp) int feupdateenv(const fenv_t *envp) { - int mxcsr, status; + __uint32_t mxcsr; + __uint16_t status; __fnstsw(&status); __stmxcsr(&mxcsr); @@ -113,7 +114,8 @@ feupdateenv(const fenv_t *envp) int __feenableexcept(int mask) { - int mxcsr, control, omask; + __uint32_t mxcsr, omask; + __uint16_t control; mask &= FE_ALL_EXCEPT; __fnstcw(&control); @@ -129,7 +131,8 @@ __feenableexcept(int mask) int __fedisableexcept(int mask) { - int mxcsr, control, omask; + __uint32_t mxcsr, omask; + __uint16_t control; mask &= FE_ALL_EXCEPT; __fnstcw(&control); Modified: user/imp/tbemd/lib/msun/amd64/fenv.h ============================================================================== --- user/imp/tbemd/lib/msun/amd64/fenv.h Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/lib/msun/amd64/fenv.h Sun Feb 7 19:04:12 2010 (r203623) @@ -110,7 +110,8 @@ feclearexcept(int __excepts) static __inline int fegetexceptflag(fexcept_t *__flagp, int __excepts) { - int __mxcsr, __status; + __uint32_t __mxcsr; + __uint16_t __status; __stmxcsr(&__mxcsr); __fnstsw(&__status); @@ -124,7 +125,8 @@ int feraiseexcept(int __excepts); static __inline int fetestexcept(int __excepts) { - int __mxcsr, __status; + __uint32_t __mxcsr; + __uint16_t __status; __stmxcsr(&__mxcsr); __fnstsw(&__status); @@ -134,7 +136,7 @@ fetestexcept(int __excepts) static __inline int fegetround(void) { - int __control; + __uint16_t __control; /* * We assume that the x87 and the SSE unit agree on the @@ -149,7 +151,8 @@ fegetround(void) static __inline int fesetround(int __round) { - int __mxcsr, __control; + __uint32_t __mxcsr; + __uint16_t __control; if (__round & ~_ROUND_MASK) return (-1); @@ -197,7 +200,7 @@ int fedisableexcept(int __mask); static __inline int fegetexcept(void) { - int __control; + __uint16_t __control; /* * We assume that the masks for the x87 and the SSE unit are Modified: user/imp/tbemd/lib/msun/i387/fenv.c ============================================================================== --- user/imp/tbemd/lib/msun/i387/fenv.c Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/lib/msun/i387/fenv.c Sun Feb 7 19:04:12 2010 (r203623) @@ -87,7 +87,7 @@ int fesetexceptflag(const fexcept_t *flagp, int excepts) { fenv_t env; - int mxcsr; + __uint32_t mxcsr; __fnstenv(&env); env.__status &= ~excepts; @@ -117,7 +117,7 @@ feraiseexcept(int excepts) int fegetenv(fenv_t *envp) { - int mxcsr; + __uint32_t mxcsr; __fnstenv(envp); /* @@ -135,7 +135,7 @@ fegetenv(fenv_t *envp) int feholdexcept(fenv_t *envp) { - int mxcsr; + __uint32_t mxcsr; __fnstenv(envp); __fnclex(); @@ -152,7 +152,8 @@ feholdexcept(fenv_t *envp) int feupdateenv(const fenv_t *envp) { - int mxcsr, status; + __uint32_t mxcsr; + __uint16_t status; __fnstsw(&status); if (__HAS_SSE()) @@ -167,7 +168,8 @@ feupdateenv(const fenv_t *envp) int __feenableexcept(int mask) { - int mxcsr, control, omask; + __uint32_t mxcsr, omask; + __uint16_t control; mask &= FE_ALL_EXCEPT; __fnstcw(&control); @@ -188,7 +190,8 @@ __feenableexcept(int mask) int __fedisableexcept(int mask) { - int mxcsr, control, omask; + __uint32_t mxcsr, omask; + __uint16_t control; mask &= FE_ALL_EXCEPT; __fnstcw(&control); Modified: user/imp/tbemd/lib/msun/i387/fenv.h ============================================================================== --- user/imp/tbemd/lib/msun/i387/fenv.h Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/lib/msun/i387/fenv.h Sun Feb 7 19:04:12 2010 (r203623) @@ -114,7 +114,7 @@ static __inline int feclearexcept(int __excepts) { fenv_t __env; - int __mxcsr; + __uint32_t __mxcsr; if (__excepts == FE_ALL_EXCEPT) { __fnclex(); @@ -134,7 +134,8 @@ feclearexcept(int __excepts) static __inline int fegetexceptflag(fexcept_t *__flagp, int __excepts) { - int __mxcsr, __status; + __uint32_t __mxcsr; + __uint16_t __status; __fnstsw(&__status); if (__HAS_SSE()) @@ -151,7 +152,8 @@ int feraiseexcept(int __excepts); static __inline int fetestexcept(int __excepts) { - int __mxcsr, __status; + __uint32_t __mxcsr; + __uint16_t __status; __fnstsw(&__status); if (__HAS_SSE()) @@ -164,7 +166,7 @@ fetestexcept(int __excepts) static __inline int fegetround(void) { - int __control; + __uint16_t __control; /* * We assume that the x87 and the SSE unit agree on the @@ -179,7 +181,8 @@ fegetround(void) static __inline int fesetround(int __round) { - int __mxcsr, __control; + __uint32_t __mxcsr; + __uint16_t __control; if (__round & ~_ROUND_MASK) return (-1); @@ -206,7 +209,7 @@ static __inline int fesetenv(const fenv_t *__envp) { fenv_t __env = *__envp; - int __mxcsr; + __uint32_t __mxcsr; __mxcsr = __get_mxcsr(__env); __set_mxcsr(__env, 0xffffffff); @@ -234,7 +237,7 @@ int fedisableexcept(int __mask); static __inline int fegetexcept(void) { - int __control; + __uint16_t __control; /* * We assume that the masks for the x87 and the SSE unit are Modified: user/imp/tbemd/release/doc/en_US.ISO8859-1/hardware/article.sgml ============================================================================== --- user/imp/tbemd/release/doc/en_US.ISO8859-1/hardware/article.sgml Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/release/doc/en_US.ISO8859-1/hardware/article.sgml Sun Feb 7 19:04:12 2010 (r203623) @@ -316,8 +316,51 @@ powerpc - The information for this paragraph has yet to be - compiled. + This section describes the systems currently known to be + supported by &os; on the PowerPC platform. This list is not + exhaustive. + + In general, all New World architecture Apple hardware + is supported, as well a limited selection of non-Apple + machines. + + All systems listed below are fully supported, with the + exception that software fan control is currently missing on + the Power Macintosh G5. SMP is supported on all systems with + more than 1 processor. + + + + Apple iMac + + + Apple Power Macintosh G3 (Blue & White) + + + Apple Power Macintosh G4 + + + Apple Power Macintosh G5 (non-970MP models) + + + Apple iBook + + + Apple PowerBook G4 + + + Apple XServe G4 + + + Apple XServe G5 + + + Apple Mac Mini + + + Embedded boards based on MPC85XX + + Modified: user/imp/tbemd/sbin/dump/itime.c ============================================================================== --- user/imp/tbemd/sbin/dump/itime.c Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/sbin/dump/itime.c Sun Feb 7 19:04:12 2010 (r203623) @@ -106,8 +106,10 @@ readdumptimes(FILE *df) for (;;) { dtwalk = (struct dumptime *)calloc(1, sizeof (struct dumptime)); - if (getrecord(df, &(dtwalk->dt_value)) < 0) + if (getrecord(df, &(dtwalk->dt_value)) < 0) { + free(dtwalk); break; + } nddates++; SLIST_INSERT_HEAD(&dthead, dtwalk, dt_list); } Modified: user/imp/tbemd/sbin/dump/main.c ============================================================================== --- user/imp/tbemd/sbin/dump/main.c Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/sbin/dump/main.c Sun Feb 7 19:04:12 2010 (r203623) @@ -767,7 +767,8 @@ obsolete(int *argcp, char **argvp[]) if (flags) { *p = '\0'; *nargv++ = flagsp; - } + } else + free(flagsp); /* Copy remaining arguments. */ while ((*nargv++ = *argv++)); Modified: user/imp/tbemd/sbin/geom/class/multipath/geom_multipath.c ============================================================================== --- user/imp/tbemd/sbin/geom/class/multipath/geom_multipath.c Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/sbin/geom/class/multipath/geom_multipath.c Sun Feb 7 19:04:12 2010 (r203623) @@ -55,6 +55,10 @@ struct g_command class_commands[] = { NULL, "[-v] name prov ..." }, { + "destroy", G_FLAG_VERBOSE, NULL, G_NULL_OPTS, + NULL, "[-v] prov ..." + }, + { "clear", G_FLAG_VERBOSE, mp_main, G_NULL_OPTS, NULL, "[-v] prov ..." }, Modified: user/imp/tbemd/sbin/ifconfig/ifcarp.c ============================================================================== --- user/imp/tbemd/sbin/ifconfig/ifcarp.c Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/sbin/ifconfig/ifcarp.c Sun Feb 7 19:04:12 2010 (r203623) @@ -96,6 +96,7 @@ setcarp_passwd(const char *val, int d, i if (ioctl(s, SIOCGVH, (caddr_t)&ifr) == -1) err(1, "SIOCGVH"); + memset(carpr.carpr_key, 0, sizeof(carpr.carpr_key)); /* XXX Should hash the password into the key here, perhaps? */ strlcpy(carpr.carpr_key, val, CARP_KEY_LEN); Modified: user/imp/tbemd/sbin/iscontrol/iscontrol.h ============================================================================== --- user/imp/tbemd/sbin/iscontrol/iscontrol.h Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/sbin/iscontrol/iscontrol.h Sun Feb 7 19:04:12 2010 (r203623) @@ -144,7 +144,6 @@ int addText(pdu_t *pp, char *fmt, ...); void freePDU(pdu_t *pp); int xmitpdu(isess_t *sess, pdu_t *pp); int recvpdu(isess_t *sess, pdu_t *pp); -void pukeText(char *it, pdu_t *pp); int lookup(token_t *tbl, char *m); Modified: user/imp/tbemd/sbin/iscontrol/pdu.c ============================================================================== --- user/imp/tbemd/sbin/iscontrol/pdu.c Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/sbin/iscontrol/pdu.c Sun Feb 7 19:04:12 2010 (r203623) @@ -46,6 +46,8 @@ __FBSDID("$FreeBSD$"); #include "iscsi.h" #include "iscontrol.h" +static void pukeText(char *it, pdu_t *pp); + int xmitpdu(isess_t *sess, pdu_t *pp) { @@ -153,7 +155,7 @@ freePDU(pdu_t *pp) pp->ds_size = pp->ds_len = 0; } -void +static void pukeText(char *it, pdu_t *pp) { char *ptr; Modified: user/imp/tbemd/sbin/mount_nfs/mount_nfs.c ============================================================================== --- user/imp/tbemd/sbin/mount_nfs/mount_nfs.c Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/sbin/mount_nfs/mount_nfs.c Sun Feb 7 19:04:12 2010 (r203623) @@ -130,20 +130,19 @@ enum tryret { TRYRET_LOCALERR /* Local failure. */ }; -int fallback_mount(struct iovec *iov, int iovlen, int mntflags); -int sec_name_to_num(char *sec); -char *sec_num_to_name(int num); -int getnfsargs(char *, struct iovec **iov, int *iovlen); +static int fallback_mount(struct iovec *iov, int iovlen, int mntflags); +static int sec_name_to_num(char *sec); +static char *sec_num_to_name(int num); +static int getnfsargs(char *, struct iovec **iov, int *iovlen); /* void set_rpc_maxgrouplist(int); */ -struct netconfig *getnetconf_cached(const char *netid); -const char *netidbytype(int af, int sotype); -void usage(void) __dead2; -int xdr_dir(XDR *, char *); -int xdr_fh(XDR *, struct nfhret *); -enum tryret nfs_tryproto(struct addrinfo *ai, char *hostp, char *spec, +static struct netconfig *getnetconf_cached(const char *netid); +static const char *netidbytype(int af, int sotype); +static void usage(void) __dead2; +static int xdr_dir(XDR *, char *); +static int xdr_fh(XDR *, struct nfhret *); +static enum tryret nfs_tryproto(struct addrinfo *ai, char *hostp, char *spec, char **errstr, struct iovec **iov, int *iovlen); -enum tryret returncode(enum clnt_stat stat, struct rpc_err *rpcerr); -extern int getosreldate(void); +static enum tryret returncode(enum clnt_stat stat, struct rpc_err *rpcerr); int main(int argc, char *argv[]) @@ -476,7 +475,7 @@ copyopt(struct iovec **newiov, int *newi * passing NFS mount options to nmount() as individual * parameters. It should be eventually be removed. */ -int +static int fallback_mount(struct iovec *iov, int iovlen, int mntflags) { struct nfs_args args = { @@ -663,7 +662,7 @@ fallback_mount(struct iovec *iov, int io return nmount(newiov, newiovlen, mntflags); } -int +static int sec_name_to_num(char *sec) { if (!strcmp(sec, "krb5")) @@ -677,7 +676,7 @@ sec_name_to_num(char *sec) return (-1); } -char * +static char * sec_num_to_name(int flavor) { switch (flavor) { @@ -693,17 +692,22 @@ sec_num_to_name(int flavor) return (NULL); } -int +static int getnfsargs(char *spec, struct iovec **iov, int *iovlen) { struct addrinfo hints, *ai_nfs, *ai; enum tryret ret; - int ecode, speclen, remoteerr; + int ecode, speclen, remoteerr, offset, have_bracket = 0; char *hostp, *delimp, *errstr; size_t len; static char nam[MNAMELEN + 1], pname[MAXHOSTNAMELEN + 5]; - if ((delimp = strrchr(spec, ':')) != NULL) { + if (*spec == '[' && (delimp = strchr(spec + 1, ']')) != NULL && + *(delimp + 1) == ':') { + hostp = spec + 1; + spec = delimp + 2; + have_bracket = 1; + } else if ((delimp = strrchr(spec, ':')) != NULL) { hostp = spec; spec = delimp + 1; } else if ((delimp = strrchr(spec, '@')) != NULL) { @@ -731,10 +735,15 @@ getnfsargs(char *spec, struct iovec **io /* Make both '@' and ':' notations equal */ if (*hostp != '\0') { len = strlen(hostp); - memmove(nam, hostp, len); - nam[len] = ':'; - memmove(nam + len + 1, spec, speclen); - nam[len + speclen + 1] = '\0'; + offset = 0; + if (have_bracket) + nam[offset++] = '['; + memmove(nam + offset, hostp, len); + if (have_bracket) + nam[len + offset++] = ']'; + nam[len + offset++] = ':'; + memmove(nam + len + offset, spec, speclen); + nam[len + speclen + offset] = '\0'; } /* @@ -839,7 +848,7 @@ getnfsargs(char *spec, struct iovec **io * In all error cases, *errstr will be set to a statically-allocated string * describing the error. */ -enum tryret +static enum tryret nfs_tryproto(struct addrinfo *ai, char *hostp, char *spec, char **errstr, struct iovec **iov, int *iovlen) { @@ -1061,7 +1070,7 @@ tryagain: * Catagorise a RPC return status and error into an `enum tryret' * return code. */ -enum tryret +static enum tryret returncode(enum clnt_stat stat, struct rpc_err *rpcerr) { switch (stat) { @@ -1096,7 +1105,7 @@ returncode(enum clnt_stat stat, struct r * * XXX there should be a library function for this. */ -const char * +static const char * netidbytype(int af, int sotype) { struct nc_protos *p; @@ -1116,7 +1125,7 @@ netidbytype(int af, int sotype) * Otherwise it behaves just like getnetconfigent(), so nc_*error() * work on failure. */ -struct netconfig * +static struct netconfig * getnetconf_cached(const char *netid) { static struct nc_entry { @@ -1144,13 +1153,13 @@ getnetconf_cached(const char *netid) /* * xdr routines for mount rpc's */ -int +static int xdr_dir(XDR *xdrsp, char *dirp) { return (xdr_string(xdrsp, &dirp, MNTPATHLEN)); } -int +static int xdr_fh(XDR *xdrsp, struct nfhret *np) { int i; @@ -1196,8 +1205,8 @@ xdr_fh(XDR *xdrsp, struct nfhret *np) return (0); } -void -usage() +static void +usage(void) { (void)fprintf(stderr, "%s\n%s\n%s\n%s\n", "usage: mount_nfs [-23bcdiLlNPsTU] [-a maxreadahead] [-D deadthresh]", Modified: user/imp/tbemd/sbin/newfs/newfs.c ============================================================================== --- user/imp/tbemd/sbin/newfs/newfs.c Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/sbin/newfs/newfs.c Sun Feb 7 19:04:12 2010 (r203623) @@ -499,13 +499,13 @@ usage() getprogname(), " [device-type]"); fprintf(stderr, "where fsoptions are:\n"); - fprintf(stderr, "\t-E Erase previuos disk content\n"); + fprintf(stderr, "\t-E Erase previous disk content\n"); fprintf(stderr, "\t-J Enable journaling via gjournal\n"); fprintf(stderr, "\t-L volume label to add to superblock\n"); fprintf(stderr, "\t-N do not create file system, just print out parameters\n"); fprintf(stderr, "\t-O file system format: 1 => UFS1, 2 => UFS2\n"); - fprintf(stderr, "\t-R regression test, supress random factors\n"); + fprintf(stderr, "\t-R regression test, suppress random factors\n"); fprintf(stderr, "\t-S sector size\n"); fprintf(stderr, "\t-T disktype\n"); fprintf(stderr, "\t-U enable soft updates\n"); Modified: user/imp/tbemd/sbin/sysctl/sysctl.8 ============================================================================== --- user/imp/tbemd/sbin/sysctl/sysctl.8 Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/sbin/sysctl/sysctl.8 Sun Feb 7 19:04:12 2010 (r203623) @@ -28,7 +28,7 @@ .\" From: @(#)sysctl.8 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd January 31, 2010 +.Dd February 6, 2010 .Dt SYSCTL 8 .Os .Sh NAME @@ -36,7 +36,7 @@ .Nd get or set kernel state .Sh SYNOPSIS .Nm -.Op Fl bdehNnoqx +.Op Fl bdehiNnoqx .Ar name Ns Op = Ns Ar value .Ar ... .Nm Modified: user/imp/tbemd/sbin/umount/umount.c ============================================================================== --- user/imp/tbemd/sbin/umount/umount.c Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/sbin/umount/umount.c Sun Feb 7 19:04:12 2010 (r203623) @@ -325,14 +325,21 @@ umountfs(struct statfs *sfs) if ((nfsdirname = strdup(sfs->f_mntfromname)) == NULL) err(1, "strdup"); orignfsdirname = nfsdirname; - if ((delimp = strrchr(nfsdirname, ':')) != NULL) { - *delimp = '\0'; + if (*nfsdirname == '[' && + (delimp = strchr(nfsdirname + 1, ']')) != NULL && + *(delimp + 1) == ':') { + hostp = nfsdirname + 1; + nfsdirname = delimp + 2; + } else if ((delimp = strrchr(nfsdirname, ':')) != NULL) { hostp = nfsdirname; + nfsdirname = delimp + 1; + } + if (hostp != NULL) { + *delimp = '\0'; getaddrinfo(hostp, NULL, &hints, &ai); if (ai == NULL) { warnx("can't get net id for host"); } - nfsdirname = delimp + 1; } /* Modified: user/imp/tbemd/share/man/man4/acpi_sony.4 ============================================================================== --- user/imp/tbemd/share/man/man4/acpi_sony.4 Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/share/man/man4/acpi_sony.4 Sun Feb 7 19:04:12 2010 (r203623) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 14, 2005 +.Dd February 7, 2010 .Dt ACPI_SONY 4 i386 .Os .Sh NAME @@ -48,15 +48,24 @@ acpi_sony_load="YES" The .Nm driver provides support for the notebook controller in Sony laptops. +Note that not all features will work on all laptop models. .Sh SYSCTLS -The following sysctl is currently implemented: +The following sysctl nodes are currently implemented: .Bl -tag -width indent .It Va dev.acpi_sony.0.brightness Current brightness level of the display. +.It Va dev.acpi_sony.0.brightness_default +Default brightness level of the display (survives reboot). +.It Va dev.acpi_sony.0.contrast +Current contrast level of the display. +.It Va dev.acpi_sony.0.bass_gain +Enable or disable the Bass Gain feature. .It Va dev.acpi_sony.0.cdp Turns the CD power on or off. .It Va dev.acpi_sony.0.azp Turns the audio power on or off. +.It Va dev.acpi_sony.0.lnp +Turns the wired network interface power on or off. .El .Sh SEE ALSO .Xr acpi 4 , Modified: user/imp/tbemd/share/man/man4/vr.4 ============================================================================== --- user/imp/tbemd/share/man/man4/vr.4 Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/share/man/man4/vr.4 Sun Feb 7 19:04:12 2010 (r203623) @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 11, 2008 +.Dd February 7, 2010 .Dt VR 4 .Os .Sh NAME @@ -130,6 +130,8 @@ Fast Ethernet adapters including: .It AOpen/Acer ALN-320 .It +D-Link DFE520-TX +.It D-Link DFE530-TX .It Hawking Technologies PN102TX Modified: user/imp/tbemd/share/man/man9/mtx_pool.9 ============================================================================== --- user/imp/tbemd/share/man/man9/mtx_pool.9 Sun Feb 7 18:36:30 2010 (r203622) +++ user/imp/tbemd/share/man/man9/mtx_pool.9 Sun Feb 7 19:04:12 2010 (r203623) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 25, 2002 +.Dd February 6, 2010 .Dt MTX_POOL 9 .Os .Sh NAME @@ -177,7 +177,7 @@ on each mutex in the specified pool, deallocates the memory associated with the pool, and assigns NULL to the pool pointer. .Sh SEE ALSO -.Xr locking 9 +.Xr locking 9 , .Xr mutex 9 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 19:30:25 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 58A53106568B; Sun, 7 Feb 2010 19:30:25 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 492F48FC0A; Sun, 7 Feb 2010 19:30:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o17JUP08012866; Sun, 7 Feb 2010 19:30:25 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o17JUP8M012864; Sun, 7 Feb 2010 19:30:25 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201002071930.o17JUP8M012864@svn.freebsd.org> From: Warner Losh Date: Sun, 7 Feb 2010 19:30:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203624 - user/imp/tbemd X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 19:30:25 -0000 Author: imp Date: Sun Feb 7 19:30:25 2010 New Revision: 203624 URL: http://svn.freebsd.org/changeset/base/203624 Log: Damn. this one shouldn't have snuck in. It was a lame attempt to fix installworld. The proper fix was sudo -E since now that's required in newer revs of sudo, otherwise my environment won't be passed down... Modified: user/imp/tbemd/Makefile.inc1 Modified: user/imp/tbemd/Makefile.inc1 ============================================================================== --- user/imp/tbemd/Makefile.inc1 Sun Feb 7 19:04:12 2010 (r203623) +++ user/imp/tbemd/Makefile.inc1 Sun Feb 7 19:30:25 2010 (r203624) @@ -605,7 +605,7 @@ _zoneinfo= zic tzsetup .endif ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ - install date echo egrep find grep ${_install-info} \ + date echo egrep find grep ${_install-info} \ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ test true uname wc ${_zoneinfo} From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 19:32:33 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 663C4106566C; Sun, 7 Feb 2010 19:32:33 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 566378FC15; Sun, 7 Feb 2010 19:32:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o17JWXIH013365; Sun, 7 Feb 2010 19:32:33 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o17JWX0w013363; Sun, 7 Feb 2010 19:32:33 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201002071932.o17JWX0w013363@svn.freebsd.org> From: Warner Losh Date: Sun, 7 Feb 2010 19:32:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203625 - user/imp/tbemd/contrib/binutils/bfd X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 19:32:33 -0000 Author: imp Date: Sun Feb 7 19:32:33 2010 New Revision: 203625 URL: http://svn.freebsd.org/changeset/base/203625 Log: revert this change. it does fix the bigger binaries, but hasn't been tested at all yet. Modified: user/imp/tbemd/contrib/binutils/bfd/elf32-mips.c Modified: user/imp/tbemd/contrib/binutils/bfd/elf32-mips.c ============================================================================== --- user/imp/tbemd/contrib/binutils/bfd/elf32-mips.c Sun Feb 7 19:30:25 2010 (r203624) +++ user/imp/tbemd/contrib/binutils/bfd/elf32-mips.c Sun Feb 7 19:32:33 2010 (r203625) @@ -1611,7 +1611,7 @@ static const struct ecoff_debug_swap mip /* The SVR4 MIPS ABI says that this should be 0x10000, and Linux uses page sizes of up to that limit, so we need to respect it. */ -#define ELF_MAXPAGESIZE 0x1000 +#define ELF_MAXPAGESIZE 0x10000 #define elf32_bed elf32_tradbed /* Include the target file again for this target. */ From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 19:45:12 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89D431065695; Sun, 7 Feb 2010 19:45:12 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7A22F8FC12; Sun, 7 Feb 2010 19:45:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o17JjCJc016242; Sun, 7 Feb 2010 19:45:12 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o17JjCBx016240; Sun, 7 Feb 2010 19:45:12 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201002071945.o17JjCBx016240@svn.freebsd.org> From: Warner Losh Date: Sun, 7 Feb 2010 19:45:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203627 - user/imp/tbemd/sys/conf X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 19:45:12 -0000 Author: imp Date: Sun Feb 7 19:45:12 2010 New Revision: 203627 URL: http://svn.freebsd.org/changeset/base/203627 Log: Remove the endian kludge, rather than just commenting it out. The right thing should happen now. Modified: user/imp/tbemd/sys/conf/Makefile.mips Modified: user/imp/tbemd/sys/conf/Makefile.mips ============================================================================== --- user/imp/tbemd/sys/conf/Makefile.mips Sun Feb 7 19:34:08 2010 (r203626) +++ user/imp/tbemd/sys/conf/Makefile.mips Sun Feb 7 19:45:12 2010 (r203627) @@ -45,27 +45,6 @@ ARCH_FLAGS?=-march=mips32 EXTRA_FLAGS=-fno-pic -mno-abicalls -G0 HACK_EXTRA_FLAGS=-shared -#.if defined(TARGET_BIG_ENDIAN) -#CFLAGS+=-EB -#SYSTEM_LD+=-EB -#EXTRA_FLAGS+=-EB -#TRAMP_LDFLAGS+=-Wl,-EB -#HACK_EXTRA_FLAGS+=-EB -Wl,-EB -#.if defined(TARGET_64BIT) -#SYSTEM_LD+=-m elf64btsmip_fbsd -#HACK_EXTRA_FLAGS+=-Wl,-m,elf64btsmip_fbsd -#.endif -#.else -#CFLAGS+=-EL -#SYSTEM_LD+=-EL -#EXTRA_FLAGS+=-EL -#TRAMP_LDFLAGS+=-Wl,-EL -#HACK_EXTRA_FLAGS+=-EL -Wl,-EL -#.if defined(TARGET_64BIT) -#SYSTEM_LD+=-m elf64ltsmip_fbsd -#HACK_EXTRA_FLAGS+=-Wl,-m,elf64ltsmip_fbsd -#.endif -#.endif # We add the -fno-pic flag to kernels because otherwise performance # is extremely poor, as well as -mno-abicalls to force no ABI usage. From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 19:46:03 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 634D81065693; Sun, 7 Feb 2010 19:46:03 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 53C2C8FC15; Sun, 7 Feb 2010 19:46:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o17Jk3tG016444; Sun, 7 Feb 2010 19:46:03 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o17Jk3Un016442; Sun, 7 Feb 2010 19:46:03 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201002071946.o17Jk3Un016442@svn.freebsd.org> From: Warner Losh Date: Sun, 7 Feb 2010 19:46:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203628 - user/imp/tbemd/sys/conf X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 19:46:03 -0000 Author: imp Date: Sun Feb 7 19:46:03 2010 New Revision: 203628 URL: http://svn.freebsd.org/changeset/base/203628 Log: Revert this change. it does make the kernel smaller, but only unstripped kernels. Modified: user/imp/tbemd/sys/conf/files Modified: user/imp/tbemd/sys/conf/files ============================================================================== --- user/imp/tbemd/sys/conf/files Sun Feb 7 19:45:12 2010 (r203627) +++ user/imp/tbemd/sys/conf/files Sun Feb 7 19:46:03 2010 (r203628) @@ -2090,7 +2090,7 @@ kern/kern_time.c standard kern/kern_timeout.c standard kern/kern_umtx.c standard kern/kern_uuid.c standard -kern/kern_xxx.c optional compat_43 | compat_freebsd4 +kern/kern_xxx.c standard kern/link_elf.c standard kern/linker_if.m standard kern/md4c.c optional netsmb From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 19:51:36 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83D2D1065672; Sun, 7 Feb 2010 19:51:36 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5B2B98FC1D; Sun, 7 Feb 2010 19:51:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o17JpaL2017732; Sun, 7 Feb 2010 19:51:36 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o17JpaNr017730; Sun, 7 Feb 2010 19:51:36 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201002071951.o17JpaNr017730@svn.freebsd.org> From: Warner Losh Date: Sun, 7 Feb 2010 19:51:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203630 - user/imp/tbemd/sys/conf X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 19:51:36 -0000 Author: imp Date: Sun Feb 7 19:51:36 2010 New Revision: 203630 URL: http://svn.freebsd.org/changeset/base/203630 Log: Bump the inline limit back up: that's not the point of this branch. Modified: user/imp/tbemd/sys/conf/kern.mk Modified: user/imp/tbemd/sys/conf/kern.mk ============================================================================== --- user/imp/tbemd/sys/conf/kern.mk Sun Feb 7 19:49:01 2010 (r203629) +++ user/imp/tbemd/sys/conf/kern.mk Sun Feb 7 19:51:36 2010 (r203630) @@ -84,7 +84,7 @@ INLINE_LIMIT?= 15000 # .if ${MACHINE_CPUARCH} == "mips" CFLAGS+= -msoft-float -INLINE_LIMIT?= 80 +INLINE_LIMIT?= 8000 .endif # From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 19:56:45 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6D27B1065679; Sun, 7 Feb 2010 19:56:45 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5D98B8FC1C; Sun, 7 Feb 2010 19:56:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o17JujR4018941; Sun, 7 Feb 2010 19:56:45 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o17Juj2F018938; Sun, 7 Feb 2010 19:56:45 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201002071956.o17Juj2F018938@svn.freebsd.org> From: Warner Losh Date: Sun, 7 Feb 2010 19:56:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203631 - user/imp/tbemd/sys/conf X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 19:56:45 -0000 Author: imp Date: Sun Feb 7 19:56:45 2010 New Revision: 203631 URL: http://svn.freebsd.org/changeset/base/203631 Log: back out the hacks to try to shrink mips kernel. They were good for only 10% in size... But a quick test failed, so punt for the moment until I have more than 5 minutes to test the goofy thing. Modified: user/imp/tbemd/sys/conf/kern.pre.mk user/imp/tbemd/sys/conf/kmod.mk Modified: user/imp/tbemd/sys/conf/kern.pre.mk ============================================================================== --- user/imp/tbemd/sys/conf/kern.pre.mk Sun Feb 7 19:51:36 2010 (r203630) +++ user/imp/tbemd/sys/conf/kern.pre.mk Sun Feb 7 19:56:45 2010 (r203631) @@ -24,7 +24,7 @@ SIZE?= size COPTFLAGS?= -O .else . if defined(DEBUG) -_MINUS_O= -Os +_MINUS_O= -O CTFFLAGS+= -g . else _MINUS_O= -O2 @@ -90,10 +90,10 @@ INCLUDES+= -I$S/dev/cxgb CFLAGS= ${COPTFLAGS} ${C_DIALECT} ${DEBUG} ${CWARNFLAGS} CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h .if ${CC} != "icc" -CFLAGS+= -fno-common -finline-limit=0 -CFLAGS+= --param inline-unit-growth=0 -CFLAGS+= --param large-function-growth=0 -WERROR?= +CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} +CFLAGS+= --param inline-unit-growth=100 +CFLAGS+= --param large-function-growth=1000 +WERROR?= -Werror .endif # XXX LOCORE means "don't declare C stuff" not "for locore.s". Modified: user/imp/tbemd/sys/conf/kmod.mk ============================================================================== --- user/imp/tbemd/sys/conf/kmod.mk Sun Feb 7 19:51:36 2010 (r203630) +++ user/imp/tbemd/sys/conf/kmod.mk Sun Feb 7 19:56:45 2010 (r203631) @@ -108,8 +108,8 @@ CFLAGS+= -I@/contrib/altq .if ${CC} != "icc" CFLAGS+= -finline-limit=${INLINE_LIMIT} -CFLAGS+= --param inline-unit-growth=32 -CFLAGS+= --param large-function-growth=128 +CFLAGS+= --param inline-unit-growth=100 +CFLAGS+= --param large-function-growth=1000 .endif # Disallow common variables, and if we end up with commons from From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 19:58:49 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9FE7A106566B; Sun, 7 Feb 2010 19:58:49 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 908B58FC13; Sun, 7 Feb 2010 19:58:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o17Jwnfq019491; Sun, 7 Feb 2010 19:58:49 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o17JwnkK019489; Sun, 7 Feb 2010 19:58:49 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201002071958.o17JwnkK019489@svn.freebsd.org> From: Warner Losh Date: Sun, 7 Feb 2010 19:58:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203632 - user/imp/tbemd/sys/conf X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 19:58:49 -0000 Author: imp Date: Sun Feb 7 19:58:49 2010 New Revision: 203632 URL: http://svn.freebsd.org/changeset/base/203632 Log: diff reduction to head. Modified: user/imp/tbemd/sys/conf/ldscript.mips.octeon1.32 Modified: user/imp/tbemd/sys/conf/ldscript.mips.octeon1.32 ============================================================================== --- user/imp/tbemd/sys/conf/ldscript.mips.octeon1.32 Sun Feb 7 19:56:45 2010 (r203631) +++ user/imp/tbemd/sys/conf/ldscript.mips.octeon1.32 Sun Feb 7 19:58:49 2010 (r203632) @@ -7,7 +7,7 @@ OUTPUT_ARCH(mips) ENTRY(_start) SECTIONS { - . = KERNLOADADDR + SIZEOF_HEADERS; + . = KERNLOADADDR; .text . : { *(.text) *(.dynamic) From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 20:01:53 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 63AB6106568F; Sun, 7 Feb 2010 20:01:53 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3AFC78FC20; Sun, 7 Feb 2010 20:01:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o17K1rs4020286; Sun, 7 Feb 2010 20:01:53 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o17K1rYc020284; Sun, 7 Feb 2010 20:01:53 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201002072001.o17K1rYc020284@svn.freebsd.org> From: Warner Losh Date: Sun, 7 Feb 2010 20:01:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203633 - user/imp/tbemd/sys/conf X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 20:01:53 -0000 Author: imp Date: Sun Feb 7 20:01:52 2010 New Revision: 203633 URL: http://svn.freebsd.org/changeset/base/203633 Log: This shouldn't be necessary. Modified: user/imp/tbemd/sys/conf/Makefile.pc98 Modified: user/imp/tbemd/sys/conf/Makefile.pc98 ============================================================================== --- user/imp/tbemd/sys/conf/Makefile.pc98 Sun Feb 7 19:58:49 2010 (r203632) +++ user/imp/tbemd/sys/conf/Makefile.pc98 Sun Feb 7 20:01:52 2010 (r203633) @@ -30,8 +30,6 @@ S= ../../.. .endif .include "$S/conf/kern.pre.mk" -MACHINE=pc98 - MKMODULESENV+= MACHINE=${MACHINE} %BEFORE_DEPEND From owner-svn-src-user@FreeBSD.ORG Sun Feb 7 22:24:04 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D27D1065670; Sun, 7 Feb 2010 22:24:04 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6E27A8FC16; Sun, 7 Feb 2010 22:24:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o17MO40H051933; Sun, 7 Feb 2010 22:24:04 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o17MO4v6051931; Sun, 7 Feb 2010 22:24:04 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201002072224.o17MO4v6051931@svn.freebsd.org> From: Doug Barton Date: Sun, 7 Feb 2010 22:24:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203640 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 22:24:04 -0000 Author: dougb Date: Sun Feb 7 22:24:04 2010 New Revision: 203640 URL: http://svn.freebsd.org/changeset/base/203640 Log: This change was committed in the ports version 2.17 Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sun Feb 7 22:14:10 2010 (r203639) +++ user/dougb/portmaster/portmaster Sun Feb 7 22:24:04 2010 (r203640) @@ -1958,7 +1958,10 @@ echo "===>>> The following actions will echo -n "===>>> Proceed? y/n [y] " read answer case "$answer" in - [nN]*) safe_exit ;; + [nN]*) echo '' +echo "===>>> If you would like to upgrade or install some, but not" +echo " all of the above try adding '-i' to the command line." + safe_exit ;; esac unset build_l fi From owner-svn-src-user@FreeBSD.ORG Mon Feb 8 00:36:37 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5961B1065676; Mon, 8 Feb 2010 00:36:37 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4A5758FC17; Mon, 8 Feb 2010 00:36:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o180ab5m081088; Mon, 8 Feb 2010 00:36:37 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o180abUo081086; Mon, 8 Feb 2010 00:36:37 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201002080036.o180abUo081086@svn.freebsd.org> From: Doug Barton Date: Mon, 8 Feb 2010 00:36:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203642 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 00:36:37 -0000 Author: dougb Date: Mon Feb 8 00:36:37 2010 New Revision: 203642 URL: http://svn.freebsd.org/changeset/base/203642 Log: Add code to prevent duplicate entries in the build list. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sun Feb 7 23:49:27 2010 (r203641) +++ user/dougb/portmaster/portmaster Mon Feb 8 00:36:37 2010 (r203642) @@ -1666,10 +1666,16 @@ update_build_l () { case "$1" in */*) origin=$1 ; iport=`iport_from_origin $origin` if [ -z "$iport" ]; then + case "$build_l" in + *\ $origin\\*) return ;; + esac build_l="${build_l}\tInstall $origin\n" return fi ;; - *) origin=`origin_from_pdb $1` ; iport=$1 ;; + *) origin=`origin_from_pdb $1` ; iport=$1 + case "$build_l" in + *\ $iport\ *) return ;; + esac ;; esac pm_cd $pd/$origin && new_port=`pm_make -V PKGNAME` From owner-svn-src-user@FreeBSD.ORG Mon Feb 8 00:44:00 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 48278106566B; Mon, 8 Feb 2010 00:44:00 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 393268FC13; Mon, 8 Feb 2010 00:44:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o180i0Wn082712; Mon, 8 Feb 2010 00:44:00 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o180i0Hq082710; Mon, 8 Feb 2010 00:44:00 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201002080044.o180i0Hq082710@svn.freebsd.org> From: Doug Barton Date: Mon, 8 Feb 2010 00:44:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203643 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 00:44:00 -0000 Author: dougb Date: Mon Feb 8 00:43:59 2010 New Revision: 203643 URL: http://svn.freebsd.org/changeset/base/203643 Log: If we are running on a cons25 terminal let term_printf() return instead of trying to printf the escapes which won't work and will annoy users. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon Feb 8 00:36:37 2010 (r203642) +++ user/dougb/portmaster/portmaster Mon Feb 8 00:43:59 2010 (r203643) @@ -1657,6 +1657,10 @@ check_fetch_only () { } term_printf () { + case "$TERM" in + cons25) return ;; + esac + printf "\033]0;${0##*/}: ${PM_PARENT_PORT}${1}\007" } From owner-svn-src-user@FreeBSD.ORG Mon Feb 8 00:57:57 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF8B210656B9; Mon, 8 Feb 2010 00:57:57 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B02FA8FC17; Mon, 8 Feb 2010 00:57:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o180vvCi085788; Mon, 8 Feb 2010 00:57:57 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o180vvuw085786; Mon, 8 Feb 2010 00:57:57 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201002080057.o180vvuw085786@svn.freebsd.org> From: Doug Barton Date: Mon, 8 Feb 2010 00:57:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203644 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 00:57:57 -0000 Author: dougb Date: Mon Feb 8 00:57:57 2010 New Revision: 203644 URL: http://svn.freebsd.org/changeset/base/203644 Log: Add a --no-term-title option to avoid updating the xterm title bar Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon Feb 8 00:43:59 2010 (r203643) +++ user/dougb/portmaster/portmaster Mon Feb 8 00:57:57 2010 (r203644) @@ -240,7 +240,7 @@ usage () { echo "Common flags: [--force-config] [-CGHKgntvw B|b f|i D|d]" echo " [[--packages|--packages-only] [-P|-PP] | [--packages-build]]" echo " [--packages-if-newer] [--delete-build-only] [--always-fetch]" - echo " [--local-packagedir=] [--no-confirm]" + echo " [--local-packagedir=] [--no-confirm] [--no-term-title]" echo " [-m ] [-x ]" echo "${0##*/} [Common flags] " echo "${0##*/} [Common flags] " @@ -298,6 +298,7 @@ usage () { echo ' Can be specified more than once' echo '--no-confirm do not ask user to confirm list of ports to be' echo ' installed and/or updated before proceeding' + echo '--no-term-title do not update the xterm title bar' echo '' echo '--show-work list what ports are and would be installed' echo '' @@ -438,6 +439,8 @@ for var in "$@" ; do export PM_DEL_BUILD_ONLY ;; --no-confirm) PM_NO_CONFIRM=pm_no_confirm export PM_NO_CONFIRM ;; + --no-term-title) PM_NO_TERM_TITLE=pm_no_term_title + export PM_NO_TERM_TITLE ;; --help) usage 0 ;; --version) version ; exit 0 ;; --clean-distfiles) CLEAN_DISTFILES=clean_distfiles ;; @@ -1657,6 +1660,8 @@ check_fetch_only () { } term_printf () { + [ -n "$PM_NO_TERM_TITLE" ] && return + case "$TERM" in cons25) return ;; esac From owner-svn-src-user@FreeBSD.ORG Mon Feb 8 04:12:11 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 39F9B106566C; Mon, 8 Feb 2010 04:12:11 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2A1618FC15; Mon, 8 Feb 2010 04:12:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o184CBWx028601; Mon, 8 Feb 2010 04:12:11 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o184CBYn028599; Mon, 8 Feb 2010 04:12:11 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201002080412.o184CBYn028599@svn.freebsd.org> From: Doug Barton Date: Mon, 8 Feb 2010 04:12:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203646 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 04:12:11 -0000 Author: dougb Date: Mon Feb 8 04:12:10 2010 New Revision: 203646 URL: http://svn.freebsd.org/changeset/base/203646 Log: 1. Add code so that if a user has an +IGNOREME file for a port that is a dependency and chooses not to update it we will not falsely claim that it will be udpated in post_config(). This requires moving the writing of num_of_deps and build_l to IPC_SAVE into safe_exit() so that the modified values will be read by the parent. 2. If a user chose -G don't print the (${dep_of_deps}/${num_of_deps}) in the xterm title since the latter will not be incremented. This has the pleasant side effect of allowing better indenting of the code. 3. Remove debug code. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon Feb 8 03:11:55 2010 (r203645) +++ user/dougb/portmaster/portmaster Mon Feb 8 04:12:10 2010 (r203646) @@ -215,8 +215,13 @@ safe_exit () { [ -n "$PM_DEL_BUILD_ONLY" ] && echo "build_deps_il='$build_deps_il'" >> $IPC_SAVE - elif [ -z "$NO_DEP_UPDATES" ]; then - echo 'unset NO_DEP_UPDATES' >> $IPC_SAVE + else + # Do these here so +IGNOREME can modify them + echo "num_of_deps='$num_of_deps'" >> $IPC_SAVE + echo "build_l='$build_l'" >> $IPC_SAVE + if [ -z "$NO_DEP_UPDATES" ]; then + echo 'unset NO_DEP_UPDATES' >> $IPC_SAVE + fi fi [ -z "$NO_BACKUP" -a -z "$BACKUP" ] && echo "NB_DELETE='$NB_DELETE'" >> $IPC_SAVE @@ -1703,21 +1708,25 @@ update_port () { [ -n "$2" ] && update_to=" to $2" echo "===>>> Launching child to update ${1#$pd/}${update_to}" - dep_of_deps=$(( $dep_of_deps + 1 )) + if [ -z "$NO_RECURSIVE_CONFIG" ]; then + local deps - if [ -n "$CONFIG_ONLY" ]; then - num_of_deps=$(( $num_of_deps + 1 )) - update_build_l $1 + dep_of_deps=$(( $dep_of_deps + 1 )) + + if [ -n "$CONFIG_ONLY" ]; then + num_of_deps=$(( $num_of_deps + 1 )) + update_build_l $1 + fi + + deps=" (${dep_of_deps}/${num_of_deps})" fi if [ -n "$PM_DEPTH" ]; then echo " ${PM_DEPTH}>> ${1#$pd/}" -term_printf " ${PM_DEPTH#* }>> ${1#$pd/} (${dep_of_deps}/${num_of_deps})" + term_printf " ${PM_DEPTH#* }>> ${1#$pd/}${deps}" else if [ -n "$UPDATE_ALL" ]; then - term_printf " >> ${1#$pd/} (${dep_of_deps}/${num_of_deps})" - else -#echo '' ; echo "Debug> NO PM_DEPTH HERE" ; echo '' + term_printf " >> ${1#$pd/}${deps}" fi fi @@ -1742,7 +1751,7 @@ term_printf " ${PM_DEPTH#* }>> ${1#$pd/} elif [ -n "$CONFIG_ONLY" -a -z "$PM_PACKAGES" ]; then echo "===>>> Continuing 'make config' dependency check for $portdir" else -term_printf " ${PM_DEPTH#* }(${dep_of_deps}/${num_of_deps})" + term_printf " ${PM_DEPTH#* }${deps}" echo "===>>> Returning to dependency check for $portdir" fi return 0 @@ -1937,7 +1946,11 @@ dependency_check () { case "$PM_DEPTH" in *\>\>*) echo " $PM_DEPTH" ;; *) if [ "$PM_PARENT_PORT" = All ]; then - term_printf " >> ${upg_port:-$portdir} (${dep_of_deps}/${num_of_deps})" + if [ -z "$NO_RECURSIVE_CONFIG" ]; then + local deps + deps=" (${dep_of_deps}/${num_of_deps})" + fi + term_printf " >> ${upg_port:-$portdir}${deps}" else term_printf fi ;; @@ -2015,14 +2028,9 @@ echo " all of the above try adding [ "$real_rundep" = 'no' ] && eval build_only_dl_g=\"${build_only_dl_g}\$${var}_p \" - -#[ "$real_rundep" = 'no' ] && printf "\nDebug> Inserting $var into bodlg\n\n" - eval unset $var ${var}_p done -#echo "Debug> build_only_dl_g: X${build_only_dl_g}X" ; echo '' - unset run_dl_g rundep_list PM_BUILD_ONLY_LIST=pm_bol fi @@ -2420,6 +2428,15 @@ if [ -e "$pdb/$upg_port/+IGNOREME" ]; th case "$answer" in [yY]) ;; # Let it build *) CUR_DEPS="${CUR_DEPS}${upg_port}:${portdir}:" + # Outdent + if [ $dep_of_deps -gt 0 ]; then + dep_of_deps=$(( $dep_of_deps - 1 )) + if [ -n "$CONFIG_ONLY" ]; then + num_of_deps=$(( $num_of_deps - 1 )) + build_l="${build_l%\t*}" + fi + fi + # Outdent safe_exit ;; esac else @@ -2550,8 +2567,6 @@ if [ -n "$CONFIG_ONLY" ]; then if [ ! "$$" -eq "$PM_PARENT_PID" ]; then # Save state for the parent process to read back in echo "CONFIG_SEEN_LIST='$CONFIG_SEEN_LIST'" > $IPC_SAVE - echo "num_of_deps='$num_of_deps'" >> $IPC_SAVE - echo "build_l='$build_l'" >> $IPC_SAVE if [ "$PM_BUILD_ONLY_LIST" = pmp_doing_build_deps ]; then echo "build_only_dl_g='$build_only_dl_g'" >> $IPC_SAVE From owner-svn-src-user@FreeBSD.ORG Mon Feb 8 05:06:48 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 465CD106566B; Mon, 8 Feb 2010 05:06:48 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3619A8FC19; Mon, 8 Feb 2010 05:06:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1856m7b040611; Mon, 8 Feb 2010 05:06:48 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1856mQm040608; Mon, 8 Feb 2010 05:06:48 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002080506.o1856mQm040608@svn.freebsd.org> From: Kip Macy Date: Mon, 8 Feb 2010 05:06:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203647 - user/kmacy/head_flowtable_v6/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 05:06:48 -0000 Author: kmacy Date: Mon Feb 8 05:06:47 2010 New Revision: 203647 URL: http://svn.freebsd.org/changeset/base/203647 Log: - reduce debugging noise - create separate flow to route routines for INET and INET6 Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c user/kmacy/head_flowtable_v6/sys/net/flowtable.h Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Mon Feb 8 04:12:10 2010 (r203646) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Mon Feb 8 05:06:47 2010 (r203647) @@ -186,7 +186,6 @@ static struct cv flowclean_cv; static struct mtx flowclean_lock; static uint32_t flowclean_cycles; -#define FLOWTABLE_DEBUG #ifdef FLOWTABLE_DEBUG #define FLDPRINTF(ft, flags, fmt, ...) \ do { \ @@ -417,40 +416,6 @@ flags_to_proto(int flags) return (proto); } -void -flow_to_route(struct flentry *fle, struct route *ro) -{ - uint32_t *hashkey = NULL; - -#ifdef INET6 - if (fle->f_flags & FL_IPV6) { - struct sockaddr_in6 *sin6; - - sin6 = (struct sockaddr_in6 *)&ro->ro_dst; - - sin6->sin6_family = AF_INET6; - sin6->sin6_len = sizeof(*sin6); - hashkey = ((struct flentry_v6 *)fle)->fl_flow.ipf_key; - memcpy(&sin6->sin6_addr, &hashkey[2], sizeof (struct in6_addr)); - } else -#endif -#ifdef INET - { - struct sockaddr_in *sin; - - sin = (struct sockaddr_in *)&ro->ro_dst; - - sin->sin_family = AF_INET; - sin->sin_len = sizeof(*sin); - hashkey = ((struct flentry_v4 *)fle)->fl_flow.ipf_key; - sin->sin_addr.s_addr = hashkey[2]; - } -#endif - ; /* terminate INET6 else if no INET4 */ - ro->ro_rt = __DEVOLATILE(struct rtentry *, fle->f_rt); - ro->ro_lle = __DEVOLATILE(struct llentry *, fle->f_lle); -} - #ifdef INET #ifdef FLOWTABLE_DEBUG static void @@ -583,6 +548,21 @@ flowtable_lookup_mbuf4(struct flowtable return (flowtable_lookup(ft, &ssa, &dsa, M_GETFIB(m), flags)); } + +void +flow_to_route(struct flentry *fle, struct route *ro) +{ + uint32_t *hashkey = NULL; + struct sockaddr_in *sin; + + sin = (struct sockaddr_in *)&ro->ro_dst; + sin->sin_family = AF_INET; + sin->sin_len = sizeof(*sin); + hashkey = ((struct flentry_v4 *)fle)->fl_flow.ipf_key; + sin->sin_addr.s_addr = hashkey[2]; + ro->ro_rt = __DEVOLATILE(struct rtentry *, fle->f_rt); + ro->ro_lle = __DEVOLATILE(struct llentry *, fle->f_lle); +} #endif /* INET */ #ifdef INET6 @@ -772,6 +752,23 @@ flowtable_lookup_mbuf6(struct flowtable return (flowtable_lookup(ft, &ssa, &dsa, M_GETFIB(m), flags)); } + +void +flow_to_route_in6(struct flentry *fle, struct route_in6 *ro) +{ + uint32_t *hashkey = NULL; + struct sockaddr_in6 *sin6; + + sin6 = (struct sockaddr_in6 *)&ro->ro_dst; + + sin6->sin6_family = AF_INET6; + sin6->sin6_len = sizeof(*sin6); + hashkey = ((struct flentry_v6 *)fle)->fl_flow.ipf_key; + memcpy(&sin6->sin6_addr, &hashkey[5], sizeof (struct in6_addr)); + ro->ro_rt = __DEVOLATILE(struct rtentry *, fle->f_rt); + ro->ro_lle = __DEVOLATILE(struct llentry *, fle->f_lle); + +} #endif /* INET6 */ static bitstr_t * @@ -967,11 +964,6 @@ kern_flowtable_insert(struct flowtable * FLDPRINTF(ft, FL_DEBUG, "kern_flowtable_insert: key=%x:%x:%x hash=%x fibnum=%d flags=%x\n", key[0], key[1], key[2], hash, fibnum, flags); -#ifdef FLOWTABLE_DEBUG - if (flags & FL_DEBUG) - ipv4_flow_print_tuple(flags, flags_to_proto(flags), - (struct sockaddr_in *)ssa, (struct sockaddr_in *)dsa); -#endif return (flowtable_insert(ft, hash, key, fibnum, ro, flags)); } @@ -1071,18 +1063,6 @@ flowtable_lookup(struct flowtable *ft, s goto uncached; } keycheck: -#ifdef FLOWTABLE_DEBUG - if (flags & FL_DEBUG){ - printf("keycheck: key=%x:%x:%x hash=%x fibnum=%02d " - "keyequal=%d hashequal=%d", - key[0], key[1], key[2], hash, fibnum, - flowtable_key_equal(fle, key), - (fle->f_fhash == hash)); - ipv4_flow_print_tuple(flags, proto, - (struct sockaddr_in *)ssa, - (struct sockaddr_in *)dsa); - } -#endif rt = __DEVOLATILE(struct rtentry *, fle->f_rt); lle = __DEVOLATILE(struct llentry *, fle->f_lle); if ((rt != NULL) Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.h ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.h Mon Feb 8 04:12:10 2010 (r203646) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.h Mon Feb 8 05:06:47 2010 (r203647) @@ -50,6 +50,9 @@ struct flentry; VNET_DECLARE(struct flowtable *, ip_ft); #define V_ip_ft VNET(ip_ft) +VNET_DECLARE(struct flowtable *, ip6_ft); +#define V_ip6_ft VNET(ip6_ft) + struct flowtable *flowtable_alloc(char *name, int nentry, int flags); /* @@ -66,10 +69,16 @@ int kern_flowtable_insert(struct flowtab struct sockaddr *dsa, struct route *ro, uint32_t fibnum, int flags); void flow_invalidate(struct flentry *fl); +void flowtable_route_flush(struct flowtable *ft, struct rtentry *rt); +#ifdef INET void flow_to_route(struct flentry *fl, struct route *ro); +#endif + +#ifdef INET6 +void flow_to_route_in6(struct flentry *fl, struct route_in6 *ro); +#endif -void flowtable_route_flush(struct flowtable *ft, struct rtentry *rt); #endif /* _KERNEL */ #endif From owner-svn-src-user@FreeBSD.ORG Mon Feb 8 05:07:22 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B4871065670; Mon, 8 Feb 2010 05:07:22 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EFDE58FC08; Mon, 8 Feb 2010 05:07:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1857Lfw040779; Mon, 8 Feb 2010 05:07:21 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1857LsW040777; Mon, 8 Feb 2010 05:07:21 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002080507.o1857LsW040777@svn.freebsd.org> From: Kip Macy Date: Mon, 8 Feb 2010 05:07:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203648 - user/kmacy/head_flowtable_v6/sys/netinet X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 05:07:22 -0000 Author: kmacy Date: Mon Feb 8 05:07:21 2010 New Revision: 203648 URL: http://svn.freebsd.org/changeset/base/203648 Log: add opt_inet.h to hide flow routine generally Modified: user/kmacy/head_flowtable_v6/sys/netinet/ip_output.c Modified: user/kmacy/head_flowtable_v6/sys/netinet/ip_output.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/netinet/ip_output.c Mon Feb 8 05:06:47 2010 (r203647) +++ user/kmacy/head_flowtable_v6/sys/netinet/ip_output.c Mon Feb 8 05:07:21 2010 (r203648) @@ -32,6 +32,7 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_inet.h" #include "opt_ipfw.h" #include "opt_ipsec.h" #include "opt_route.h" From owner-svn-src-user@FreeBSD.ORG Mon Feb 8 05:08:25 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1BE301065676; Mon, 8 Feb 2010 05:08:25 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0BCA98FC16; Mon, 8 Feb 2010 05:08:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1858OYK041048; Mon, 8 Feb 2010 05:08:24 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1858OIq041043; Mon, 8 Feb 2010 05:08:24 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002080508.o1858OIq041043@svn.freebsd.org> From: Kip Macy Date: Mon, 8 Feb 2010 05:08:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203649 - user/kmacy/head_flowtable_v6/sys/netinet6 X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 05:08:25 -0000 Author: kmacy Date: Mon Feb 8 05:08:24 2010 New Revision: 203649 URL: http://svn.freebsd.org/changeset/base/203649 Log: add flowtable support to ip6_output Modified: user/kmacy/head_flowtable_v6/sys/netinet6/in6_proto.c user/kmacy/head_flowtable_v6/sys/netinet6/ip6_input.c user/kmacy/head_flowtable_v6/sys/netinet6/ip6_output.c user/kmacy/head_flowtable_v6/sys/netinet6/udp6_usrreq.c Modified: user/kmacy/head_flowtable_v6/sys/netinet6/in6_proto.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/netinet6/in6_proto.c Mon Feb 8 05:07:21 2010 (r203648) +++ user/kmacy/head_flowtable_v6/sys/netinet6/in6_proto.c Mon Feb 8 05:08:24 2010 (r203649) @@ -546,6 +546,16 @@ SYSCTL_VNET_INT(_net_inet6_ip6, IPV6CTL_ &VNET_NAME(ip6stealth), 0, ""); #endif +#ifdef FLOWTABLE +static VNET_DEFINE(int, ip6_output_flowtable_size) = 2048; +VNET_DEFINE(struct flowtable *, ip6_ft); +#define V_ip6_output_flowtable_size VNET(ip6_output_flowtable_size) + +SYSCTL_VNET_INT(_net_inet6_ip6, OID_AUTO, output_flowtable_size, CTLFLAG_RDTUN, + &VNET_NAME(ip6_output_flowtable_size), 2048, + "number of entries in the per-cpu output flow caches"); +#endif + /* net.inet6.icmp6 */ SYSCTL_VNET_INT(_net_inet6_icmp6, ICMPV6CTL_REDIRACCEPT, rediraccept, CTLFLAG_RW, &VNET_NAME(icmp6_rediraccept), 0, ""); Modified: user/kmacy/head_flowtable_v6/sys/netinet6/ip6_input.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/netinet6/ip6_input.c Mon Feb 8 05:07:21 2010 (r203648) +++ user/kmacy/head_flowtable_v6/sys/netinet6/ip6_input.c Mon Feb 8 05:08:24 2010 (r203649) @@ -192,6 +192,11 @@ ip6_init(void) #define IPV6_SENDREDIRECTS 1 #endif +#ifdef FLOWTABLE + TUNABLE_INT_FETCH("net.inet6.ip6.output_flowtable_size", + &V_ip6_output_flowtable_size); + V_ip6_ft = flowtable_alloc(V_ip6_output_flowtable_size, FL_PCPU); +#endif V_ip6_forwarding = IPV6FORWARDING; /* act as router? */ V_ip6_sendredirects = IPV6_SENDREDIRECTS; V_ip6_defhlim = IPV6_DEFHLIM; Modified: user/kmacy/head_flowtable_v6/sys/netinet6/ip6_output.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/netinet6/ip6_output.c Mon Feb 8 05:07:21 2010 (r203648) +++ user/kmacy/head_flowtable_v6/sys/netinet6/ip6_output.c Mon Feb 8 05:08:24 2010 (r203649) @@ -206,6 +206,7 @@ ip6_output(struct mbuf *m0, struct ip6_p struct in6_addr finaldst, src0, dst0; u_int32_t zone; struct route_in6 *ro_pmtu = NULL; + int flevalid = 0; int hdrsplit = 0; int needipsec = 0; #ifdef IPSEC @@ -223,9 +224,7 @@ ip6_output(struct mbuf *m0, struct ip6_p } finaldst = ip6->ip6_dst; - bzero(&exthdrs, sizeof(exthdrs)); - if (opt) { /* Hop-by-Hop options header */ MAKE_EXTHDR(opt->ip6po_hbh, &exthdrs.ip6e_hbh); @@ -462,7 +461,22 @@ skip_ipsec2:; if (opt && opt->ip6po_rthdr) ro = &opt->ip6po_route; dst = (struct sockaddr_in6 *)&ro->ro_dst; - +#ifdef FLOWTABLE + if (ro == &ip6route) { + struct flentry *fle; + + /* + * The flow table returns route entries valid for up to 30 + * seconds; we rely on the remainder of ip_output() taking no + * longer than that long for the stability of ro_rt. The + * flow ID assignment must have happened before this point. + */ + if ((fle = flowtable_lookup_mbuf(V_ip6_ft, m, AF_INET6)) != NULL) { + flow_to_route_in6(fle, ro); + flevalid = 1; + } + } +#endif again: /* * if specified, try to fill in the traffic class field. @@ -568,7 +582,10 @@ again: dst_sa.sin6_family = AF_INET6; dst_sa.sin6_len = sizeof(dst_sa); dst_sa.sin6_addr = ip6->ip6_dst; - if ((error = in6_selectroute(&dst_sa, opt, im6o, ro, + if (flevalid) { + rt = ro->ro_rt; + ifp = ro->ro_rt->rt_ifp; + } else if ((error = in6_selectroute(&dst_sa, opt, im6o, ro, &ifp, &rt)) != 0) { switch (error) { case EHOSTUNREACH: @@ -1052,7 +1069,8 @@ sendorfree: V_ip6stat.ip6s_fragmented++; done: - if (ro == &ip6route && ro->ro_rt) { /* brace necessary for RTFREE */ + if (ro == &ip6route && ro->ro_rt && flevalid == 0) { + /* brace necessary for RTFREE */ RTFREE(ro->ro_rt); } else if (ro_pmtu == &ip6route && ro_pmtu->ro_rt) { RTFREE(ro_pmtu->ro_rt); Modified: user/kmacy/head_flowtable_v6/sys/netinet6/udp6_usrreq.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/netinet6/udp6_usrreq.c Mon Feb 8 05:07:21 2010 (r203648) +++ user/kmacy/head_flowtable_v6/sys/netinet6/udp6_usrreq.c Mon Feb 8 05:08:24 2010 (r203649) @@ -1079,7 +1079,9 @@ udp6_send(struct socket *so, int flags, mac_inpcb_create_mbuf(inp, m); #endif error = udp6_output(inp, m, addr, control, td); +#ifdef INET out: +#endif INP_WUNLOCK(inp); INP_INFO_WUNLOCK(&V_udbinfo); return (error); From owner-svn-src-user@FreeBSD.ORG Mon Feb 8 05:08:43 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2D0011065740; Mon, 8 Feb 2010 05:08:43 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1D7FE8FC1E; Mon, 8 Feb 2010 05:08:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1858hCr041150; Mon, 8 Feb 2010 05:08:43 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1858hv8041148; Mon, 8 Feb 2010 05:08:43 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002080508.o1858hv8041148@svn.freebsd.org> From: Kip Macy Date: Mon, 8 Feb 2010 05:08:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203650 - user/kmacy/head_flowtable_v6/sys/amd64/conf X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 05:08:43 -0000 Author: kmacy Date: Mon Feb 8 05:08:42 2010 New Revision: 203650 URL: http://svn.freebsd.org/changeset/base/203650 Log: re-enable INET6 Modified: user/kmacy/head_flowtable_v6/sys/amd64/conf/GENERIC Modified: user/kmacy/head_flowtable_v6/sys/amd64/conf/GENERIC ============================================================================== --- user/kmacy/head_flowtable_v6/sys/amd64/conf/GENERIC Mon Feb 8 05:08:24 2010 (r203649) +++ user/kmacy/head_flowtable_v6/sys/amd64/conf/GENERIC Mon Feb 8 05:08:42 2010 (r203650) @@ -27,6 +27,7 @@ options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption options FFS # Berkeley Fast Filesystem options INET +options INET6 options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists options UFS_DIRHASH # Improve performance on big directories From owner-svn-src-user@FreeBSD.ORG Mon Feb 8 05:13:09 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 10A30106566C; Mon, 8 Feb 2010 05:13:09 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EF27D8FC19; Mon, 8 Feb 2010 05:13:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o185D80Y042150; Mon, 8 Feb 2010 05:13:08 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o185D84K042148; Mon, 8 Feb 2010 05:13:08 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201002080513.o185D84K042148@svn.freebsd.org> From: Doug Barton Date: Mon, 8 Feb 2010 05:13:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203651 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 05:13:09 -0000 Author: dougb Date: Mon Feb 8 05:13:08 2010 New Revision: 203651 URL: http://svn.freebsd.org/changeset/base/203651 Log: 1. Fix 2 places where sudo privileges might be needed but the non-sudo version of the command was called. [1] 2. Condense the "don't do term_printf() if we're on cons25" test into a simpler version. Submitted by: N.J. Mann [1] (for pkg_delete) Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon Feb 8 05:08:42 2010 (r203650) +++ user/dougb/portmaster/portmaster Mon Feb 8 05:13:08 2010 (r203651) @@ -199,7 +199,7 @@ safe_exit () { cd for f in $build_deps_il; do [ -n "$PM_VERBOSE" ] && echo " $f" - pkg_delete -f $f + pm_pkg_delete_s -f $f done echo '' fi @@ -1666,10 +1666,7 @@ check_fetch_only () { term_printf () { [ -n "$PM_NO_TERM_TITLE" ] && return - - case "$TERM" in - cons25) return ;; - esac + [ "$TERM" = cons25 ] && return printf "\033]0;${0##*/}: ${PM_PARENT_PORT}${1}\007" } @@ -2702,7 +2699,7 @@ fetch_package () { fi fetch $fetch_args -o $ppd ${sitepath}${1}.tbz 2>/dev/null || { - pm_unlink ${ppd}/${1}.tbz; + pm_unlink_s ${ppd}/${1}.tbz; fetch $fetch_args -o $ppd ${sitepath}${1}.tbz 2>/dev/null; } fi } From owner-svn-src-user@FreeBSD.ORG Mon Feb 8 05:39:32 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD0EA106566C; Mon, 8 Feb 2010 05:39:32 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 937DE8FC22; Mon, 8 Feb 2010 05:39:32 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o185dW5m047948; Mon, 8 Feb 2010 05:39:32 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o185dW6l047944; Mon, 8 Feb 2010 05:39:32 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002080539.o185dW6l047944@svn.freebsd.org> From: Kip Macy Date: Mon, 8 Feb 2010 05:39:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203652 - user/kmacy/head_flowtable_v6/sys/netinet6 X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 05:39:32 -0000 Author: kmacy Date: Mon Feb 8 05:39:32 2010 New Revision: 203652 URL: http://svn.freebsd.org/changeset/base/203652 Log: - add opt_route.h so that FLOWTABLE can be defined - shuffle variables and fix call to flowtable_alloc Modified: user/kmacy/head_flowtable_v6/sys/netinet6/in6_proto.c user/kmacy/head_flowtable_v6/sys/netinet6/ip6_input.c user/kmacy/head_flowtable_v6/sys/netinet6/ip6_output.c Modified: user/kmacy/head_flowtable_v6/sys/netinet6/in6_proto.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/netinet6/in6_proto.c Mon Feb 8 05:13:08 2010 (r203651) +++ user/kmacy/head_flowtable_v6/sys/netinet6/in6_proto.c Mon Feb 8 05:39:32 2010 (r203652) @@ -70,6 +70,7 @@ __FBSDID("$FreeBSD$"); #include "opt_carp.h" #include "opt_sctp.h" #include "opt_mpath.h" +#include "opt_route.h" #include #include @@ -130,6 +131,10 @@ __FBSDID("$FreeBSD$"); #include +#ifdef FLOWTABLE +#include +#endif + /* * TCP/IP protocol family: IP6, ICMP6, UDP, TCP. */ @@ -547,7 +552,7 @@ SYSCTL_VNET_INT(_net_inet6_ip6, IPV6CTL_ #endif #ifdef FLOWTABLE -static VNET_DEFINE(int, ip6_output_flowtable_size) = 2048; +VNET_DEFINE(int, ip6_output_flowtable_size) = 2048; VNET_DEFINE(struct flowtable *, ip6_ft); #define V_ip6_output_flowtable_size VNET(ip6_output_flowtable_size) Modified: user/kmacy/head_flowtable_v6/sys/netinet6/ip6_input.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/netinet6/ip6_input.c Mon Feb 8 05:13:08 2010 (r203651) +++ user/kmacy/head_flowtable_v6/sys/netinet6/ip6_input.c Mon Feb 8 05:39:32 2010 (r203652) @@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" +#include "opt_route.h" #include #include @@ -113,6 +114,12 @@ __FBSDID("$FreeBSD$"); #include +#ifdef FLOWTABLE +#include +extern VNET_DEFINE(int, ip6_output_flowtable_size); +#define V_ip6_output_flowtable_size VNET(ip6_output_flowtable_size) +#endif + extern struct domain inet6domain; u_char ip6_protox[IPPROTO_MAX]; @@ -195,7 +202,7 @@ ip6_init(void) #ifdef FLOWTABLE TUNABLE_INT_FETCH("net.inet6.ip6.output_flowtable_size", &V_ip6_output_flowtable_size); - V_ip6_ft = flowtable_alloc(V_ip6_output_flowtable_size, FL_PCPU); + V_ip6_ft = flowtable_alloc("ipv6", V_ip6_output_flowtable_size, FL_PCPU); #endif V_ip6_forwarding = IPV6FORWARDING; /* act as router? */ V_ip6_sendredirects = IPV6_SENDREDIRECTS; Modified: user/kmacy/head_flowtable_v6/sys/netinet6/ip6_output.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/netinet6/ip6_output.c Mon Feb 8 05:13:08 2010 (r203651) +++ user/kmacy/head_flowtable_v6/sys/netinet6/ip6_output.c Mon Feb 8 05:39:32 2010 (r203652) @@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" +#include "opt_route.h" #include #include @@ -106,6 +107,10 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef FLOWTABLE +#include +#endif + extern int in6_mcast_loop; struct ip6_exthdrs { From owner-svn-src-user@FreeBSD.ORG Mon Feb 8 05:52:03 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B38E1065676; Mon, 8 Feb 2010 05:52:03 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1BF158FC18; Mon, 8 Feb 2010 05:52:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o185q3D1050718; Mon, 8 Feb 2010 05:52:03 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o185q2sU050716; Mon, 8 Feb 2010 05:52:03 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002080552.o185q2sU050716@svn.freebsd.org> From: Kip Macy Date: Mon, 8 Feb 2010 05:52:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203653 - user/kmacy/head_flowtable_v6/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 05:52:03 -0000 Author: kmacy Date: Mon Feb 8 05:52:02 2010 New Revision: 203653 URL: http://svn.freebsd.org/changeset/base/203653 Log: - call llentry_update with right LLTABLE Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Mon Feb 8 05:39:32 2010 (r203652) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Mon Feb 8 05:52:02 2010 (r203653) @@ -1117,7 +1117,14 @@ uncached: l3addr = rt->rt_gateway; else l3addr = &ro->ro_dst; - llentry_update(&lle, LLTABLE(ifp), l3addr, ifp); +#ifdef INET6 + if (ssa->sa_family == AF_INET6) + llentry_update(&lle, LLTABLE6(ifp), l3addr, ifp); +#endif +#ifdef INET + if (ssa->sa_family == AF_INET) + llentry_update(&lle, LLTABLE(ifp), l3addr, ifp); +#endif ro->ro_lle = lle; if (lle == NULL) { From owner-svn-src-user@FreeBSD.ORG Mon Feb 8 06:08:47 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2969106566B; Mon, 8 Feb 2010 06:08:47 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E376D8FC17; Mon, 8 Feb 2010 06:08:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1868lIp054485; Mon, 8 Feb 2010 06:08:47 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1868lQl054483; Mon, 8 Feb 2010 06:08:47 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201002080608.o1868lQl054483@svn.freebsd.org> From: Doug Barton Date: Mon, 8 Feb 2010 06:08:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203654 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 06:08:48 -0000 Author: dougb Date: Mon Feb 8 06:08:47 2010 New Revision: 203654 URL: http://svn.freebsd.org/changeset/base/203654 Log: Document the --no-term-title feature Modified: user/dougb/portmaster/portmaster.8 Modified: user/dougb/portmaster/portmaster.8 ============================================================================== --- user/dougb/portmaster/portmaster.8 Mon Feb 8 05:52:02 2010 (r203653) +++ user/dougb/portmaster/portmaster.8 Mon Feb 8 06:08:47 2010 (r203654) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 23, 2010 +.Dd February 7, 2010 .Dt PORTMASTER 8 .Os .Sh NAME @@ -39,6 +39,7 @@ Common Flags: .Op Fl -always-fetch .Op Fl -local-packagedir= .Op Fl -no-confirm +.Op Fl -no-term-title .Op Fl m Ar arguments for make .Op Fl x Ar glob pattern to exclude from building .Nm @@ -413,6 +414,8 @@ etc. .It Fl -no-confirm do not ask the user to confirm the list of ports to be installed and/or updated before proceeding +.It Fl -no-term-title +do not update the xterm title bar .It Fl l list all installed ports by category .It Fl L @@ -605,6 +608,9 @@ along with their related options. # # Suppress the build confirmation message (--no-confirm) # PM_NO_CONFIRM=pm_no_confirm +# +# Do not update the xterm title bar (--no-term-title) +# PM_NO_TERM_TITLE=pm_no_term_title .Ed .Pp .It Pa /var/db/pkg/*/+IGNOREME From owner-svn-src-user@FreeBSD.ORG Mon Feb 8 06:09:35 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E6E04106566B; Mon, 8 Feb 2010 06:09:35 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D83408FC20; Mon, 8 Feb 2010 06:09:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1869ZQq054720; Mon, 8 Feb 2010 06:09:35 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1869ZGO054718; Mon, 8 Feb 2010 06:09:35 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201002080609.o1869ZGO054718@svn.freebsd.org> From: Doug Barton Date: Mon, 8 Feb 2010 06:09:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203655 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 06:09:36 -0000 Author: dougb Date: Mon Feb 8 06:09:35 2010 New Revision: 203655 URL: http://svn.freebsd.org/changeset/base/203655 Log: One more place where build_l is updated that needs to go through the function to avoid duplicates Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon Feb 8 06:08:47 2010 (r203654) +++ user/dougb/portmaster/portmaster Mon Feb 8 06:09:35 2010 (r203655) @@ -2471,7 +2471,7 @@ if [ -n "$CONFIG_ONLY" -a "$$" -eq "$PM_ if [ -n "$upg_port" ]; then update_build_l $upg_port else - build_l="${build_l}\tInstall $portdir\n" + update_build_l $portdir fi fi From owner-svn-src-user@FreeBSD.ORG Mon Feb 8 06:28:33 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F0DCC106566B; Mon, 8 Feb 2010 06:28:33 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E21C68FC13; Mon, 8 Feb 2010 06:28:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o186SXIW058904; Mon, 8 Feb 2010 06:28:33 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o186SXE8058902; Mon, 8 Feb 2010 06:28:33 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201002080628.o186SXE8058902@svn.freebsd.org> From: Doug Barton Date: Mon, 8 Feb 2010 06:28:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203656 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 06:28:34 -0000 Author: dougb Date: Mon Feb 8 06:28:33 2010 New Revision: 203656 URL: http://svn.freebsd.org/changeset/base/203656 Log: Refactor the duplicate detection code in update_build_l(): 1. Put the case statements all on one line to condense the code a bit 2. Reorganize the code to avoid expensive greps through /var/db/pkg if we find a duplicate. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon Feb 8 06:09:35 2010 (r203655) +++ user/dougb/portmaster/portmaster Mon Feb 8 06:28:33 2010 (r203656) @@ -1675,18 +1675,16 @@ update_build_l () { local origin iport new_port case "$1" in - */*) origin=$1 ; iport=`iport_from_origin $origin` + */*) origin=$1 + case "$build_l" in *\ $origin\\*) return ;; esac + iport=`iport_from_origin $origin` if [ -z "$iport" ]; then - case "$build_l" in - *\ $origin\\*) return ;; - esac build_l="${build_l}\tInstall $origin\n" return fi ;; - *) origin=`origin_from_pdb $1` ; iport=$1 - case "$build_l" in - *\ $iport\ *) return ;; - esac ;; + *) iport=$1 + case "$build_l" in *\ $iport\ *|*\ $iport\\*) return ;; esac + origin=`origin_from_pdb $1` ;; esac pm_cd $pd/$origin && new_port=`pm_make -V PKGNAME` From owner-svn-src-user@FreeBSD.ORG Mon Feb 8 07:38:25 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B073106568B; Mon, 8 Feb 2010 07:38:25 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5C9848FC21; Mon, 8 Feb 2010 07:38:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o187cPS8074287; Mon, 8 Feb 2010 07:38:25 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o187cP13074285; Mon, 8 Feb 2010 07:38:25 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002080738.o187cP13074285@svn.freebsd.org> From: Kip Macy Date: Mon, 8 Feb 2010 07:38:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203658 - user/kmacy/head_flowtable_v6/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 07:38:25 -0000 Author: kmacy Date: Mon Feb 8 07:38:25 2010 New Revision: 203658 URL: http://svn.freebsd.org/changeset/base/203658 Log: set FL_IPV6 when doing insert Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Mon Feb 8 07:31:05 2010 (r203657) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Mon Feb 8 07:38:25 2010 (r203658) @@ -1044,6 +1044,7 @@ flowtable_lookup(struct flowtable *ft, s dsin6 = (struct sockaddr_in6 *)dsa; ssin6 = (struct sockaddr_in6 *)ssa; + flags |= FL_IPV6; hash = ipv6_flow_lookup_hash_internal(ssin6, dsin6, key, flags); } #endif From owner-svn-src-user@FreeBSD.ORG Mon Feb 8 08:22:42 2010 Return-Path: Delivered-To: svn-src-user@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 194D61065692; Mon, 8 Feb 2010 08:22:42 +0000 (UTC) (envelope-from nyan@jp.FreeBSD.org) Received: from sakura.ccs.furiru.org (sakura.ccs.furiru.org [IPv6:2001:2f0:104:8060::1]) by mx1.freebsd.org (Postfix) with ESMTP id B98C58FC26; Mon, 8 Feb 2010 08:22:41 +0000 (UTC) Received: from localhost (authenticated bits=0) by sakura.ccs.furiru.org (unknown) with ESMTP id o188MavJ072695; Mon, 8 Feb 2010 17:22:39 +0900 (JST) (envelope-from nyan@jp.FreeBSD.org) Date: Mon, 08 Feb 2010 17:21:37 +0900 (JST) Message-Id: <20100208.172137.27851207.nyan@jp.FreeBSD.org> To: imp@FreeBSD.org From: TAKAHASHI Yoshihiro In-Reply-To: <201002072001.o17K1rYc020284@svn.freebsd.org> References: <201002072001.o17K1rYc020284@svn.freebsd.org> X-Mailer: Mew version 6.3 on Emacs 22.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: src-committers@FreeBSD.org, svn-src-user@FreeBSD.org Subject: Re: svn commit: r203633 - user/imp/tbemd/sys/conf X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 08:22:42 -0000 In article <201002072001.o17K1rYc020284@svn.freebsd.org> Warner Losh writes: > Log: > This shouldn't be necessary. > > Modified: > user/imp/tbemd/sys/conf/Makefile.pc98 > > Modified: user/imp/tbemd/sys/conf/Makefile.pc98 > ============================================================================== > --- user/imp/tbemd/sys/conf/Makefile.pc98 Sun Feb 7 19:58:49 2010 (r203632) > +++ user/imp/tbemd/sys/conf/Makefile.pc98 Sun Feb 7 20:01:52 2010 (r203633) > @@ -30,8 +30,6 @@ S= ../../.. > .endif > .include "$S/conf/kern.pre.mk" > > -MACHINE=pc98 > - > MKMODULESENV+= MACHINE=${MACHINE} > > %BEFORE_DEPEND This is needed for cross-building. It enables to require no additional option for 'make'. I usually use the following commands to build pc98 kernel on i386 machine. # cd /sys/pc98/conf # config GENERIC # cd ../compile/GENERIC # make depend # make --- TAKAHASHI Yoshihiro From owner-svn-src-user@FreeBSD.ORG Mon Feb 8 16:24:27 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 533B2106568B; Mon, 8 Feb 2010 16:24:27 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 43E718FC1B; Mon, 8 Feb 2010 16:24:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o18GORmX094612; Mon, 8 Feb 2010 16:24:27 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o18GORdX094610; Mon, 8 Feb 2010 16:24:27 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002081624.o18GORdX094610@svn.freebsd.org> From: Kip Macy Date: Mon, 8 Feb 2010 16:24:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203670 - user/kmacy/head_flowtable_v6/sys/netinet6 X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 16:24:27 -0000 Author: kmacy Date: Mon Feb 8 16:24:26 2010 New Revision: 203670 URL: http://svn.freebsd.org/changeset/base/203670 Log: don't RTFREE on flowtable hit Modified: user/kmacy/head_flowtable_v6/sys/netinet6/ip6_output.c Modified: user/kmacy/head_flowtable_v6/sys/netinet6/ip6_output.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/netinet6/ip6_output.c Mon Feb 8 15:55:01 2010 (r203669) +++ user/kmacy/head_flowtable_v6/sys/netinet6/ip6_output.c Mon Feb 8 16:24:26 2010 (r203670) @@ -1077,7 +1077,8 @@ done: if (ro == &ip6route && ro->ro_rt && flevalid == 0) { /* brace necessary for RTFREE */ RTFREE(ro->ro_rt); - } else if (ro_pmtu == &ip6route && ro_pmtu->ro_rt) { + } else if (ro_pmtu == &ip6route && ro_pmtu->ro_rt && + ((flevalid == 0) || (ro_pmtu != ro))) { RTFREE(ro_pmtu->ro_rt); } #ifdef IPSEC From owner-svn-src-user@FreeBSD.ORG Mon Feb 8 17:26:59 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 374CC10656A8; Mon, 8 Feb 2010 17:26:59 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0E5B58FC1B; Mon, 8 Feb 2010 17:26:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o18HQwDo008421; Mon, 8 Feb 2010 17:26:58 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o18HQw1Z008420; Mon, 8 Feb 2010 17:26:58 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002081726.o18HQw1Z008420@svn.freebsd.org> From: Kip Macy Date: Mon, 8 Feb 2010 17:26:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203671 - user/kmacy/head_flowtable_v6/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 17:26:59 -0000 Author: kmacy Date: Mon Feb 8 17:26:58 2010 New Revision: 203671 URL: http://svn.freebsd.org/changeset/base/203671 Log: print interface flags and v6 hashkey in debug output Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Mon Feb 8 16:24:26 2010 (r203670) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Mon Feb 8 17:26:58 2010 (r203671) @@ -1531,14 +1531,19 @@ static void flow_show(struct flowtable *ft, struct flentry *fle) { int idle_time; - int rt_valid; + int rt_valid, ifp_valid; uint16_t sport, dport; uint32_t *hashkey; char saddr[4*sizeof "123"], daddr[4*sizeof "123"]; + volatile struct rtentry *rt; + struct ifnet *ifp = NULL; idle_time = (int)(time_uptime - fle->f_uptime); - rt_valid = fle->f_rt != NULL; - + rt = fle->f_rt; + rt_valid = rt != NULL; + if (rt_valid) + ifp = rt->rt_ifp; + ifp_valid = ifp != NULL; hashkey = flowtable_get_hashkey(fle); if (fle->f_flags & FL_IPV6) goto skipaddr; @@ -1553,7 +1558,7 @@ flow_show(struct flowtable *ft, struct f dport); } else db_printf("%s ", daddr); - + skipaddr: if (fle->f_flags & FL_STALE) db_printf(" FL_STALE "); @@ -1561,14 +1566,29 @@ skipaddr: db_printf(" FL_TCP "); if (fle->f_flags & FL_UDP) db_printf(" FL_UDP "); - if (rt_valid && (fle->f_rt->rt_flags & RTF_UP)) - db_printf(" RTF_UP "); - - db_printf("\n\tkey=%08x:%08x:%08x hash=%08x idle_time=%03d" - "\n\tfibnum=%02d rt=%p ifp=%p", - hashkey[0], hashkey[1], hashkey[2], fle->f_fhash, - idle_time, fle->f_fibnum, - fle->f_rt, rt_valid ? fle->f_rt->rt_ifp : NULL); + if (rt_valid) { + if (rt->rt_flags & RTF_UP) + db_printf(" RTF_UP "); + } + if (ifp_valid) { + if (ifp->if_flags & IFF_LOOPBACK) + db_printf(" IFF_LOOPBACK "); + if (ifp->if_flags & IFF_UP) + db_printf(" IFF_UP "); + if (ifp->if_flags & IFF_POINTOPOINT) + db_printf(" IFF_POINTOPOINT "); + } + if (fle->f_flags & FL_IPV6) + db_printf("\n\tkey=%08x:%08x:%08x%08x:%08x:%08x%08x:%08x:%08x", + hashkey[0], hashkey[1], hashkey[2], + hashkey[3], hashkey[4], hashkey[5], + hashkey[6], hashkey[7], hashkey[8]); + else + db_printf("\n\tkey=%08x:%08x:%08x ", + hashkey[0], hashkey[1], hashkey[2]); + db_printf("hash=%08x idle_time=%03d" + "\n\tfibnum=%02d rt=%p", + fle->f_fhash, idle_time, fle->f_fibnum, fle->f_rt); db_printf("\n"); } From owner-svn-src-user@FreeBSD.ORG Mon Feb 8 17:38:39 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 822CB106566B; Mon, 8 Feb 2010 17:38:39 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 72B848FC12; Mon, 8 Feb 2010 17:38:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o18HcdtT011019; Mon, 8 Feb 2010 17:38:39 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o18HcdoQ011017; Mon, 8 Feb 2010 17:38:39 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002081738.o18HcdoQ011017@svn.freebsd.org> From: Kip Macy Date: Mon, 8 Feb 2010 17:38:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203672 - user/kmacy/head_flowtable_v6/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 17:38:39 -0000 Author: kmacy Date: Mon Feb 8 17:38:39 2010 New Revision: 203672 URL: http://svn.freebsd.org/changeset/base/203672 Log: don't hash loopback addresses Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Mon Feb 8 17:26:58 2010 (r203671) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Mon Feb 8 17:38:39 2010 (r203672) @@ -513,7 +513,6 @@ ipv4_flow_lookup_hash_internal( if ((V_flowtable_enable == 0) || (V_flowtable_ready == 0)) return (0); - proto = flags_to_proto(flags); sport = dport = key[2] = key[1] = key[0] = 0; if ((ssin != NULL) && (flags & FL_HASH_ALL)) { @@ -1033,7 +1032,10 @@ flowtable_lookup(struct flowtable *ft, s dsin = (struct sockaddr_in *)dsa; ssin = (struct sockaddr_in *)ssa; - + if ((ntohl(dsin->sin_addr.s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET || + (ntohl(ssin->sin_addr.s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) + return (NULL); + hash = ipv4_flow_lookup_hash_internal(ssin, dsin, key, flags); } #endif From owner-svn-src-user@FreeBSD.ORG Mon Feb 8 18:49:54 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3BBAE106566C; Mon, 8 Feb 2010 18:49:54 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 254D88FC08; Mon, 8 Feb 2010 18:49:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o18Insv7026903; Mon, 8 Feb 2010 18:49:54 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o18InrYJ026841; Mon, 8 Feb 2010 18:49:53 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201002081849.o18InrYJ026841@svn.freebsd.org> From: Ed Schouten Date: Mon, 8 Feb 2010 18:49:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203675 - in user/ed/newcons: . bin/cp bin/csh bin/date bin/kenv bin/ls bin/pax bin/pkill bin/setfacl bin/sh cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contr... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2010 18:49:54 -0000 Author: ed Date: Mon Feb 8 18:49:50 2010 New Revision: 203675 URL: http://svn.freebsd.org/changeset/base/203675 Log: Merge HEAD at r203673. Added: user/ed/newcons/contrib/csup/auth.c - copied unchanged from r203673, head/contrib/csup/auth.c user/ed/newcons/contrib/csup/auth.h - copied unchanged from r203673, head/contrib/csup/auth.h user/ed/newcons/contrib/csup/cpasswd.1 - copied unchanged from r203673, head/contrib/csup/cpasswd.1 user/ed/newcons/contrib/csup/cpasswd.sh - copied unchanged from r203673, head/contrib/csup/cpasswd.sh user/ed/newcons/contrib/ntp/html/build/hints/solaris.xtra.4095849 - copied unchanged from r203673, head/contrib/ntp/html/build/hints/solaris.xtra.4095849 user/ed/newcons/etc/devd/uath.conf - copied unchanged from r203673, head/etc/devd/uath.conf user/ed/newcons/etc/rc.d/rtsold - copied unchanged from r203673, head/etc/rc.d/rtsold user/ed/newcons/include/semaphore.h - copied unchanged from r203673, head/include/semaphore.h user/ed/newcons/include/termios.h - copied unchanged from r203673, head/include/termios.h user/ed/newcons/include/utmpx.h - copied unchanged from r203673, head/include/utmpx.h user/ed/newcons/lib/csu/i386-elf/crt1_c.c - copied unchanged from r203673, head/lib/csu/i386-elf/crt1_c.c user/ed/newcons/lib/csu/i386-elf/crt1_s.S - copied unchanged from r203673, head/lib/csu/i386-elf/crt1_s.S user/ed/newcons/lib/libarchive/archive_crc32.h - copied unchanged from r203673, head/lib/libarchive/archive_crc32.h user/ed/newcons/lib/libarchive/archive_entry_xattr.c - copied unchanged from r203673, head/lib/libarchive/archive_entry_xattr.c user/ed/newcons/lib/libarchive/archive_hash.h - copied unchanged from r203673, head/lib/libarchive/archive_hash.h user/ed/newcons/lib/libarchive/archive_read_support_compression_uu.c - copied unchanged from r203673, head/lib/libarchive/archive_read_support_compression_uu.c user/ed/newcons/lib/libarchive/archive_write_set_format_zip.c - copied unchanged from r203673, head/lib/libarchive/archive_write_set_format_zip.c user/ed/newcons/lib/libarchive/test/test_compat_cpio.c - copied unchanged from r203673, head/lib/libarchive/test/test_compat_cpio.c user/ed/newcons/lib/libarchive/test/test_compat_cpio_1.cpio.uu - copied unchanged from r203673, head/lib/libarchive/test/test_compat_cpio_1.cpio.uu user/ed/newcons/lib/libarchive/test/test_compat_lzma.c - copied unchanged from r203673, head/lib/libarchive/test/test_compat_lzma.c user/ed/newcons/lib/libarchive/test/test_compat_lzma_1.tlz.uu - copied unchanged from r203673, head/lib/libarchive/test/test_compat_lzma_1.tlz.uu user/ed/newcons/lib/libarchive/test/test_compat_lzma_2.tlz.uu - copied unchanged from r203673, head/lib/libarchive/test/test_compat_lzma_2.tlz.uu user/ed/newcons/lib/libarchive/test/test_compat_lzma_3.tlz.uu - copied unchanged from r203673, head/lib/libarchive/test/test_compat_lzma_3.tlz.uu user/ed/newcons/lib/libarchive/test/test_fuzz_1.iso.Z.uu - copied unchanged from r203673, head/lib/libarchive/test/test_fuzz_1.iso.Z.uu user/ed/newcons/lib/libarchive/test/test_read_format_ar.ar.uu - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_ar.ar.uu user/ed/newcons/lib/libarchive/test/test_read_format_cpio_bin_lzma.c - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_cpio_bin_lzma.c user/ed/newcons/lib/libarchive/test/test_read_format_iso.iso.Z.uu - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_iso.iso.Z.uu user/ed/newcons/lib/libarchive/test/test_read_format_iso_joliet.iso.Z.uu - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_iso_joliet.iso.Z.uu user/ed/newcons/lib/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu user/ed/newcons/lib/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu user/ed/newcons/lib/libarchive/test/test_read_format_iso_multi_extent.c - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_iso_multi_extent.c user/ed/newcons/lib/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu user/ed/newcons/lib/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu user/ed/newcons/lib/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu user/ed/newcons/lib/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu user/ed/newcons/lib/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu user/ed/newcons/lib/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu user/ed/newcons/lib/libarchive/test/test_read_format_isojoliet_long.c - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_isojoliet_long.c user/ed/newcons/lib/libarchive/test/test_read_format_isojoliet_rr.c - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_isojoliet_rr.c user/ed/newcons/lib/libarchive/test/test_read_format_isorr_ce.c - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_isorr_ce.c user/ed/newcons/lib/libarchive/test/test_read_format_isorr_new_bz2.c - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_isorr_new_bz2.c user/ed/newcons/lib/libarchive/test/test_read_format_isorr_rr_moved.c - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_isorr_rr_moved.c user/ed/newcons/lib/libarchive/test/test_read_format_isozisofs_bz2.c - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_isozisofs_bz2.c user/ed/newcons/lib/libarchive/test/test_read_format_mtree.mtree.uu - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_mtree.mtree.uu user/ed/newcons/lib/libarchive/test/test_read_format_tlz.c - copied unchanged from r203673, head/lib/libarchive/test/test_read_format_tlz.c user/ed/newcons/lib/libarchive/test/test_read_uu.c - copied unchanged from r203673, head/lib/libarchive/test/test_read_uu.c user/ed/newcons/lib/libarchive/test/test_write_disk_symlink.c - copied unchanged from r203673, head/lib/libarchive/test/test_write_disk_symlink.c user/ed/newcons/lib/libarchive/test/test_write_format_zip.c - copied unchanged from r203673, head/lib/libarchive/test/test_write_format_zip.c user/ed/newcons/lib/libarchive/test/test_write_format_zip_empty.c - copied unchanged from r203673, head/lib/libarchive/test/test_write_format_zip_empty.c user/ed/newcons/lib/libarchive/test/test_write_format_zip_no_compression.c - copied unchanged from r203673, head/lib/libarchive/test/test_write_format_zip_no_compression.c user/ed/newcons/lib/libc/gen/getutxent.3 - copied unchanged from r203673, head/lib/libc/gen/getutxent.3 user/ed/newcons/lib/libc/gen/getutxent.c - copied unchanged from r203673, head/lib/libc/gen/getutxent.c user/ed/newcons/lib/libc/gen/pututxline.c - copied unchanged from r203673, head/lib/libc/gen/pututxline.c user/ed/newcons/lib/libc/gen/sem_new.c - copied unchanged from r203673, head/lib/libc/gen/sem_new.c user/ed/newcons/lib/libc/gen/utxdb.c - copied unchanged from r203673, head/lib/libc/gen/utxdb.c user/ed/newcons/lib/libc/gen/utxdb.h - copied unchanged from r203673, head/lib/libc/gen/utxdb.h user/ed/newcons/lib/libc/mips/gen/hardfloat/ - copied from r203673, head/lib/libc/mips/gen/hardfloat/ user/ed/newcons/lib/libc/stdlib/ql.h - copied unchanged from r203673, head/lib/libc/stdlib/ql.h user/ed/newcons/lib/libc/stdlib/qr.h - copied unchanged from r203673, head/lib/libc/stdlib/qr.h user/ed/newcons/lib/libefi/ - copied from r203673, head/lib/libefi/ user/ed/newcons/lib/libgpib/gpib.3 - copied unchanged from r203673, head/lib/libgpib/gpib.3 user/ed/newcons/lib/libpmc/pmc.xscale.3 - copied unchanged from r203673, head/lib/libpmc/pmc.xscale.3 user/ed/newcons/lib/libulog/ - copied from r203673, head/lib/libulog/ user/ed/newcons/libexec/ulog-helper/ - copied from r203673, head/libexec/ulog-helper/ user/ed/newcons/release/picobsd/floppy.tree/sbin/ - copied from r203673, head/release/picobsd/floppy.tree/sbin/ user/ed/newcons/release/picobsd/qemu/ - copied from r203673, head/release/picobsd/qemu/ user/ed/newcons/sbin/geom/class/cache/gcache.8 - copied unchanged from r203673, head/sbin/geom/class/cache/gcache.8 user/ed/newcons/sbin/geom/class/mountver/ - copied from r203673, head/sbin/geom/class/mountver/ user/ed/newcons/share/doc/usd/05.dc/ - copied from r203673, head/share/doc/usd/05.dc/ user/ed/newcons/share/doc/usd/06.bc/ - copied from r203673, head/share/doc/usd/06.bc/ user/ed/newcons/share/man/man3/pthread_affinity_np.3 - copied unchanged from r203673, head/share/man/man3/pthread_affinity_np.3 user/ed/newcons/share/man/man3/pthread_attr_affinity_np.3 - copied unchanged from r203673, head/share/man/man3/pthread_attr_affinity_np.3 user/ed/newcons/share/man/man4/amdsbwd.4 - copied unchanged from r203673, head/share/man/man4/amdsbwd.4 user/ed/newcons/share/man/man4/gpib.4 - copied unchanged from r203673, head/share/man/man4/gpib.4 user/ed/newcons/share/man/man4/ipwfw.4 - copied unchanged from r203673, head/share/man/man4/ipwfw.4 user/ed/newcons/share/man/man4/iwifw.4 - copied unchanged from r203673, head/share/man/man4/iwifw.4 user/ed/newcons/share/man/man4/man4.powerpc/adb.4 - copied unchanged from r203673, head/share/man/man4/man4.powerpc/adb.4 user/ed/newcons/share/man/man4/man4.powerpc/akbd.4 - copied unchanged from r203673, head/share/man/man4/man4.powerpc/akbd.4 user/ed/newcons/share/man/man4/man4.powerpc/ams.4 - copied unchanged from r203673, head/share/man/man4/man4.powerpc/ams.4 user/ed/newcons/share/man/man4/man4.powerpc/cuda.4 - copied unchanged from r203673, head/share/man/man4/man4.powerpc/cuda.4 user/ed/newcons/share/man/man4/mk48txx.4 - copied unchanged from r203673, head/share/man/man4/mk48txx.4 user/ed/newcons/share/man/man4/nvram.4 - copied unchanged from r203673, head/share/man/man4/nvram.4 user/ed/newcons/share/man/man4/pcii.4 - copied unchanged from r203673, head/share/man/man4/pcii.4 user/ed/newcons/share/man/man4/run.4 - copied unchanged from r203673, head/share/man/man4/run.4 user/ed/newcons/share/man/man4/siba.4 - copied unchanged from r203673, head/share/man/man4/siba.4 user/ed/newcons/share/man/man4/tnt4882.4 - copied unchanged from r203673, head/share/man/man4/tnt4882.4 user/ed/newcons/share/man/man4/uhso.4 - copied unchanged from r203673, head/share/man/man4/uhso.4 user/ed/newcons/sys/arm/arm/cpufunc_asm_fa526.S - copied unchanged from r203673, head/sys/arm/arm/cpufunc_asm_fa526.S user/ed/newcons/sys/arm/conf/CNS11XXNAS - copied unchanged from r203673, head/sys/arm/conf/CNS11XXNAS user/ed/newcons/sys/arm/econa/ - copied from r203673, head/sys/arm/econa/ user/ed/newcons/sys/boot/common/md.c - copied unchanged from r203673, head/sys/boot/common/md.c user/ed/newcons/sys/boot/efi/libefi/efipart.c - copied unchanged from r203673, head/sys/boot/efi/libefi/efipart.c user/ed/newcons/sys/boot/i386/libi386/spinconsole.c - copied unchanged from r203673, head/sys/boot/i386/libi386/spinconsole.c user/ed/newcons/sys/boot/pc98/boot2/boot1.S - copied unchanged from r203673, head/sys/boot/pc98/boot2/boot1.S user/ed/newcons/sys/boot/pc98/boot2/boot2.c - copied unchanged from r203673, head/sys/boot/pc98/boot2/boot2.c user/ed/newcons/sys/boot/pc98/libpc98/libpc98.h - copied unchanged from r203673, head/sys/boot/pc98/libpc98/libpc98.h user/ed/newcons/sys/boot/pc98/libpc98/pc98_sys.c - copied unchanged from r203673, head/sys/boot/pc98/libpc98/pc98_sys.c user/ed/newcons/sys/compat/linux/linux_videodev.h - copied unchanged from r203673, head/sys/compat/linux/linux_videodev.h user/ed/newcons/sys/compat/linux/linux_videodev_compat.h - copied unchanged from r203673, head/sys/compat/linux/linux_videodev_compat.h user/ed/newcons/sys/conf/ldscript.mips.mips64 - copied unchanged from r203673, head/sys/conf/ldscript.mips.mips64 user/ed/newcons/sys/conf/ldscript.mips.octeon1.32 - copied unchanged from r203673, head/sys/conf/ldscript.mips.octeon1.32 user/ed/newcons/sys/conf/ldscript.mips.octeon1.64 - copied unchanged from r203673, head/sys/conf/ldscript.mips.octeon1.64 user/ed/newcons/sys/conf/ldscript.mips.octeon1.n32 - copied unchanged from r203673, head/sys/conf/ldscript.mips.octeon1.n32 user/ed/newcons/sys/contrib/dev/iwn/iwlwifi-1000-128.50.3.1.fw.uu - copied unchanged from r203673, head/sys/contrib/dev/iwn/iwlwifi-1000-128.50.3.1.fw.uu user/ed/newcons/sys/contrib/dev/iwn/iwlwifi-4965-228.61.2.24.fw.uu - copied unchanged from r203673, head/sys/contrib/dev/iwn/iwlwifi-4965-228.61.2.24.fw.uu user/ed/newcons/sys/contrib/dev/iwn/iwlwifi-5000-8.24.2.12.fw.uu - copied unchanged from r203673, head/sys/contrib/dev/iwn/iwlwifi-5000-8.24.2.12.fw.uu user/ed/newcons/sys/contrib/dev/iwn/iwlwifi-6000-9.176.4.1.fw.uu - copied unchanged from r203673, head/sys/contrib/dev/iwn/iwlwifi-6000-9.176.4.1.fw.uu user/ed/newcons/sys/contrib/dev/run/ - copied from r203673, head/sys/contrib/dev/run/ user/ed/newcons/sys/dev/amdsbwd/ - copied from r203673, head/sys/dev/amdsbwd/ user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar9285.ini - copied unchanged from r203673, head/sys/dev/ath/ath_hal/ar5416/ar9285.ini user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar9285v2.ini - copied unchanged from r203673, head/sys/dev/ath/ath_hal/ar5416/ar9285v2.ini user/ed/newcons/sys/dev/cfe/cfe_env.c - copied unchanged from r203673, head/sys/dev/cfe/cfe_env.c user/ed/newcons/sys/dev/drm/drm_hashtab.c - copied unchanged from r203673, head/sys/dev/drm/drm_hashtab.c user/ed/newcons/sys/dev/drm/drm_hashtab.h - copied unchanged from r203673, head/sys/dev/drm/drm_hashtab.h user/ed/newcons/sys/dev/drm/drm_mm.c - copied unchanged from r203673, head/sys/dev/drm/drm_mm.c user/ed/newcons/sys/dev/drm/drm_mm.h - copied unchanged from r203673, head/sys/dev/drm/drm_mm.h user/ed/newcons/sys/dev/drm/drm_sman.c - copied unchanged from r203673, head/sys/dev/drm/drm_sman.c user/ed/newcons/sys/dev/drm/drm_sman.h - copied unchanged from r203673, head/sys/dev/drm/drm_sman.h user/ed/newcons/sys/dev/drm/via_3d_reg.h - copied unchanged from r203673, head/sys/dev/drm/via_3d_reg.h user/ed/newcons/sys/dev/drm/via_dma.c - copied unchanged from r203673, head/sys/dev/drm/via_dma.c user/ed/newcons/sys/dev/drm/via_dmablit.c - copied unchanged from r203673, head/sys/dev/drm/via_dmablit.c user/ed/newcons/sys/dev/drm/via_dmablit.h - copied unchanged from r203673, head/sys/dev/drm/via_dmablit.h user/ed/newcons/sys/dev/drm/via_drm.h - copied unchanged from r203673, head/sys/dev/drm/via_drm.h user/ed/newcons/sys/dev/drm/via_drv.c - copied unchanged from r203673, head/sys/dev/drm/via_drv.c user/ed/newcons/sys/dev/drm/via_drv.h - copied unchanged from r203673, head/sys/dev/drm/via_drv.h user/ed/newcons/sys/dev/drm/via_irq.c - copied unchanged from r203673, head/sys/dev/drm/via_irq.c user/ed/newcons/sys/dev/drm/via_map.c - copied unchanged from r203673, head/sys/dev/drm/via_map.c user/ed/newcons/sys/dev/drm/via_mm.c - copied unchanged from r203673, head/sys/dev/drm/via_mm.c user/ed/newcons/sys/dev/drm/via_verifier.c - copied unchanged from r203673, head/sys/dev/drm/via_verifier.c user/ed/newcons/sys/dev/drm/via_verifier.h - copied unchanged from r203673, head/sys/dev/drm/via_verifier.h user/ed/newcons/sys/dev/drm/via_video.c - copied unchanged from r203673, head/sys/dev/drm/via_video.c user/ed/newcons/sys/dev/flash/mx25l.c - copied unchanged from r203673, head/sys/dev/flash/mx25l.c user/ed/newcons/sys/dev/flash/mx25lreg.h - copied unchanged from r203673, head/sys/dev/flash/mx25lreg.h user/ed/newcons/sys/dev/hwpmc/hwpmc_xscale.c - copied unchanged from r203673, head/sys/dev/hwpmc/hwpmc_xscale.c user/ed/newcons/sys/dev/hwpmc/hwpmc_xscale.h - copied unchanged from r203673, head/sys/dev/hwpmc/hwpmc_xscale.h user/ed/newcons/sys/dev/ieee488/tnt4882.h - copied unchanged from r203673, head/sys/dev/ieee488/tnt4882.h user/ed/newcons/sys/dev/siba/siba_bwn.c - copied unchanged from r203673, head/sys/dev/siba/siba_bwn.c user/ed/newcons/sys/dev/siba/siba_cc.c - copied unchanged from r203673, head/sys/dev/siba/siba_cc.c user/ed/newcons/sys/dev/siba/siba_core.c - copied unchanged from r203673, head/sys/dev/siba/siba_core.c user/ed/newcons/sys/dev/usb/net/uhso.c - copied unchanged from r203673, head/sys/dev/usb/net/uhso.c user/ed/newcons/sys/dev/usb/wlan/if_run.c - copied unchanged from r203673, head/sys/dev/usb/wlan/if_run.c user/ed/newcons/sys/dev/usb/wlan/if_runreg.h - copied unchanged from r203673, head/sys/dev/usb/wlan/if_runreg.h user/ed/newcons/sys/dev/usb/wlan/if_runvar.h - copied unchanged from r203673, head/sys/dev/usb/wlan/if_runvar.h user/ed/newcons/sys/fs/ext2fs/ - copied from r203673, head/sys/fs/ext2fs/ user/ed/newcons/sys/geom/mountver/ - copied from r203673, head/sys/geom/mountver/ user/ed/newcons/sys/ia64/ia64/bus_machdep.c - copied unchanged from r203673, head/sys/ia64/ia64/bus_machdep.c user/ed/newcons/sys/ia64/ia64/iodev_machdep.c - copied unchanged from r203673, head/sys/ia64/ia64/iodev_machdep.c user/ed/newcons/sys/ia64/include/iodev.h - copied unchanged from r203673, head/sys/ia64/include/iodev.h user/ed/newcons/sys/mips/alchemy/ - copied from r203673, head/sys/mips/alchemy/ user/ed/newcons/sys/mips/atheros/ - copied from r203673, head/sys/mips/atheros/ user/ed/newcons/sys/mips/cavium/ - copied from r203673, head/sys/mips/cavium/ user/ed/newcons/sys/mips/conf/ALCHEMY - copied unchanged from r203673, head/sys/mips/conf/ALCHEMY user/ed/newcons/sys/mips/conf/AR71XX - copied unchanged from r203673, head/sys/mips/conf/AR71XX user/ed/newcons/sys/mips/conf/AR71XX.hints - copied unchanged from r203673, head/sys/mips/conf/AR71XX.hints user/ed/newcons/sys/mips/conf/MALTA64 - copied unchanged from r203673, head/sys/mips/conf/MALTA64 user/ed/newcons/sys/mips/conf/OCTEON1 - copied unchanged from r203673, head/sys/mips/conf/OCTEON1 user/ed/newcons/sys/mips/conf/OCTEON1-32 - copied unchanged from r203673, head/sys/mips/conf/OCTEON1-32 user/ed/newcons/sys/mips/conf/OCTEON1.hints - copied unchanged from r203673, head/sys/mips/conf/OCTEON1.hints user/ed/newcons/sys/mips/conf/SWARM - copied unchanged from r203673, head/sys/mips/conf/SWARM user/ed/newcons/sys/mips/conf/SWARM.hints - copied unchanged from r203673, head/sys/mips/conf/SWARM.hints user/ed/newcons/sys/mips/conf/XLR - copied unchanged from r203673, head/sys/mips/conf/XLR user/ed/newcons/sys/mips/include/cdefs.h - copied unchanged from r203673, head/sys/mips/include/cdefs.h user/ed/newcons/sys/mips/include/fls64.h - copied unchanged from r203673, head/sys/mips/include/fls64.h user/ed/newcons/sys/mips/mips/bus_space_generic.c - copied unchanged from r203673, head/sys/mips/mips/bus_space_generic.c user/ed/newcons/sys/mips/mips/elf_trampoline.c - copied unchanged from r203673, head/sys/mips/mips/elf_trampoline.c user/ed/newcons/sys/mips/mips/inckern.S - copied unchanged from r203673, head/sys/mips/mips/inckern.S user/ed/newcons/sys/mips/mips/ptrace_machdep.c - copied unchanged from r203673, head/sys/mips/mips/ptrace_machdep.c user/ed/newcons/sys/mips/mips/sys_machdep.c - copied unchanged from r203673, head/sys/mips/mips/sys_machdep.c user/ed/newcons/sys/mips/rmi/ - copied from r203673, head/sys/mips/rmi/ user/ed/newcons/sys/mips/sibyte/ - copied from r203673, head/sys/mips/sibyte/ user/ed/newcons/sys/modules/amdsbwd/ - copied from r203673, head/sys/modules/amdsbwd/ user/ed/newcons/sys/modules/drm/via/ - copied from r203673, head/sys/modules/drm/via/ user/ed/newcons/sys/modules/epic/ - copied from r203673, head/sys/modules/epic/ user/ed/newcons/sys/modules/geom/geom_mountver/ - copied from r203673, head/sys/modules/geom/geom_mountver/ user/ed/newcons/sys/modules/iwnfw/iwn1000/ - copied from r203673, head/sys/modules/iwnfw/iwn1000/ user/ed/newcons/sys/modules/iwnfw/iwn6000/ - copied from r203673, head/sys/modules/iwnfw/iwn6000/ user/ed/newcons/sys/modules/runfw/ - copied from r203673, head/sys/modules/runfw/ user/ed/newcons/sys/modules/siba_bwn/ - copied from r203673, head/sys/modules/siba_bwn/ user/ed/newcons/sys/modules/usb/run/ - copied from r203673, head/sys/modules/usb/run/ user/ed/newcons/sys/modules/usb/uhso/ - copied from r203673, head/sys/modules/usb/uhso/ user/ed/newcons/sys/netinet/ipfw/ip_fw_dynamic.c - copied unchanged from r203673, head/sys/netinet/ipfw/ip_fw_dynamic.c user/ed/newcons/sys/netinet/ipfw/ip_fw_log.c - copied unchanged from r203673, head/sys/netinet/ipfw/ip_fw_log.c user/ed/newcons/sys/netinet/ipfw/ip_fw_private.h - copied unchanged from r203673, head/sys/netinet/ipfw/ip_fw_private.h user/ed/newcons/sys/netinet/ipfw/ip_fw_sockopt.c - copied unchanged from r203673, head/sys/netinet/ipfw/ip_fw_sockopt.c user/ed/newcons/sys/netinet/ipfw/ip_fw_table.c - copied unchanged from r203673, head/sys/netinet/ipfw/ip_fw_table.c user/ed/newcons/sys/sparc64/ebus/epic.c - copied unchanged from r203673, head/sys/sparc64/ebus/epic.c user/ed/newcons/sys/sparc64/pci/fire.c - copied unchanged from r203673, head/sys/sparc64/pci/fire.c user/ed/newcons/sys/sparc64/pci/firereg.h - copied unchanged from r203673, head/sys/sparc64/pci/firereg.h user/ed/newcons/sys/sparc64/pci/firevar.h - copied unchanged from r203673, head/sys/sparc64/pci/firevar.h user/ed/newcons/sys/sys/_termios.h - copied unchanged from r203673, head/sys/sys/_termios.h user/ed/newcons/sys/sys/_umtx.h - copied unchanged from r203673, head/sys/sys/_umtx.h user/ed/newcons/tools/regression/acltools/02.t - copied unchanged from r203673, head/tools/regression/acltools/02.t user/ed/newcons/tools/regression/bin/sh/builtins/builtin1.0 - copied unchanged from r203673, head/tools/regression/bin/sh/builtins/builtin1.0 user/ed/newcons/tools/regression/bin/sh/builtins/command6.0 - copied unchanged from r203673, head/tools/regression/bin/sh/builtins/command6.0 user/ed/newcons/tools/regression/bin/sh/builtins/command6.0.stdout - copied unchanged from r203673, head/tools/regression/bin/sh/builtins/command6.0.stdout user/ed/newcons/tools/regression/bin/sh/builtins/command7.0 - copied unchanged from r203673, head/tools/regression/bin/sh/builtins/command7.0 user/ed/newcons/tools/regression/bin/sh/builtins/fc2.0 - copied unchanged from r203673, head/tools/regression/bin/sh/builtins/fc2.0 user/ed/newcons/tools/regression/bin/sh/builtins/type2.0 - copied unchanged from r203673, head/tools/regression/bin/sh/builtins/type2.0 user/ed/newcons/tools/regression/bin/sh/execution/redir1.0 - copied unchanged from r203673, head/tools/regression/bin/sh/execution/redir1.0 user/ed/newcons/tools/regression/bin/sh/execution/redir2.0 - copied unchanged from r203673, head/tools/regression/bin/sh/execution/redir2.0 user/ed/newcons/tools/regression/bin/sh/expansion/arith1.0 - copied unchanged from r203673, head/tools/regression/bin/sh/expansion/arith1.0 user/ed/newcons/tools/regression/bin/sh/expansion/arith2.0 - copied unchanged from r203673, head/tools/regression/bin/sh/expansion/arith2.0 user/ed/newcons/tools/regression/bin/sh/expansion/cmdsubst1.0 - copied unchanged from r203673, head/tools/regression/bin/sh/expansion/cmdsubst1.0 user/ed/newcons/tools/regression/bin/sh/parameters/mail1.0 - copied unchanged from r203673, head/tools/regression/bin/sh/parameters/mail1.0 user/ed/newcons/tools/regression/bin/sh/parameters/mail2.0 - copied unchanged from r203673, head/tools/regression/bin/sh/parameters/mail2.0 user/ed/newcons/tools/regression/kqueue/ - copied from r203673, head/tools/regression/kqueue/ user/ed/newcons/tools/regression/posixsem2/ - copied from r203673, head/tools/regression/posixsem2/ user/ed/newcons/tools/regression/usr.bin/comm/ - copied from r203673, head/tools/regression/usr.bin/comm/ user/ed/newcons/tools/regression/usr.bin/make/syntax/directive-t0/ - copied from r203673, head/tools/regression/usr.bin/make/syntax/directive-t0/ user/ed/newcons/tools/regression/usr.bin/make/sysmk/ - copied from r203673, head/tools/regression/usr.bin/make/sysmk/ user/ed/newcons/tools/tools/notescheck/ - copied from r203673, head/tools/tools/notescheck/ user/ed/newcons/usr.bin/bc/ - copied from r203673, head/usr.bin/bc/ user/ed/newcons/usr.bin/dc/ - copied from r203673, head/usr.bin/dc/ user/ed/newcons/usr.bin/tar/err.c - copied unchanged from r203673, head/usr.bin/tar/err.c user/ed/newcons/usr.bin/tar/err.h - copied unchanged from r203673, head/usr.bin/tar/err.h user/ed/newcons/usr.bin/tar/line_reader.c - copied unchanged from r203673, head/usr.bin/tar/line_reader.c user/ed/newcons/usr.bin/tar/line_reader.h - copied unchanged from r203673, head/usr.bin/tar/line_reader.h user/ed/newcons/usr.bin/tar/matching.h - copied unchanged from r203673, head/usr.bin/tar/matching.h user/ed/newcons/usr.bin/tar/pathmatch.c - copied unchanged from r203673, head/usr.bin/tar/pathmatch.c user/ed/newcons/usr.bin/tar/pathmatch.h - copied unchanged from r203673, head/usr.bin/tar/pathmatch.h user/ed/newcons/usr.bin/wtmpcvt/ - copied from r203673, head/usr.bin/wtmpcvt/ user/ed/newcons/usr.sbin/service/ - copied from r203673, head/usr.sbin/service/ user/ed/newcons/usr.sbin/traceroute/findsaddr-udp.c - copied unchanged from r203673, head/usr.sbin/traceroute/findsaddr-udp.c user/ed/newcons/usr.sbin/uhsoctl/ - copied from r203673, head/usr.sbin/uhsoctl/ Deleted: user/ed/newcons/contrib/one-true-awk/mac.code user/ed/newcons/etc/rc.d/ip6fw user/ed/newcons/etc/rc.firewall6 user/ed/newcons/gnu/usr.bin/binutils/gdb/Makefile.alpha user/ed/newcons/gnu/usr.bin/binutils/ld/Makefile.alpha user/ed/newcons/gnu/usr.bin/binutils/libbfd/Makefile.alpha user/ed/newcons/gnu/usr.bin/binutils/libopcodes/Makefile.alpha user/ed/newcons/lib/csu/i386-elf/crt1.c user/ed/newcons/lib/libarchive/test/test_fuzz_1.iso.uu user/ed/newcons/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu user/ed/newcons/lib/libarchive/test/test_read_format_isojoliet_bz2.iso.bz2.uu user/ed/newcons/lib/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu user/ed/newcons/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu user/ed/newcons/lib/libc/mips/gen/fpgetmask.c user/ed/newcons/lib/libc/mips/gen/fpgetround.c user/ed/newcons/lib/libc/mips/gen/fpgetsticky.c user/ed/newcons/lib/libc/mips/gen/fpsetmask.c user/ed/newcons/lib/libc/mips/gen/fpsetround.c user/ed/newcons/lib/libc/mips/gen/fpsetsticky.c user/ed/newcons/lib/libutil/login.3 user/ed/newcons/lib/libutil/login.c user/ed/newcons/lib/libutil/logout.3 user/ed/newcons/lib/libutil/logout.c user/ed/newcons/lib/libutil/logwtmp.3 user/ed/newcons/lib/libutil/logwtmp.c user/ed/newcons/share/examples/pppd/ user/ed/newcons/share/examples/slattach/ user/ed/newcons/share/examples/sliplogin/ user/ed/newcons/share/examples/startslip/ user/ed/newcons/share/man/man5/utmp.5 user/ed/newcons/sys/boot/efi/libefi/efifs.c user/ed/newcons/sys/boot/pc98/boot2/asm.S user/ed/newcons/sys/boot/pc98/boot2/asm.h user/ed/newcons/sys/boot/pc98/boot2/bios.S user/ed/newcons/sys/boot/pc98/boot2/boot.c user/ed/newcons/sys/boot/pc98/boot2/boot.h user/ed/newcons/sys/boot/pc98/boot2/boot2.S user/ed/newcons/sys/boot/pc98/boot2/dinode.h user/ed/newcons/sys/boot/pc98/boot2/disk.c user/ed/newcons/sys/boot/pc98/boot2/fs.h user/ed/newcons/sys/boot/pc98/boot2/inode.h user/ed/newcons/sys/boot/pc98/boot2/io.c user/ed/newcons/sys/boot/pc98/boot2/probe_keyboard.c user/ed/newcons/sys/boot/pc98/boot2/quota.h user/ed/newcons/sys/boot/pc98/boot2/serial.S user/ed/newcons/sys/boot/pc98/boot2/serial_16550.S user/ed/newcons/sys/boot/pc98/boot2/serial_8251.S user/ed/newcons/sys/boot/pc98/boot2/start.S user/ed/newcons/sys/boot/pc98/boot2/sys.c user/ed/newcons/sys/boot/pc98/boot2/table.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h user/ed/newcons/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu user/ed/newcons/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu user/ed/newcons/sys/gnu/fs/ext2fs/ user/ed/newcons/sys/mips/include/bus_octeon.h user/ed/newcons/sys/mips/include/intr.h user/ed/newcons/sys/mips/include/pltfm.h user/ed/newcons/sys/mips/sentry5/siba_cc.c user/ed/newcons/sys/mips/sentry5/siba_mips.c user/ed/newcons/sys/mips/sentry5/siba_sdram.c user/ed/newcons/sys/sys/semaphore.h user/ed/newcons/usr.bin/awk/b.c.diff user/ed/newcons/usr.bin/awk/main.c.diff user/ed/newcons/usr.bin/awk/run.c.diff user/ed/newcons/usr.bin/tar/siginfo.c user/ed/newcons/usr.sbin/ndp/gnuc.h user/ed/newcons/usr.sbin/ntp/ntptrace/Makefile Modified: user/ed/newcons/COPYRIGHT user/ed/newcons/MAINTAINERS user/ed/newcons/Makefile user/ed/newcons/Makefile.inc1 user/ed/newcons/ObsoleteFiles.inc user/ed/newcons/UPDATING user/ed/newcons/bin/cp/cp.1 user/ed/newcons/bin/cp/cp.c user/ed/newcons/bin/cp/utils.c user/ed/newcons/bin/csh/config.h user/ed/newcons/bin/csh/config_p.h user/ed/newcons/bin/date/Makefile user/ed/newcons/bin/date/date.1 user/ed/newcons/bin/date/date.c user/ed/newcons/bin/kenv/kenv.c user/ed/newcons/bin/ls/ls.c user/ed/newcons/bin/ls/ls.h user/ed/newcons/bin/ls/print.c user/ed/newcons/bin/pax/Makefile user/ed/newcons/bin/pax/cpio.h user/ed/newcons/bin/pax/ftree.c user/ed/newcons/bin/pax/gen_subs.c user/ed/newcons/bin/pax/sel_subs.c user/ed/newcons/bin/pax/tar.h user/ed/newcons/bin/pkill/Makefile user/ed/newcons/bin/pkill/pkill.c user/ed/newcons/bin/setfacl/merge.c user/ed/newcons/bin/setfacl/remove.c user/ed/newcons/bin/setfacl/setfacl.h user/ed/newcons/bin/setfacl/util.c user/ed/newcons/bin/sh/alias.c user/ed/newcons/bin/sh/alias.h user/ed/newcons/bin/sh/arith.h user/ed/newcons/bin/sh/arith.y user/ed/newcons/bin/sh/cd.c user/ed/newcons/bin/sh/error.c user/ed/newcons/bin/sh/error.h user/ed/newcons/bin/sh/eval.c user/ed/newcons/bin/sh/eval.h user/ed/newcons/bin/sh/exec.c user/ed/newcons/bin/sh/exec.h user/ed/newcons/bin/sh/expand.c user/ed/newcons/bin/sh/expand.h user/ed/newcons/bin/sh/histedit.c user/ed/newcons/bin/sh/input.c user/ed/newcons/bin/sh/input.h user/ed/newcons/bin/sh/jobs.c user/ed/newcons/bin/sh/mail.c user/ed/newcons/bin/sh/main.c user/ed/newcons/bin/sh/main.h user/ed/newcons/bin/sh/memalloc.c user/ed/newcons/bin/sh/memalloc.h user/ed/newcons/bin/sh/miscbltin.c user/ed/newcons/bin/sh/mkbuiltins user/ed/newcons/bin/sh/mkinit.c user/ed/newcons/bin/sh/mksyntax.c user/ed/newcons/bin/sh/myhistedit.h user/ed/newcons/bin/sh/mystring.c user/ed/newcons/bin/sh/options.c user/ed/newcons/bin/sh/options.h user/ed/newcons/bin/sh/output.c user/ed/newcons/bin/sh/output.h user/ed/newcons/bin/sh/parser.c user/ed/newcons/bin/sh/parser.h user/ed/newcons/bin/sh/redir.c user/ed/newcons/bin/sh/sh.1 user/ed/newcons/bin/sh/show.c user/ed/newcons/bin/sh/show.h user/ed/newcons/bin/sh/trap.h user/ed/newcons/bin/sh/var.c user/ed/newcons/bin/sh/var.h user/ed/newcons/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c user/ed/newcons/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c user/ed/newcons/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c user/ed/newcons/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h user/ed/newcons/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c user/ed/newcons/contrib/bind9/CHANGES user/ed/newcons/contrib/bind9/FAQ user/ed/newcons/contrib/bind9/FAQ.xml user/ed/newcons/contrib/bind9/bin/dnssec/dnssec-signzone.8 user/ed/newcons/contrib/bind9/bin/dnssec/dnssec-signzone.html user/ed/newcons/contrib/bind9/bin/named/query.c user/ed/newcons/contrib/bind9/doc/arm/Bv9ARM.pdf user/ed/newcons/contrib/bind9/doc/arm/man.dnssec-signzone.html user/ed/newcons/contrib/bind9/doc/arm/man.named-checkconf.html user/ed/newcons/contrib/bind9/doc/arm/man.named-checkzone.html user/ed/newcons/contrib/bind9/doc/arm/man.named.html user/ed/newcons/contrib/bind9/doc/arm/man.nsupdate.html user/ed/newcons/contrib/bind9/doc/arm/man.rndc-confgen.html user/ed/newcons/contrib/bind9/doc/arm/man.rndc.conf.html user/ed/newcons/contrib/bind9/doc/arm/man.rndc.html user/ed/newcons/contrib/bind9/lib/dns/api user/ed/newcons/contrib/bind9/lib/dns/include/dns/db.h user/ed/newcons/contrib/bind9/lib/dns/include/dns/ncache.h user/ed/newcons/contrib/bind9/lib/dns/include/dns/types.h user/ed/newcons/contrib/bind9/lib/dns/masterdump.c user/ed/newcons/contrib/bind9/lib/dns/rbtdb.c user/ed/newcons/contrib/bind9/lib/dns/resolver.c user/ed/newcons/contrib/bind9/lib/dns/validator.c user/ed/newcons/contrib/bind9/lib/isc/ia64/include/isc/atomic.h user/ed/newcons/contrib/bind9/lib/lwres/man/lwres.html user/ed/newcons/contrib/bind9/lib/lwres/man/lwres_buffer.html user/ed/newcons/contrib/bind9/lib/lwres/man/lwres_config.html user/ed/newcons/contrib/bind9/lib/lwres/man/lwres_context.html user/ed/newcons/contrib/bind9/lib/lwres/man/lwres_gabn.html user/ed/newcons/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html user/ed/newcons/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html user/ed/newcons/contrib/bind9/lib/lwres/man/lwres_gethostent.html user/ed/newcons/contrib/bind9/lib/lwres/man/lwres_getipnode.html user/ed/newcons/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html user/ed/newcons/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html user/ed/newcons/contrib/bind9/lib/lwres/man/lwres_gnba.html user/ed/newcons/contrib/bind9/lib/lwres/man/lwres_hstrerror.html user/ed/newcons/contrib/bind9/lib/lwres/man/lwres_inetntop.html user/ed/newcons/contrib/bind9/lib/lwres/man/lwres_noop.html user/ed/newcons/contrib/bind9/lib/lwres/man/lwres_packet.html user/ed/newcons/contrib/bind9/lib/lwres/man/lwres_resutil.html user/ed/newcons/contrib/bind9/version user/ed/newcons/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt user/ed/newcons/contrib/bsnmp/snmp_mibII/mibII.c user/ed/newcons/contrib/bsnmp/snmp_mibII/mibII.h user/ed/newcons/contrib/bsnmp/snmp_mibII/mibII_begemot.c user/ed/newcons/contrib/bsnmp/snmp_mibII/mibII_tree.def user/ed/newcons/contrib/csup/Makefile user/ed/newcons/contrib/csup/TODO user/ed/newcons/contrib/csup/config.h user/ed/newcons/contrib/csup/csup.1 user/ed/newcons/contrib/csup/main.c user/ed/newcons/contrib/csup/proto.c user/ed/newcons/contrib/expat/lib/xmlparse.c user/ed/newcons/contrib/expat/lib/xmltok_impl.c user/ed/newcons/contrib/gcc/config/freebsd-spec.h user/ed/newcons/contrib/gcc/config/mips/freebsd.h user/ed/newcons/contrib/groff/font/devutf8/R.proto user/ed/newcons/contrib/groff/tmac/an-old.tmac user/ed/newcons/contrib/groff/tmac/doc-common user/ed/newcons/contrib/groff/tmac/doc-old.tmac user/ed/newcons/contrib/groff/tmac/doc-syms user/ed/newcons/contrib/groff/tmac/doc.tmac user/ed/newcons/contrib/groff/tmac/groff_mdoc.man user/ed/newcons/contrib/libpcap/inet.c user/ed/newcons/contrib/netcat/FREEBSD-vendor user/ed/newcons/contrib/netcat/nc.1 user/ed/newcons/contrib/netcat/netcat.c user/ed/newcons/contrib/ntp/COPYRIGHT user/ed/newcons/contrib/ntp/ChangeLog user/ed/newcons/contrib/ntp/CommitLog user/ed/newcons/contrib/ntp/Makefile.in user/ed/newcons/contrib/ntp/NEWS user/ed/newcons/contrib/ntp/README user/ed/newcons/contrib/ntp/README.bk user/ed/newcons/contrib/ntp/README.patches user/ed/newcons/contrib/ntp/WHERE-TO-START user/ed/newcons/contrib/ntp/aclocal.m4 user/ed/newcons/contrib/ntp/adjtimed/Makefile.in user/ed/newcons/contrib/ntp/arlib/Makefile.in user/ed/newcons/contrib/ntp/arlib/aclocal.m4 user/ed/newcons/contrib/ntp/arlib/configure user/ed/newcons/contrib/ntp/build user/ed/newcons/contrib/ntp/clockstuff/Makefile.in user/ed/newcons/contrib/ntp/config.h.in user/ed/newcons/contrib/ntp/configure user/ed/newcons/contrib/ntp/configure.ac user/ed/newcons/contrib/ntp/flock-build user/ed/newcons/contrib/ntp/html/copyright.html user/ed/newcons/contrib/ntp/html/drivers/driver40.html user/ed/newcons/contrib/ntp/include/Makefile.in user/ed/newcons/contrib/ntp/include/copyright.def user/ed/newcons/contrib/ntp/include/isc/Makefile.in user/ed/newcons/contrib/ntp/include/ntp_debug.h user/ed/newcons/contrib/ntp/include/version.def user/ed/newcons/contrib/ntp/kernel/Makefile.in user/ed/newcons/contrib/ntp/kernel/sys/Makefile.in user/ed/newcons/contrib/ntp/libntp/Makefile.in user/ed/newcons/contrib/ntp/libopts/Makefile.in user/ed/newcons/contrib/ntp/libparse/Makefile.am user/ed/newcons/contrib/ntp/libparse/Makefile.in user/ed/newcons/contrib/ntp/libparse/clk_rawdcf.c user/ed/newcons/contrib/ntp/ntpd/Makefile.in user/ed/newcons/contrib/ntp/ntpd/cmd_args.c user/ed/newcons/contrib/ntp/ntpd/ntp_crypto.c user/ed/newcons/contrib/ntp/ntpd/ntp_intres.c user/ed/newcons/contrib/ntp/ntpd/ntp_io.c user/ed/newcons/contrib/ntp/ntpd/ntp_request.c user/ed/newcons/contrib/ntp/ntpd/ntp_timer.c user/ed/newcons/contrib/ntp/ntpd/ntpd-opts.c user/ed/newcons/contrib/ntp/ntpd/ntpd-opts.h user/ed/newcons/contrib/ntp/ntpd/ntpd-opts.texi user/ed/newcons/contrib/ntp/ntpd/ntpd.1 user/ed/newcons/contrib/ntp/ntpd/ntpd.c user/ed/newcons/contrib/ntp/ntpd/ntpdsim-opts.c user/ed/newcons/contrib/ntp/ntpd/ntpdsim-opts.h user/ed/newcons/contrib/ntp/ntpd/ntpdsim-opts.texi user/ed/newcons/contrib/ntp/ntpd/ntpdsim.1 user/ed/newcons/contrib/ntp/ntpd/refclock_dumbclock.c user/ed/newcons/contrib/ntp/ntpd/refclock_hopfser.c user/ed/newcons/contrib/ntp/ntpd/refclock_jjy.c user/ed/newcons/contrib/ntp/ntpd/refclock_nmea.c user/ed/newcons/contrib/ntp/ntpd/refclock_palisade.c user/ed/newcons/contrib/ntp/ntpdate/Makefile.in user/ed/newcons/contrib/ntp/ntpdc/Makefile.in user/ed/newcons/contrib/ntp/ntpdc/ntpdc-opts.c user/ed/newcons/contrib/ntp/ntpdc/ntpdc-opts.h user/ed/newcons/contrib/ntp/ntpdc/ntpdc-opts.texi user/ed/newcons/contrib/ntp/ntpdc/ntpdc.1 user/ed/newcons/contrib/ntp/ntpq/Makefile.in user/ed/newcons/contrib/ntp/ntpq/ntpq-opts.c user/ed/newcons/contrib/ntp/ntpq/ntpq-opts.h user/ed/newcons/contrib/ntp/ntpq/ntpq-opts.texi user/ed/newcons/contrib/ntp/ntpq/ntpq.1 user/ed/newcons/contrib/ntp/ntpq/ntpq.c user/ed/newcons/contrib/ntp/packageinfo.sh user/ed/newcons/contrib/ntp/parseutil/Makefile.in user/ed/newcons/contrib/ntp/scripts/Makefile.in user/ed/newcons/contrib/ntp/sntp/Makefile.in user/ed/newcons/contrib/ntp/sntp/aclocal.m4 user/ed/newcons/contrib/ntp/sntp/config.h.in user/ed/newcons/contrib/ntp/sntp/configure user/ed/newcons/contrib/ntp/sntp/configure.ac user/ed/newcons/contrib/ntp/sntp/libopts/Makefile.in user/ed/newcons/contrib/ntp/sntp/sntp-opts.c user/ed/newcons/contrib/ntp/sntp/sntp-opts.def user/ed/newcons/contrib/ntp/sntp/sntp-opts.h user/ed/newcons/contrib/ntp/sntp/sntp-opts.texi user/ed/newcons/contrib/ntp/sntp/sntp.1 user/ed/newcons/contrib/ntp/sntp/version.def user/ed/newcons/contrib/ntp/util/Makefile.in user/ed/newcons/contrib/ntp/util/ntp-keygen-opts.c user/ed/newcons/contrib/ntp/util/ntp-keygen-opts.h user/ed/newcons/contrib/ntp/util/ntp-keygen-opts.texi user/ed/newcons/contrib/ntp/util/ntp-keygen.1 user/ed/newcons/contrib/ntp/version user/ed/newcons/contrib/ntp/version.m4 user/ed/newcons/contrib/one-true-awk/FIXES user/ed/newcons/contrib/one-true-awk/b.c user/ed/newcons/contrib/one-true-awk/lib.c user/ed/newcons/contrib/one-true-awk/main.c user/ed/newcons/contrib/one-true-awk/makefile user/ed/newcons/contrib/one-true-awk/maketab.c user/ed/newcons/contrib/one-true-awk/proctab.c user/ed/newcons/contrib/one-true-awk/proto.h user/ed/newcons/contrib/one-true-awk/run.c user/ed/newcons/contrib/opie/libopie/getutmpentry.c user/ed/newcons/contrib/opie/libopie/insecure.c user/ed/newcons/contrib/opie/libopie/login.c user/ed/newcons/contrib/pf/man/pf.conf.5 user/ed/newcons/contrib/pf/pfctl/parse.y user/ed/newcons/contrib/pf/pfctl/pf_print_state.c user/ed/newcons/contrib/pf/pfctl/pfctl_parser.c user/ed/newcons/contrib/sendmail/CACerts user/ed/newcons/contrib/sendmail/FREEBSD-upgrade user/ed/newcons/contrib/sendmail/LICENSE user/ed/newcons/contrib/sendmail/PGPKEYS user/ed/newcons/contrib/sendmail/README user/ed/newcons/contrib/sendmail/RELEASE_NOTES user/ed/newcons/contrib/sendmail/cf/README user/ed/newcons/contrib/sendmail/cf/cf/submit.cf user/ed/newcons/contrib/sendmail/cf/feature/ldap_routing.m4 user/ed/newcons/contrib/sendmail/cf/m4/cfhead.m4 user/ed/newcons/contrib/sendmail/cf/m4/proto.m4 user/ed/newcons/contrib/sendmail/cf/m4/version.m4 user/ed/newcons/contrib/sendmail/contrib/qtool.pl user/ed/newcons/contrib/sendmail/contrib/smcontrol.pl user/ed/newcons/contrib/sendmail/doc/op/op.me user/ed/newcons/contrib/sendmail/include/libmilter/mfapi.h user/ed/newcons/contrib/sendmail/include/libmilter/mfdef.h user/ed/newcons/contrib/sendmail/include/sm/conf.h user/ed/newcons/contrib/sendmail/include/sm/ldap.h user/ed/newcons/contrib/sendmail/include/sm/sem.h user/ed/newcons/contrib/sendmail/libmilter/Makefile.m4 user/ed/newcons/contrib/sendmail/libmilter/comm.c user/ed/newcons/contrib/sendmail/libmilter/docs/api.html user/ed/newcons/contrib/sendmail/libmilter/docs/overview.html user/ed/newcons/contrib/sendmail/libmilter/docs/smfi_addheader.html user/ed/newcons/contrib/sendmail/libmilter/docs/smfi_chgheader.html user/ed/newcons/contrib/sendmail/libmilter/docs/smfi_insheader.html user/ed/newcons/contrib/sendmail/libmilter/engine.c user/ed/newcons/contrib/sendmail/libmilter/example.c user/ed/newcons/contrib/sendmail/libmilter/handler.c user/ed/newcons/contrib/sendmail/libmilter/libmilter.h user/ed/newcons/contrib/sendmail/libmilter/listener.c user/ed/newcons/contrib/sendmail/libmilter/main.c user/ed/newcons/contrib/sendmail/libmilter/worker.c user/ed/newcons/contrib/sendmail/libsm/debug.c user/ed/newcons/contrib/sendmail/libsm/ldap.c user/ed/newcons/contrib/sendmail/libsm/mbdb.c user/ed/newcons/contrib/sendmail/libsm/sem.c user/ed/newcons/contrib/sendmail/libsm/t-sem.c user/ed/newcons/contrib/sendmail/libsmdb/smdb1.c user/ed/newcons/contrib/sendmail/libsmdb/smdb2.c user/ed/newcons/contrib/sendmail/libsmutil/safefile.c user/ed/newcons/contrib/sendmail/praliases/praliases.8 user/ed/newcons/contrib/sendmail/praliases/praliases.c user/ed/newcons/contrib/sendmail/src/Makefile.m4 user/ed/newcons/contrib/sendmail/src/README user/ed/newcons/contrib/sendmail/src/TRACEFLAGS user/ed/newcons/contrib/sendmail/src/collect.c user/ed/newcons/contrib/sendmail/src/conf.c user/ed/newcons/contrib/sendmail/src/conf.h user/ed/newcons/contrib/sendmail/src/daemon.c user/ed/newcons/contrib/sendmail/src/deliver.c user/ed/newcons/contrib/sendmail/src/envelope.c user/ed/newcons/contrib/sendmail/src/headers.c user/ed/newcons/contrib/sendmail/src/main.c user/ed/newcons/contrib/sendmail/src/map.c user/ed/newcons/contrib/sendmail/src/milter.c user/ed/newcons/contrib/sendmail/src/queue.c user/ed/newcons/contrib/sendmail/src/ratectrl.c user/ed/newcons/contrib/sendmail/src/readcf.c user/ed/newcons/contrib/sendmail/src/savemail.c user/ed/newcons/contrib/sendmail/src/sendmail.8 user/ed/newcons/contrib/sendmail/src/sendmail.h user/ed/newcons/contrib/sendmail/src/sfsasl.c user/ed/newcons/contrib/sendmail/src/srvrsmtp.c user/ed/newcons/contrib/sendmail/src/tls.c user/ed/newcons/contrib/sendmail/src/usersmtp.c user/ed/newcons/contrib/sendmail/src/util.c user/ed/newcons/contrib/sendmail/src/version.c user/ed/newcons/contrib/sendmail/vacation/vacation.c user/ed/newcons/contrib/smbfs/smbutil/view.c user/ed/newcons/contrib/tcp_wrappers/hosts_access.c user/ed/newcons/contrib/telnet/telnet/externs.h user/ed/newcons/contrib/telnet/telnetd/sys_term.c user/ed/newcons/contrib/telnet/telnetd/telnetd.c user/ed/newcons/contrib/top/username.c user/ed/newcons/crypto/heimdal/kcm/connect.c user/ed/newcons/crypto/openssh/config.h user/ed/newcons/crypto/openssh/defines.h user/ed/newcons/crypto/openssh/loginrec.c user/ed/newcons/crypto/openssh/sshd.c user/ed/newcons/crypto/openssl/ssl/s3_lib.c user/ed/newcons/crypto/openssl/ssl/s3_pkt.c user/ed/newcons/crypto/openssl/ssl/s3_srvr.c user/ed/newcons/etc/Makefile user/ed/newcons/etc/defaults/devfs.rules user/ed/newcons/etc/defaults/rc.conf user/ed/newcons/etc/devd/Makefile user/ed/newcons/etc/etc.amd64/ttys user/ed/newcons/etc/etc.arm/ttys user/ed/newcons/etc/etc.i386/ttys user/ed/newcons/etc/etc.ia64/ttys user/ed/newcons/etc/etc.mips/ttys user/ed/newcons/etc/etc.pc98/ttys user/ed/newcons/etc/etc.powerpc/ttys user/ed/newcons/etc/etc.sparc64/ttys user/ed/newcons/etc/mtree/BIND.chroot.dist user/ed/newcons/etc/mtree/BSD.include.dist user/ed/newcons/etc/mtree/BSD.usr.dist user/ed/newcons/etc/mtree/BSD.var.dist user/ed/newcons/etc/namedb/named.conf user/ed/newcons/etc/namedb/named.root user/ed/newcons/etc/network.subr user/ed/newcons/etc/newsyslog.conf user/ed/newcons/etc/periodic/monthly/200.accounting user/ed/newcons/etc/rc.d/Makefile user/ed/newcons/etc/rc.d/cleanvar user/ed/newcons/etc/rc.d/devfs user/ed/newcons/etc/rc.d/ipfw user/ed/newcons/etc/rc.d/named user/ed/newcons/etc/rc.d/nsswitch user/ed/newcons/etc/rc.d/ntpdate user/ed/newcons/etc/rc.d/var user/ed/newcons/etc/rc.firewall user/ed/newcons/etc/rc.subr user/ed/newcons/etc/sendmail/freebsd.mc user/ed/newcons/etc/sendmail/freebsd.submit.mc user/ed/newcons/etc/services user/ed/newcons/etc/termcap.small user/ed/newcons/games/fortune/datfiles/fortunes user/ed/newcons/games/fortune/datfiles/fortunes-o.real user/ed/newcons/games/fortune/datfiles/freebsd-tips user/ed/newcons/games/fortune/strfile/strfile.c user/ed/newcons/games/fortune/unstr/unstr.c user/ed/newcons/games/morse/Makefile user/ed/newcons/games/morse/morse.c user/ed/newcons/games/number/number.c user/ed/newcons/games/pom/pom.6 user/ed/newcons/games/pom/pom.c user/ed/newcons/gnu/lib/libgcc/Makefile user/ed/newcons/gnu/lib/libstdc++/Makefile user/ed/newcons/gnu/lib/libsupc++/Makefile user/ed/newcons/gnu/usr.bin/Makefile user/ed/newcons/gnu/usr.bin/binutils/Makefile.inc user/ed/newcons/gnu/usr.bin/binutils/Makefile.inc0 user/ed/newcons/gnu/usr.bin/binutils/ld/Makefile.mips user/ed/newcons/gnu/usr.bin/binutils/libbfd/Makefile user/ed/newcons/gnu/usr.bin/cc/Makefile.tgt user/ed/newcons/gnu/usr.bin/groff/tmac/mdoc.local user/ed/newcons/include/Makefile user/ed/newcons/include/dirent.h user/ed/newcons/include/paths.h user/ed/newcons/include/signal.h user/ed/newcons/include/strings.h user/ed/newcons/include/unistd.h user/ed/newcons/include/utmp.h user/ed/newcons/kerberos5/usr.bin/kdestroy/Makefile user/ed/newcons/kerberos5/usr.bin/kpasswd/Makefile user/ed/newcons/lib/Makefile user/ed/newcons/lib/Makefile.inc user/ed/newcons/lib/bind/config.h user/ed/newcons/lib/bind/dns/code.h user/ed/newcons/lib/bind/dns/dns/enumclass.h user/ed/newcons/lib/bind/dns/dns/enumtype.h user/ed/newcons/lib/bind/dns/dns/rdatastruct.h user/ed/newcons/lib/csu/Makefile.inc user/ed/newcons/lib/csu/amd64/Makefile user/ed/newcons/lib/csu/arm/Makefile user/ed/newcons/lib/csu/i386-elf/Makefile user/ed/newcons/lib/csu/ia64/Makefile user/ed/newcons/lib/csu/mips/Makefile user/ed/newcons/lib/csu/powerpc/Makefile user/ed/newcons/lib/csu/sparc64/Makefile user/ed/newcons/lib/libarchive/Makefile user/ed/newcons/lib/libarchive/archive.h user/ed/newcons/lib/libarchive/archive_check_magic.c user/ed/newcons/lib/libarchive/archive_endian.h user/ed/newcons/lib/libarchive/archive_entry.c user/ed/newcons/lib/libarchive/archive_entry.h user/ed/newcons/lib/libarchive/archive_entry_link_resolver.c user/ed/newcons/lib/libarchive/archive_entry_private.h user/ed/newcons/lib/libarchive/archive_entry_stat.c user/ed/newcons/lib/libarchive/archive_platform.h user/ed/newcons/lib/libarchive/archive_private.h user/ed/newcons/lib/libarchive/archive_read.c user/ed/newcons/lib/libarchive/archive_read_disk_entry_from_file.c user/ed/newcons/lib/libarchive/archive_read_disk_private.h user/ed/newcons/lib/libarchive/archive_read_disk_set_standard_lookup.c user/ed/newcons/lib/libarchive/archive_read_open_fd.c user/ed/newcons/lib/libarchive/archive_read_open_file.c user/ed/newcons/lib/libarchive/archive_read_open_filename.c user/ed/newcons/lib/libarchive/archive_read_private.h user/ed/newcons/lib/libarchive/archive_read_support_compression_all.c user/ed/newcons/lib/libarchive/archive_read_support_compression_bzip2.c user/ed/newcons/lib/libarchive/archive_read_support_compression_compress.c user/ed/newcons/lib/libarchive/archive_read_support_compression_gzip.c user/ed/newcons/lib/libarchive/archive_read_support_compression_program.c user/ed/newcons/lib/libarchive/archive_read_support_compression_xz.c user/ed/newcons/lib/libarchive/archive_read_support_format_ar.c user/ed/newcons/lib/libarchive/archive_read_support_format_cpio.c user/ed/newcons/lib/libarchive/archive_read_support_format_iso9660.c user/ed/newcons/lib/libarchive/archive_read_support_format_mtree.c user/ed/newcons/lib/libarchive/archive_read_support_format_raw.c user/ed/newcons/lib/libarchive/archive_read_support_format_tar.c user/ed/newcons/lib/libarchive/archive_read_support_format_zip.c user/ed/newcons/lib/libarchive/archive_string.c user/ed/newcons/lib/libarchive/archive_string.h user/ed/newcons/lib/libarchive/archive_util.3 user/ed/newcons/lib/libarchive/archive_util.c user/ed/newcons/lib/libarchive/archive_virtual.c user/ed/newcons/lib/libarchive/archive_write.3 user/ed/newcons/lib/libarchive/archive_write.c user/ed/newcons/lib/libarchive/archive_write_disk.c user/ed/newcons/lib/libarchive/archive_write_disk_private.h user/ed/newcons/lib/libarchive/archive_write_disk_set_standard_lookup.c user/ed/newcons/lib/libarchive/archive_write_open_fd.c user/ed/newcons/lib/libarchive/archive_write_private.h user/ed/newcons/lib/libarchive/archive_write_set_compression_bzip2.c user/ed/newcons/lib/libarchive/archive_write_set_compression_compress.c user/ed/newcons/lib/libarchive/archive_write_set_compression_gzip.c user/ed/newcons/lib/libarchive/archive_write_set_compression_none.c user/ed/newcons/lib/libarchive/archive_write_set_compression_program.c user/ed/newcons/lib/libarchive/archive_write_set_compression_xz.c user/ed/newcons/lib/libarchive/archive_write_set_format.c user/ed/newcons/lib/libarchive/archive_write_set_format_ar.c user/ed/newcons/lib/libarchive/archive_write_set_format_by_name.c user/ed/newcons/lib/libarchive/archive_write_set_format_cpio.c user/ed/newcons/lib/libarchive/archive_write_set_format_cpio_newc.c user/ed/newcons/lib/libarchive/archive_write_set_format_mtree.c user/ed/newcons/lib/libarchive/archive_write_set_format_pax.c user/ed/newcons/lib/libarchive/config_freebsd.h user/ed/newcons/lib/libarchive/filter_fork.h user/ed/newcons/lib/libarchive/libarchive-formats.5 user/ed/newcons/lib/libarchive/tar.5 user/ed/newcons/lib/libarchive/test/Makefile user/ed/newcons/lib/libarchive/test/main.c user/ed/newcons/lib/libarchive/test/test.h user/ed/newcons/lib/libarchive/test/test_acl_pax.c user/ed/newcons/lib/libarchive/test/test_compat_bzip2.c user/ed/newcons/lib/libarchive/test/test_compat_solaris_tar_acl.c user/ed/newcons/lib/libarchive/test/test_entry.c user/ed/newcons/lib/libarchive/test/test_entry_strmode.c user/ed/newcons/lib/libarchive/test/test_extattr_freebsd.c user/ed/newcons/lib/libarchive/test/test_fuzz.c user/ed/newcons/lib/libarchive/test/test_open_fd.c user/ed/newcons/lib/libarchive/test/test_open_file.c user/ed/newcons/lib/libarchive/test/test_pax_filename_encoding.c user/ed/newcons/lib/libarchive/test/test_read_compress_program.c user/ed/newcons/lib/libarchive/test/test_read_data_large.c user/ed/newcons/lib/libarchive/test/test_read_disk.c user/ed/newcons/lib/libarchive/test/test_read_disk_entry_from_file.c user/ed/newcons/lib/libarchive/test/test_read_extract.c user/ed/newcons/lib/libarchive/test/test_read_format_ar.c user/ed/newcons/lib/libarchive/test/test_read_format_cpio_bin_bz2.c user/ed/newcons/lib/libarchive/test/test_read_format_iso_gz.c user/ed/newcons/lib/libarchive/test/test_read_format_isojoliet_bz2.c user/ed/newcons/lib/libarchive/test/test_read_format_isorr_bz2.c user/ed/newcons/lib/libarchive/test/test_read_format_mtree.c user/ed/newcons/lib/libarchive/test/test_read_format_pax_bz2.c user/ed/newcons/lib/libarchive/test/test_read_format_tar.c user/ed/newcons/lib/libarchive/test/test_read_format_tbz.c user/ed/newcons/lib/libarchive/test/test_read_large.c user/ed/newcons/lib/libarchive/test/test_tar_large.c user/ed/newcons/lib/libarchive/test/test_write_compress_program.c user/ed/newcons/lib/libarchive/test/test_write_disk.c user/ed/newcons/lib/libarchive/test/test_write_disk_failures.c user/ed/newcons/lib/libarchive/test/test_write_disk_hardlink.c user/ed/newcons/lib/libarchive/test/test_write_disk_perms.c user/ed/newcons/lib/libarchive/test/test_write_disk_secure.c user/ed/newcons/lib/libarchive/test/test_write_disk_sparse.c user/ed/newcons/lib/libarchive/test/test_write_disk_times.c user/ed/newcons/lib/libarchive/test/test_write_format_cpio_empty.c user/ed/newcons/lib/libarchive/test/test_write_format_cpio_newc.c user/ed/newcons/lib/libarchive/test/test_write_format_cpio_odc.c user/ed/newcons/lib/libarchive/test/test_write_format_tar_ustar.c user/ed/newcons/lib/libauditd/Makefile user/ed/newcons/lib/libautofs/Makefile user/ed/newcons/lib/libbegemot/Makefile user/ed/newcons/lib/libbsm/Makefile user/ed/newcons/lib/libbz2/Makefile user/ed/newcons/lib/libc/Makefile user/ed/newcons/lib/libc/gen/Makefile.inc user/ed/newcons/lib/libc/gen/Symbol.map user/ed/newcons/lib/libc/gen/_pthread_stubs.c user/ed/newcons/lib/libc/gen/devname.c user/ed/newcons/lib/libc/gen/exec.c user/ed/newcons/lib/libc/gen/fdevname.c user/ed/newcons/lib/libc/gen/fts.3 user/ed/newcons/lib/libc/gen/fts.c user/ed/newcons/lib/libc/gen/getlogin.c user/ed/newcons/lib/libc/gen/getttyent.3 user/ed/newcons/lib/libc/gen/getttyent.c user/ed/newcons/lib/libc/gen/nlist.c user/ed/newcons/lib/libc/gen/opendir.c user/ed/newcons/lib/libc/gen/pause.c user/ed/newcons/lib/libc/gen/pwcache.c user/ed/newcons/lib/libc/gen/raise.c user/ed/newcons/lib/libc/gen/rand48.3 user/ed/newcons/lib/libc/gen/scandir.3 user/ed/newcons/lib/libc/gen/scandir.c user/ed/newcons/lib/libc/gen/sem.c user/ed/newcons/lib/libc/gen/sem_init.3 user/ed/newcons/lib/libc/gen/sem_open.3 user/ed/newcons/lib/libc/gen/sleep.c user/ed/newcons/lib/libc/gen/termios.c user/ed/newcons/lib/libc/gen/time.3 user/ed/newcons/lib/libc/gen/time.c user/ed/newcons/lib/libc/gen/timezone.c user/ed/newcons/lib/libc/gen/ttyname.3 user/ed/newcons/lib/libc/gen/ttyslot.c user/ed/newcons/lib/libc/gen/usleep.c user/ed/newcons/lib/libc/gmon/gmon.c user/ed/newcons/lib/libc/include/libc_private.h user/ed/newcons/lib/libc/mips/Symbol.map user/ed/newcons/lib/libc/mips/sys/brk.S user/ed/newcons/lib/libc/mips/sys/ptrace.S user/ed/newcons/lib/libc/net/sctp_bindx.3 user/ed/newcons/lib/libc/net/sctp_connectx.3 user/ed/newcons/lib/libc/net/sctp_getaddrlen.3 user/ed/newcons/lib/libc/net/sctp_getassocid.3 user/ed/newcons/lib/libc/net/sctp_getpaddrs.3 user/ed/newcons/lib/libc/net/sctp_opt_info.3 user/ed/newcons/lib/libc/net/sctp_recvmsg.3 user/ed/newcons/lib/libc/net/sctp_send.3 user/ed/newcons/lib/libc/net/sctp_sendmsg.3 user/ed/newcons/lib/libc/net/sctp_sys_calls.c user/ed/newcons/lib/libc/nls/es_ES.ISO8859-1.msg user/ed/newcons/lib/libc/nls/gl_ES.ISO8859-1.msg user/ed/newcons/lib/libc/nls/msgcat.c user/ed/newcons/lib/libc/posix1e/Makefile.inc user/ed/newcons/lib/libc/posix1e/acl_delete_entry.c user/ed/newcons/lib/libc/posix1e/acl_to_text.c user/ed/newcons/lib/libc/rpc/getnetpath.c user/ed/newcons/lib/libc/rpc/svc.c user/ed/newcons/lib/libc/rpc/svc_auth_des.c user/ed/newcons/lib/libc/stdio/findfp.c user/ed/newcons/lib/libc/stdio/fread.c user/ed/newcons/lib/libc/stdio/funopen.c user/ed/newcons/lib/libc/stdio/fwrite.c user/ed/newcons/lib/libc/stdio/getc.3 user/ed/newcons/lib/libc/stdio/getline.3 user/ed/newcons/lib/libc/stdio/printf.3 user/ed/newcons/lib/libc/stdio/sprintf.c user/ed/newcons/lib/libc/stdio/sscanf.c user/ed/newcons/lib/libc/stdio/vsscanf.c user/ed/newcons/lib/libc/stdlib/getenv.3 user/ed/newcons/lib/libc/stdlib/getenv.c user/ed/newcons/lib/libc/stdlib/malloc.3 user/ed/newcons/lib/libc/stdlib/malloc.c user/ed/newcons/lib/libc/stdlib/system.c user/ed/newcons/lib/libc/stdtime/localtime.c user/ed/newcons/lib/libc/stdtime/tzfile.5 user/ed/newcons/lib/libc/string/memccpy.3 user/ed/newcons/lib/libc/string/memchr.3 user/ed/newcons/lib/libc/string/memcmp.3 user/ed/newcons/lib/libc/string/memset.3 user/ed/newcons/lib/libc/string/strcat.3 user/ed/newcons/lib/libc/string/strcmp.3 user/ed/newcons/lib/libc/string/strndup.c user/ed/newcons/lib/libc/string/strsignal.c user/ed/newcons/lib/libc/sys/__error.c user/ed/newcons/lib/libc/sys/clock_gettime.2 user/ed/newcons/lib/libc/sys/cpuset.2 user/ed/newcons/lib/libc/sys/cpuset_getaffinity.2 user/ed/newcons/lib/libc/sys/kqueue.2 user/ed/newcons/lib/libc/sys/mount.2 user/ed/newcons/lib/libc/sys/sctp_generic_recvmsg.2 user/ed/newcons/lib/libc/sys/sctp_generic_sendmsg.2 user/ed/newcons/lib/libc/sys/sctp_peeloff.2 user/ed/newcons/lib/libc/sys/sendfile.2 user/ed/newcons/lib/libc/sys/setpgid.2 user/ed/newcons/lib/libc/sys/shm_open.2 user/ed/newcons/lib/libc/sys/wait.2 user/ed/newcons/lib/libcalendar/Makefile user/ed/newcons/lib/libcam/Makefile user/ed/newcons/lib/libcompat/Makefile user/ed/newcons/lib/libcrypt/Makefile user/ed/newcons/lib/libdevinfo/Makefile user/ed/newcons/lib/libdevstat/Makefile user/ed/newcons/lib/libdwarf/Makefile user/ed/newcons/lib/libedit/Makefile user/ed/newcons/lib/libelf/Makefile user/ed/newcons/lib/libelf/elf.3 user/ed/newcons/lib/libexpat/Makefile user/ed/newcons/lib/libexpat/libbsdxml.3 user/ed/newcons/lib/libfetch/Makefile user/ed/newcons/lib/libfetch/fetch.3 user/ed/newcons/lib/libfetch/http.c user/ed/newcons/lib/libftpio/Makefile user/ed/newcons/lib/libgeom/geom_getxml.c user/ed/newcons/lib/libgeom/geom_util.c user/ed/newcons/lib/libgeom/geom_xml2tree.c user/ed/newcons/lib/libgeom/libgeom.3 user/ed/newcons/lib/libgeom/libgeom.h user/ed/newcons/lib/libgpib/Makefile user/ed/newcons/lib/libgssapi/Makefile user/ed/newcons/lib/libgssapi/gss_accept_sec_context.3 user/ed/newcons/lib/libgssapi/gss_acquire_cred.3 user/ed/newcons/lib/libgssapi/gss_add_cred.3 user/ed/newcons/lib/libgssapi/gss_add_oid_set_member.3 user/ed/newcons/lib/libgssapi/gss_canonicalize_name.3 user/ed/newcons/lib/libgssapi/gss_compare_name.3 user/ed/newcons/lib/libgssapi/gss_context_time.3 user/ed/newcons/lib/libgssapi/gss_create_empty_oid_set.3 user/ed/newcons/lib/libgssapi/gss_delete_sec_context.3 user/ed/newcons/lib/libgssapi/gss_display_name.3 user/ed/newcons/lib/libgssapi/gss_display_status.3 user/ed/newcons/lib/libgssapi/gss_duplicate_name.3 user/ed/newcons/lib/libgssapi/gss_export_name.3 user/ed/newcons/lib/libgssapi/gss_export_sec_context.3 user/ed/newcons/lib/libgssapi/gss_get_mic.3 user/ed/newcons/lib/libgssapi/gss_import_name.3 user/ed/newcons/lib/libgssapi/gss_import_sec_context.3 user/ed/newcons/lib/libgssapi/gss_indicate_mechs.3 user/ed/newcons/lib/libgssapi/gss_init_sec_context.3 user/ed/newcons/lib/libgssapi/gss_inquire_context.3 user/ed/newcons/lib/libgssapi/gss_inquire_cred.3 user/ed/newcons/lib/libgssapi/gss_inquire_cred_by_mech.3 user/ed/newcons/lib/libgssapi/gss_inquire_mechs_for_name.3 user/ed/newcons/lib/libgssapi/gss_inquire_names_for_mech.3 user/ed/newcons/lib/libgssapi/gss_mech_switch.c user/ed/newcons/lib/libgssapi/gss_process_context_token.3 user/ed/newcons/lib/libgssapi/gss_release_buffer.3 user/ed/newcons/lib/libgssapi/gss_release_cred.3 user/ed/newcons/lib/libgssapi/gss_release_name.3 user/ed/newcons/lib/libgssapi/gss_release_oid_set.3 user/ed/newcons/lib/libgssapi/gss_test_oid_set_member.3 user/ed/newcons/lib/libgssapi/gss_unwrap.3 user/ed/newcons/lib/libgssapi/gss_verify_mic.3 user/ed/newcons/lib/libgssapi/gss_wrap.3 user/ed/newcons/lib/libgssapi/gss_wrap_size_limit.3 user/ed/newcons/lib/libgssapi/gssapi.3 user/ed/newcons/lib/libgssapi/mech.5 user/ed/newcons/lib/libipsec/Makefile user/ed/newcons/lib/libipx/Makefile user/ed/newcons/lib/libjail/Makefile user/ed/newcons/lib/libjail/jail.c user/ed/newcons/lib/libkiconv/Makefile user/ed/newcons/lib/libkvm/Makefile user/ed/newcons/lib/libkvm/kvm_proc.c user/ed/newcons/lib/libmagic/Makefile user/ed/newcons/lib/libmd/Makefile user/ed/newcons/lib/libmilter/Makefile user/ed/newcons/lib/libmp/Makefile user/ed/newcons/lib/libncp/Makefile user/ed/newcons/lib/libngatm/Makefile user/ed/newcons/lib/libopie/Makefile user/ed/newcons/lib/libopie/config.h user/ed/newcons/lib/libpam/modules/Makefile.inc user/ed/newcons/lib/libpam/modules/pam_exec/Makefile user/ed/newcons/lib/libpam/modules/pam_krb5/Makefile user/ed/newcons/lib/libpam/modules/pam_lastlog/Makefile user/ed/newcons/lib/libpam/modules/pam_lastlog/pam_lastlog.8 user/ed/newcons/lib/libpam/modules/pam_lastlog/pam_lastlog.c user/ed/newcons/lib/libpam/modules/pam_radius/Makefile user/ed/newcons/lib/libpam/modules/pam_ssh/Makefile user/ed/newcons/lib/libpam/modules/pam_unix/pam_unix.c user/ed/newcons/lib/libpcap/Makefile user/ed/newcons/lib/libpmc/Makefile user/ed/newcons/lib/libpmc/libpmc.c user/ed/newcons/lib/libproc/Makefile user/ed/newcons/lib/libradius/Makefile user/ed/newcons/lib/librpcsec_gss/Makefile user/ed/newcons/lib/librpcsec_gss/rpc_gss_get_error.3 user/ed/newcons/lib/librpcsec_gss/rpc_gss_get_mech_info.3 user/ed/newcons/lib/librpcsec_gss/rpc_gss_get_mechanisms.3 user/ed/newcons/lib/librpcsec_gss/rpc_gss_get_principal_name.3 user/ed/newcons/lib/librpcsec_gss/rpc_gss_get_versions.3 user/ed/newcons/lib/librpcsec_gss/rpc_gss_getcred.3 user/ed/newcons/lib/librpcsec_gss/rpc_gss_is_installed.3 user/ed/newcons/lib/librpcsec_gss/rpc_gss_max_data_length.3 user/ed/newcons/lib/librpcsec_gss/rpc_gss_mech_to_oid.3 user/ed/newcons/lib/librpcsec_gss/rpc_gss_oid_to_mech.3 user/ed/newcons/lib/librpcsec_gss/rpc_gss_qop_to_num.3 user/ed/newcons/lib/librpcsec_gss/rpc_gss_seccreate.3 user/ed/newcons/lib/librpcsec_gss/rpc_gss_set_callback.3 user/ed/newcons/lib/librpcsec_gss/rpc_gss_set_defaults.3 user/ed/newcons/lib/librpcsec_gss/rpc_gss_set_svc_name.3 user/ed/newcons/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3 user/ed/newcons/lib/librpcsec_gss/rpcsec_gss.3 user/ed/newcons/lib/librpcsec_gss/rpcsec_gss_conf.c user/ed/newcons/lib/librpcsec_gss/svc_rpcsec_gss.c user/ed/newcons/lib/librt/Makefile user/ed/newcons/lib/libsbuf/Makefile user/ed/newcons/lib/libsm/Makefile user/ed/newcons/lib/libsmdb/Makefile user/ed/newcons/lib/libsmutil/Makefile user/ed/newcons/lib/libstand/Makefile user/ed/newcons/lib/libstand/bzipfs.c user/ed/newcons/lib/libstand/dosfs.c user/ed/newcons/lib/libstand/gzipfs.c user/ed/newcons/lib/libtacplus/Makefile user/ed/newcons/lib/libtacplus/libtacplus.3 user/ed/newcons/lib/libtacplus/taclib.c user/ed/newcons/lib/libtacplus/taclib.h user/ed/newcons/lib/libtacplus/taclib_private.h user/ed/newcons/lib/libthr/Makefile user/ed/newcons/lib/libthr/arch/mips/include/pthread_md.h user/ed/newcons/lib/libthr/pthread.map user/ed/newcons/lib/libthr/thread/thr_init.c user/ed/newcons/lib/libthr/thread/thr_private.h user/ed/newcons/lib/libthr/thread/thr_sem.c user/ed/newcons/lib/libthr/thread/thr_umtx.c user/ed/newcons/lib/libthread_db/Makefile user/ed/newcons/lib/libufs/Makefile user/ed/newcons/lib/libugidfw/Makefile user/ed/newcons/lib/libugidfw/ugidfw.c user/ed/newcons/lib/libusb/Makefile user/ed/newcons/lib/libusb/libusb10.c user/ed/newcons/lib/libusb/libusb20.3 user/ed/newcons/lib/libusb/libusb20.c user/ed/newcons/lib/libusb/libusb20.h user/ed/newcons/lib/libusb/libusb20_int.h user/ed/newcons/lib/libusb/libusb20_ugen20.c user/ed/newcons/lib/libutil/Makefile user/ed/newcons/lib/libutil/gr_util.c user/ed/newcons/lib/libutil/libutil.h user/ed/newcons/lib/libutil/login_tty.c user/ed/newcons/lib/libvgl/Makefile user/ed/newcons/lib/libwrap/Makefile user/ed/newcons/lib/liby/Makefile user/ed/newcons/lib/libypclnt/Makefile user/ed/newcons/lib/libz/Makefile user/ed/newcons/lib/msun/amd64/fenv.c user/ed/newcons/lib/msun/amd64/fenv.h user/ed/newcons/lib/msun/i387/fenv.c user/ed/newcons/lib/msun/i387/fenv.h user/ed/newcons/lib/ncurses/Makefile.inc user/ed/newcons/libexec/Makefile user/ed/newcons/libexec/Makefile.inc user/ed/newcons/libexec/atrun/Makefile user/ed/newcons/libexec/atrun/atrun.c user/ed/newcons/libexec/bootpd/Makefile user/ed/newcons/libexec/bootpd/Makefile.inc user/ed/newcons/libexec/bootpd/tools/Makefile.inc user/ed/newcons/libexec/comsat/comsat.8 user/ed/newcons/libexec/comsat/comsat.c user/ed/newcons/libexec/fingerd/Makefile user/ed/newcons/libexec/ftpd/ftpd.8 user/ed/newcons/libexec/ftpd/ftpd.c user/ed/newcons/libexec/ftpd/logwtmp.c user/ed/newcons/libexec/getty/Makefile user/ed/newcons/libexec/getty/ttys.5 user/ed/newcons/libexec/mail.local/Makefile user/ed/newcons/libexec/mknetid/Makefile user/ed/newcons/libexec/pppoed/Makefile user/ed/newcons/libexec/rbootd/Makefile user/ed/newcons/libexec/revnetgroup/Makefile user/ed/newcons/libexec/rlogind/rlogind.c user/ed/newcons/libexec/rpc.rquotad/Makefile user/ed/newcons/libexec/rpc.rstatd/Makefile user/ed/newcons/libexec/rpc.rusersd/Makefile user/ed/newcons/libexec/rpc.rusersd/rusers_proc.c user/ed/newcons/libexec/rpc.rusersd/rusersd.c user/ed/newcons/libexec/rpc.rwalld/Makefile user/ed/newcons/libexec/rpc.sprayd/Makefile user/ed/newcons/libexec/rshd/Makefile user/ed/newcons/libexec/rtld-aout/shlib.c user/ed/newcons/libexec/rtld-aout/support.c user/ed/newcons/libexec/rtld-elf/Makefile user/ed/newcons/libexec/rtld-elf/rtld.c user/ed/newcons/libexec/rtld-elf/rtld.h user/ed/newcons/libexec/smrsh/Makefile user/ed/newcons/libexec/talkd/Makefile user/ed/newcons/libexec/talkd/process.c user/ed/newcons/libexec/tcpd/Makefile user/ed/newcons/libexec/tftp-proxy/Makefile user/ed/newcons/libexec/tftpd/Makefile user/ed/newcons/libexec/ypxfr/Makefile user/ed/newcons/release/Makefile user/ed/newcons/release/amd64/boot_crunch.conf user/ed/newcons/release/doc/en_US.ISO8859-1/hardware/article.sgml user/ed/newcons/release/doc/en_US.ISO8859-1/relnotes/article.sgml user/ed/newcons/release/doc/share/misc/dev.archlist.txt user/ed/newcons/release/i386/boot_crunch.conf user/ed/newcons/release/pc98/boot_crunch.conf user/ed/newcons/release/picobsd/bridge/PICOBSD user/ed/newcons/release/picobsd/bridge/crunch.conf user/ed/newcons/release/picobsd/build/mfs.mtree user/ed/newcons/release/picobsd/build/picobsd user/ed/newcons/release/picobsd/floppy.tree/etc/master.passwd user/ed/newcons/release/powerpc/boot_crunch.conf user/ed/newcons/release/sparc64/boot_crunch.conf user/ed/newcons/release/sun4v/boot_crunch.conf user/ed/newcons/sbin/adjkerntz/Makefile user/ed/newcons/sbin/atacontrol/atacontrol.c user/ed/newcons/sbin/camcontrol/camcontrol.8 user/ed/newcons/sbin/camcontrol/camcontrol.c user/ed/newcons/sbin/comcontrol/comcontrol.c user/ed/newcons/sbin/dump/itime.c user/ed/newcons/sbin/dump/main.c user/ed/newcons/sbin/dumpfs/dumpfs.c user/ed/newcons/sbin/fsck_ffs/fsutil.c user/ed/newcons/sbin/fsck_ffs/gjournal.c user/ed/newcons/sbin/fsck_ffs/main.c user/ed/newcons/sbin/fsck_ffs/pass1.c user/ed/newcons/sbin/fsck_ffs/pass2.c user/ed/newcons/sbin/geom/class/Makefile user/ed/newcons/sbin/geom/class/cache/Makefile user/ed/newcons/sbin/geom/class/mirror/geom_mirror.c user/ed/newcons/sbin/geom/class/mirror/gmirror.8 user/ed/newcons/sbin/geom/class/multipath/geom_multipath.c user/ed/newcons/sbin/geom/class/raid3/geom_raid3.c user/ed/newcons/sbin/geom/class/raid3/graid3.8 user/ed/newcons/sbin/geom/class/stripe/geom_stripe.c user/ed/newcons/sbin/geom/core/geom.8 user/ed/newcons/sbin/geom/core/geom.c user/ed/newcons/sbin/ggate/ggated/ggated.c user/ed/newcons/sbin/growfs/growfs.c user/ed/newcons/sbin/ifconfig/Makefile user/ed/newcons/sbin/ifconfig/af_inet.c user/ed/newcons/sbin/ifconfig/ifcarp.c user/ed/newcons/sbin/ifconfig/ifconfig.8 user/ed/newcons/sbin/ifconfig/ifconfig.c user/ed/newcons/sbin/ifconfig/ifieee80211.c user/ed/newcons/sbin/ifconfig/regdomain.c user/ed/newcons/sbin/init/init.8 user/ed/newcons/sbin/init/init.c user/ed/newcons/sbin/ipfw/dummynet.c user/ed/newcons/sbin/ipfw/ipfw.8 user/ed/newcons/sbin/ipfw/ipfw2.c user/ed/newcons/sbin/ipfw/ipfw2.h user/ed/newcons/sbin/iscontrol/iscontrol.h user/ed/newcons/sbin/iscontrol/pdu.c user/ed/newcons/sbin/kldconfig/Makefile user/ed/newcons/sbin/kldload/Makefile user/ed/newcons/sbin/kldstat/Makefile user/ed/newcons/sbin/ldconfig/ldconfig.c user/ed/newcons/sbin/mdconfig/Makefile user/ed/newcons/sbin/mdconfig/mdconfig.c user/ed/newcons/sbin/mknod/mknod.8 user/ed/newcons/sbin/mknod/mknod.c user/ed/newcons/sbin/mount/mntopts.h user/ed/newcons/sbin/mount/mount.8 user/ed/newcons/sbin/mount/mount.c user/ed/newcons/sbin/mount/vfslist.c user/ed/newcons/sbin/mount_msdosfs/mount_msdosfs.8 user/ed/newcons/sbin/mount_msdosfs/mount_msdosfs.c user/ed/newcons/sbin/mount_nfs/mount_nfs.8 user/ed/newcons/sbin/mount_nfs/mount_nfs.c user/ed/newcons/sbin/mount_nullfs/mount_nullfs.c user/ed/newcons/sbin/natd/Makefile user/ed/newcons/sbin/natd/natd.c user/ed/newcons/sbin/newfs/Makefile user/ed/newcons/sbin/newfs/mkfs.c user/ed/newcons/sbin/newfs/newfs.c user/ed/newcons/sbin/nfsiod/nfsiod.8 user/ed/newcons/sbin/nfsiod/nfsiod.c user/ed/newcons/sbin/rcorder/ealloc.c user/ed/newcons/sbin/rcorder/hash.c user/ed/newcons/sbin/rcorder/rcorder.c user/ed/newcons/sbin/reboot/Makefile user/ed/newcons/sbin/reboot/reboot.8 user/ed/newcons/sbin/reboot/reboot.c user/ed/newcons/sbin/restore/Makefile user/ed/newcons/sbin/restore/dirs.c user/ed/newcons/sbin/restore/extern.h user/ed/newcons/sbin/restore/interactive.c user/ed/newcons/sbin/restore/tape.c user/ed/newcons/sbin/routed/if.c user/ed/newcons/sbin/setkey/setkey.8 user/ed/newcons/sbin/shutdown/shutdown.c user/ed/newcons/sbin/swapon/Makefile user/ed/newcons/sbin/sysctl/sysctl.8 user/ed/newcons/sbin/sysctl/sysctl.c user/ed/newcons/sbin/tunefs/Makefile user/ed/newcons/sbin/tunefs/tunefs.8 user/ed/newcons/sbin/tunefs/tunefs.c user/ed/newcons/sbin/umount/Makefile user/ed/newcons/sbin/umount/umount.c user/ed/newcons/secure/Makefile user/ed/newcons/secure/Makefile.inc user/ed/newcons/share/doc/usd/Makefile user/ed/newcons/share/examples/Makefile user/ed/newcons/share/examples/etc/make.conf user/ed/newcons/share/examples/kld/cdev/test/Makefile user/ed/newcons/share/examples/kld/cdev/test/testcdev.c user/ed/newcons/share/examples/kld/firmware/fwconsumer/fw_consumer.c user/ed/newcons/share/examples/kld/syscall/test/Makefile user/ed/newcons/share/examples/kld/syscall/test/call.c user/ed/newcons/share/man/man3/Makefile user/ed/newcons/share/man/man3/pthread.3 user/ed/newcons/share/man/man3/pthread_attr.3 user/ed/newcons/share/man/man3/pthread_join.3 user/ed/newcons/share/man/man3/sysexits.3 user/ed/newcons/share/man/man4/Makefile user/ed/newcons/share/man/man4/acpi.4 user/ed/newcons/share/man/man4/acpi_asus.4 user/ed/newcons/share/man/man4/acpi_sony.4 user/ed/newcons/share/man/man4/ahci.4 user/ed/newcons/share/man/man4/ath.4 user/ed/newcons/share/man/man4/aue.4 user/ed/newcons/share/man/man4/axe.4 user/ed/newcons/share/man/man4/bridge.4 user/ed/newcons/share/man/man4/carp.4 user/ed/newcons/share/man/man4/cdce.4 user/ed/newcons/share/man/man4/cpufreq.4 user/ed/newcons/share/man/man4/dc.4 user/ed/newcons/share/man/man4/epair.4 user/ed/newcons/share/man/man4/faith.4 user/ed/newcons/share/man/man4/gem.4 user/ed/newcons/share/man/man4/gif.4 user/ed/newcons/share/man/man4/hme.4 user/ed/newcons/share/man/man4/ifmib.4 user/ed/newcons/share/man/man4/ipsec.4 user/ed/newcons/share/man/man4/iwnfw.4 user/ed/newcons/share/man/man4/lge.4 user/ed/newcons/share/man/man4/mac.4 user/ed/newcons/share/man/man4/man4.i386/vpd.4 user/ed/newcons/share/man/man4/man4.powerpc/Makefile user/ed/newcons/share/man/man4/man4.powerpc/pmu.4 user/ed/newcons/share/man/man4/man4.sparc64/ebus.4 user/ed/newcons/share/man/man4/mfi.4 user/ed/newcons/share/man/man4/mpt.4 user/ed/newcons/share/man/man4/mwlfw.4 user/ed/newcons/share/man/man4/ndis.4 user/ed/newcons/share/man/man4/netintro.4 user/ed/newcons/share/man/man4/nge.4 user/ed/newcons/share/man/man4/pcm.4 user/ed/newcons/share/man/man4/pcn.4 user/ed/newcons/share/man/man4/psm.4 user/ed/newcons/share/man/man4/pts.4 user/ed/newcons/share/man/man4/ral.4 user/ed/newcons/share/man/man4/re.4 user/ed/newcons/share/man/man4/rl.4 user/ed/newcons/share/man/man4/rue.4 user/ed/newcons/share/man/man4/rum.4 user/ed/newcons/share/man/man4/sctp.4 user/ed/newcons/share/man/man4/sf.4 user/ed/newcons/share/man/man4/sis.4 user/ed/newcons/share/man/man4/sk.4 user/ed/newcons/share/man/man4/smbus.4 user/ed/newcons/share/man/man4/snd_hda.4 user/ed/newcons/share/man/man4/snd_uaudio.4 user/ed/newcons/share/man/man4/ste.4 user/ed/newcons/share/man/man4/sysmouse.4 user/ed/newcons/share/man/man4/targ.4 user/ed/newcons/share/man/man4/termios.4 user/ed/newcons/share/man/man4/tty.4 user/ed/newcons/share/man/man4/u3g.4 user/ed/newcons/share/man/man4/uart.4 user/ed/newcons/share/man/man4/ucom.4 user/ed/newcons/share/man/man4/udav.4 user/ed/newcons/share/man/man4/ural.4 user/ed/newcons/share/man/man4/urio.4 user/ed/newcons/share/man/man4/urtw.4 user/ed/newcons/share/man/man4/vge.4 user/ed/newcons/share/man/man4/vr.4 user/ed/newcons/share/man/man4/watchdog.4 user/ed/newcons/share/man/man4/wi.4 user/ed/newcons/share/man/man4/wlan.4 user/ed/newcons/share/man/man5/Makefile user/ed/newcons/share/man/man5/devfs.rules.5 user/ed/newcons/share/man/man5/make.conf.5 user/ed/newcons/share/man/man5/rc.conf.5 user/ed/newcons/share/man/man5/src.conf.5 user/ed/newcons/share/man/man5/tmpfs.5 user/ed/newcons/share/man/man7/build.7 user/ed/newcons/share/man/man7/hier.7 user/ed/newcons/share/man/man7/release.7 user/ed/newcons/share/man/man7/security.7 user/ed/newcons/share/man/man8/rc.subr.8 user/ed/newcons/share/man/man9/LOCK_PROFILING.9 user/ed/newcons/share/man/man9/Makefile user/ed/newcons/share/man/man9/VFS.9 user/ed/newcons/share/man/man9/VFS_CHECKEXP.9 user/ed/newcons/share/man/man9/VFS_FHTOVP.9 user/ed/newcons/share/man/man9/VOP_OPENCLOSE.9 user/ed/newcons/share/man/man9/alloc_unr.9 user/ed/newcons/share/man/man9/ifnet.9 user/ed/newcons/share/man/man9/kthread.9 user/ed/newcons/share/man/man9/locking.9 user/ed/newcons/share/man/man9/mac.9 user/ed/newcons/share/man/man9/mtx_pool.9 user/ed/newcons/share/man/man9/namei.9 user/ed/newcons/share/man/man9/pci.9 user/ed/newcons/share/man/man9/sleep.9 user/ed/newcons/share/man/man9/sleepqueue.9 user/ed/newcons/share/man/man9/sysctl.9 user/ed/newcons/share/man/man9/usbdi.9 user/ed/newcons/share/man/man9/vm_page_bits.9 user/ed/newcons/share/misc/bsd-family-tree user/ed/newcons/share/misc/committers-doc.dot user/ed/newcons/share/misc/committers-ports.dot user/ed/newcons/share/misc/committers-src.dot user/ed/newcons/share/mk/bsd.dep.mk user/ed/newcons/share/mk/bsd.lib.mk user/ed/newcons/share/mk/bsd.libnames.mk user/ed/newcons/share/mk/bsd.own.mk user/ed/newcons/share/mk/bsd.subdir.mk user/ed/newcons/share/mk/bsd.sys.mk user/ed/newcons/share/mk/sys.mk user/ed/newcons/share/security/lomac-policy.contexts user/ed/newcons/share/termcap/termcap.5 user/ed/newcons/share/termcap/termcap.src user/ed/newcons/share/zoneinfo/asia user/ed/newcons/share/zoneinfo/europe user/ed/newcons/share/zoneinfo/northamerica user/ed/newcons/share/zoneinfo/zone.tab user/ed/newcons/sys/amd64/acpica/acpi_switch.S user/ed/newcons/sys/amd64/amd64/amd64_mem.c user/ed/newcons/sys/amd64/amd64/identcpu.c user/ed/newcons/sys/amd64/amd64/io.c user/ed/newcons/sys/amd64/amd64/local_apic.c user/ed/newcons/sys/amd64/amd64/machdep.c user/ed/newcons/sys/amd64/amd64/mca.c user/ed/newcons/sys/amd64/amd64/mem.c user/ed/newcons/sys/amd64/amd64/mp_machdep.c user/ed/newcons/sys/amd64/amd64/msi.c user/ed/newcons/sys/amd64/amd64/pmap.c user/ed/newcons/sys/amd64/amd64/sys_machdep.c user/ed/newcons/sys/amd64/amd64/trap.c user/ed/newcons/sys/amd64/amd64/vm_machdep.c user/ed/newcons/sys/amd64/conf/DEFAULTS user/ed/newcons/sys/amd64/conf/GENERIC user/ed/newcons/sys/amd64/conf/Makefile user/ed/newcons/sys/amd64/conf/NOTES user/ed/newcons/sys/amd64/conf/XENHVM user/ed/newcons/sys/amd64/ia32/ia32_reg.c user/ed/newcons/sys/amd64/ia32/ia32_syscall.c user/ed/newcons/sys/amd64/include/apicvar.h user/ed/newcons/sys/amd64/include/cpufunc.h user/ed/newcons/sys/amd64/include/iodev.h user/ed/newcons/sys/amd64/include/mca.h user/ed/newcons/sys/amd64/include/specialreg.h user/ed/newcons/sys/amd64/isa/clock.c user/ed/newcons/sys/arm/arm/busdma_machdep.c user/ed/newcons/sys/arm/arm/cpufunc.c user/ed/newcons/sys/arm/arm/db_trace.c user/ed/newcons/sys/arm/arm/elf_trampoline.c user/ed/newcons/sys/arm/arm/mem.c user/ed/newcons/sys/arm/arm/pmap.c user/ed/newcons/sys/arm/arm/trap.c user/ed/newcons/sys/arm/conf/AVILA user/ed/newcons/sys/arm/conf/CAMBRIA user/ed/newcons/sys/arm/conf/CRB user/ed/newcons/sys/arm/conf/EP80219 user/ed/newcons/sys/arm/conf/GUMSTIX user/ed/newcons/sys/arm/conf/IQ31244 user/ed/newcons/sys/arm/conf/SIMICS user/ed/newcons/sys/arm/conf/SKYEYE user/ed/newcons/sys/arm/include/cpuconf.h user/ed/newcons/sys/arm/include/cpufunc.h user/ed/newcons/sys/arm/include/pmc_mdep.h user/ed/newcons/sys/arm/mv/mv_sata.c user/ed/newcons/sys/arm/xscale/ixp425/files.ixp425 user/ed/newcons/sys/boot/common/Makefile.inc user/ed/newcons/sys/boot/common/bootstrap.h user/ed/newcons/sys/boot/common/dev_net.c user/ed/newcons/sys/boot/common/module.c user/ed/newcons/sys/boot/efi/include/efilib.h user/ed/newcons/sys/boot/efi/libefi/Makefile user/ed/newcons/sys/boot/forth/loader.conf user/ed/newcons/sys/boot/forth/loader.conf.5 user/ed/newcons/sys/boot/i386/Makefile user/ed/newcons/sys/boot/i386/gptboot/gptboot.c user/ed/newcons/sys/boot/i386/libi386/Makefile user/ed/newcons/sys/boot/i386/libi386/biosacpi.c user/ed/newcons/sys/boot/i386/libi386/biosdisk.c user/ed/newcons/sys/boot/i386/libi386/biosmem.c user/ed/newcons/sys/boot/i386/libi386/libi386.h user/ed/newcons/sys/boot/i386/libi386/vidconsole.c user/ed/newcons/sys/boot/i386/loader/conf.c user/ed/newcons/sys/boot/i386/loader/main.c user/ed/newcons/sys/boot/i386/zfsboot/zfsboot.c user/ed/newcons/sys/boot/ia64/efi/conf.c user/ed/newcons/sys/boot/ia64/efi/main.c user/ed/newcons/sys/boot/ia64/efi/version user/ed/newcons/sys/boot/ofw/libofw/ofw_disk.c user/ed/newcons/sys/boot/pc98/Makefile.inc user/ed/newcons/sys/boot/pc98/boot0.5/selector.s user/ed/newcons/sys/boot/pc98/boot2/Makefile user/ed/newcons/sys/boot/pc98/btx/btx/btx.S user/ed/newcons/sys/boot/pc98/kgzldr/crt.s user/ed/newcons/sys/boot/pc98/libpc98/Makefile user/ed/newcons/sys/boot/pc98/libpc98/biosdisk.c user/ed/newcons/sys/boot/pc98/libpc98/biosmem.c user/ed/newcons/sys/boot/pc98/loader/main.c user/ed/newcons/sys/boot/sparc64/loader/Makefile user/ed/newcons/sys/boot/sparc64/loader/main.c user/ed/newcons/sys/boot/uboot/lib/glue.c user/ed/newcons/sys/boot/zfs/zfsimpl.c user/ed/newcons/sys/cam/ata/ata_all.c user/ed/newcons/sys/cam/ata/ata_all.h user/ed/newcons/sys/cam/ata/ata_da.c user/ed/newcons/sys/cam/ata/ata_pmp.c user/ed/newcons/sys/cam/ata/ata_xpt.c user/ed/newcons/sys/cam/cam.c user/ed/newcons/sys/cam/cam.h user/ed/newcons/sys/cam/cam_ccb.h user/ed/newcons/sys/cam/cam_periph.c user/ed/newcons/sys/cam/cam_periph.h user/ed/newcons/sys/cam/cam_queue.h user/ed/newcons/sys/cam/cam_sim.c user/ed/newcons/sys/cam/cam_xpt.c user/ed/newcons/sys/cam/cam_xpt.h user/ed/newcons/sys/cam/cam_xpt_internal.h user/ed/newcons/sys/cam/cam_xpt_periph.h user/ed/newcons/sys/cam/cam_xpt_sim.h user/ed/newcons/sys/cam/scsi/scsi_all.c user/ed/newcons/sys/cam/scsi/scsi_cd.c user/ed/newcons/sys/cam/scsi/scsi_ch.c user/ed/newcons/sys/cam/scsi/scsi_da.c user/ed/newcons/sys/cam/scsi/scsi_low.c user/ed/newcons/sys/cam/scsi/scsi_pass.c user/ed/newcons/sys/cam/scsi/scsi_ses.c user/ed/newcons/sys/cam/scsi/scsi_targ_bh.c user/ed/newcons/sys/cam/scsi/scsi_xpt.c user/ed/newcons/sys/cddl/boot/zfs/zfsimpl.h user/ed/newcons/sys/cddl/boot/zfs/zfssubr.c user/ed/newcons/sys/cddl/compat/opensolaris/sys/time.h user/ed/newcons/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h user/ed/newcons/sys/compat/freebsd32/freebsd32_proto.h user/ed/newcons/sys/compat/freebsd32/freebsd32_syscall.h user/ed/newcons/sys/compat/freebsd32/freebsd32_syscalls.c user/ed/newcons/sys/compat/freebsd32/freebsd32_sysent.c user/ed/newcons/sys/compat/freebsd32/syscalls.master user/ed/newcons/sys/compat/linux/linux_file.c user/ed/newcons/sys/compat/linux/linux_futex.c user/ed/newcons/sys/compat/linux/linux_ioctl.c user/ed/newcons/sys/compat/linux/linux_ioctl.h user/ed/newcons/sys/compat/linux/linux_misc.c user/ed/newcons/sys/compat/linux/linux_signal.c user/ed/newcons/sys/compat/linux/linux_uid16.c user/ed/newcons/sys/compat/svr4/svr4_misc.c user/ed/newcons/sys/compat/svr4/svr4_termios.c user/ed/newcons/sys/compat/svr4/syscalls.master user/ed/newcons/sys/compat/x86bios/x86bios.c user/ed/newcons/sys/conf/Makefile.arm user/ed/newcons/sys/conf/Makefile.mips user/ed/newcons/sys/conf/NOTES user/ed/newcons/sys/conf/files user/ed/newcons/sys/conf/files.amd64 user/ed/newcons/sys/conf/files.arm user/ed/newcons/sys/conf/files.i386 user/ed/newcons/sys/conf/files.ia64 user/ed/newcons/sys/conf/files.mips user/ed/newcons/sys/conf/files.pc98 user/ed/newcons/sys/conf/files.sparc64 user/ed/newcons/sys/conf/files.sun4v user/ed/newcons/sys/conf/kern.mk user/ed/newcons/sys/conf/ldscript.mips user/ed/newcons/sys/conf/makeLINT.mk user/ed/newcons/sys/conf/options user/ed/newcons/sys/conf/options.arm user/ed/newcons/sys/conf/options.i386 user/ed/newcons/sys/conf/options.mips user/ed/newcons/sys/conf/options.pc98 user/ed/newcons/sys/conf/options.sparc64 user/ed/newcons/sys/contrib/dev/acpica/changes.txt user/ed/newcons/sys/contrib/dev/acpica/common/adfile.c user/ed/newcons/sys/contrib/dev/acpica/common/adisasm.c user/ed/newcons/sys/contrib/dev/acpica/common/adwalk.c user/ed/newcons/sys/contrib/dev/acpica/common/dmextern.c user/ed/newcons/sys/contrib/dev/acpica/common/dmrestag.c user/ed/newcons/sys/contrib/dev/acpica/common/dmtable.c user/ed/newcons/sys/contrib/dev/acpica/common/dmtbdump.c user/ed/newcons/sys/contrib/dev/acpica/common/dmtbinfo.c user/ed/newcons/sys/contrib/dev/acpica/common/getopt.c user/ed/newcons/sys/contrib/dev/acpica/compiler/aslanalyze.c user/ed/newcons/sys/contrib/dev/acpica/compiler/aslcodegen.c user/ed/newcons/sys/contrib/dev/acpica/compiler/aslcompile.c user/ed/newcons/sys/contrib/dev/acpica/compiler/aslcompiler.h user/ed/newcons/sys/contrib/dev/acpica/compiler/aslcompiler.l user/ed/newcons/sys/contrib/dev/acpica/compiler/aslcompiler.y user/ed/newcons/sys/contrib/dev/acpica/compiler/asldefine.h user/ed/newcons/sys/contrib/dev/acpica/compiler/aslerror.c user/ed/newcons/sys/contrib/dev/acpica/compiler/aslfiles.c user/ed/newcons/sys/contrib/dev/acpica/compiler/aslfold.c user/ed/newcons/sys/contrib/dev/acpica/compiler/aslglobal.h user/ed/newcons/sys/contrib/dev/acpica/compiler/asllength.c user/ed/newcons/sys/contrib/dev/acpica/compiler/asllisting.c user/ed/newcons/sys/contrib/dev/acpica/compiler/aslload.c user/ed/newcons/sys/contrib/dev/acpica/compiler/asllookup.c user/ed/newcons/sys/contrib/dev/acpica/compiler/aslmain.c user/ed/newcons/sys/contrib/dev/acpica/compiler/aslmap.c user/ed/newcons/sys/contrib/dev/acpica/compiler/aslopcodes.c user/ed/newcons/sys/contrib/dev/acpica/compiler/asloperands.c user/ed/newcons/sys/contrib/dev/acpica/compiler/aslopt.c user/ed/newcons/sys/contrib/dev/acpica/compiler/aslresource.c user/ed/newcons/sys/contrib/dev/acpica/compiler/aslrestype1.c user/ed/newcons/sys/contrib/dev/acpica/compiler/aslrestype2.c user/ed/newcons/sys/contrib/dev/acpica/compiler/aslstartup.c user/ed/newcons/sys/contrib/dev/acpica/compiler/aslstubs.c user/ed/newcons/sys/contrib/dev/acpica/compiler/asltransform.c user/ed/newcons/sys/contrib/dev/acpica/compiler/asltree.c user/ed/newcons/sys/contrib/dev/acpica/compiler/asltypes.h user/ed/newcons/sys/contrib/dev/acpica/compiler/aslutils.c user/ed/newcons/sys/contrib/dev/acpica/debugger/dbcmds.c user/ed/newcons/sys/contrib/dev/acpica/debugger/dbdisply.c user/ed/newcons/sys/contrib/dev/acpica/debugger/dbexec.c user/ed/newcons/sys/contrib/dev/acpica/debugger/dbfileio.c user/ed/newcons/sys/contrib/dev/acpica/debugger/dbhistry.c user/ed/newcons/sys/contrib/dev/acpica/debugger/dbinput.c user/ed/newcons/sys/contrib/dev/acpica/debugger/dbstats.c user/ed/newcons/sys/contrib/dev/acpica/debugger/dbutils.c user/ed/newcons/sys/contrib/dev/acpica/debugger/dbxface.c user/ed/newcons/sys/contrib/dev/acpica/disassembler/dmbuffer.c user/ed/newcons/sys/contrib/dev/acpica/disassembler/dmnames.c user/ed/newcons/sys/contrib/dev/acpica/disassembler/dmobject.c user/ed/newcons/sys/contrib/dev/acpica/disassembler/dmopcode.c user/ed/newcons/sys/contrib/dev/acpica/disassembler/dmresrc.c user/ed/newcons/sys/contrib/dev/acpica/disassembler/dmresrcl.c user/ed/newcons/sys/contrib/dev/acpica/disassembler/dmresrcs.c user/ed/newcons/sys/contrib/dev/acpica/disassembler/dmutils.c user/ed/newcons/sys/contrib/dev/acpica/disassembler/dmwalk.c user/ed/newcons/sys/contrib/dev/acpica/dispatcher/dsfield.c user/ed/newcons/sys/contrib/dev/acpica/dispatcher/dsinit.c user/ed/newcons/sys/contrib/dev/acpica/dispatcher/dsmethod.c user/ed/newcons/sys/contrib/dev/acpica/dispatcher/dsmthdat.c user/ed/newcons/sys/contrib/dev/acpica/dispatcher/dsobject.c user/ed/newcons/sys/contrib/dev/acpica/dispatcher/dsopcode.c user/ed/newcons/sys/contrib/dev/acpica/dispatcher/dsutils.c user/ed/newcons/sys/contrib/dev/acpica/dispatcher/dswexec.c user/ed/newcons/sys/contrib/dev/acpica/dispatcher/dswload.c user/ed/newcons/sys/contrib/dev/acpica/dispatcher/dswscope.c user/ed/newcons/sys/contrib/dev/acpica/dispatcher/dswstate.c user/ed/newcons/sys/contrib/dev/acpica/events/evevent.c user/ed/newcons/sys/contrib/dev/acpica/events/evgpe.c user/ed/newcons/sys/contrib/dev/acpica/events/evgpeblk.c user/ed/newcons/sys/contrib/dev/acpica/events/evmisc.c user/ed/newcons/sys/contrib/dev/acpica/events/evregion.c user/ed/newcons/sys/contrib/dev/acpica/events/evrgnini.c user/ed/newcons/sys/contrib/dev/acpica/events/evsci.c user/ed/newcons/sys/contrib/dev/acpica/events/evxface.c user/ed/newcons/sys/contrib/dev/acpica/events/evxfevnt.c user/ed/newcons/sys/contrib/dev/acpica/events/evxfregn.c user/ed/newcons/sys/contrib/dev/acpica/executer/exconfig.c user/ed/newcons/sys/contrib/dev/acpica/executer/exconvrt.c user/ed/newcons/sys/contrib/dev/acpica/executer/excreate.c user/ed/newcons/sys/contrib/dev/acpica/executer/exdump.c user/ed/newcons/sys/contrib/dev/acpica/executer/exfield.c user/ed/newcons/sys/contrib/dev/acpica/executer/exfldio.c user/ed/newcons/sys/contrib/dev/acpica/executer/exmisc.c user/ed/newcons/sys/contrib/dev/acpica/executer/exmutex.c user/ed/newcons/sys/contrib/dev/acpica/executer/exnames.c user/ed/newcons/sys/contrib/dev/acpica/executer/exoparg1.c user/ed/newcons/sys/contrib/dev/acpica/executer/exoparg2.c user/ed/newcons/sys/contrib/dev/acpica/executer/exoparg3.c user/ed/newcons/sys/contrib/dev/acpica/executer/exoparg6.c user/ed/newcons/sys/contrib/dev/acpica/executer/exprep.c user/ed/newcons/sys/contrib/dev/acpica/executer/exregion.c user/ed/newcons/sys/contrib/dev/acpica/executer/exresnte.c user/ed/newcons/sys/contrib/dev/acpica/executer/exresolv.c user/ed/newcons/sys/contrib/dev/acpica/executer/exresop.c user/ed/newcons/sys/contrib/dev/acpica/executer/exstore.c user/ed/newcons/sys/contrib/dev/acpica/executer/exstoren.c user/ed/newcons/sys/contrib/dev/acpica/executer/exstorob.c user/ed/newcons/sys/contrib/dev/acpica/executer/exsystem.c user/ed/newcons/sys/contrib/dev/acpica/executer/exutils.c user/ed/newcons/sys/contrib/dev/acpica/hardware/hwacpi.c user/ed/newcons/sys/contrib/dev/acpica/hardware/hwgpe.c user/ed/newcons/sys/contrib/dev/acpica/hardware/hwregs.c user/ed/newcons/sys/contrib/dev/acpica/hardware/hwsleep.c user/ed/newcons/sys/contrib/dev/acpica/hardware/hwtimer.c user/ed/newcons/sys/contrib/dev/acpica/hardware/hwvalid.c user/ed/newcons/sys/contrib/dev/acpica/hardware/hwxface.c user/ed/newcons/sys/contrib/dev/acpica/include/acapps.h user/ed/newcons/sys/contrib/dev/acpica/include/accommon.h user/ed/newcons/sys/contrib/dev/acpica/include/acconfig.h user/ed/newcons/sys/contrib/dev/acpica/include/acdebug.h user/ed/newcons/sys/contrib/dev/acpica/include/acdisasm.h user/ed/newcons/sys/contrib/dev/acpica/include/acdispat.h user/ed/newcons/sys/contrib/dev/acpica/include/acevents.h user/ed/newcons/sys/contrib/dev/acpica/include/acexcep.h user/ed/newcons/sys/contrib/dev/acpica/include/acglobal.h user/ed/newcons/sys/contrib/dev/acpica/include/achware.h user/ed/newcons/sys/contrib/dev/acpica/include/acinterp.h user/ed/newcons/sys/contrib/dev/acpica/include/aclocal.h user/ed/newcons/sys/contrib/dev/acpica/include/acmacros.h user/ed/newcons/sys/contrib/dev/acpica/include/acnames.h user/ed/newcons/sys/contrib/dev/acpica/include/acnamesp.h user/ed/newcons/sys/contrib/dev/acpica/include/acobject.h user/ed/newcons/sys/contrib/dev/acpica/include/acopcode.h user/ed/newcons/sys/contrib/dev/acpica/include/acoutput.h user/ed/newcons/sys/contrib/dev/acpica/include/acparser.h user/ed/newcons/sys/contrib/dev/acpica/include/acpi.h user/ed/newcons/sys/contrib/dev/acpica/include/acpiosxf.h user/ed/newcons/sys/contrib/dev/acpica/include/acpixf.h user/ed/newcons/sys/contrib/dev/acpica/include/acpredef.h user/ed/newcons/sys/contrib/dev/acpica/include/acresrc.h user/ed/newcons/sys/contrib/dev/acpica/include/acrestyp.h user/ed/newcons/sys/contrib/dev/acpica/include/acstruct.h user/ed/newcons/sys/contrib/dev/acpica/include/actables.h user/ed/newcons/sys/contrib/dev/acpica/include/actbl.h user/ed/newcons/sys/contrib/dev/acpica/include/actbl1.h user/ed/newcons/sys/contrib/dev/acpica/include/actbl2.h user/ed/newcons/sys/contrib/dev/acpica/include/actypes.h user/ed/newcons/sys/contrib/dev/acpica/include/acutils.h user/ed/newcons/sys/contrib/dev/acpica/include/amlcode.h user/ed/newcons/sys/contrib/dev/acpica/include/amlresrc.h user/ed/newcons/sys/contrib/dev/acpica/include/platform/acenv.h user/ed/newcons/sys/contrib/dev/acpica/include/platform/acfreebsd.h user/ed/newcons/sys/contrib/dev/acpica/include/platform/acgcc.h user/ed/newcons/sys/contrib/dev/acpica/namespace/nsaccess.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nsalloc.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nsdump.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nsdumpdv.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nseval.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nsinit.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nsload.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nsnames.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nsobject.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nsparse.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nspredef.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nsrepair.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nsrepair2.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nssearch.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nsutils.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nswalk.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nsxfeval.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nsxfname.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nsxfobj.c user/ed/newcons/sys/contrib/dev/acpica/osunixxf.c user/ed/newcons/sys/contrib/dev/acpica/parser/psargs.c user/ed/newcons/sys/contrib/dev/acpica/parser/psloop.c user/ed/newcons/sys/contrib/dev/acpica/parser/psopcode.c user/ed/newcons/sys/contrib/dev/acpica/parser/psparse.c user/ed/newcons/sys/contrib/dev/acpica/parser/psscope.c user/ed/newcons/sys/contrib/dev/acpica/parser/pstree.c user/ed/newcons/sys/contrib/dev/acpica/parser/psutils.c user/ed/newcons/sys/contrib/dev/acpica/parser/pswalk.c user/ed/newcons/sys/contrib/dev/acpica/parser/psxface.c user/ed/newcons/sys/contrib/dev/acpica/resources/rsaddr.c user/ed/newcons/sys/contrib/dev/acpica/resources/rscalc.c user/ed/newcons/sys/contrib/dev/acpica/resources/rscreate.c user/ed/newcons/sys/contrib/dev/acpica/resources/rsdump.c user/ed/newcons/sys/contrib/dev/acpica/resources/rsinfo.c user/ed/newcons/sys/contrib/dev/acpica/resources/rsio.c user/ed/newcons/sys/contrib/dev/acpica/resources/rsirq.c user/ed/newcons/sys/contrib/dev/acpica/resources/rslist.c user/ed/newcons/sys/contrib/dev/acpica/resources/rsmemory.c user/ed/newcons/sys/contrib/dev/acpica/resources/rsmisc.c user/ed/newcons/sys/contrib/dev/acpica/resources/rsutils.c user/ed/newcons/sys/contrib/dev/acpica/resources/rsxface.c user/ed/newcons/sys/contrib/dev/acpica/tables/tbfadt.c user/ed/newcons/sys/contrib/dev/acpica/tables/tbfind.c user/ed/newcons/sys/contrib/dev/acpica/tables/tbinstal.c user/ed/newcons/sys/contrib/dev/acpica/tables/tbutils.c user/ed/newcons/sys/contrib/dev/acpica/tables/tbxface.c user/ed/newcons/sys/contrib/dev/acpica/tables/tbxfroot.c user/ed/newcons/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h user/ed/newcons/sys/contrib/dev/acpica/utilities/utalloc.c user/ed/newcons/sys/contrib/dev/acpica/utilities/utcache.c user/ed/newcons/sys/contrib/dev/acpica/utilities/utcopy.c user/ed/newcons/sys/contrib/dev/acpica/utilities/utdebug.c user/ed/newcons/sys/contrib/dev/acpica/utilities/utdelete.c user/ed/newcons/sys/contrib/dev/acpica/utilities/uteval.c user/ed/newcons/sys/contrib/dev/acpica/utilities/utglobal.c user/ed/newcons/sys/contrib/dev/acpica/utilities/utids.c user/ed/newcons/sys/contrib/dev/acpica/utilities/utinit.c user/ed/newcons/sys/contrib/dev/acpica/utilities/utlock.c user/ed/newcons/sys/contrib/dev/acpica/utilities/utmath.c user/ed/newcons/sys/contrib/dev/acpica/utilities/utmisc.c user/ed/newcons/sys/contrib/dev/acpica/utilities/utmutex.c user/ed/newcons/sys/contrib/dev/acpica/utilities/utobject.c user/ed/newcons/sys/contrib/dev/acpica/utilities/utresrc.c user/ed/newcons/sys/contrib/dev/acpica/utilities/utstate.c user/ed/newcons/sys/contrib/dev/acpica/utilities/uttrack.c user/ed/newcons/sys/contrib/dev/acpica/utilities/utxface.c user/ed/newcons/sys/contrib/dev/uath/ar5523.bin.uu user/ed/newcons/sys/contrib/ngatm/netnatm/api/cc_conn.c user/ed/newcons/sys/contrib/pf/net/if_pfsync.c user/ed/newcons/sys/contrib/pf/net/if_pfsync.h user/ed/newcons/sys/contrib/pf/net/pf.c user/ed/newcons/sys/contrib/pf/net/pfvar.h user/ed/newcons/sys/ddb/db_ps.c user/ed/newcons/sys/dev/aac/aac.c user/ed/newcons/sys/dev/aac/aac_cam.c user/ed/newcons/sys/dev/aac/aacvar.h user/ed/newcons/sys/dev/acpi_support/acpi_ibm.c user/ed/newcons/sys/dev/acpi_support/acpi_panasonic.c user/ed/newcons/sys/dev/acpi_support/acpi_sony.c user/ed/newcons/sys/dev/acpi_support/acpi_wmi.c user/ed/newcons/sys/dev/acpica/Osd/OsdHardware.c user/ed/newcons/sys/dev/acpica/Osd/OsdSchedule.c user/ed/newcons/sys/dev/acpica/acpi_cpu.c user/ed/newcons/sys/dev/acpica/acpi_ec.c user/ed/newcons/sys/dev/acpica/acpi_hpet.c user/ed/newcons/sys/dev/acpica/acpi_if.m user/ed/newcons/sys/dev/acpica/acpi_package.c user/ed/newcons/sys/dev/acpica/acpi_powerres.c user/ed/newcons/sys/dev/acpica/acpi_smbat.c user/ed/newcons/sys/dev/acpica/acpivar.h user/ed/newcons/sys/dev/adb/adb.h user/ed/newcons/sys/dev/adb/adb_bus.c user/ed/newcons/sys/dev/adb/adb_mouse.c user/ed/newcons/sys/dev/adlink/adlink.c user/ed/newcons/sys/dev/ae/if_ae.c user/ed/newcons/sys/dev/agp/agp.c user/ed/newcons/sys/dev/agp/agp_via.c user/ed/newcons/sys/dev/ahci/ahci.c user/ed/newcons/sys/dev/ahci/ahci.h user/ed/newcons/sys/dev/aic7xxx/aic79xx_pci.c user/ed/newcons/sys/dev/aic7xxx/aicasm/Makefile user/ed/newcons/sys/dev/aic7xxx/aicasm/aicasm.c user/ed/newcons/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l user/ed/newcons/sys/dev/aic7xxx/aicasm/aicasm_scan.l user/ed/newcons/sys/dev/aic7xxx/aicasm/aicasm_symbol.c user/ed/newcons/sys/dev/amd/amd.c user/ed/newcons/sys/dev/amr/amr.c user/ed/newcons/sys/dev/arcmsr/arcmsr.c user/ed/newcons/sys/dev/asr/asr.c user/ed/newcons/sys/dev/ata/ata-all.c user/ed/newcons/sys/dev/ata/ata-all.h user/ed/newcons/sys/dev/ata/ata-disk.c user/ed/newcons/sys/dev/ata/ata-dma.c user/ed/newcons/sys/dev/ata/ata-lowlevel.c user/ed/newcons/sys/dev/ata/ata-pci.c user/ed/newcons/sys/dev/ata/ata-pci.h user/ed/newcons/sys/dev/ata/ata-queue.c user/ed/newcons/sys/dev/ata/ata-raid.c user/ed/newcons/sys/dev/ata/ata-sata.c user/ed/newcons/sys/dev/ata/ata_if.m user/ed/newcons/sys/dev/ata/atapi-cam.c user/ed/newcons/sys/dev/ata/atapi-cd.c user/ed/newcons/sys/dev/ata/atapi-cd.h user/ed/newcons/sys/dev/ata/atapi-fd.c user/ed/newcons/sys/dev/ata/atapi-tape.c user/ed/newcons/sys/dev/ata/chipsets/ata-acard.c user/ed/newcons/sys/dev/ata/chipsets/ata-acerlabs.c user/ed/newcons/sys/dev/ata/chipsets/ata-ahci.c user/ed/newcons/sys/dev/ata/chipsets/ata-amd.c user/ed/newcons/sys/dev/ata/chipsets/ata-ati.c user/ed/newcons/sys/dev/ata/chipsets/ata-cenatek.c user/ed/newcons/sys/dev/ata/chipsets/ata-cypress.c user/ed/newcons/sys/dev/ata/chipsets/ata-cyrix.c user/ed/newcons/sys/dev/ata/chipsets/ata-highpoint.c user/ed/newcons/sys/dev/ata/chipsets/ata-intel.c user/ed/newcons/sys/dev/ata/chipsets/ata-ite.c user/ed/newcons/sys/dev/ata/chipsets/ata-jmicron.c user/ed/newcons/sys/dev/ata/chipsets/ata-marvell.c user/ed/newcons/sys/dev/ata/chipsets/ata-micron.c user/ed/newcons/sys/dev/ata/chipsets/ata-national.c user/ed/newcons/sys/dev/ata/chipsets/ata-netcell.c user/ed/newcons/sys/dev/ata/chipsets/ata-nvidia.c user/ed/newcons/sys/dev/ata/chipsets/ata-promise.c user/ed/newcons/sys/dev/ata/chipsets/ata-serverworks.c user/ed/newcons/sys/dev/ata/chipsets/ata-siliconimage.c user/ed/newcons/sys/dev/ata/chipsets/ata-sis.c user/ed/newcons/sys/dev/ata/chipsets/ata-via.c user/ed/newcons/sys/dev/ath/ath_hal/ah_eeprom_v4k.h user/ed/newcons/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c user/ed/newcons/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c user/ed/newcons/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c user/ed/newcons/sys/dev/ath/ath_hal/ar5212/ar5212_power.c user/ed/newcons/sys/dev/ath/ath_hal/ar5212/ar5212reg.h user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416.h user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_power.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416desc.h user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416phy.h user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar5416reg.h user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c user/ed/newcons/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c user/ed/newcons/sys/dev/ath/if_ath.c user/ed/newcons/sys/dev/atkbdc/psm.c user/ed/newcons/sys/dev/auxio/auxio.c user/ed/newcons/sys/dev/bce/if_bce.c user/ed/newcons/sys/dev/bce/if_bcereg.h user/ed/newcons/sys/dev/bge/if_bge.c user/ed/newcons/sys/dev/bge/if_bgereg.h user/ed/newcons/sys/dev/bktr/bktr_i2c.c user/ed/newcons/sys/dev/bktr/bktr_os.c user/ed/newcons/sys/dev/cardbus/cardbus.c user/ed/newcons/sys/dev/cardbus/cardbus_cis.c user/ed/newcons/sys/dev/cfe/cfe_api.c user/ed/newcons/sys/dev/cfe/cfe_console.c user/ed/newcons/sys/dev/ciss/ciss.c user/ed/newcons/sys/dev/cs/if_cs.c user/ed/newcons/sys/dev/cs/if_csreg.h user/ed/newcons/sys/dev/ct/ct_isa.c user/ed/newcons/sys/dev/cxgb/common/cxgb_common.h user/ed/newcons/sys/dev/cxgb/common/cxgb_t3_hw.c user/ed/newcons/sys/dev/cxgb/cxgb_adapter.h user/ed/newcons/sys/dev/cxgb/cxgb_main.c user/ed/newcons/sys/dev/cxgb/cxgb_sge.c user/ed/newcons/sys/dev/cxgb/cxgb_t3fw.h user/ed/newcons/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c user/ed/newcons/sys/dev/cxgb/ulp/tom/cxgb_vm.c user/ed/newcons/sys/dev/dc/if_dc.c user/ed/newcons/sys/dev/dc/if_dcreg.h user/ed/newcons/sys/dev/de/if_de.c user/ed/newcons/sys/dev/dpms/dpms.c user/ed/newcons/sys/dev/dpt/dpt.h user/ed/newcons/sys/dev/dpt/dpt_scsi.c user/ed/newcons/sys/dev/drm/drmP.h user/ed/newcons/sys/dev/drm/drm_linux_list.h user/ed/newcons/sys/dev/drm/drm_memory.c user/ed/newcons/sys/dev/drm/drm_vm.c user/ed/newcons/sys/dev/drm/i915_drv.c user/ed/newcons/sys/dev/drm/i915_drv.h user/ed/newcons/sys/dev/e1000/LICENSE user/ed/newcons/sys/dev/e1000/e1000_80003es2lan.c user/ed/newcons/sys/dev/e1000/e1000_80003es2lan.h user/ed/newcons/sys/dev/e1000/e1000_82540.c user/ed/newcons/sys/dev/e1000/e1000_82541.c user/ed/newcons/sys/dev/e1000/e1000_82542.c user/ed/newcons/sys/dev/e1000/e1000_82543.c user/ed/newcons/sys/dev/e1000/e1000_82571.c user/ed/newcons/sys/dev/e1000/e1000_82575.c user/ed/newcons/sys/dev/e1000/e1000_82575.h user/ed/newcons/sys/dev/e1000/e1000_api.c user/ed/newcons/sys/dev/e1000/e1000_api.h user/ed/newcons/sys/dev/e1000/e1000_defines.h user/ed/newcons/sys/dev/e1000/e1000_hw.h user/ed/newcons/sys/dev/e1000/e1000_ich8lan.c user/ed/newcons/sys/dev/e1000/e1000_ich8lan.h user/ed/newcons/sys/dev/e1000/e1000_mac.c user/ed/newcons/sys/dev/e1000/e1000_mac.h user/ed/newcons/sys/dev/e1000/e1000_manage.c user/ed/newcons/sys/dev/e1000/e1000_osdep.h user/ed/newcons/sys/dev/e1000/e1000_phy.c user/ed/newcons/sys/dev/e1000/e1000_phy.h user/ed/newcons/sys/dev/e1000/e1000_regs.h user/ed/newcons/sys/dev/e1000/if_em.c user/ed/newcons/sys/dev/e1000/if_em.h user/ed/newcons/sys/dev/e1000/if_igb.c user/ed/newcons/sys/dev/e1000/if_igb.h user/ed/newcons/sys/dev/ep/if_ep.c user/ed/newcons/sys/dev/ex/if_ex.c user/ed/newcons/sys/dev/exca/excareg.h user/ed/newcons/sys/dev/fatm/if_fatm.c user/ed/newcons/sys/dev/fb/creator.c user/ed/newcons/sys/dev/fb/fb.c user/ed/newcons/sys/dev/fb/fbreg.h user/ed/newcons/sys/dev/fb/machfb.c user/ed/newcons/sys/dev/fb/s3_pci.c user/ed/newcons/sys/dev/fb/vesa.c user/ed/newcons/sys/dev/fb/vga.c user/ed/newcons/sys/dev/fb/vgareg.h user/ed/newcons/sys/dev/fdc/fdc_acpi.c user/ed/newcons/sys/dev/firewire/fwdev.c user/ed/newcons/sys/dev/firewire/fwmem.c user/ed/newcons/sys/dev/firewire/sbp.c user/ed/newcons/sys/dev/hatm/if_hatm.c user/ed/newcons/sys/dev/hifn/hifn7751.c user/ed/newcons/sys/dev/hptiop/hptiop.c user/ed/newcons/sys/dev/hptmv/entry.c user/ed/newcons/sys/dev/hptrr/hptrr_osm_bsd.c user/ed/newcons/sys/dev/hptrr/os_bsd.h user/ed/newcons/sys/dev/hwpmc/hwpmc_arm.c user/ed/newcons/sys/dev/hwpmc/hwpmc_core.c user/ed/newcons/sys/dev/hwpmc/hwpmc_intel.c user/ed/newcons/sys/dev/hwpmc/hwpmc_mod.c user/ed/newcons/sys/dev/hwpmc/hwpmc_x86.c user/ed/newcons/sys/dev/hwpmc/pmc_events.h user/ed/newcons/sys/dev/ic/ns16550.h user/ed/newcons/sys/dev/ichsmb/ichsmb_pci.c user/ed/newcons/sys/dev/ichwd/ichwd.c user/ed/newcons/sys/dev/ichwd/ichwd.h user/ed/newcons/sys/dev/ieee488/ibfoo.c user/ed/newcons/sys/dev/ieee488/pcii.c user/ed/newcons/sys/dev/ieee488/tnt4882.c user/ed/newcons/sys/dev/ieee488/upd7210.c user/ed/newcons/sys/dev/ieee488/upd7210.h user/ed/newcons/sys/dev/if_ndis/if_ndis.c user/ed/newcons/sys/dev/if_ndis/if_ndis_usb.c user/ed/newcons/sys/dev/iir/iir.c user/ed/newcons/sys/dev/iir/iir_ctrl.c user/ed/newcons/sys/dev/iir/iir_pci.c user/ed/newcons/sys/dev/io/iodev.c user/ed/newcons/sys/dev/ipmi/ipmi.c user/ed/newcons/sys/dev/ips/ips_pci.c user/ed/newcons/sys/dev/iscsi/initiator/isc_sm.c user/ed/newcons/sys/dev/isp/isp.c user/ed/newcons/sys/dev/isp/isp_freebsd.c user/ed/newcons/sys/dev/isp/isp_freebsd.h user/ed/newcons/sys/dev/isp/isp_library.c user/ed/newcons/sys/dev/isp/isp_library.h user/ed/newcons/sys/dev/isp/isp_pci.c user/ed/newcons/sys/dev/isp/isp_sbus.c user/ed/newcons/sys/dev/isp/ispmbox.h user/ed/newcons/sys/dev/isp/ispvar.h user/ed/newcons/sys/dev/iwn/if_iwn.c user/ed/newcons/sys/dev/iwn/if_iwnreg.h user/ed/newcons/sys/dev/iwn/if_iwnvar.h user/ed/newcons/sys/dev/ixgbe/ixgbe.c user/ed/newcons/sys/dev/ixgbe/ixgbe.h user/ed/newcons/sys/dev/ixgbe/ixgbe_82598.c user/ed/newcons/sys/dev/ixgbe/ixgbe_82599.c user/ed/newcons/sys/dev/ixgbe/ixgbe_api.c user/ed/newcons/sys/dev/ixgbe/ixgbe_api.h user/ed/newcons/sys/dev/ixgbe/ixgbe_common.c user/ed/newcons/sys/dev/ixgbe/ixgbe_common.h user/ed/newcons/sys/dev/ixgbe/ixgbe_osdep.h user/ed/newcons/sys/dev/ixgbe/ixgbe_phy.c user/ed/newcons/sys/dev/ixgbe/ixgbe_phy.h user/ed/newcons/sys/dev/ixgbe/ixgbe_type.h user/ed/newcons/sys/dev/jme/if_jme.c user/ed/newcons/sys/dev/ksyms/ksyms.c user/ed/newcons/sys/dev/led/led.c user/ed/newcons/sys/dev/lmc/if_lmc.c user/ed/newcons/sys/dev/malo/if_malo.c user/ed/newcons/sys/dev/mc146818/mc146818.c user/ed/newcons/sys/dev/mc146818/mc146818reg.h user/ed/newcons/sys/dev/mc146818/mc146818var.h user/ed/newcons/sys/dev/md/md.c user/ed/newcons/sys/dev/mge/if_mge.c user/ed/newcons/sys/dev/mii/brgphy.c user/ed/newcons/sys/dev/mii/ip1000phy.c user/ed/newcons/sys/dev/mii/miidevs user/ed/newcons/sys/dev/mii/tdkphy.c user/ed/newcons/sys/dev/mk48txx/mk48txx.c user/ed/newcons/sys/dev/mk48txx/mk48txxreg.h user/ed/newcons/sys/dev/mk48txx/mk48txxvar.h user/ed/newcons/sys/dev/mly/mly.c user/ed/newcons/sys/dev/mpt/mpt_cam.c user/ed/newcons/sys/dev/mpt/mpt_cam.h user/ed/newcons/sys/dev/mpt/mpt_pci.c user/ed/newcons/sys/dev/mpt/mpt_raid.c user/ed/newcons/sys/dev/msk/if_msk.c user/ed/newcons/sys/dev/mxge/eth_z8e.h user/ed/newcons/sys/dev/mxge/ethp_z8e.h user/ed/newcons/sys/dev/mxge/if_mxge.c user/ed/newcons/sys/dev/mxge/rss_eth_z8e.h user/ed/newcons/sys/dev/mxge/rss_ethp_z8e.h user/ed/newcons/sys/dev/nve/if_nve.c user/ed/newcons/sys/dev/patm/if_patm_intr.c user/ed/newcons/sys/dev/pccard/card_if.m user/ed/newcons/sys/dev/pci/pci.c user/ed/newcons/sys/dev/pci/pci_pci.c user/ed/newcons/sys/dev/pci/pci_private.h user/ed/newcons/sys/dev/pci/pcireg.h user/ed/newcons/sys/dev/pci/pcivar.h user/ed/newcons/sys/dev/pdq/if_fea.c user/ed/newcons/sys/dev/ppbus/vpo.c user/ed/newcons/sys/dev/puc/puc.c user/ed/newcons/sys/dev/puc/pucdata.c user/ed/newcons/sys/dev/re/if_re.c user/ed/newcons/sys/dev/safe/safe.c user/ed/newcons/sys/dev/siba/siba.c user/ed/newcons/sys/dev/siba/siba_ids.h user/ed/newcons/sys/dev/siba/siba_pcib.c user/ed/newcons/sys/dev/siba/sibareg.h user/ed/newcons/sys/dev/siba/sibavar.h user/ed/newcons/sys/dev/siis/siis.c user/ed/newcons/sys/dev/siis/siis.h user/ed/newcons/sys/dev/sound/pci/hda/hdac.c user/ed/newcons/sys/dev/sound/pci/hda/hdac_private.h user/ed/newcons/sys/dev/sound/pci/maestro3.c user/ed/newcons/sys/dev/sound/pcm/channel.c user/ed/newcons/sys/dev/sound/pcm/dsp.c user/ed/newcons/sys/dev/sound/pcm/mixer.c user/ed/newcons/sys/dev/sound/pcm/sndstat.c user/ed/newcons/sys/dev/sound/pcm/sndstat.h user/ed/newcons/sys/dev/sound/usb/uaudio.c user/ed/newcons/sys/dev/ste/if_ste.c user/ed/newcons/sys/dev/ste/if_stereg.h user/ed/newcons/sys/dev/syscons/syscons.c user/ed/newcons/sys/dev/syscons/sysmouse.c user/ed/newcons/sys/dev/tdfx/tdfx_pci.c user/ed/newcons/sys/dev/trm/trm.c user/ed/newcons/sys/dev/twa/tw_osl_cam.c user/ed/newcons/sys/dev/twe/twe.c user/ed/newcons/sys/dev/twe/twe_freebsd.c user/ed/newcons/sys/dev/twe/twevar.h user/ed/newcons/sys/dev/uart/uart_bus_acpi.c user/ed/newcons/sys/dev/uart/uart_bus_ebus.c user/ed/newcons/sys/dev/uart/uart_bus_pci.c user/ed/newcons/sys/dev/uart/uart_core.c user/ed/newcons/sys/dev/uart/uart_cpu_sparc64.c user/ed/newcons/sys/dev/uart/uart_tty.c user/ed/newcons/sys/dev/usb/controller/ehci.c user/ed/newcons/sys/dev/usb/controller/ehci_pci.c user/ed/newcons/sys/dev/usb/controller/musb_otg.c user/ed/newcons/sys/dev/usb/controller/ohci_pci.c user/ed/newcons/sys/dev/usb/controller/uhci.c user/ed/newcons/sys/dev/usb/controller/uhci_pci.c user/ed/newcons/sys/dev/usb/input/atp.c user/ed/newcons/sys/dev/usb/input/uhid.c user/ed/newcons/sys/dev/usb/net/if_aue.c user/ed/newcons/sys/dev/usb/net/if_axe.c user/ed/newcons/sys/dev/usb/net/if_cdce.c user/ed/newcons/sys/dev/usb/net/if_cue.c user/ed/newcons/sys/dev/usb/net/if_kue.c user/ed/newcons/sys/dev/usb/quirk/usb_quirk.c user/ed/newcons/sys/dev/usb/quirk/usb_quirk.h user/ed/newcons/sys/dev/usb/serial/u3g.c user/ed/newcons/sys/dev/usb/serial/uftdi.c user/ed/newcons/sys/dev/usb/serial/uipaq.c user/ed/newcons/sys/dev/usb/serial/umodem.c user/ed/newcons/sys/dev/usb/serial/uplcom.c user/ed/newcons/sys/dev/usb/serial/usb_serial.h user/ed/newcons/sys/dev/usb/serial/uslcom.c user/ed/newcons/sys/dev/usb/serial/uvisor.c user/ed/newcons/sys/dev/usb/storage/umass.c user/ed/newcons/sys/dev/usb/usb_device.c user/ed/newcons/sys/dev/usb/usb_dynamic.c user/ed/newcons/sys/dev/usb/usb_dynamic.h user/ed/newcons/sys/dev/usb/usb_msctest.c user/ed/newcons/sys/dev/usb/usb_msctest.h user/ed/newcons/sys/dev/usb/usbdevs user/ed/newcons/sys/dev/usb/usbdi.h user/ed/newcons/sys/dev/usb/wlan/if_rum.c user/ed/newcons/sys/dev/usb/wlan/if_uath.c user/ed/newcons/sys/dev/usb/wlan/if_ural.c user/ed/newcons/sys/dev/usb/wlan/if_urtw.c user/ed/newcons/sys/dev/usb/wlan/if_urtwvar.h user/ed/newcons/sys/dev/usb/wlan/if_zyd.c user/ed/newcons/sys/dev/vge/if_vge.c user/ed/newcons/sys/dev/vge/if_vgereg.h user/ed/newcons/sys/dev/vge/if_vgevar.h user/ed/newcons/sys/dev/wpi/if_wpi.c user/ed/newcons/sys/dev/xen/blkfront/blkfront.c user/ed/newcons/sys/dev/xen/blkfront/block.h user/ed/newcons/sys/dev/xen/netfront/netfront.c user/ed/newcons/sys/dev/xl/if_xl.c user/ed/newcons/sys/fs/cd9660/cd9660_vfsops.c user/ed/newcons/sys/fs/cd9660/cd9660_vnops.c user/ed/newcons/sys/fs/devfs/devfs_devs.c user/ed/newcons/sys/fs/devfs/devfs_vnops.c user/ed/newcons/sys/fs/nfs/nfs_commonacl.c user/ed/newcons/sys/fs/nfs/nfs_commonport.c user/ed/newcons/sys/fs/nfs/nfs_commonsubs.c user/ed/newcons/sys/fs/nfs/nfs_var.h user/ed/newcons/sys/fs/nfs/nfsport.h user/ed/newcons/sys/fs/nfsclient/nfs.h user/ed/newcons/sys/fs/nfsclient/nfs_clbio.c user/ed/newcons/sys/fs/nfsclient/nfs_clnfsiod.c user/ed/newcons/sys/fs/nfsclient/nfs_clrpcops.c user/ed/newcons/sys/fs/nfsclient/nfs_clstate.c user/ed/newcons/sys/fs/nfsclient/nfs_clsubs.c user/ed/newcons/sys/fs/nfsclient/nfs_clvfsops.c user/ed/newcons/sys/fs/nfsclient/nfs_clvnops.c user/ed/newcons/sys/fs/nfsclient/nfsmount.h user/ed/newcons/sys/fs/nfsclient/nfsnode.h user/ed/newcons/sys/fs/nfsserver/nfs_nfsdcache.c user/ed/newcons/sys/fs/nfsserver/nfs_nfsdport.c user/ed/newcons/sys/fs/nfsserver/nfs_nfsdserv.c user/ed/newcons/sys/fs/nfsserver/nfs_nfsdstate.c user/ed/newcons/sys/fs/ntfs/ntfs.h user/ed/newcons/sys/fs/ntfs/ntfs_subr.c user/ed/newcons/sys/fs/ntfs/ntfs_vfsops.c user/ed/newcons/sys/fs/nwfs/nwfs_node.c user/ed/newcons/sys/fs/nwfs/nwfs_vnops.c user/ed/newcons/sys/fs/portalfs/portal_vnops.c user/ed/newcons/sys/fs/procfs/procfs_status.c user/ed/newcons/sys/fs/pseudofs/pseudofs_vnops.c user/ed/newcons/sys/fs/smbfs/smbfs_smb.c user/ed/newcons/sys/fs/tmpfs/tmpfs.h user/ed/newcons/sys/fs/tmpfs/tmpfs_subr.c user/ed/newcons/sys/fs/tmpfs/tmpfs_vfsops.c user/ed/newcons/sys/geom/concat/g_concat.c user/ed/newcons/sys/geom/eli/g_eli_key.c user/ed/newcons/sys/geom/gate/g_gate.c user/ed/newcons/sys/geom/geom_dev.c user/ed/newcons/sys/geom/geom_dump.c user/ed/newcons/sys/geom/geom_io.c user/ed/newcons/sys/geom/geom_redboot.c user/ed/newcons/sys/geom/geom_slice.c user/ed/newcons/sys/geom/label/g_label.c user/ed/newcons/sys/geom/label/g_label.h user/ed/newcons/sys/geom/label/g_label_ext2fs.c user/ed/newcons/sys/geom/label/g_label_gpt.c user/ed/newcons/sys/geom/label/g_label_iso9660.c user/ed/newcons/sys/geom/label/g_label_msdosfs.c user/ed/newcons/sys/geom/label/g_label_ntfs.c user/ed/newcons/sys/geom/label/g_label_reiserfs.c user/ed/newcons/sys/geom/label/g_label_ufs.c user/ed/newcons/sys/geom/mirror/g_mirror.c user/ed/newcons/sys/geom/mirror/g_mirror.h user/ed/newcons/sys/geom/part/g_part.c user/ed/newcons/sys/geom/part/g_part.h user/ed/newcons/sys/geom/part/g_part_bsd.c user/ed/newcons/sys/geom/part/g_part_gpt.c user/ed/newcons/sys/geom/part/g_part_vtoc8.c user/ed/newcons/sys/geom/raid3/g_raid3.c user/ed/newcons/sys/geom/raid3/g_raid3.h user/ed/newcons/sys/geom/stripe/g_stripe.c user/ed/newcons/sys/geom/uzip/g_uzip.c user/ed/newcons/sys/geom/vinum/geom_vinum.c user/ed/newcons/sys/geom/vinum/geom_vinum_create.c user/ed/newcons/sys/geom/virstor/g_virstor.c user/ed/newcons/sys/gnu/fs/reiserfs/reiserfs_fs.h user/ed/newcons/sys/gnu/fs/reiserfs/reiserfs_vfsops.c user/ed/newcons/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c user/ed/newcons/sys/i386/conf/GENERIC user/ed/newcons/sys/i386/conf/Makefile user/ed/newcons/sys/i386/conf/NOTES user/ed/newcons/sys/i386/conf/PAE user/ed/newcons/sys/i386/i386/elan-mmcr.c user/ed/newcons/sys/i386/i386/i686_mem.c user/ed/newcons/sys/i386/i386/identcpu.c user/ed/newcons/sys/i386/i386/io.c user/ed/newcons/sys/i386/i386/local_apic.c user/ed/newcons/sys/i386/i386/locore.s user/ed/newcons/sys/i386/i386/machdep.c user/ed/newcons/sys/i386/i386/mca.c user/ed/newcons/sys/i386/i386/mem.c user/ed/newcons/sys/i386/i386/minidump_machdep.c user/ed/newcons/sys/i386/i386/msi.c user/ed/newcons/sys/i386/i386/pmap.c user/ed/newcons/sys/i386/i386/trap.c user/ed/newcons/sys/i386/ibcs2/ibcs2_misc.c user/ed/newcons/sys/i386/ibcs2/syscalls.master user/ed/newcons/sys/i386/include/apicvar.h user/ed/newcons/sys/i386/include/cpufunc.h user/ed/newcons/sys/i386/include/iodev.h user/ed/newcons/sys/i386/include/mca.h user/ed/newcons/sys/i386/include/pmap.h user/ed/newcons/sys/i386/include/specialreg.h user/ed/newcons/sys/i386/isa/clock.c user/ed/newcons/sys/i386/xbox/xboxfb.c user/ed/newcons/sys/i386/xen/exception.s user/ed/newcons/sys/i386/xen/locore.s user/ed/newcons/sys/i386/xen/mp_machdep.c user/ed/newcons/sys/i386/xen/pmap.c user/ed/newcons/sys/i386/xen/xen_machdep.c user/ed/newcons/sys/ia64/conf/DEFAULTS user/ed/newcons/sys/ia64/conf/GENERIC user/ed/newcons/sys/ia64/conf/Makefile user/ed/newcons/sys/ia64/ia64/clock.c user/ed/newcons/sys/ia64/ia64/efi.c user/ed/newcons/sys/ia64/ia64/exception.S user/ed/newcons/sys/ia64/ia64/genassym.c user/ed/newcons/sys/ia64/ia64/interrupt.c user/ed/newcons/sys/ia64/ia64/machdep.c user/ed/newcons/sys/ia64/ia64/mem.c user/ed/newcons/sys/ia64/ia64/mp_machdep.c user/ed/newcons/sys/ia64/ia64/nexus.c user/ed/newcons/sys/ia64/ia64/pmap.c user/ed/newcons/sys/ia64/ia64/sscdisk.c user/ed/newcons/sys/ia64/ia64/sys_machdep.c user/ed/newcons/sys/ia64/ia64/trap.c user/ed/newcons/sys/ia64/include/bus.h user/ed/newcons/sys/ia64/include/clock.h user/ed/newcons/sys/ia64/include/cpufunc.h user/ed/newcons/sys/ia64/include/efi.h user/ed/newcons/sys/ia64/include/ia64_cpu.h user/ed/newcons/sys/ia64/include/kdb.h user/ed/newcons/sys/ia64/include/mca.h user/ed/newcons/sys/ia64/include/md_var.h user/ed/newcons/sys/ia64/include/param.h user/ed/newcons/sys/ia64/include/pcpu.h user/ed/newcons/sys/ia64/include/pmap.h user/ed/newcons/sys/ia64/include/sysarch.h user/ed/newcons/sys/ia64/pci/pci_cfgreg.c user/ed/newcons/sys/isa/pnp.c user/ed/newcons/sys/isa/vga_isa.c user/ed/newcons/sys/kern/kern_clock.c user/ed/newcons/sys/kern/kern_conf.c user/ed/newcons/sys/kern/kern_cpu.c user/ed/newcons/sys/kern/kern_environment.c user/ed/newcons/sys/kern/kern_event.c user/ed/newcons/sys/kern/kern_exit.c user/ed/newcons/sys/kern/kern_fail.c user/ed/newcons/sys/kern/kern_intr.c user/ed/newcons/sys/kern/kern_jail.c user/ed/newcons/sys/kern/kern_kthread.c user/ed/newcons/sys/kern/kern_lock.c user/ed/newcons/sys/kern/kern_mib.c user/ed/newcons/sys/kern/kern_mutex.c user/ed/newcons/sys/kern/kern_proc.c user/ed/newcons/sys/kern/kern_prot.c user/ed/newcons/sys/kern/kern_rmlock.c user/ed/newcons/sys/kern/kern_shutdown.c user/ed/newcons/sys/kern/kern_sig.c user/ed/newcons/sys/kern/kern_sx.c user/ed/newcons/sys/kern/kern_timeout.c user/ed/newcons/sys/kern/kern_umtx.c user/ed/newcons/sys/kern/makesyscalls.sh user/ed/newcons/sys/kern/sched_4bsd.c user/ed/newcons/sys/kern/sched_ule.c user/ed/newcons/sys/kern/subr_acl_nfs4.c user/ed/newcons/sys/kern/subr_acl_posix1e.c user/ed/newcons/sys/kern/subr_bus.c user/ed/newcons/sys/kern/subr_devstat.c user/ed/newcons/sys/kern/subr_eventhandler.c user/ed/newcons/sys/kern/subr_firmware.c user/ed/newcons/sys/kern/subr_param.c user/ed/newcons/sys/kern/subr_sleepqueue.c user/ed/newcons/sys/kern/subr_turnstile.c user/ed/newcons/sys/kern/subr_witness.c user/ed/newcons/sys/kern/sys_process.c user/ed/newcons/sys/kern/syscalls.master user/ed/newcons/sys/kern/tty.c user/ed/newcons/sys/kern/tty_compat.c user/ed/newcons/sys/kern/tty_inq.c user/ed/newcons/sys/kern/tty_outq.c user/ed/newcons/sys/kern/tty_pts.c user/ed/newcons/sys/kern/uipc_accf.c user/ed/newcons/sys/kern/uipc_sem.c user/ed/newcons/sys/kern/uipc_syscalls.c user/ed/newcons/sys/kern/vfs_acl.c user/ed/newcons/sys/kern/vfs_lookup.c user/ed/newcons/sys/kern/vfs_mount.c user/ed/newcons/sys/kern/vfs_subr.c user/ed/newcons/sys/kern/vfs_syscalls.c user/ed/newcons/sys/kern/vfs_vnops.c user/ed/newcons/sys/mips/adm5120/adm5120_machdep.c (contents, props changed) user/ed/newcons/sys/mips/adm5120/files.adm5120 (contents, props changed) user/ed/newcons/sys/mips/adm5120/if_admsw.c (contents, props changed) user/ed/newcons/sys/mips/adm5120/obio.c (contents, props changed) user/ed/newcons/sys/mips/adm5120/uart_cpu_adm5120.c (contents, props changed) user/ed/newcons/sys/mips/conf/MALTA (contents, props changed) user/ed/newcons/sys/mips/conf/QEMU (contents, props changed) user/ed/newcons/sys/mips/conf/SENTRY5 (contents, props changed) user/ed/newcons/sys/mips/idt/files.idt (contents, props changed) user/ed/newcons/sys/mips/idt/idt_machdep.c (contents, props changed) user/ed/newcons/sys/mips/idt/obio.c (contents, props changed) user/ed/newcons/sys/mips/idt/uart_bus_rc32434.c (contents, props changed) user/ed/newcons/sys/mips/idt/uart_cpu_rc32434.c (contents, props changed) user/ed/newcons/sys/mips/include/_align.h (contents, props changed) user/ed/newcons/sys/mips/include/_bus.h (contents, props changed) user/ed/newcons/sys/mips/include/_types.h (contents, props changed) user/ed/newcons/sys/mips/include/asm.h (contents, props changed) user/ed/newcons/sys/mips/include/atomic.h (contents, props changed) user/ed/newcons/sys/mips/include/bus.h (contents, props changed) user/ed/newcons/sys/mips/include/cache.h (contents, props changed) user/ed/newcons/sys/mips/include/cache_mipsNN.h (contents, props changed) user/ed/newcons/sys/mips/include/cpu.h (contents, props changed) user/ed/newcons/sys/mips/include/cpufunc.h (contents, props changed) user/ed/newcons/sys/mips/include/cpuinfo.h (contents, props changed) user/ed/newcons/sys/mips/include/cpuregs.h (contents, props changed) user/ed/newcons/sys/mips/include/db_machdep.h (contents, props changed) user/ed/newcons/sys/mips/include/elf.h (contents, props changed) user/ed/newcons/sys/mips/include/endian.h (contents, props changed) user/ed/newcons/sys/mips/include/float.h (contents, props changed) user/ed/newcons/sys/mips/include/hwfunc.h (contents, props changed) user/ed/newcons/sys/mips/include/intr_machdep.h (contents, props changed) user/ed/newcons/sys/mips/include/kdb.h (contents, props changed) user/ed/newcons/sys/mips/include/locore.h (contents, props changed) user/ed/newcons/sys/mips/include/md_var.h (contents, props changed) user/ed/newcons/sys/mips/include/param.h (contents, props changed) user/ed/newcons/sys/mips/include/pcb.h (contents, props changed) user/ed/newcons/sys/mips/include/pcpu.h (contents, props changed) user/ed/newcons/sys/mips/include/pmap.h (contents, props changed) user/ed/newcons/sys/mips/include/proc.h (contents, props changed) user/ed/newcons/sys/mips/include/profile.h (contents, props changed) user/ed/newcons/sys/mips/include/psl.h (contents, props changed) user/ed/newcons/sys/mips/include/pte.h (contents, props changed) user/ed/newcons/sys/mips/include/regdef.h (contents, props changed) user/ed/newcons/sys/mips/include/regnum.h (contents, props changed) user/ed/newcons/sys/mips/include/sysarch.h (contents, props changed) user/ed/newcons/sys/mips/include/trap.h (contents, props changed) user/ed/newcons/sys/mips/include/ucontext.h (contents, props changed) user/ed/newcons/sys/mips/malta/files.malta (contents, props changed) user/ed/newcons/sys/mips/malta/gt_pci.c (contents, props changed) user/ed/newcons/sys/mips/malta/malta_machdep.c (contents, props changed) user/ed/newcons/sys/mips/malta/maltareg.h (contents, props changed) user/ed/newcons/sys/mips/malta/obio.c (contents, props changed) user/ed/newcons/sys/mips/malta/std.malta (contents, props changed) user/ed/newcons/sys/mips/malta/uart_bus_maltausart.c (contents, props changed) user/ed/newcons/sys/mips/malta/uart_cpu_maltausart.c (contents, props changed) user/ed/newcons/sys/mips/malta/yamon.h (contents, props changed) user/ed/newcons/sys/mips/mips/busdma_machdep.c (contents, props changed) user/ed/newcons/sys/mips/mips/cache.c (contents, props changed) user/ed/newcons/sys/mips/mips/cache_mipsNN.c (contents, props changed) user/ed/newcons/sys/mips/mips/copystr.S (contents, props changed) user/ed/newcons/sys/mips/mips/cpu.c (contents, props changed) user/ed/newcons/sys/mips/mips/db_trace.c (contents, props changed) user/ed/newcons/sys/mips/mips/elf_machdep.c (contents, props changed) user/ed/newcons/sys/mips/mips/exception.S (contents, props changed) user/ed/newcons/sys/mips/mips/fp.S (contents, props changed) user/ed/newcons/sys/mips/mips/gdb_machdep.c (contents, props changed) user/ed/newcons/sys/mips/mips/genassym.c (contents, props changed) user/ed/newcons/sys/mips/mips/in_cksum.c (contents, props changed) user/ed/newcons/sys/mips/mips/intr_machdep.c (contents, props changed) user/ed/newcons/sys/mips/mips/locore.S (contents, props changed) user/ed/newcons/sys/mips/mips/machdep.c (contents, props changed) user/ed/newcons/sys/mips/mips/mainbus.c (contents, props changed) user/ed/newcons/sys/mips/mips/mem.c (contents, props changed) user/ed/newcons/sys/mips/mips/nexus.c (contents, props changed) user/ed/newcons/sys/mips/mips/pm_machdep.c (contents, props changed) user/ed/newcons/sys/mips/mips/pmap.c (contents, props changed) user/ed/newcons/sys/mips/mips/psraccess.S (contents, props changed) user/ed/newcons/sys/mips/mips/support.S (contents, props changed) user/ed/newcons/sys/mips/mips/swtch.S (contents, props changed) user/ed/newcons/sys/mips/mips/tick.c (contents, props changed) user/ed/newcons/sys/mips/mips/tlb.S (contents, props changed) user/ed/newcons/sys/mips/mips/trap.c (contents, props changed) user/ed/newcons/sys/mips/mips/vm_machdep.c (contents, props changed) user/ed/newcons/sys/mips/sentry5/files.sentry5 (contents, props changed) user/ed/newcons/sys/mips/sentry5/obio.c (contents, props changed) user/ed/newcons/sys/mips/sentry5/s5_machdep.c (contents, props changed) user/ed/newcons/sys/mips/sentry5/uart_bus_sbusart.c (contents, props changed) user/ed/newcons/sys/mips/sentry5/uart_cpu_sbusart.c (contents, props changed) user/ed/newcons/sys/modules/Makefile user/ed/newcons/sys/modules/ath/Makefile user/ed/newcons/sys/modules/crypto/Makefile user/ed/newcons/sys/modules/drm/Makefile user/ed/newcons/sys/modules/drm/drm/Makefile user/ed/newcons/sys/modules/ext2fs/Makefile user/ed/newcons/sys/modules/geom/Makefile user/ed/newcons/sys/modules/ipfw/Makefile user/ed/newcons/sys/modules/iwnfw/Makefile user/ed/newcons/sys/modules/iwnfw/iwn4965/Makefile user/ed/newcons/sys/modules/iwnfw/iwn5000/Makefile user/ed/newcons/sys/modules/usb/Makefile user/ed/newcons/sys/net/flowtable.c user/ed/newcons/sys/net/if.c user/ed/newcons/sys/net/if.h user/ed/newcons/sys/net/if_bridge.c user/ed/newcons/sys/net/if_dead.c user/ed/newcons/sys/net/if_epair.c user/ed/newcons/sys/net/if_ethersubr.c user/ed/newcons/sys/net/if_lagg.c user/ed/newcons/sys/net/if_lagg.h user/ed/newcons/sys/net/if_llatbl.c user/ed/newcons/sys/net/if_llatbl.h user/ed/newcons/sys/net/if_var.h user/ed/newcons/sys/net/if_vlan.c user/ed/newcons/sys/net/netisr.c user/ed/newcons/sys/net/radix.c user/ed/newcons/sys/net/radix.h user/ed/newcons/sys/net/route.c user/ed/newcons/sys/net/route.h user/ed/newcons/sys/net/rtsock.c user/ed/newcons/sys/net/vnet.c user/ed/newcons/sys/net/vnet.h user/ed/newcons/sys/net80211/ieee80211.c user/ed/newcons/sys/net80211/ieee80211_adhoc.c user/ed/newcons/sys/net80211/ieee80211_crypto_tkip.c user/ed/newcons/sys/net80211/ieee80211_freebsd.c user/ed/newcons/sys/net80211/ieee80211_hostap.c user/ed/newcons/sys/net80211/ieee80211_ioctl.c user/ed/newcons/sys/net80211/ieee80211_mesh.c user/ed/newcons/sys/net80211/ieee80211_mesh.h user/ed/newcons/sys/net80211/ieee80211_node.c user/ed/newcons/sys/net80211/ieee80211_sta.c user/ed/newcons/sys/net80211/ieee80211_var.h user/ed/newcons/sys/net80211/ieee80211_wds.c user/ed/newcons/sys/netgraph/atm/uni/ng_uni.c user/ed/newcons/sys/netgraph/ng_base.c user/ed/newcons/sys/netgraph/ng_bridge.c user/ed/newcons/sys/netgraph/ng_eiface.c user/ed/newcons/sys/netgraph/ng_ether.c user/ed/newcons/sys/netgraph/ng_fec.c user/ed/newcons/sys/netgraph/ng_ipfw.c user/ed/newcons/sys/netgraph/ng_ipfw.h user/ed/newcons/sys/netinet/if_ether.c user/ed/newcons/sys/netinet/in.c user/ed/newcons/sys/netinet/in.h user/ed/newcons/sys/netinet/in_pcb.c user/ed/newcons/sys/netinet/ip.h user/ed/newcons/sys/netinet/ip_carp.c user/ed/newcons/sys/netinet/ip_divert.c user/ed/newcons/sys/netinet/ip_divert.h user/ed/newcons/sys/netinet/ip_dummynet.h user/ed/newcons/sys/netinet/ip_encap.c user/ed/newcons/sys/netinet/ip_fw.h user/ed/newcons/sys/netinet/ip_mroute.c user/ed/newcons/sys/netinet/ip_output.c user/ed/newcons/sys/netinet/ip_var.h user/ed/newcons/sys/netinet/ipfw/ip_dummynet.c user/ed/newcons/sys/netinet/ipfw/ip_fw2.c user/ed/newcons/sys/netinet/ipfw/ip_fw_nat.c user/ed/newcons/sys/netinet/ipfw/ip_fw_pfil.c user/ed/newcons/sys/netinet/libalias/alias_db.c user/ed/newcons/sys/netinet/libalias/alias_mod.c user/ed/newcons/sys/netinet/raw_ip.c user/ed/newcons/sys/netinet/sctp_asconf.c user/ed/newcons/sys/netinet/sctp_auth.c user/ed/newcons/sys/netinet/sctp_auth.h user/ed/newcons/sys/netinet/sctp_constants.h user/ed/newcons/sys/netinet/sctp_header.h user/ed/newcons/sys/netinet/sctp_indata.c user/ed/newcons/sys/netinet/sctp_indata.h user/ed/newcons/sys/netinet/sctp_input.c user/ed/newcons/sys/netinet/sctp_os_bsd.h user/ed/newcons/sys/netinet/sctp_output.c user/ed/newcons/sys/netinet/sctp_pcb.c user/ed/newcons/sys/netinet/sctp_structs.h user/ed/newcons/sys/netinet/sctp_sysctl.c user/ed/newcons/sys/netinet/sctp_uio.h user/ed/newcons/sys/netinet/sctp_usrreq.c user/ed/newcons/sys/netinet/sctputil.c user/ed/newcons/sys/netinet/tcp.h user/ed/newcons/sys/netinet/tcp_usrreq.c user/ed/newcons/sys/netinet/tcp_var.h user/ed/newcons/sys/netinet6/icmp6.c user/ed/newcons/sys/netinet6/in6.c user/ed/newcons/sys/netinet6/in6_pcb.c user/ed/newcons/sys/netinet6/in6_proto.c user/ed/newcons/sys/netinet6/in6_src.c user/ed/newcons/sys/netinet6/ip6_input.c user/ed/newcons/sys/netinet6/mld6.c user/ed/newcons/sys/netinet6/mld6_var.h user/ed/newcons/sys/netinet6/nd6.c user/ed/newcons/sys/netinet6/nd6_rtr.c user/ed/newcons/sys/netinet6/raw_ip6.c user/ed/newcons/sys/netipsec/ipcomp_var.h user/ed/newcons/sys/netipsec/ipsec_mbuf.c user/ed/newcons/sys/netipsec/xform_ipcomp.c user/ed/newcons/sys/nfsclient/bootp_subr.c user/ed/newcons/sys/nfsclient/krpc_subr.c user/ed/newcons/sys/nfsclient/nfs.h user/ed/newcons/sys/nfsclient/nfs_bio.c user/ed/newcons/sys/nfsclient/nfs_nfsiod.c user/ed/newcons/sys/nfsclient/nfs_subs.c user/ed/newcons/sys/nfsclient/nfs_vfsops.c user/ed/newcons/sys/nfsclient/nfs_vnops.c user/ed/newcons/sys/nfsclient/nfsmount.h user/ed/newcons/sys/nfsclient/nfsnode.h user/ed/newcons/sys/nfsserver/nfs.h user/ed/newcons/sys/nfsserver/nfs_fha.c user/ed/newcons/sys/nfsserver/nfs_serv.c user/ed/newcons/sys/nfsserver/nfs_srvkrpc.c user/ed/newcons/sys/opencrypto/crypto.c user/ed/newcons/sys/opencrypto/cryptosoft.c user/ed/newcons/sys/opencrypto/deflate.c user/ed/newcons/sys/opencrypto/deflate.h user/ed/newcons/sys/pc98/cbus/clock.c user/ed/newcons/sys/pc98/cbus/gdc.c user/ed/newcons/sys/pc98/conf/DEFAULTS user/ed/newcons/sys/pc98/conf/GENERIC user/ed/newcons/sys/pc98/conf/Makefile user/ed/newcons/sys/pc98/conf/NOTES user/ed/newcons/sys/pci/if_rlreg.h user/ed/newcons/sys/pci/ncr.c user/ed/newcons/sys/pci/nfsmb.c user/ed/newcons/sys/powerpc/aim/machdep.c user/ed/newcons/sys/powerpc/aim/mmu_oea.c user/ed/newcons/sys/powerpc/aim/mmu_oea64.c user/ed/newcons/sys/powerpc/aim/ofw_machdep.c user/ed/newcons/sys/powerpc/aim/trap.c user/ed/newcons/sys/powerpc/booke/clock.c user/ed/newcons/sys/powerpc/booke/machdep.c user/ed/newcons/sys/powerpc/booke/pmap.c user/ed/newcons/sys/powerpc/booke/trap.c user/ed/newcons/sys/powerpc/conf/GENERIC user/ed/newcons/sys/powerpc/conf/Makefile user/ed/newcons/sys/powerpc/include/cpu.h user/ed/newcons/sys/powerpc/include/md_var.h user/ed/newcons/sys/powerpc/include/vmparam.h user/ed/newcons/sys/powerpc/mpc85xx/pci_ocp.c user/ed/newcons/sys/powerpc/ofw/ofw_syscons.c user/ed/newcons/sys/powerpc/powermac/ata_dbdma.c user/ed/newcons/sys/powerpc/powermac/ata_kauai.c user/ed/newcons/sys/powerpc/powermac/ata_macio.c user/ed/newcons/sys/powerpc/powerpc/cpu.c user/ed/newcons/sys/powerpc/powerpc/mem.c user/ed/newcons/sys/powerpc/psim/ata_iobus.c user/ed/newcons/sys/rpc/authunix_prot.c user/ed/newcons/sys/rpc/clnt_dg.c user/ed/newcons/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c user/ed/newcons/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c user/ed/newcons/sys/security/audit/audit_arg.c user/ed/newcons/sys/security/audit/audit_bsm.c user/ed/newcons/sys/security/mac_lomac/mac_lomac.c user/ed/newcons/sys/sparc64/central/central.c user/ed/newcons/sys/sparc64/conf/GENERIC user/ed/newcons/sys/sparc64/conf/Makefile user/ed/newcons/sys/sparc64/conf/NOTES user/ed/newcons/sys/sparc64/ebus/ebus.c user/ed/newcons/sys/sparc64/fhc/fhc.c user/ed/newcons/sys/sparc64/include/bus_common.h user/ed/newcons/sys/sparc64/include/intr_machdep.h user/ed/newcons/sys/sparc64/include/iommureg.h user/ed/newcons/sys/sparc64/include/iommuvar.h user/ed/newcons/sys/sparc64/isa/ofw_isa.c user/ed/newcons/sys/sparc64/pci/apb.c user/ed/newcons/sys/sparc64/pci/ofw_pci.h user/ed/newcons/sys/sparc64/pci/ofw_pcib.c user/ed/newcons/sys/sparc64/pci/ofw_pcibus.c user/ed/newcons/sys/sparc64/pci/psycho.c user/ed/newcons/sys/sparc64/pci/psychovar.h user/ed/newcons/sys/sparc64/pci/schizo.c user/ed/newcons/sys/sparc64/pci/schizovar.h user/ed/newcons/sys/sparc64/sbus/dma_sbus.c user/ed/newcons/sys/sparc64/sbus/sbus.c user/ed/newcons/sys/sparc64/sparc64/eeprom.c user/ed/newcons/sys/sparc64/sparc64/genassym.c user/ed/newcons/sys/sparc64/sparc64/identcpu.c user/ed/newcons/sys/sparc64/sparc64/interrupt.S user/ed/newcons/sys/sparc64/sparc64/intr_machdep.c user/ed/newcons/sys/sparc64/sparc64/iommu.c user/ed/newcons/sys/sparc64/sparc64/machdep.c user/ed/newcons/sys/sparc64/sparc64/nexus.c user/ed/newcons/sys/sparc64/sparc64/ofw_machdep.c user/ed/newcons/sys/sparc64/sparc64/rtc.c user/ed/newcons/sys/sparc64/sparc64/stack_machdep.c user/ed/newcons/sys/sparc64/sparc64/swtch.S user/ed/newcons/sys/sparc64/sparc64/trap.c user/ed/newcons/sys/sparc64/sparc64/upa.c user/ed/newcons/sys/sun4v/conf/GENERIC user/ed/newcons/sys/sun4v/conf/Makefile user/ed/newcons/sys/sun4v/conf/NOTES user/ed/newcons/sys/sun4v/include/bus.h user/ed/newcons/sys/sun4v/sun4v/bus_machdep.c user/ed/newcons/sys/sun4v/sun4v/stack_machdep.c user/ed/newcons/sys/sun4v/sun4v/trap.c user/ed/newcons/sys/sys/_lockmgr.h user/ed/newcons/sys/sys/_semaphore.h user/ed/newcons/sys/sys/acl.h user/ed/newcons/sys/sys/apm.h user/ed/newcons/sys/sys/ata.h user/ed/newcons/sys/sys/bio.h user/ed/newcons/sys/sys/bus.h user/ed/newcons/sys/sys/cdefs.h user/ed/newcons/sys/sys/conf.h user/ed/newcons/sys/sys/copyright.h user/ed/newcons/sys/sys/disk.h user/ed/newcons/sys/sys/event.h user/ed/newcons/sys/sys/file.h user/ed/newcons/sys/sys/gpt.h user/ed/newcons/sys/sys/jail.h user/ed/newcons/sys/sys/kthread.h user/ed/newcons/sys/sys/mount.h user/ed/newcons/sys/sys/param.h user/ed/newcons/sys/sys/pmc.h user/ed/newcons/sys/sys/priv.h user/ed/newcons/sys/sys/proc.h user/ed/newcons/sys/sys/sdt.h user/ed/newcons/sys/sys/signalvar.h user/ed/newcons/sys/sys/sleepqueue.h user/ed/newcons/sys/sys/socket.h user/ed/newcons/sys/sys/sockio.h user/ed/newcons/sys/sys/syscallsubr.h user/ed/newcons/sys/sys/systm.h user/ed/newcons/sys/sys/termios.h user/ed/newcons/sys/sys/tty.h user/ed/newcons/sys/sys/ttydevsw.h user/ed/newcons/sys/sys/umtx.h user/ed/newcons/sys/sys/vnode.h user/ed/newcons/sys/teken/teken_scs.h user/ed/newcons/sys/ufs/ffs/ffs_alloc.c user/ed/newcons/sys/ufs/ffs/ffs_rawread.c user/ed/newcons/sys/ufs/ffs/ffs_snapshot.c user/ed/newcons/sys/ufs/ffs/ffs_vfsops.c user/ed/newcons/sys/ufs/ffs/fs.h user/ed/newcons/sys/ufs/ufs/acl.h user/ed/newcons/sys/ufs/ufs/ufs_acl.c user/ed/newcons/sys/ufs/ufs/ufs_dirhash.c user/ed/newcons/sys/ufs/ufs/ufs_lookup.c user/ed/newcons/sys/ufs/ufs/ufs_vnops.c user/ed/newcons/sys/vm/device_pager.c user/ed/newcons/sys/vm/uma_core.c user/ed/newcons/sys/vm/uma_int.h user/ed/newcons/sys/vm/vm_fault.c user/ed/newcons/sys/vm/vm_map.c user/ed/newcons/sys/vm/vm_map.h user/ed/newcons/sys/vm/vm_object.c user/ed/newcons/sys/vm/vm_object.h user/ed/newcons/sys/vm/vm_pageout.c user/ed/newcons/sys/vm/vnode_pager.c user/ed/newcons/sys/xen/gnttab.c user/ed/newcons/sys/xen/xenbus/xenbus_probe.c user/ed/newcons/tools/build/mk/OptionalObsoleteFiles.inc user/ed/newcons/tools/make_libdeps.sh user/ed/newcons/tools/regression/acct/Makefile user/ed/newcons/tools/regression/acct/regress.t (contents, props changed) user/ed/newcons/tools/regression/acltools/tools-crossfs.test user/ed/newcons/tools/regression/bin/date/regress.sh user/ed/newcons/tools/regression/bin/mv/regress.sh user/ed/newcons/tools/regression/bin/sh/builtins/fc1.0 user/ed/newcons/tools/regression/bin/sh/errors/backquote-error1.0 user/ed/newcons/tools/regression/bin/sh/parser/for1.0 user/ed/newcons/tools/regression/environ/Makefile.envctl user/ed/newcons/tools/regression/environ/envctl.c user/ed/newcons/tools/regression/environ/envtest.t user/ed/newcons/tools/regression/fifo/fifo_misc/fifo_misc.c user/ed/newcons/tools/regression/geom/ConfCmp/ConfCmp.c user/ed/newcons/tools/regression/usr.bin/Makefile user/ed/newcons/tools/regression/usr.bin/calendar/regress.sh user/ed/newcons/tools/regression/usr.bin/jot/regress.sh user/ed/newcons/tools/regression/usr.bin/lastcomm/values.sh user/ed/newcons/tools/regression/usr.bin/make/common.sh user/ed/newcons/tools/regression/usr.bin/pkill/pgrep-t.t user/ed/newcons/tools/regression/usr.bin/pkill/pkill-t.t user/ed/newcons/tools/regression/usr.bin/sed/multitest.t user/ed/newcons/tools/tools/README user/ed/newcons/tools/tools/ath/athdecode/main.c user/ed/newcons/tools/tools/sysbuild/sysbuild.sh user/ed/newcons/usr.bin/Makefile user/ed/newcons/usr.bin/Makefile.inc user/ed/newcons/usr.bin/apply/Makefile user/ed/newcons/usr.bin/ar/Makefile user/ed/newcons/usr.bin/ar/acpyacc.y user/ed/newcons/usr.bin/ar/ar.c user/ed/newcons/usr.bin/ar/read.c user/ed/newcons/usr.bin/at/Makefile user/ed/newcons/usr.bin/at/at.c user/ed/newcons/usr.bin/at/at.man user/ed/newcons/usr.bin/atm/sscop/Makefile user/ed/newcons/usr.bin/awk/Makefile user/ed/newcons/usr.bin/banner/banner.c user/ed/newcons/usr.bin/biff/biff.c user/ed/newcons/usr.bin/bluetooth/bthost/Makefile user/ed/newcons/usr.bin/brandelf/brandelf.1 user/ed/newcons/usr.bin/bsdiff/Makefile.inc user/ed/newcons/usr.bin/bzip2/Makefile user/ed/newcons/usr.bin/calendar/Makefile user/ed/newcons/usr.bin/calendar/calendar.c user/ed/newcons/usr.bin/calendar/calendars/calendar.all user/ed/newcons/usr.bin/calendar/calendars/calendar.dutch user/ed/newcons/usr.bin/calendar/calendars/calendar.freebsd user/ed/newcons/usr.bin/calendar/day.c user/ed/newcons/usr.bin/calendar/io.c user/ed/newcons/usr.bin/calendar/ostern.c user/ed/newcons/usr.bin/calendar/paskha.c user/ed/newcons/usr.bin/catman/Makefile user/ed/newcons/usr.bin/catman/catman.c user/ed/newcons/usr.bin/chkey/Makefile user/ed/newcons/usr.bin/chpass/Makefile user/ed/newcons/usr.bin/chpass/chpass.1 user/ed/newcons/usr.bin/colldef/Makefile user/ed/newcons/usr.bin/comm/comm.1 user/ed/newcons/usr.bin/comm/comm.c user/ed/newcons/usr.bin/compile_et/Makefile user/ed/newcons/usr.bin/compress/Makefile user/ed/newcons/usr.bin/cpio/Makefile user/ed/newcons/usr.bin/cpio/cmdline.c user/ed/newcons/usr.bin/cpio/cpio.c user/ed/newcons/usr.bin/cpio/cpio.h user/ed/newcons/usr.bin/cpio/test/Makefile user/ed/newcons/usr.bin/cpuset/Makefile user/ed/newcons/usr.bin/csup/Makefile user/ed/newcons/usr.bin/ctags/ctags.c user/ed/newcons/usr.bin/ctags/fortran.c user/ed/newcons/usr.bin/dig/Makefile user/ed/newcons/usr.bin/du/Makefile user/ed/newcons/usr.bin/elf2aout/Makefile user/ed/newcons/usr.bin/elfdump/Makefile user/ed/newcons/usr.bin/elfdump/elfdump.1 user/ed/newcons/usr.bin/env/Makefile user/ed/newcons/usr.bin/fetch/Makefile user/ed/newcons/usr.bin/fetch/fetch.c user/ed/newcons/usr.bin/file2c/Makefile user/ed/newcons/usr.bin/find/Makefile user/ed/newcons/usr.bin/find/function.c user/ed/newcons/usr.bin/finger/Makefile user/ed/newcons/usr.bin/finger/extern.h user/ed/newcons/usr.bin/finger/finger.1 user/ed/newcons/usr.bin/finger/finger.c user/ed/newcons/usr.bin/finger/finger.h user/ed/newcons/usr.bin/finger/lprint.c user/ed/newcons/usr.bin/finger/net.c user/ed/newcons/usr.bin/finger/sprint.c user/ed/newcons/usr.bin/finger/util.c user/ed/newcons/usr.bin/fstat/Makefile user/ed/newcons/usr.bin/fsync/Makefile user/ed/newcons/usr.bin/ftp/Makefile user/ed/newcons/usr.bin/gcore/Makefile user/ed/newcons/usr.bin/gcore/extern.h user/ed/newcons/usr.bin/gcore/gcore.c user/ed/newcons/usr.bin/gencat/Makefile user/ed/newcons/usr.bin/gencat/gencat.c user/ed/newcons/usr.bin/getent/Makefile user/ed/newcons/usr.bin/getent/getent.1 user/ed/newcons/usr.bin/getent/getent.c user/ed/newcons/usr.bin/gprof/Makefile user/ed/newcons/usr.bin/gprof/aout.c user/ed/newcons/usr.bin/gzip/Makefile user/ed/newcons/usr.bin/head/Makefile user/ed/newcons/usr.bin/hexdump/Makefile user/ed/newcons/usr.bin/host/Makefile user/ed/newcons/usr.bin/id/Makefile user/ed/newcons/usr.bin/ipcrm/Makefile user/ed/newcons/usr.bin/ipcs/Makefile user/ed/newcons/usr.bin/kdump/Makefile user/ed/newcons/usr.bin/kdump/kdump.c user/ed/newcons/usr.bin/keylogin/Makefile user/ed/newcons/usr.bin/killall/killall.1 user/ed/newcons/usr.bin/ktrace/Makefile user/ed/newcons/usr.bin/ktrdump/Makefile user/ed/newcons/usr.bin/lam/lam.c user/ed/newcons/usr.bin/last/Makefile user/ed/newcons/usr.bin/last/last.1 user/ed/newcons/usr.bin/last/last.c user/ed/newcons/usr.bin/lastcomm/Makefile user/ed/newcons/usr.bin/lastcomm/lastcomm.c user/ed/newcons/usr.bin/lastcomm/pathnames.h user/ed/newcons/usr.bin/ldd/Makefile user/ed/newcons/usr.bin/ldd/ldd.1 user/ed/newcons/usr.bin/leave/Makefile user/ed/newcons/usr.bin/less/Makefile.common user/ed/newcons/usr.bin/lex/Makefile user/ed/newcons/usr.bin/lex/flex.skl user/ed/newcons/usr.bin/lex/initscan.c user/ed/newcons/usr.bin/lex/lib/Makefile user/ed/newcons/usr.bin/limits/Makefile user/ed/newcons/usr.bin/locale/Makefile user/ed/newcons/usr.bin/locate/Makefile.inc user/ed/newcons/usr.bin/locate/locate/Makefile user/ed/newcons/usr.bin/lock/Makefile user/ed/newcons/usr.bin/logger/Makefile user/ed/newcons/usr.bin/login/Makefile user/ed/newcons/usr.bin/login/login.c user/ed/newcons/usr.bin/login/login_fbtab.c user/ed/newcons/usr.bin/logins/Makefile user/ed/newcons/usr.bin/logname/Makefile user/ed/newcons/usr.bin/look/Makefile user/ed/newcons/usr.bin/lsvfs/Makefile user/ed/newcons/usr.bin/m4/Makefile user/ed/newcons/usr.bin/mail/Makefile user/ed/newcons/usr.bin/make/Makefile user/ed/newcons/usr.bin/make/dir.c user/ed/newcons/usr.bin/make/dir.h user/ed/newcons/usr.bin/make/for.c user/ed/newcons/usr.bin/make/globals.h user/ed/newcons/usr.bin/make/job.c user/ed/newcons/usr.bin/make/lst.c user/ed/newcons/usr.bin/make/lst.h user/ed/newcons/usr.bin/make/main.c user/ed/newcons/usr.bin/make/make.1 user/ed/newcons/usr.bin/make/make.c user/ed/newcons/usr.bin/make/parse.c user/ed/newcons/usr.bin/make/proc.c user/ed/newcons/usr.bin/make/str.c user/ed/newcons/usr.bin/make/targ.c user/ed/newcons/usr.bin/make/var.c user/ed/newcons/usr.bin/makewhatis/makewhatis.c user/ed/newcons/usr.bin/minigzip/Makefile user/ed/newcons/usr.bin/mkfifo/Makefile user/ed/newcons/usr.bin/mklocale/Makefile user/ed/newcons/usr.bin/mklocale/lex.l user/ed/newcons/usr.bin/mklocale/yacc.y user/ed/newcons/usr.bin/mkstr/Makefile user/ed/newcons/usr.bin/mktemp/mktemp.c user/ed/newcons/usr.bin/mkuzip/Makefile user/ed/newcons/usr.bin/msgs/Makefile user/ed/newcons/usr.bin/nc/Makefile user/ed/newcons/usr.bin/ncplist/Makefile user/ed/newcons/usr.bin/ncplist/ncplist.1 user/ed/newcons/usr.bin/netstat/if.c user/ed/newcons/usr.bin/netstat/ipsec.c user/ed/newcons/usr.bin/netstat/main.c user/ed/newcons/usr.bin/netstat/netstat.1 user/ed/newcons/usr.bin/netstat/netstat.h user/ed/newcons/usr.bin/newkey/Makefile user/ed/newcons/usr.bin/nfsstat/Makefile user/ed/newcons/usr.bin/nl/Makefile user/ed/newcons/usr.bin/nohup/Makefile user/ed/newcons/usr.bin/nslookup/Makefile user/ed/newcons/usr.bin/nsupdate/Makefile user/ed/newcons/usr.bin/opieinfo/Makefile user/ed/newcons/usr.bin/opiekey/Makefile user/ed/newcons/usr.bin/opiepasswd/Makefile user/ed/newcons/usr.bin/passwd/Makefile user/ed/newcons/usr.bin/passwd/passwd.c user/ed/newcons/usr.bin/pr/Makefile user/ed/newcons/usr.bin/pr/egetopt.c user/ed/newcons/usr.bin/printf/Makefile user/ed/newcons/usr.bin/procstat/Makefile user/ed/newcons/usr.bin/procstat/procstat.1 user/ed/newcons/usr.bin/renice/renice.c user/ed/newcons/usr.bin/revoke/Makefile user/ed/newcons/usr.bin/rlogin/Makefile user/ed/newcons/usr.bin/rpcgen/Makefile user/ed/newcons/usr.bin/rpcgen/rpc_hout.c user/ed/newcons/usr.bin/rpcgen/rpc_main.c user/ed/newcons/usr.bin/rpcinfo/Makefile user/ed/newcons/usr.bin/rsh/Makefile user/ed/newcons/usr.bin/rup/Makefile user/ed/newcons/usr.bin/ruptime/Makefile user/ed/newcons/usr.bin/rusers/Makefile user/ed/newcons/usr.bin/rwho/Makefile user/ed/newcons/usr.bin/rwho/rwho.c user/ed/newcons/usr.bin/script/script.c user/ed/newcons/usr.bin/sed/Makefile user/ed/newcons/usr.bin/showmount/showmount.c user/ed/newcons/usr.bin/smbutil/Makefile user/ed/newcons/usr.bin/sockstat/Makefile user/ed/newcons/usr.bin/sockstat/sockstat.1 user/ed/newcons/usr.bin/sockstat/sockstat.c user/ed/newcons/usr.bin/su/Makefile user/ed/newcons/usr.bin/systat/Makefile user/ed/newcons/usr.bin/systat/vmstat.c user/ed/newcons/usr.bin/tail/Makefile user/ed/newcons/usr.bin/tail/misc.c user/ed/newcons/usr.bin/talk/ctl_transact.c user/ed/newcons/usr.bin/talk/display.c user/ed/newcons/usr.bin/talk/get_addrs.c user/ed/newcons/usr.bin/talk/get_iface.c user/ed/newcons/usr.bin/talk/get_names.c user/ed/newcons/usr.bin/talk/invite.c user/ed/newcons/usr.bin/talk/look_up.c user/ed/newcons/usr.bin/talk/talk.1 user/ed/newcons/usr.bin/talk/talk.c user/ed/newcons/usr.bin/talk/talk.h user/ed/newcons/usr.bin/tar/Makefile user/ed/newcons/usr.bin/tar/bsdtar.c user/ed/newcons/usr.bin/tar/bsdtar.h user/ed/newcons/usr.bin/tar/bsdtar_platform.h user/ed/newcons/usr.bin/tar/cmdline.c user/ed/newcons/usr.bin/tar/config_freebsd.h user/ed/newcons/usr.bin/tar/getdate.c user/ed/newcons/usr.bin/tar/matching.c user/ed/newcons/usr.bin/tar/read.c user/ed/newcons/usr.bin/tar/subst.c user/ed/newcons/usr.bin/tar/test/Makefile user/ed/newcons/usr.bin/tar/util.c user/ed/newcons/usr.bin/tar/write.c user/ed/newcons/usr.bin/tcopy/Makefile user/ed/newcons/usr.bin/tcopy/tcopy.c user/ed/newcons/usr.bin/telnet/Makefile user/ed/newcons/usr.bin/tftp/tftp.c user/ed/newcons/usr.bin/time/Makefile user/ed/newcons/usr.bin/top/Makefile user/ed/newcons/usr.bin/tr/Makefile user/ed/newcons/usr.bin/truss/Makefile user/ed/newcons/usr.bin/truss/amd64-fbsd32.c user/ed/newcons/usr.bin/truss/i386-fbsd.c user/ed/newcons/usr.bin/truss/main.c user/ed/newcons/usr.bin/truss/mips-fbsd.c user/ed/newcons/usr.bin/truss/syscalls.c user/ed/newcons/usr.bin/tset/extern.h user/ed/newcons/usr.bin/tset/map.c user/ed/newcons/usr.bin/tset/misc.c user/ed/newcons/usr.bin/tset/set.c user/ed/newcons/usr.bin/tset/term.c user/ed/newcons/usr.bin/tset/tset.c user/ed/newcons/usr.bin/tset/wrterm.c user/ed/newcons/usr.bin/uname/uname.1 user/ed/newcons/usr.bin/uname/uname.c user/ed/newcons/usr.bin/unifdef/Makefile user/ed/newcons/usr.bin/unifdef/unifdef.1 user/ed/newcons/usr.bin/unifdef/unifdef.c user/ed/newcons/usr.bin/unifdef/unifdefall.sh user/ed/newcons/usr.bin/uniq/uniq.1 user/ed/newcons/usr.bin/uniq/uniq.c user/ed/newcons/usr.bin/unzip/Makefile user/ed/newcons/usr.bin/unzip/unzip.c user/ed/newcons/usr.bin/users/users.1 user/ed/newcons/usr.bin/users/users.c user/ed/newcons/usr.bin/uudecode/Makefile user/ed/newcons/usr.bin/uuencode/Makefile user/ed/newcons/usr.bin/vacation/Makefile user/ed/newcons/usr.bin/vgrind/Makefile user/ed/newcons/usr.bin/vi/Makefile user/ed/newcons/usr.bin/vis/foldit.c user/ed/newcons/usr.bin/vmstat/Makefile user/ed/newcons/usr.bin/w/w.1 user/ed/newcons/usr.bin/w/w.c user/ed/newcons/usr.bin/wall/Makefile user/ed/newcons/usr.bin/wall/wall.c user/ed/newcons/usr.bin/wc/Makefile user/ed/newcons/usr.bin/wc/wc.c user/ed/newcons/usr.bin/whereis/Makefile user/ed/newcons/usr.bin/who/Makefile user/ed/newcons/usr.bin/who/who.1 user/ed/newcons/usr.bin/who/who.c user/ed/newcons/usr.bin/whois/whois.1 user/ed/newcons/usr.bin/whois/whois.c user/ed/newcons/usr.bin/write/Makefile user/ed/newcons/usr.bin/write/write.c user/ed/newcons/usr.bin/xargs/Makefile user/ed/newcons/usr.bin/xinstall/Makefile user/ed/newcons/usr.bin/xinstall/xinstall.c user/ed/newcons/usr.bin/xlint/xlint/xlint.c user/ed/newcons/usr.bin/yacc/Makefile user/ed/newcons/usr.bin/yacc/defs.h user/ed/newcons/usr.bin/yacc/skeleton.c user/ed/newcons/usr.bin/ypcat/Makefile user/ed/newcons/usr.bin/ypmatch/Makefile user/ed/newcons/usr.bin/ypwhich/Makefile user/ed/newcons/usr.sbin/Makefile user/ed/newcons/usr.sbin/Makefile.inc user/ed/newcons/usr.sbin/ac/Makefile user/ed/newcons/usr.sbin/ac/ac.8 user/ed/newcons/usr.sbin/ac/ac.c user/ed/newcons/usr.sbin/accton/Makefile user/ed/newcons/usr.sbin/accton/accton.c user/ed/newcons/usr.sbin/acpi/acpiconf/Makefile user/ed/newcons/usr.sbin/acpi/acpidb/acpidb.c user/ed/newcons/usr.sbin/acpi/acpidump/Makefile user/ed/newcons/usr.sbin/acpi/iasl/Makefile user/ed/newcons/usr.sbin/adduser/adduser.sh user/ed/newcons/usr.sbin/amd/Makefile.inc user/ed/newcons/usr.sbin/ancontrol/ancontrol.c user/ed/newcons/usr.sbin/apm/Makefile user/ed/newcons/usr.sbin/apm/apm.8 user/ed/newcons/usr.sbin/apm/apm.c user/ed/newcons/usr.sbin/apmd/Makefile user/ed/newcons/usr.sbin/arp/arp.c user/ed/newcons/usr.sbin/asf/Makefile user/ed/newcons/usr.sbin/asf/asf_kld.c user/ed/newcons/usr.sbin/audit/Makefile user/ed/newcons/usr.sbin/auditd/Makefile user/ed/newcons/usr.sbin/auditreduce/Makefile user/ed/newcons/usr.sbin/authpf/Makefile user/ed/newcons/usr.sbin/boot0cfg/Makefile user/ed/newcons/usr.sbin/bootparamd/Makefile.inc user/ed/newcons/usr.sbin/bootparamd/bootparamd/bootparamd.c user/ed/newcons/usr.sbin/bsnmpd/bsnmpd/Makefile user/ed/newcons/usr.sbin/bsnmpd/gensnmptree/Makefile user/ed/newcons/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c user/ed/newcons/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c user/ed/newcons/usr.sbin/bsnmpd/modules/snmp_pf/Makefile user/ed/newcons/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c user/ed/newcons/usr.sbin/btxld/Makefile user/ed/newcons/usr.sbin/burncd/Makefile user/ed/newcons/usr.sbin/burncd/burncd.8 user/ed/newcons/usr.sbin/burncd/burncd.c user/ed/newcons/usr.sbin/cdcontrol/Makefile user/ed/newcons/usr.sbin/cdcontrol/cdcontrol.c user/ed/newcons/usr.sbin/chkgrp/Makefile user/ed/newcons/usr.sbin/chown/Makefile user/ed/newcons/usr.sbin/chroot/Makefile user/ed/newcons/usr.sbin/chroot/chroot.c user/ed/newcons/usr.sbin/clear_locks/Makefile user/ed/newcons/usr.sbin/config/Makefile user/ed/newcons/usr.sbin/config/lang.l user/ed/newcons/usr.sbin/cpucontrol/Makefile user/ed/newcons/usr.sbin/cpucontrol/cpucontrol.c user/ed/newcons/usr.sbin/cron/cron/Makefile user/ed/newcons/usr.sbin/crunch/Makefile.inc user/ed/newcons/usr.sbin/crunch/examples/really-big.conf user/ed/newcons/usr.sbin/ctm/ctm/Makefile user/ed/newcons/usr.sbin/ctm/ctm_dequeue/Makefile user/ed/newcons/usr.sbin/ctm/ctm_rmail/Makefile user/ed/newcons/usr.sbin/ctm/ctm_smail/Makefile user/ed/newcons/usr.sbin/ctm/ctm_smail/ctm_smail.c user/ed/newcons/usr.sbin/daemon/Makefile user/ed/newcons/usr.sbin/dconschat/Makefile user/ed/newcons/usr.sbin/devinfo/Makefile user/ed/newcons/usr.sbin/digictl/Makefile user/ed/newcons/usr.sbin/diskinfo/Makefile user/ed/newcons/usr.sbin/diskinfo/diskinfo.8 user/ed/newcons/usr.sbin/diskinfo/diskinfo.c user/ed/newcons/usr.sbin/dnssec-dsfromkey/Makefile user/ed/newcons/usr.sbin/dnssec-keyfromlabel/Makefile user/ed/newcons/usr.sbin/dnssec-keygen/Makefile user/ed/newcons/usr.sbin/dnssec-signzone/Makefile user/ed/newcons/usr.sbin/dumpcis/Makefile user/ed/newcons/usr.sbin/editmap/Makefile user/ed/newcons/usr.sbin/edquota/Makefile user/ed/newcons/usr.sbin/eeprom/Makefile user/ed/newcons/usr.sbin/eeprom/eeprom.c user/ed/newcons/usr.sbin/extattr/Makefile user/ed/newcons/usr.sbin/extattr/rmextattr.c user/ed/newcons/usr.sbin/extattrctl/Makefile user/ed/newcons/usr.sbin/extattrctl/extattrctl.c user/ed/newcons/usr.sbin/faithd/Makefile user/ed/newcons/usr.sbin/faithd/faithd.8 user/ed/newcons/usr.sbin/faithd/faithd.c user/ed/newcons/usr.sbin/fdcontrol/Makefile user/ed/newcons/usr.sbin/fdformat/Makefile user/ed/newcons/usr.sbin/fdread/Makefile user/ed/newcons/usr.sbin/fdwrite/Makefile user/ed/newcons/usr.sbin/fifolog/Makefile.inc user/ed/newcons/usr.sbin/fifolog/lib/getdate.y user/ed/newcons/usr.sbin/freebsd-update/freebsd-update.sh user/ed/newcons/usr.sbin/ftp-proxy/libevent/Makefile user/ed/newcons/usr.sbin/getfmac/Makefile user/ed/newcons/usr.sbin/getpmac/Makefile user/ed/newcons/usr.sbin/gstat/Makefile user/ed/newcons/usr.sbin/inetd/Makefile user/ed/newcons/usr.sbin/inetd/inetd.c user/ed/newcons/usr.sbin/iostat/Makefile user/ed/newcons/usr.sbin/ip6addrctl/Makefile user/ed/newcons/usr.sbin/ipfwpcap/Makefile user/ed/newcons/usr.sbin/jail/Makefile user/ed/newcons/usr.sbin/jail/jail.8 user/ed/newcons/usr.sbin/jexec/Makefile user/ed/newcons/usr.sbin/jls/Makefile user/ed/newcons/usr.sbin/jls/jls.c user/ed/newcons/usr.sbin/kbdcontrol/kbdcontrol.c user/ed/newcons/usr.sbin/kernbb/Makefile user/ed/newcons/usr.sbin/lastlogin/Makefile user/ed/newcons/usr.sbin/lastlogin/lastlogin.8 user/ed/newcons/usr.sbin/lastlogin/lastlogin.c user/ed/newcons/usr.sbin/lmcconfig/Makefile user/ed/newcons/usr.sbin/lpr/common_source/Makefile user/ed/newcons/usr.sbin/lpr/common_source/lp.h user/ed/newcons/usr.sbin/lpr/common_source/rmjob.c user/ed/newcons/usr.sbin/lpr/filters.ru/Makefile.inc user/ed/newcons/usr.sbin/lpr/lpc/Makefile user/ed/newcons/usr.sbin/lpr/lpd/Makefile user/ed/newcons/usr.sbin/lpr/lpr/Makefile user/ed/newcons/usr.sbin/lptcontrol/Makefile user/ed/newcons/usr.sbin/mailstats/Makefile user/ed/newcons/usr.sbin/mailwrapper/Makefile user/ed/newcons/usr.sbin/makefs/makefs.8 user/ed/newcons/usr.sbin/makemap/Makefile user/ed/newcons/usr.sbin/memcontrol/Makefile user/ed/newcons/usr.sbin/mergemaster/mergemaster.8 user/ed/newcons/usr.sbin/mergemaster/mergemaster.sh user/ed/newcons/usr.sbin/mixer/Makefile user/ed/newcons/usr.sbin/mld6query/Makefile user/ed/newcons/usr.sbin/mlxcontrol/Makefile user/ed/newcons/usr.sbin/mount_portalfs/mount_portalfs.c user/ed/newcons/usr.sbin/mount_smbfs/Makefile user/ed/newcons/usr.sbin/mountd/exports.5 user/ed/newcons/usr.sbin/moused/Makefile user/ed/newcons/usr.sbin/mptable/Makefile user/ed/newcons/usr.sbin/mtree/Makefile user/ed/newcons/usr.sbin/named-checkconf/Makefile user/ed/newcons/usr.sbin/named-checkzone/Makefile user/ed/newcons/usr.sbin/named/Makefile user/ed/newcons/usr.sbin/ndiscvt/ndiscvt.c user/ed/newcons/usr.sbin/ndp/Makefile user/ed/newcons/usr.sbin/newsyslog/Makefile user/ed/newcons/usr.sbin/newsyslog/newsyslog.8 user/ed/newcons/usr.sbin/newsyslog/newsyslog.c user/ed/newcons/usr.sbin/nfsd/Makefile user/ed/newcons/usr.sbin/nfsd/nfsd.c user/ed/newcons/usr.sbin/nfsd/nfsv4.4 user/ed/newcons/usr.sbin/nfsd/stablerestart.5 user/ed/newcons/usr.sbin/nghook/Makefile user/ed/newcons/usr.sbin/nscd/nscd.conf.5 user/ed/newcons/usr.sbin/ntp/Makefile user/ed/newcons/usr.sbin/ntp/Makefile.inc user/ed/newcons/usr.sbin/ntp/config.h user/ed/newcons/usr.sbin/ntp/doc/Makefile user/ed/newcons/usr.sbin/nvram/Makefile user/ed/newcons/usr.sbin/ofwdump/Makefile user/ed/newcons/usr.sbin/pciconf/Makefile user/ed/newcons/usr.sbin/pkg_install/add/main.c user/ed/newcons/usr.sbin/pkg_install/create/main.c user/ed/newcons/usr.sbin/pkg_install/delete/Makefile user/ed/newcons/usr.sbin/pkg_install/delete/main.c user/ed/newcons/usr.sbin/pkg_install/info/Makefile user/ed/newcons/usr.sbin/pkg_install/info/main.c user/ed/newcons/usr.sbin/pkg_install/lib/lib.h user/ed/newcons/usr.sbin/pkg_install/updating/Makefile user/ed/newcons/usr.sbin/pkg_install/updating/main.c user/ed/newcons/usr.sbin/pkg_install/updating/pkg_updating.1 user/ed/newcons/usr.sbin/pkg_install/version/Makefile user/ed/newcons/usr.sbin/pkg_install/version/main.c user/ed/newcons/usr.sbin/pmcannotate/Makefile user/ed/newcons/usr.sbin/pmcannotate/pmcannotate.c user/ed/newcons/usr.sbin/pmccontrol/Makefile user/ed/newcons/usr.sbin/pmcstat/Makefile user/ed/newcons/usr.sbin/pmcstat/pmcstat_log.c user/ed/newcons/usr.sbin/pnpinfo/Makefile user/ed/newcons/usr.sbin/portsnap/make_index/Makefile user/ed/newcons/usr.sbin/portsnap/phttpget/Makefile user/ed/newcons/usr.sbin/portsnap/portsnap/portsnap.sh user/ed/newcons/usr.sbin/powerd/Makefile user/ed/newcons/usr.sbin/powerd/powerd.8 user/ed/newcons/usr.sbin/powerd/powerd.c user/ed/newcons/usr.sbin/ppp/Makefile user/ed/newcons/usr.sbin/ppp/id.c user/ed/newcons/usr.sbin/ppp/id.h user/ed/newcons/usr.sbin/ppp/physical.c user/ed/newcons/usr.sbin/ppp/physical.h user/ed/newcons/usr.sbin/ppp/ppp.8.m4 user/ed/newcons/usr.sbin/pppctl/Makefile user/ed/newcons/usr.sbin/praliases/Makefile user/ed/newcons/usr.sbin/praudit/Makefile user/ed/newcons/usr.sbin/procctl/Makefile user/ed/newcons/usr.sbin/pstat/Makefile user/ed/newcons/usr.sbin/pw/Makefile user/ed/newcons/usr.sbin/pw/pw_user.c user/ed/newcons/usr.sbin/pwd_mkdb/Makefile user/ed/newcons/usr.sbin/quotaon/Makefile user/ed/newcons/usr.sbin/quotaon/quotaon.c user/ed/newcons/usr.sbin/repquota/Makefile user/ed/newcons/usr.sbin/repquota/repquota.c user/ed/newcons/usr.sbin/rip6query/Makefile user/ed/newcons/usr.sbin/rip6query/rip6query.c user/ed/newcons/usr.sbin/rmt/Makefile user/ed/newcons/usr.sbin/rmt/rmt.c user/ed/newcons/usr.sbin/rndc-confgen/Makefile user/ed/newcons/usr.sbin/rndc/Makefile user/ed/newcons/usr.sbin/route6d/Makefile user/ed/newcons/usr.sbin/rpc.lockd/Makefile user/ed/newcons/usr.sbin/rpc.statd/Makefile user/ed/newcons/usr.sbin/rpc.umntall/Makefile user/ed/newcons/usr.sbin/rpc.umntall/mounttab.c user/ed/newcons/usr.sbin/rpc.yppasswdd/Makefile user/ed/newcons/usr.sbin/rpc.ypupdated/Makefile user/ed/newcons/usr.sbin/rpc.ypxfrd/Makefile user/ed/newcons/usr.sbin/rpcbind/Makefile user/ed/newcons/usr.sbin/rpcbind/rpcb_svc_com.c user/ed/newcons/usr.sbin/rrenumd/Makefile user/ed/newcons/usr.sbin/rtadvd/Makefile user/ed/newcons/usr.sbin/rtprio/Makefile user/ed/newcons/usr.sbin/rtsold/Makefile user/ed/newcons/usr.sbin/rtsold/probe.c user/ed/newcons/usr.sbin/rtsold/rtsold.c user/ed/newcons/usr.sbin/rwhod/Makefile user/ed/newcons/usr.sbin/rwhod/rwhod.8 user/ed/newcons/usr.sbin/rwhod/rwhod.c user/ed/newcons/usr.sbin/sa/Makefile user/ed/newcons/usr.sbin/sa/main.c user/ed/newcons/usr.sbin/sa/pdb.c user/ed/newcons/usr.sbin/sa/usrdb.c user/ed/newcons/usr.sbin/sendmail/Makefile user/ed/newcons/usr.sbin/setfmac/Makefile user/ed/newcons/usr.sbin/setpmac/Makefile user/ed/newcons/usr.sbin/smbmsg/Makefile user/ed/newcons/usr.sbin/smbmsg/smbmsg.8 user/ed/newcons/usr.sbin/snapinfo/snapinfo.c user/ed/newcons/usr.sbin/sysinstall/Makefile user/ed/newcons/usr.sbin/sysinstall/disks.c user/ed/newcons/usr.sbin/sysinstall/dist.c user/ed/newcons/usr.sbin/sysinstall/label.c user/ed/newcons/usr.sbin/sysinstall/user.c user/ed/newcons/usr.sbin/syslogd/syslogd.c user/ed/newcons/usr.sbin/tcpdchk/Makefile user/ed/newcons/usr.sbin/tcpdmatch/Makefile user/ed/newcons/usr.sbin/tcpdrop/Makefile user/ed/newcons/usr.sbin/tcpdump/Makefile.inc user/ed/newcons/usr.sbin/timed/timed/master.c user/ed/newcons/usr.sbin/timed/timed/slave.c user/ed/newcons/usr.sbin/traceroute/Makefile user/ed/newcons/usr.sbin/traceroute6/Makefile user/ed/newcons/usr.sbin/tzsetup/Makefile user/ed/newcons/usr.sbin/uathload/Makefile user/ed/newcons/usr.sbin/usbconfig/Makefile user/ed/newcons/usr.sbin/usbconfig/dump.c user/ed/newcons/usr.sbin/usbconfig/dump.h user/ed/newcons/usr.sbin/usbconfig/usbconfig.8 user/ed/newcons/usr.sbin/usbconfig/usbconfig.c user/ed/newcons/usr.sbin/usbdevs/Makefile user/ed/newcons/usr.sbin/vidcontrol/Makefile user/ed/newcons/usr.sbin/vipw/Makefile user/ed/newcons/usr.sbin/wake/Makefile user/ed/newcons/usr.sbin/wake/wake.8 user/ed/newcons/usr.sbin/wake/wake.c user/ed/newcons/usr.sbin/watchdogd/Makefile user/ed/newcons/usr.sbin/watchdogd/watchdogd.c user/ed/newcons/usr.sbin/wlandebug/Makefile user/ed/newcons/usr.sbin/wlconfig/Makefile user/ed/newcons/usr.sbin/yp_mkdb/Makefile user/ed/newcons/usr.sbin/ypbind/Makefile user/ed/newcons/usr.sbin/yppoll/Makefile user/ed/newcons/usr.sbin/yppush/Makefile user/ed/newcons/usr.sbin/yppush/yppush_main.c user/ed/newcons/usr.sbin/ypserv/Makefile user/ed/newcons/usr.sbin/ypserv/yp_main.c user/ed/newcons/usr.sbin/ypserv/yp_server.c user/ed/newcons/usr.sbin/ypserv/ypinit.sh user/ed/newcons/usr.sbin/ypserv/ypserv.8 user/ed/newcons/usr.sbin/ypset/Makefile user/ed/newcons/usr.sbin/zic/Theory user/ed/newcons/usr.sbin/zic/zdump/Makefile user/ed/newcons/usr.sbin/zic/zic/Makefile Directory Properties: user/ed/newcons/ (props changed) user/ed/newcons/contrib/bind9/ (props changed) user/ed/newcons/contrib/expat/ (props changed) user/ed/newcons/contrib/groff/ (props changed) user/ed/newcons/contrib/netcat/ (props changed) user/ed/newcons/contrib/ntp/ (props changed) user/ed/newcons/contrib/one-true-awk/ (props changed) user/ed/newcons/contrib/sendmail/ (props changed) user/ed/newcons/etc/rc.d/static_arp (props changed) user/ed/newcons/lib/libc/ (props changed) user/ed/newcons/lib/libc/stdtime/ (props changed) user/ed/newcons/share/zoneinfo/ (props changed) user/ed/newcons/sys/ (props changed) user/ed/newcons/sys/contrib/dev/acpica/ (props changed) user/ed/newcons/sys/mips/adm5120/adm5120reg.h (props changed) user/ed/newcons/sys/mips/adm5120/admpci.c (props changed) user/ed/newcons/sys/mips/adm5120/console.c (props changed) user/ed/newcons/sys/mips/adm5120/if_admswreg.h (props changed) user/ed/newcons/sys/mips/adm5120/if_admswvar.h (props changed) user/ed/newcons/sys/mips/adm5120/obiovar.h (props changed) user/ed/newcons/sys/mips/adm5120/std.adm5120 (props changed) user/ed/newcons/sys/mips/adm5120/uart_bus_adm5120.c (props changed) user/ed/newcons/sys/mips/adm5120/uart_dev_adm5120.c (props changed) user/ed/newcons/sys/mips/adm5120/uart_dev_adm5120.h (props changed) user/ed/newcons/sys/mips/conf/.cvsignore (props changed) user/ed/newcons/sys/mips/conf/ADM5120 (props changed) user/ed/newcons/sys/mips/conf/ADM5120.hints (props changed) user/ed/newcons/sys/mips/conf/DEFAULTS (props changed) user/ed/newcons/sys/mips/conf/IDT (props changed) user/ed/newcons/sys/mips/conf/IDT.hints (props changed) user/ed/newcons/sys/mips/conf/MALTA.hints (props changed) user/ed/newcons/sys/mips/conf/SENTRY5.hints (props changed) user/ed/newcons/sys/mips/idt/idtpci.c (props changed) user/ed/newcons/sys/mips/idt/idtreg.h (props changed) user/ed/newcons/sys/mips/idt/if_kr.c (props changed) user/ed/newcons/sys/mips/idt/if_krreg.h (props changed) user/ed/newcons/sys/mips/idt/obiovar.h (props changed) user/ed/newcons/sys/mips/idt/std.idt (props changed) user/ed/newcons/sys/mips/include/_bus_octeon.h (props changed) user/ed/newcons/sys/mips/include/_inttypes.h (props changed) user/ed/newcons/sys/mips/include/_limits.h (props changed) user/ed/newcons/sys/mips/include/_stdint.h (props changed) user/ed/newcons/sys/mips/include/archtype.h (props changed) user/ed/newcons/sys/mips/include/asmacros.h (props changed) user/ed/newcons/sys/mips/include/bootinfo.h (props changed) user/ed/newcons/sys/mips/include/bswap.h (props changed) user/ed/newcons/sys/mips/include/bus_dma.h (props changed) user/ed/newcons/sys/mips/include/cache_r4k.h (props changed) user/ed/newcons/sys/mips/include/clock.h (props changed) user/ed/newcons/sys/mips/include/clockvar.h (props changed) user/ed/newcons/sys/mips/include/cputypes.h (props changed) user/ed/newcons/sys/mips/include/defs.h (props changed) user/ed/newcons/sys/mips/include/exec.h (props changed) user/ed/newcons/sys/mips/include/floatingpoint.h (props changed) user/ed/newcons/sys/mips/include/fpu.h (props changed) user/ed/newcons/sys/mips/include/frame.h (props changed) user/ed/newcons/sys/mips/include/gdb_machdep.h (props changed) user/ed/newcons/sys/mips/include/ieee.h (props changed) user/ed/newcons/sys/mips/include/ieeefp.h (props changed) user/ed/newcons/sys/mips/include/in_cksum.h (props changed) user/ed/newcons/sys/mips/include/iodev.h (props changed) user/ed/newcons/sys/mips/include/limits.h (props changed) user/ed/newcons/sys/mips/include/memdev.h (props changed) user/ed/newcons/sys/mips/include/metadata.h (props changed) user/ed/newcons/sys/mips/include/minidump.h (props changed) user/ed/newcons/sys/mips/include/mips_opcode.h (props changed) user/ed/newcons/sys/mips/include/mp_watchdog.h (props changed) user/ed/newcons/sys/mips/include/mutex.h (props changed) user/ed/newcons/sys/mips/include/pci_cfgreg.h (props changed) user/ed/newcons/sys/mips/include/pmc_mdep.h (props changed) user/ed/newcons/sys/mips/include/ppireg.h (props changed) user/ed/newcons/sys/mips/include/ptrace.h (props changed) user/ed/newcons/sys/mips/include/queue.h (props changed) user/ed/newcons/sys/mips/include/reg.h (props changed) user/ed/newcons/sys/mips/include/reloc.h (props changed) user/ed/newcons/sys/mips/include/resource.h (props changed) user/ed/newcons/sys/mips/include/rm7000.h (props changed) user/ed/newcons/sys/mips/include/runq.h (props changed) user/ed/newcons/sys/mips/include/segments.h (props changed) user/ed/newcons/sys/mips/include/setjmp.h (props changed) user/ed/newcons/sys/mips/include/sf_buf.h (props changed) user/ed/newcons/sys/mips/include/sigframe.h (props changed) user/ed/newcons/sys/mips/include/signal.h (props changed) user/ed/newcons/sys/mips/include/smp.h (props changed) user/ed/newcons/sys/mips/include/stdarg.h (props changed) user/ed/newcons/sys/mips/include/timerreg.h (props changed) user/ed/newcons/sys/mips/include/varargs.h (props changed) user/ed/newcons/sys/mips/include/vmparam.h (props changed) user/ed/newcons/sys/mips/malta/gt.c (props changed) user/ed/newcons/sys/mips/malta/gtreg.h (props changed) user/ed/newcons/sys/mips/malta/gtvar.h (props changed) user/ed/newcons/sys/mips/malta/obiovar.h (props changed) user/ed/newcons/sys/mips/malta/yamon.c (props changed) user/ed/newcons/sys/mips/mips/autoconf.c (props changed) user/ed/newcons/sys/mips/mips/db_disasm.c (props changed) user/ed/newcons/sys/mips/mips/db_interface.c (props changed) user/ed/newcons/sys/mips/mips/dump_machdep.c (props changed) user/ed/newcons/sys/mips/mips/elf64_machdep.c (props changed) user/ed/newcons/sys/mips/mips/mp_machdep.c (props changed) user/ed/newcons/sys/mips/mips/stack_machdep.c (props changed) user/ed/newcons/sys/mips/mips/uio_machdep.c (props changed) user/ed/newcons/sys/mips/sentry5/obiovar.h (props changed) user/ed/newcons/sys/mips/sentry5/s5reg.h (props changed) user/ed/newcons/tools/regression/usr.bin/lastcomm/regress.t (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.3 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.4 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.5 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.6 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.7 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.3 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.4 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.5 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.6 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.7 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.3 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.4 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.5 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.6 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.7 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.3 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.4 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.5 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.6 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.7 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6 (props changed) user/ed/newcons/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7 (props changed) user/ed/newcons/tools/regression/usr.bin/make/basic/t0/expected.status.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/basic/t0/expected.stderr.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/basic/t0/expected.stdout.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/basic/t1/expected.status.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/basic/t1/expected.stderr.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/basic/t1/expected.stdout.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/basic/t2/expected.status.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/basic/t2/expected.stderr.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/basic/t2/expected.stdout.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/basic/t3/expected.status.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/basic/t3/expected.stderr.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/basic/t3/expected.stdout.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/builtin/expected.status.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/builtin/expected.status.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/builtin/expected.stderr.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/builtin/expected.stderr.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/builtin/expected.stdout.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/builtin/expected.stdout.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/path/expected.status.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/path/expected.status.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/path/expected.stderr.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/path/expected.stderr.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/path/expected.stdout.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/path/expected.stdout.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/path_select/expected.status.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/path_select/expected.status.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/path_select/expected.stderr.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/path_select/expected.stderr.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/path_select/expected.stdout.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/path_select/expected.stdout.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/replace/expected.status.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/replace/expected.status.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/replace/expected.stderr.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/replace/expected.stderr.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/replace/expected.stdout.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/replace/expected.stdout.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/select/expected.status.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/select/expected.status.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/select/expected.stderr.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/select/expected.stderr.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/select/expected.stdout.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/shell/select/expected.stdout.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/suffixes/basic/expected.status.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/suffixes/basic/expected.stderr.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/suffixes/basic/expected.stdout.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/suffixes/src_wild1/expected.status.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stderr.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stdout.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/suffixes/src_wild2/expected.status.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stderr.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stdout.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/syntax/enl/expected.status.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/syntax/enl/expected.status.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/syntax/enl/expected.stderr.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/syntax/enl/expected.stderr.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/syntax/enl/expected.stdout.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/syntax/enl/expected.stdout.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/syntax/semi/expected.status.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/syntax/semi/expected.status.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/syntax/semi/expected.stderr.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/syntax/semi/expected.stderr.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/syntax/semi/expected.stdout.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/syntax/semi/expected.stdout.2 (props changed) user/ed/newcons/tools/regression/usr.bin/make/variables/modifier_M/expected.status.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/variables/modifier_M/expected.stderr.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/variables/modifier_M/expected.stdout.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/variables/t0/expected.status.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/variables/t0/expected.stderr.1 (props changed) user/ed/newcons/tools/regression/usr.bin/make/variables/t0/expected.stdout.1 (props changed) user/ed/newcons/tools/regression/usr.sbin/sa/regress.t (props changed) user/ed/newcons/usr.sbin/zic/ (props changed) Modified: user/ed/newcons/COPYRIGHT ============================================================================== --- user/ed/newcons/COPYRIGHT Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/COPYRIGHT Mon Feb 8 18:49:50 2010 (r203675) @@ -4,7 +4,7 @@ The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (c) 1992-2009 The FreeBSD Project. All rights reserved. +Copyright (c) 1992-2010 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions Modified: user/ed/newcons/MAINTAINERS ============================================================================== --- user/ed/newcons/MAINTAINERS Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/MAINTAINERS Mon Feb 8 18:49:50 2010 (r203675) @@ -48,7 +48,6 @@ iostat(8) ken Pre-commit review requeste cd(4) ken Pre-commit review requested. pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. -isp(4) mjacob Pre-commit review requested. em(4) jfv Pre-commit review requested. tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. @@ -124,6 +123,8 @@ usr.bin/bluetooth emax Pre-commit review usr.sbin/bluetooth emax Pre-commit review preferred. gnu/usr.bin/send-pr bugmaster Pre-commit review requested. ncurses rafan Heads-up appreciated, try not to break it. +*env(3) secteam Due to the problematic security history of this + code, please have patches reviewed by secteam. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. Modified: user/ed/newcons/Makefile ============================================================================== --- user/ed/newcons/Makefile Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/Makefile Mon Feb 8 18:49:50 2010 (r203675) @@ -278,7 +278,7 @@ tinderbox: # with a reasonable chance of success, regardless of how old your # existing system is. # -.if make(universe) || make(tinderbox) +.if make(universe) || make(universe_kernels) || make(tinderbox) TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v .if defined(DOING_TINDERBOX) @@ -297,10 +297,6 @@ universe_prologue: rm -f ${FAILFILE} .endif .for target in ${TARGETS} -KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ - find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \ - ! -name DEFAULTS ! -name LINT -KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/} universe: universe_${target} .ORDER: universe_prologue universe_${target} universe_epilogue universe_${target}: @@ -320,16 +316,26 @@ universe_${target}: (echo "${target} 'make LINT' failed," \ "check _.${target}.makeLINT for details"| ${MAKEFAIL})) .endif + @cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} TARGET=${target} \ + universe_kernels + @echo ">> ${target} completed on `LC_ALL=C date`" +.endfor +universe_kernels: universe_kernconfs +.if !defined(TARGET) +TARGET!= uname -m +.endif +KERNCONFS!= cd ${.CURDIR}/sys/${TARGET}/conf && \ + find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \ + ! -name DEFAULTS ! -name NOTES +universe_kernconfs: .for kernel in ${KERNCONFS} @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ ${MAKE} ${JFLAG} buildkernel \ - TARGET=${target} \ + TARGET=${TARGET} \ KERNCONF=${kernel} \ - > _.${target}.${kernel} 2>&1 || \ - (echo "${target} ${kernel} kernel failed," \ - "check _.${target}.${kernel} for details"| ${MAKEFAIL})) -.endfor - @echo ">> ${target} completed on `LC_ALL=C date`" + > _.${TARGET}.${kernel} 2>&1 || \ + (echo "${TARGET} ${kernel} kernel failed," \ + "check _.${TARGET}.${kernel} for details"| ${MAKEFAIL})) .endfor universe: universe_epilogue universe_epilogue: Modified: user/ed/newcons/Makefile.inc1 ============================================================================== --- user/ed/newcons/Makefile.inc1 Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/Makefile.inc1 Mon Feb 8 18:49:50 2010 (r203675) @@ -5,10 +5,11 @@ # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNO_CLEAN do not clean at all # -DNO_SHARE do not go into share subdir -# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELDEPEND +# -DKERNFAST define NO_KERNEL{CONFIG,CLEAN,DEPEND,OBJ} # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel # -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel # -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel +# -DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel # -DNO_PORTSUPDATE do not update ports in ${MAKE} update # -DNO_DOCUPDATE do not update doc in ${MAKE} update # -DNO_CTF do not run the DTrace CTF conversion tools on built objects @@ -694,6 +695,7 @@ distrib-dirs distribution: NO_KERNELCLEAN= t NO_KERNELCONFIG= t NO_KERNELDEPEND= t +NO_KERNELOBJ= t # Shortcut for KERNCONF=Blah -DKERNFAST is now KERNFAST=Blah .if !defined(KERNCONF) && ${KERNFAST} != "1" KERNCONF=${KERNFAST} @@ -763,11 +765,13 @@ buildkernel: @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} ${CLEANDIR} .endif +.if !defined(NO_KERNELOBJ) @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2.2: rebuilding the object tree" @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} obj +.endif @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2.3: build tools" @@ -936,6 +940,11 @@ _mklocale= usr.bin/mklocale _sed= usr.bin/sed .endif +.if ${BOOTSTRAPPING} < 900006 +_lex= usr.bin/lex +_yacc= usr.bin/yacc +.endif + .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -962,6 +971,8 @@ bootstrap-tools: ${_mklocale} \ usr.bin/rpcgen \ ${_sed} \ + ${_lex} \ + ${_yacc} \ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ @@ -1094,19 +1105,19 @@ _startup_libs+= lib/libc gnu/lib/libgcc__L: lib/libc__L -_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ - ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libroken} \ - ${_kerberos5_lib_libheimntlm} ${_kerberos5_lib_libgssapi_krb5} \ - lib/libbz2 lib/libcom_err lib/libcrypt lib/libelf \ +_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm} \ + ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ + ${_kerberos5_lib_libroken} \ + lib/libbz2 lib/libcom_err lib/libcrypt \ lib/libexpat \ - ${_lib_cddl} ${_lib_libgssapi} ${_lib_libipx} \ + ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ - lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ - ${_lib_libypclnt} lib/libz lib/msun \ + lib/libradius lib/libsbuf lib/libtacplus \ + lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} lib/libdwarf lib/libproc + ${_secure_lib_libssl} .if ${MK_LIBTHR} != "no" _lib_libthr= lib/libthr @@ -1128,18 +1139,20 @@ lib/libradius__L secure/lib/libssl__L: s .if ${MK_OPENSSH} != "no" _secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L -.if ${MK_KERBEROS} != "no" -kerberos5/lib/libgssapi_krb5__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ +.if ${MK_KERBEROS_SUPPORT} != "no" +secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ - lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \ - lib/libcrypt__L -secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libgssapi_krb5__L + lib/libmd__L kerberos5/lib/libroken__L .endif .endif .endif _secure_lib= secure/lib .endif +.if ${MK_GSSAPI} != "no" +_lib_libgssapi= lib/libgssapi +.endif + .if ${MK_IPX} != "no" _lib_libipx= lib/libipx .endif @@ -1151,8 +1164,6 @@ _kerberos5_lib_libkrb5= kerberos5/lib/li _kerberos5_lib_libhx509= kerberos5/lib/libhx509 _kerberos5_lib_libroken= kerberos5/lib/libroken _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm -_kerberos5_lib_libgssapi_krb5= kerberos5/lib/libgssapi_krb5 -_lib_libgssapi= lib/libgssapi .endif .if ${MK_NIS} != "no" @@ -1255,7 +1266,7 @@ delete-old-files: fi; \ done # Remove catpages without corresponding manpages. - @3<&0; \ + @exec 3<&0; \ find ${DESTDIR}/usr/share/man/cat* ! -type d | \ sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \ while read catpage; do \ Modified: user/ed/newcons/ObsoleteFiles.inc ============================================================================== --- user/ed/newcons/ObsoleteFiles.inc Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/ObsoleteFiles.inc Mon Feb 8 18:49:50 2010 (r203675) @@ -14,8 +14,69 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100122: move BSDL bc/dc USD documents to /usr/share/doc/usd +OLD_FILES+=usr/share/doc/papers/bc.ascii.gz +OLD_FILES+=usr/share/doc/papers/dc.ascii.gz +# 20100120: replacing GNU bc/dc with BSDL versions +OLD_FILES+=usr/share/examples/bc/ckbook.b +OLD_FILES+=usr/share/examples/bc/pi.b +OLD_FILES+=usr/share/examples/bc/primes.b +OLD_FILES+=usr/share/examples/bc/twins.b +OLD_FILES+=usr/share/info/dc.info.gz +OLD_DIRS+=usr/share/examples/bc +# 20100114: removal of ttyslot(3) +OLD_FILES+=usr/share/man/man3/ttyslot.3.gz +# 20100113: remove utmp.h, replace it by utmpx.h +OLD_FILES+=usr/share/man/man3/login.3.gz +OLD_FILES+=usr/share/man/man3/logout.3.gz +OLD_FILES+=usr/share/man/man3/logwtmp.3.gz +OLD_FILES+=usr/share/man/man3/ulog_endutxent.3.gz +OLD_FILES+=usr/share/man/man3/ulog_getutxent.3.gz +OLD_FILES+=usr/share/man/man3/ulog_getutxline.3.gz +OLD_FILES+=usr/share/man/man3/ulog_getutxuser.3.gz +OLD_FILES+=usr/share/man/man3/ulog_pututxline.3.gz +OLD_FILES+=usr/share/man/man3/ulog_setutxent.3.gz +OLD_FILES+=usr/share/man/man3/ulog_setutxfile.3.gz +OLD_FILES+=usr/share/man/man5/lastlog.5.gz +OLD_FILES+=usr/share/man/man5/utmp.5.gz +OLD_FILES+=usr/share/man/man5/wtmp.5.gz +OLD_LIBS+=lib/libutil.so.8 +# 20100105: new userland semaphore implementation +OLD_FILES+=usr/include/sys/semaphore.h +# 20100103: ntptrace(8) removed +OLD_FILES+=usr/sbin/ntptrace +OLD_FILES+=usr/share/man/man8/ntptrace.8.gz +# 20091229: remove no longer relevant examples +OLD_FILES+=usr/share/examples/pppd/auth-down.sample +OLD_FILES+=usr/share/examples/pppd/auth-up.sample +OLD_FILES+=usr/share/examples/pppd/chap-secrets.sample +OLD_FILES+=usr/share/examples/pppd/chat.sh.sample +OLD_FILES+=usr/share/examples/pppd/ip-down.sample +OLD_FILES+=usr/share/examples/pppd/ip-up.sample +OLD_FILES+=usr/share/examples/pppd/options.sample +OLD_FILES+=usr/share/examples/pppd/pap-secrets.sample +OLD_FILES+=usr/share/examples/pppd/ppp.deny.sample +OLD_FILES+=usr/share/examples/pppd/ppp.shells.sample +OLD_DIRS+=usr/share/examples/pppd +OLD_FILES+=usr/share/examples/slattach/unit-command.sh +OLD_DIRS+=usr/share/examples/slattach +OLD_FILES+=usr/share/examples/sliplogin/slip.hosts +OLD_FILES+=usr/share/examples/sliplogin/slip.login +OLD_FILES+=usr/share/examples/sliplogin/slip.logout +OLD_FILES+=usr/share/examples/sliplogin/slip.slparms +OLD_DIRS+=usr/share/examples/sliplogin +OLD_FILES+=usr/share/examples/startslip/sldown.sh +OLD_FILES+=usr/share/examples/startslip/slip.sh +OLD_FILES+=usr/share/examples/startslip/slup.sh +OLD_DIRS+=usr/share/examples/startslip +# 20091202: unify rc.firewall and rc.firewall6. +OLD_FILES+=etc/rc.d/ip6fw +OLD_FILES+=etc/rc.firewall6 +OLD_FILES+=usr/share/examples/etc/rc.firewall6 # 20091117: removal of rc.early(8) link OLD_FILES+=usr/share/man/man8/rc.early.8.gz +# 20091117: usr/share/zoneinfo/GMT link removed +OLD_FILES+=usr/share/zoneinfo/GMT # 20091027: pselect.3 implemented as syscall OLD_FILES+=usr/share/man/man3/pselect.3.gz # 20091005: fusword.9 and susword.9 removed Modified: user/ed/newcons/UPDATING ============================================================================== --- user/ed/newcons/UPDATING Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/UPDATING Mon Feb 8 18:49:50 2010 (r203675) @@ -22,6 +22,43 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20100113: + The utmp user accounting database has been replaced with utmpx, + the user accounting interface standardized by POSIX. + Unfortunately the semantics of utmp and utmpx don't match, + making it practically impossible to support both interfaces. + The user accounting database is used by tools like finger(1), + last(1), talk(1), w(1) and ac(8). + + All applications in the base system use utmpx. This means only + local binaries (e.g. from the ports tree) may still use these + utmp database files. These applications must be rebuilt to make + use of utmpx. + + After the system has been upgraded, it is safe to remove the old + log files (/var/run/utmp, /var/log/lastlog and /var/log/wtmp*), + assuming their contents is of no importance anymore. Old wtmp + databases can only be used by last(1) and ac(8) after they have + been converted to the new format using wtmpcvt(1). + +20100108: + Introduce the kernel thread "deadlock resolver" (which can be enabled + via the DEADLKRES option, see NOTES for more details) and the + sleepq_type() function for sleepqueues. + +20091202: + The rc.firewall and rc.firewall6 were unified, and + rc.firewall6 and rc.d/ip6fw were removed. + According to the removal of rc.d/ip6fw, ipv6_firewall_* rc + variables are obsoleted. Instead, the following new rc + variables are added to rc.d/ipfw: + + firewall_client_net_ipv6, firewall_simple_iif_ipv6, + firewall_simple_inet_ipv6, firewall_simple_oif_ipv6, + firewall_simple_onet_ipv6, firewall_trusted_ipv6 + + The meanings correspond to the relevant IPv4 variables. + 20091113: The default terminal emulation for syscons(4) has been changed from cons25 to xterm on all platforms except pc98. This means @@ -148,7 +185,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. 20090712: Padding has been added to struct tcpcb, sackhint and tcpstat in to facilitate future MFCs and bug fixes whilst - maintainig the ABI. However, this change breaks the ABI, so bump + maintaining the ABI. However, this change breaks the ABI, so bump __FreeBSD_version to 800102. User space tools that rely on the size of any of these structs (e.g. sockstat) need to be recompiled. @@ -882,7 +919,7 @@ COMMON ITEMS: ------------- Avoid using make -j when upgrading. While generally safe, there are sometimes problems using -j to upgrade. If your upgrade fails with - -j, please try again wtihout -j. From time to time in the past there + -j, please try again without -j. From time to time in the past there have been problems using -j with buildworld and/or installworld. This is especially true when upgrading between "distant" versions (eg one that cross a major release boundary or several minor releases, or when Modified: user/ed/newcons/bin/cp/cp.1 ============================================================================== --- user/ed/newcons/bin/cp/cp.1 Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/cp/cp.1 Mon Feb 8 18:49:50 2010 (r203675) @@ -32,7 +32,7 @@ .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd October 27, 2006 +.Dd January 17, 2010 .Dt CP 1 .Os .Sh NAME @@ -45,7 +45,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl alpv +.Op Fl alpvx .Ar source_file target_file .Nm .Oo @@ -53,7 +53,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl alpv +.Op Fl alpvx .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the @@ -183,6 +183,8 @@ permissions. Cause .Nm to be verbose, showing files as they are copied. +.It Fl x +File system mount points are not traversed. .El .Pp For each destination file that already exists, its contents are Modified: user/ed/newcons/bin/cp/cp.c ============================================================================== --- user/ed/newcons/bin/cp/cp.c Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/cp/cp.c Mon Feb 8 18:49:50 2010 (r203675) @@ -101,8 +101,9 @@ main(int argc, char *argv[]) int Hflag, Lflag, Pflag, ch, fts_options, r, have_trailing_slash; char *target; + fts_options = FTS_NOCHDIR | FTS_PHYSICAL; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1) + while ((ch = getopt(argc, argv, "HLPRafilnprvx")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -150,6 +151,9 @@ main(int argc, char *argv[]) case 'v': vflag = 1; break; + case 'x': + fts_options |= FTS_XDEV; + break; default: usage(); break; @@ -160,7 +164,6 @@ main(int argc, char *argv[]) if (argc < 2) usage(); - fts_options = FTS_NOCHDIR | FTS_PHYSICAL; if (Rflag && rflag) errx(1, "the -R and -r options may not be specified together"); if (rflag) Modified: user/ed/newcons/bin/cp/utils.c ============================================================================== --- user/ed/newcons/bin/cp/utils.c Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/cp/utils.c Mon Feb 8 18:49:50 2010 (r203675) @@ -518,8 +518,8 @@ usage(void) { (void)fprintf(stderr, "%s\n%s\n", -"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file", -" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... " +"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpvx] source_file target_file", +" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpvx] source_file ... " "target_directory"); exit(EX_USAGE); } Modified: user/ed/newcons/bin/csh/config.h ============================================================================== --- user/ed/newcons/bin/csh/config.h Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/csh/config.h Mon Feb 8 18:49:50 2010 (r203675) @@ -54,7 +54,7 @@ #define HAVE_GETPWENT 1 /* Define to 1 if you have the `getutent' function. */ -/* #undef HAVE_GETUTENT */ +#define HAVE_GETUTENT 1 /* Define if you have the iconv() function. */ /* #undef HAVE_ICONV */ @@ -130,10 +130,10 @@ #define HAVE_STRUCT_UTMP_UT_HOST 1 /* Define to 1 if `ut_tv' is member of `struct utmp'. */ -/* #undef HAVE_STRUCT_UTMP_UT_TV */ +#define HAVE_STRUCT_UTMP_UT_TV 1 /* Define to 1 if `ut_user' is member of `struct utmp'. */ -/* #undef HAVE_STRUCT_UTMP_UT_USER */ +#define HAVE_STRUCT_UTMP_UT_USER 1 /* Define to 1 if `ut_xtime' is member of `struct utmp'. */ /* #undef HAVE_STRUCT_UTMP_UT_XTIME */ @@ -159,10 +159,10 @@ #define HAVE_UNISTD_H 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_UTMPX_H */ +#define HAVE_UTMPX_H 1 /* Define to 1 if you have the header file. */ -#define HAVE_UTMP_H 1 +/* #undef HAVE_UTMP_H */ /* Define to 1 if you have the header file. */ #define HAVE_WCHAR_H 1 Modified: user/ed/newcons/bin/csh/config_p.h ============================================================================== --- user/ed/newcons/bin/csh/config_p.h Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/csh/config_p.h Mon Feb 8 18:49:50 2010 (r203675) @@ -85,6 +85,7 @@ /* Use LC_MESSAGES locale category to open the message catalog */ #define MCLoadBySet NL_CAT_LOCALE #define BUFSIZE 8192 +#define UTMPX_FILE "/var/run/utx.active" #endif #if defined(__bsdi__) Modified: user/ed/newcons/bin/date/Makefile ============================================================================== --- user/ed/newcons/bin/date/Makefile Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/date/Makefile Mon Feb 8 18:49:50 2010 (r203675) @@ -3,7 +3,5 @@ PROG= date SRCS= date.c netdate.c vary.c -DPADD= ${LIBUTIL} -LDADD= -lutil .include Modified: user/ed/newcons/bin/date/date.1 ============================================================================== --- user/ed/newcons/bin/date/date.1 Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/date/date.1 Mon Feb 8 18:49:50 2010 (r203675) @@ -299,7 +299,7 @@ for more information. .El .Sh FILES .Bl -tag -width /var/log/messages -compact -.It Pa /var/log/wtmp +.It Pa /var/log/utx.log record of date resets and time changes .It Pa /var/log/messages record of the user setting the time @@ -406,9 +406,9 @@ fails. .Sh SEE ALSO .Xr locale 1 , .Xr gettimeofday 2 , +.Xr getutxent 3 , .Xr strftime 3 , .Xr strptime 3 , -.Xr utmp 5 , .Xr timed 8 .Rs .%T "TSP: The Time Synchronization Protocol for UNIX 4.3BSD" Modified: user/ed/newcons/bin/date/date.c ============================================================================== --- user/ed/newcons/bin/date/date.c Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/date/date.c Mon Feb 8 18:49:50 2010 (r203675) @@ -48,12 +48,12 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include #include #include +#include #include "extern.h" #include "vary.h" @@ -181,6 +181,7 @@ main(int argc, char *argv[]) static void setthetime(const char *fmt, const char *p, int jflag, int nflag) { + struct utmpx utx; struct tm *lt; struct timeval tv; const char *dot, *t; @@ -271,12 +272,16 @@ setthetime(const char *fmt, const char * if (!jflag) { /* set the time */ if (nflag || netsettime(tval)) { - logwtmp("|", "date", ""); + utx.ut_type = OLD_TIME; + gettimeofday(&utx.ut_tv, NULL); + pututxline(&utx); tv.tv_sec = tval; tv.tv_usec = 0; if (settimeofday(&tv, (struct timezone *)NULL)) err(1, "settimeofday (timeval)"); - logwtmp("{", "date", ""); + utx.ut_type = NEW_TIME; + gettimeofday(&utx.ut_tv, NULL); + pututxline(&utx); } if ((p = getlogin()) == NULL) Modified: user/ed/newcons/bin/kenv/kenv.c ============================================================================== --- user/ed/newcons/bin/kenv/kenv.c Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/kenv/kenv.c Mon Feb 8 18:49:50 2010 (r203675) @@ -118,7 +118,7 @@ main(int argc, char **argv) } static int -kdumpenv() +kdumpenv(void) { char *buf, *cp; int buflen, envlen; Modified: user/ed/newcons/bin/ls/ls.c ============================================================================== --- user/ed/newcons/bin/ls/ls.c Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/ls/ls.c Mon Feb 8 18:49:50 2010 (r203675) @@ -113,6 +113,7 @@ static int f_listdir; /* list actual di static int f_listdot; /* list files beginning with . */ static int f_noautodot; /* do not automatically enable -A for root */ int f_longform; /* long listing format */ +static int f_nofollow; /* don't follow symbolic link arguments */ int f_nonprint; /* show unprintables as ? */ static int f_nosort; /* don't sort output */ int f_notabs; /* don't use tab-separated multi-col output */ @@ -234,6 +235,7 @@ main(int argc, char *argv[]) break; case 'H': fts_options |= FTS_COMFOLLOW; + f_nofollow = 0; break; case 'G': setenv("CLICOLOR", "", 1); @@ -241,11 +243,13 @@ main(int argc, char *argv[]) case 'L': fts_options &= ~FTS_PHYSICAL; fts_options |= FTS_LOGICAL; + f_nofollow = 0; break; case 'P': fts_options &= ~FTS_COMFOLLOW; fts_options &= ~FTS_LOGICAL; fts_options |= FTS_PHYSICAL; + f_nofollow = 1; break; case 'R': f_recursive = 1; @@ -396,10 +400,10 @@ main(int argc, char *argv[]) fts_options |= FTS_NOSTAT; /* - * If not -F, -d or -l options, follow any symbolic links listed on + * If not -F, -P, -d or -l options, follow any symbolic links listed on * the command line. */ - if (!f_longform && !f_listdir && (!f_type || f_slash)) + if (!f_nofollow && !f_longform && !f_listdir && (!f_type || f_slash)) fts_options |= FTS_COMFOLLOW; /* @@ -508,7 +512,7 @@ traverse(int argc, char *argv[], int opt break; case FTS_DNR: case FTS_ERR: - warnx("%s: %s", p->fts_name, strerror(p->fts_errno)); + warnx("%s: %s", p->fts_path, strerror(p->fts_errno)); rval = 1; break; case FTS_D: @@ -559,7 +563,8 @@ display(const FTSENT *p, FTSENT *list, i long maxblock; u_long btotal, labelstrlen, maxinode, maxlen, maxnlink; u_long maxlabelstr; - int bcfile, maxflags; + u_int devstrlen; + int maxflags; gid_t maxgroup; uid_t maxuser; size_t flen, ulen, glen; @@ -651,7 +656,7 @@ display(const FTSENT *p, FTSENT *list, i MAKENINES(maxsize); free(jinitmax); } - bcfile = 0; + devstrlen = 0; flags = NULL; for (cur = list, entries = 0; cur; cur = cur->fts_link) { if (cur->fts_info == FTS_ERR || cur->fts_info == FTS_NS) { @@ -791,9 +796,15 @@ label_out: np->group = &np->data[ulen + 1]; (void)strcpy(np->group, group); - if (S_ISCHR(sp->st_mode) || - S_ISBLK(sp->st_mode)) - bcfile = 1; + if ((S_ISCHR(sp->st_mode) || + S_ISBLK(sp->st_mode)) && + devstrlen < DEVSTR_HEX_LEN) { + if (minor(sp->st_rdev) > 255 || + minor(sp->st_rdev) < 0) + devstrlen = DEVSTR_HEX_LEN; + else + devstrlen = DEVSTR_LEN; + } if (f_flags) { np->flags = &np->data[ulen + glen + 2]; @@ -825,7 +836,6 @@ label_out: d.entries = entries; d.maxlen = maxlen; if (needstats) { - d.bcfile = bcfile; d.btotal = btotal; (void)snprintf(buf, sizeof(buf), "%lu", maxblock); d.s_block = strlen(buf); @@ -836,8 +846,14 @@ label_out: d.s_inode = strlen(buf); (void)snprintf(buf, sizeof(buf), "%lu", maxnlink); d.s_nlink = strlen(buf); - (void)snprintf(buf, sizeof(buf), "%ju", maxsize); - d.s_size = strlen(buf); + if (f_humanval) + d.s_size = HUMANVALSTR_LEN; + else { + (void)snprintf(buf, sizeof(buf), "%ju", maxsize); + d.s_size = strlen(buf); + } + if (d.s_size < devstrlen) + d.s_size = devstrlen; d.s_user = maxuser; } printfcn(&d); Modified: user/ed/newcons/bin/ls/ls.h ============================================================================== --- user/ed/newcons/bin/ls/ls.h Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/ls/ls.h Mon Feb 8 18:49:50 2010 (r203675) @@ -35,6 +35,10 @@ #define NO_PRINT 1 +#define HUMANVALSTR_LEN 5 +#define DEVSTR_LEN 8 +#define DEVSTR_HEX_LEN 15 + extern long blocksize; /* block size units */ extern int f_accesstime; /* use time of last access */ @@ -62,7 +66,6 @@ extern int f_color; /* add type in colo typedef struct { FTSENT *list; u_long btotal; - int bcfile; int entries; int maxlen; u_int s_block; Modified: user/ed/newcons/bin/ls/print.c ============================================================================== --- user/ed/newcons/bin/ls/print.c Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/ls/print.c Mon Feb 8 18:49:50 2010 (r203675) @@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$"); #include "extern.h" static int printaname(const FTSENT *, u_long, u_long); +static void printdev(size_t, dev_t); static void printlink(const FTSENT *); static void printtime(time_t); static int printtype(u_int); @@ -165,16 +166,7 @@ printlong(const DISPLAY *dp) if (f_label) (void)printf("%-*s ", dp->s_label, np->label); if (S_ISCHR(sp->st_mode) || S_ISBLK(sp->st_mode)) - if (minor(sp->st_rdev) > 255 || minor(sp->st_rdev) < 0) - (void)printf("%3d, 0x%08x ", - major(sp->st_rdev), - (u_int)minor(sp->st_rdev)); - else - (void)printf("%3d, %3d ", - major(sp->st_rdev), minor(sp->st_rdev)); - else if (dp->bcfile) - (void)printf("%*s%*jd ", - 8 - dp->s_size, "", dp->s_size, sp->st_size); + printdev(dp->s_size, sp->st_rdev); else printsize(dp->s_size, sp->st_size); if (f_accesstime) @@ -353,6 +345,24 @@ printaname(const FTSENT *p, u_long inode return (chcnt); } +/* + * Print device special file major and minor numbers. + */ +static void +printdev(size_t width, dev_t dev) +{ + char buf[DEVSTR_HEX_LEN + 1]; + + if (minor(dev) > 255 || minor(dev) < 0) + (void)snprintf(buf, sizeof(buf), "%3d, 0x%08x", + major(dev), (u_int)minor(dev)); + else + (void)snprintf(buf, sizeof(buf), "%3d, %3d", + major(dev), minor(dev)); + + (void)printf("%*s ", (u_int)width, buf); +} + static void printtime(time_t ftime) { @@ -592,11 +602,15 @@ printsize(size_t width, off_t bytes) { if (f_humanval) { - char buf[5]; + /* + * Reserve one space before the size and allocate room for + * the trailing '\0'. + */ + char buf[HUMANVALSTR_LEN - 1 + 1]; humanize_number(buf, sizeof(buf), (int64_t)bytes, "", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL); - (void)printf("%5s ", buf); + (void)printf("%*s ", (u_int)width, buf); } else (void)printf("%*jd ", (u_int)width, bytes); } Modified: user/ed/newcons/bin/pax/Makefile ============================================================================== --- user/ed/newcons/bin/pax/Makefile Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/pax/Makefile Mon Feb 8 18:49:50 2010 (r203675) @@ -33,8 +33,4 @@ SRCS= ar_io.c ar_subs.c buf_subs.c cache #MAN= pax.1 tar.1 cpio.1 #LINKS= ${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio -.if ${MACHINE_ARCH} == "arm" -WARNS?= 3 -.endif - .include Modified: user/ed/newcons/bin/pax/cpio.h ============================================================================== --- user/ed/newcons/bin/pax/cpio.h Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/pax/cpio.h Mon Feb 8 18:49:50 2010 (r203675) @@ -67,7 +67,7 @@ typedef struct { char c_mtime[11]; /* modification time */ char c_namesize[6]; /* length of pathname */ char c_filesize[11]; /* length of file in bytes */ -} HD_CPIO; +} HD_CPIO __aligned(1); #define MAGIC 070707 /* transportable archive id */ @@ -98,7 +98,7 @@ typedef struct { u_char h_namesize[2]; u_char h_filesize_1[2]; u_char h_filesize_2[2]; -} HD_BCPIO; +} HD_BCPIO __aligned(1); #ifdef _PAX_ /* @@ -136,7 +136,7 @@ typedef struct { char c_rmin[8]; /* special file minor # */ char c_namesize[8]; /* length of pathname */ char c_chksum[8]; /* 0 OR CRC of bytes of FILE data */ -} HD_VCPIO; +} HD_VCPIO __aligned(1); #define VMAGIC 070701 /* sVr4 new portable archive id */ #define VCMAGIC 070702 /* sVr4 new portable archive id CRC */ Modified: user/ed/newcons/bin/pax/ftree.c ============================================================================== --- user/ed/newcons/bin/pax/ftree.c Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/pax/ftree.c Mon Feb 8 18:49:50 2010 (r203675) @@ -219,7 +219,7 @@ ftree_sel(ARCHD *arcn) */ void -ftree_notsel() +ftree_notsel(void) { if (ftent != NULL) (void)fts_set(ftsp, ftent, FTS_SKIP); Modified: user/ed/newcons/bin/pax/gen_subs.c ============================================================================== --- user/ed/newcons/bin/pax/gen_subs.c Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/pax/gen_subs.c Mon Feb 8 18:49:50 2010 (r203675) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -66,10 +65,6 @@ __FBSDID("$FreeBSD$"); #define OLDFRMTM "%b %e %Y" #define CURFRMTD "%e %b %H:%M" #define OLDFRMTD "%e %b %Y" -#ifndef UT_NAMESIZE -#define UT_NAMESIZE 8 -#endif -#define UT_GRPSIZE 6 static int d_first = -1; @@ -116,9 +111,8 @@ ls_list(ARCHD *arcn, time_t now, FILE *f */ if (strftime(f_date,DATELEN,timefrmt,localtime(&(sbp->st_mtime))) == 0) f_date[0] = '\0'; - (void)fprintf(fp, "%s%2u %-*s %-*s ", f_mode, sbp->st_nlink, - UT_NAMESIZE, name_uid(sbp->st_uid, 1), UT_GRPSIZE, - name_gid(sbp->st_gid, 1)); + (void)fprintf(fp, "%s%2u %-12s %-12s ", f_mode, sbp->st_nlink, + name_uid(sbp->st_uid, 1), name_gid(sbp->st_gid, 1)); /* * print device id's for devices, or sizes for other nodes Modified: user/ed/newcons/bin/pax/sel_subs.c ============================================================================== --- user/ed/newcons/bin/pax/sel_subs.c Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/pax/sel_subs.c Mon Feb 8 18:49:50 2010 (r203675) @@ -396,6 +396,7 @@ trng_add(char *str) default: paxwarn(1, "Bad option %c with time range %s", *flgpt, str); + free(pt); goto out; } ++flgpt; Modified: user/ed/newcons/bin/pax/tar.h ============================================================================== --- user/ed/newcons/bin/pax/tar.h Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/pax/tar.h Mon Feb 8 18:49:50 2010 (r203675) @@ -96,7 +96,7 @@ typedef struct { char chksum[CHK_LEN]; /* checksum */ char linkflag; /* norm, hard, or sym. */ char linkname[TNMSZ]; /* linked to name */ -} HD_TAR; +} HD_TAR __aligned(1); #ifdef _PAX_ /* @@ -142,4 +142,4 @@ typedef struct { char devmajor[8]; /* major device number */ char devminor[8]; /* minor device number */ char prefix[TPFSZ]; /* linked to name */ -} HD_USTAR; +} HD_USTAR __aligned(1); Modified: user/ed/newcons/bin/pkill/Makefile ============================================================================== --- user/ed/newcons/bin/pkill/Makefile Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/pkill/Makefile Mon Feb 8 18:49:50 2010 (r203675) @@ -2,7 +2,6 @@ # $FreeBSD$ PROG= pkill -WARNS?= 5 DPADD= ${LIBKVM} LDADD= -lkvm Modified: user/ed/newcons/bin/pkill/pkill.c ============================================================================== --- user/ed/newcons/bin/pkill/pkill.c Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/pkill/pkill.c Mon Feb 8 18:49:50 2010 (r203675) @@ -113,14 +113,14 @@ static int cflags = REG_EXTENDED; static kvm_t *kd; static pid_t mypid; -static struct listhead euidlist = SLIST_HEAD_INITIALIZER(list); -static struct listhead ruidlist = SLIST_HEAD_INITIALIZER(list); -static struct listhead rgidlist = SLIST_HEAD_INITIALIZER(list); -static struct listhead pgrplist = SLIST_HEAD_INITIALIZER(list); -static struct listhead ppidlist = SLIST_HEAD_INITIALIZER(list); -static struct listhead tdevlist = SLIST_HEAD_INITIALIZER(list); -static struct listhead sidlist = SLIST_HEAD_INITIALIZER(list); -static struct listhead jidlist = SLIST_HEAD_INITIALIZER(list); +static struct listhead euidlist = SLIST_HEAD_INITIALIZER(euidlist); +static struct listhead ruidlist = SLIST_HEAD_INITIALIZER(ruidlist); +static struct listhead rgidlist = SLIST_HEAD_INITIALIZER(rgidlist); +static struct listhead pgrplist = SLIST_HEAD_INITIALIZER(pgrplist); +static struct listhead ppidlist = SLIST_HEAD_INITIALIZER(ppidlist); +static struct listhead tdevlist = SLIST_HEAD_INITIALIZER(tdevlist); +static struct listhead sidlist = SLIST_HEAD_INITIALIZER(sidlist); +static struct listhead jidlist = SLIST_HEAD_INITIALIZER(jidlist); static void usage(void) __attribute__((__noreturn__)); static int killact(const struct kinfo_proc *); @@ -671,8 +671,19 @@ makelist(struct listhead *head, enum lis li->li_number = -1; /* any jail */ break; case LT_TTY: - usage(); - /* NOTREACHED */ + if (li->li_number < 0) + errx(STATUS_BADUSAGE, + "Negative /dev/pts tty `%s'", sp); + snprintf(buf, sizeof(buf), _PATH_DEV "pts/%s", + sp); + if (stat(buf, &st) != -1) + goto foundtty; + if (errno == ENOENT) + errx(STATUS_BADUSAGE, "No such tty: `" + _PATH_DEV "pts/%s'", sp); + err(STATUS_ERROR, "Cannot access `" + _PATH_DEV "pts/%s'", sp); + break; default: break; } Modified: user/ed/newcons/bin/setfacl/merge.c ============================================================================== --- user/ed/newcons/bin/setfacl/merge.c Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/setfacl/merge.c Mon Feb 8 18:49:50 2010 (r203675) @@ -100,11 +100,10 @@ merge_acl(acl_t acl, acl_t *prev_acl, co acl_get_brand_np(acl, &acl_brand); acl_get_brand_np(*prev_acl, &prev_acl_brand); - if (acl_brand != prev_acl_brand) { + if (branding_mismatch(acl_brand, prev_acl_brand)) { warnx("%s: branding mismatch; existing ACL is %s, " "entry to be merged is %s", filename, - prev_acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e", - acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e"); + brand_name(prev_acl_brand), brand_name(acl_brand)); return (-1); } @@ -252,9 +251,10 @@ add_acl(acl_t acl, uint entry_number, ac return (-1); } - if (acl_brand != ACL_BRAND_NFS4) { + if (branding_mismatch(acl_brand, ACL_BRAND_NFS4)) { warnx("%s: branding mismatch; existing ACL is NFSv4, " - "entry to be added is POSIX.1e", filename); + "entry to be added is %s", filename, + brand_name(acl_brand)); return (-1); } Modified: user/ed/newcons/bin/setfacl/remove.c ============================================================================== --- user/ed/newcons/bin/setfacl/remove.c Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/setfacl/remove.c Mon Feb 8 18:49:50 2010 (r203675) @@ -53,11 +53,10 @@ remove_acl(acl_t acl, acl_t *prev_acl, c acl_get_brand_np(acl, &acl_brand); acl_get_brand_np(*prev_acl, &prev_acl_brand); - if (acl_brand != prev_acl_brand) { + if (branding_mismatch(acl_brand, prev_acl_brand)) { warnx("%s: branding mismatch; existing ACL is %s, " "entry to be removed is %s", filename, - prev_acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e", - acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e"); + brand_name(prev_acl_brand), brand_name(acl_brand)); return (-1); } Modified: user/ed/newcons/bin/setfacl/setfacl.h ============================================================================== --- user/ed/newcons/bin/setfacl/setfacl.h Mon Feb 8 18:37:10 2010 (r203674) +++ user/ed/newcons/bin/setfacl/setfacl.h Mon Feb 8 18:49:50 2010 (r203675) @@ -71,6 +71,8 @@ void remove_ext(acl_t *prev_acl, const int set_acl_mask(acl_t *prev_acl, const char *filename); /* util.c */ void *zmalloc(size_t size); +const char *brand_name(int brand); +int branding_mismatch(int brand1, int brand2); uint have_mask; uint need_mask; Modified: user/ed/newcons/bin/setfacl/util.c ============================================================================== --- user/ed/newcons/bin/setfacl/util.c Mon Feb 8 18:37:10 2010 (r203674) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Tue Feb 9 14:31:02 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BAAEC1065672; Tue, 9 Feb 2010 14:31:02 +0000 (UTC) (envelope-from eri@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A6C868FC24; Tue, 9 Feb 2010 14:31:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o19EV2gM092883; Tue, 9 Feb 2010 14:31:02 GMT (envelope-from eri@svn.freebsd.org) Received: (from eri@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o19EV2wc092871; Tue, 9 Feb 2010 14:31:02 GMT (envelope-from eri@svn.freebsd.org) Message-Id: <201002091431.o19EV2wc092871@svn.freebsd.org> From: Ermal Luçi Date: Tue, 9 Feb 2010 14:31:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203702 - in user/eri/pf45/head: cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/lib/libzfs/common contrib/expat/lib contrib/netcat contrib/nt... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Feb 2010 14:31:02 -0000 Author: eri Date: Tue Feb 9 14:31:02 2010 New Revision: 203702 URL: http://svn.freebsd.org/changeset/base/203702 Log: MFH Added: user/eri/pf45/head/contrib/ntp/html/build/hints/solaris.xtra.4095849 user/eri/pf45/head/include/semaphore.h user/eri/pf45/head/include/utmpx.h user/eri/pf45/head/release/picobsd/floppy.tree/sbin/ user/eri/pf45/head/release/picobsd/floppy.tree/sbin/dhclient-script (contents, props changed) user/eri/pf45/head/release/picobsd/qemu/ user/eri/pf45/head/release/picobsd/qemu/PICOBSD user/eri/pf45/head/release/picobsd/qemu/PICOBSD.hints user/eri/pf45/head/release/picobsd/qemu/config user/eri/pf45/head/release/picobsd/qemu/crunch.conf user/eri/pf45/head/release/picobsd/qemu/floppy.tree.exclude user/eri/pf45/head/sbin/geom/class/cache/gcache.8 user/eri/pf45/head/sbin/geom/class/mountver/ user/eri/pf45/head/sbin/geom/class/mountver/Makefile user/eri/pf45/head/sbin/geom/class/mountver/geom_mountver.c user/eri/pf45/head/sbin/geom/class/mountver/gmountver.8 user/eri/pf45/head/tools/regression/acltools/02.t user/eri/pf45/head/tools/regression/bin/sh/builtins/builtin1.0 user/eri/pf45/head/tools/regression/bin/sh/builtins/command6.0 user/eri/pf45/head/tools/regression/bin/sh/builtins/command6.0.stdout user/eri/pf45/head/tools/regression/bin/sh/builtins/command7.0 user/eri/pf45/head/tools/regression/bin/sh/builtins/fc2.0 user/eri/pf45/head/tools/regression/bin/sh/builtins/type2.0 user/eri/pf45/head/tools/regression/bin/sh/expansion/arith1.0 user/eri/pf45/head/tools/regression/bin/sh/expansion/arith2.0 user/eri/pf45/head/tools/regression/bin/sh/expansion/cmdsubst1.0 user/eri/pf45/head/tools/regression/kqueue/ user/eri/pf45/head/tools/regression/kqueue/Makefile user/eri/pf45/head/tools/regression/kqueue/common.h user/eri/pf45/head/tools/regression/kqueue/config.h user/eri/pf45/head/tools/regression/kqueue/main.c user/eri/pf45/head/tools/regression/kqueue/proc.c user/eri/pf45/head/tools/regression/kqueue/read.c user/eri/pf45/head/tools/regression/kqueue/signal.c user/eri/pf45/head/tools/regression/kqueue/timer.c user/eri/pf45/head/tools/regression/kqueue/user.c user/eri/pf45/head/tools/regression/kqueue/vnode.c user/eri/pf45/head/tools/regression/posixsem2/ user/eri/pf45/head/tools/regression/posixsem2/Makefile user/eri/pf45/head/tools/regression/posixsem2/semtest.c user/eri/pf45/head/tools/regression/usr.bin/comm/ user/eri/pf45/head/tools/regression/usr.bin/comm/Makefile user/eri/pf45/head/tools/regression/usr.bin/comm/regress.00.out user/eri/pf45/head/tools/regression/usr.bin/comm/regress.00a.in user/eri/pf45/head/tools/regression/usr.bin/comm/regress.00b.in user/eri/pf45/head/tools/regression/usr.bin/comm/regress.01.out user/eri/pf45/head/tools/regression/usr.bin/comm/regress.01a.in user/eri/pf45/head/tools/regression/usr.bin/comm/regress.01b.in user/eri/pf45/head/tools/regression/usr.bin/comm/regress.02.out user/eri/pf45/head/tools/regression/usr.bin/comm/regress.02a.in user/eri/pf45/head/tools/regression/usr.bin/comm/regress.02b.in user/eri/pf45/head/tools/regression/usr.bin/comm/regress.sh user/eri/pf45/head/tools/regression/usr.bin/comm/regress.t user/eri/pf45/head/tools/regression/usr.bin/make/syntax/directive-t0/ user/eri/pf45/head/tools/regression/usr.bin/make/syntax/directive-t0/Makefile user/eri/pf45/head/tools/regression/usr.bin/make/syntax/directive-t0/expected.status.1 user/eri/pf45/head/tools/regression/usr.bin/make/syntax/directive-t0/expected.stderr.1 user/eri/pf45/head/tools/regression/usr.bin/make/syntax/directive-t0/expected.stdout.1 user/eri/pf45/head/tools/regression/usr.bin/make/syntax/directive-t0/test.t user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/ user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t0/ user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t0/2/ user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t0/2/1/ user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t0/2/1/Makefile user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.status.1 user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stderr.1 user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stdout.1 user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t0/2/1/test.t user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t0/mk/ user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t0/mk/sys.mk user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t1/ user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t1/2/ user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t1/2/1/ user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t1/2/1/cleanup user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.status.1 user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stderr.1 user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stdout.1 user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t1/2/1/test.t user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t1/mk/ user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t1/mk/sys.mk user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t2/ user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t2/2/ user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t2/2/1/ user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t2/2/1/cleanup user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.status.1 user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stderr.1 user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stdout.1 user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t2/2/1/test.t user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t2/mk/ user/eri/pf45/head/tools/regression/usr.bin/make/sysmk/t2/mk/sys.mk user/eri/pf45/head/tools/tools/notescheck/ user/eri/pf45/head/tools/tools/notescheck/Makefile user/eri/pf45/head/tools/tools/notescheck/notescheck.py user/eri/pf45/head/usr.bin/bc/ user/eri/pf45/head/usr.bin/bc/Makefile user/eri/pf45/head/usr.bin/bc/USD.doc/ user/eri/pf45/head/usr.bin/bc/USD.doc/bc user/eri/pf45/head/usr.bin/bc/bc.1 user/eri/pf45/head/usr.bin/bc/bc.library user/eri/pf45/head/usr.bin/bc/bc.y user/eri/pf45/head/usr.bin/bc/extern.h user/eri/pf45/head/usr.bin/bc/pathnames.h user/eri/pf45/head/usr.bin/bc/scan.l user/eri/pf45/head/usr.bin/dc/ user/eri/pf45/head/usr.bin/dc/Makefile user/eri/pf45/head/usr.bin/dc/USD.doc/ user/eri/pf45/head/usr.bin/dc/USD.doc/dc user/eri/pf45/head/usr.bin/dc/bcode.c user/eri/pf45/head/usr.bin/dc/bcode.h user/eri/pf45/head/usr.bin/dc/dc.1 user/eri/pf45/head/usr.bin/dc/dc.c user/eri/pf45/head/usr.bin/dc/extern.h user/eri/pf45/head/usr.bin/dc/inout.c user/eri/pf45/head/usr.bin/dc/mem.c user/eri/pf45/head/usr.bin/dc/stack.c user/eri/pf45/head/usr.bin/wtmpcvt/ user/eri/pf45/head/usr.bin/wtmpcvt/Makefile user/eri/pf45/head/usr.bin/wtmpcvt/wtmpcvt.1 user/eri/pf45/head/usr.bin/wtmpcvt/wtmpcvt.c Modified: user/eri/pf45/head/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c user/eri/pf45/head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c user/eri/pf45/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h user/eri/pf45/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c user/eri/pf45/head/contrib/expat/lib/xmlparse.c user/eri/pf45/head/contrib/expat/lib/xmltok_impl.c user/eri/pf45/head/contrib/netcat/FREEBSD-vendor user/eri/pf45/head/contrib/ntp/COPYRIGHT user/eri/pf45/head/contrib/ntp/ChangeLog user/eri/pf45/head/contrib/ntp/CommitLog user/eri/pf45/head/contrib/ntp/Makefile.in user/eri/pf45/head/contrib/ntp/NEWS user/eri/pf45/head/contrib/ntp/README user/eri/pf45/head/contrib/ntp/README.bk user/eri/pf45/head/contrib/ntp/README.patches user/eri/pf45/head/contrib/ntp/WHERE-TO-START user/eri/pf45/head/contrib/ntp/aclocal.m4 user/eri/pf45/head/contrib/ntp/adjtimed/Makefile.in user/eri/pf45/head/contrib/ntp/arlib/Makefile.in user/eri/pf45/head/contrib/ntp/arlib/aclocal.m4 user/eri/pf45/head/contrib/ntp/arlib/configure user/eri/pf45/head/contrib/ntp/build user/eri/pf45/head/contrib/ntp/clockstuff/Makefile.in user/eri/pf45/head/contrib/ntp/config.h.in user/eri/pf45/head/contrib/ntp/configure user/eri/pf45/head/contrib/ntp/configure.ac user/eri/pf45/head/contrib/ntp/flock-build user/eri/pf45/head/contrib/ntp/html/copyright.html user/eri/pf45/head/contrib/ntp/html/drivers/driver40.html user/eri/pf45/head/contrib/ntp/include/Makefile.in user/eri/pf45/head/contrib/ntp/include/copyright.def user/eri/pf45/head/contrib/ntp/include/isc/Makefile.in user/eri/pf45/head/contrib/ntp/include/ntp_debug.h user/eri/pf45/head/contrib/ntp/include/version.def user/eri/pf45/head/contrib/ntp/kernel/Makefile.in user/eri/pf45/head/contrib/ntp/kernel/sys/Makefile.in user/eri/pf45/head/contrib/ntp/libntp/Makefile.in user/eri/pf45/head/contrib/ntp/libopts/Makefile.in user/eri/pf45/head/contrib/ntp/libparse/Makefile.am user/eri/pf45/head/contrib/ntp/libparse/Makefile.in user/eri/pf45/head/contrib/ntp/libparse/clk_rawdcf.c user/eri/pf45/head/contrib/ntp/ntpd/Makefile.in user/eri/pf45/head/contrib/ntp/ntpd/cmd_args.c user/eri/pf45/head/contrib/ntp/ntpd/ntp_crypto.c user/eri/pf45/head/contrib/ntp/ntpd/ntp_intres.c user/eri/pf45/head/contrib/ntp/ntpd/ntp_io.c user/eri/pf45/head/contrib/ntp/ntpd/ntp_request.c user/eri/pf45/head/contrib/ntp/ntpd/ntp_timer.c user/eri/pf45/head/contrib/ntp/ntpd/ntpd-opts.c user/eri/pf45/head/contrib/ntp/ntpd/ntpd-opts.h user/eri/pf45/head/contrib/ntp/ntpd/ntpd-opts.texi user/eri/pf45/head/contrib/ntp/ntpd/ntpd.1 user/eri/pf45/head/contrib/ntp/ntpd/ntpd.c user/eri/pf45/head/contrib/ntp/ntpd/ntpdsim-opts.c user/eri/pf45/head/contrib/ntp/ntpd/ntpdsim-opts.h user/eri/pf45/head/contrib/ntp/ntpd/ntpdsim-opts.texi user/eri/pf45/head/contrib/ntp/ntpd/ntpdsim.1 user/eri/pf45/head/contrib/ntp/ntpd/refclock_dumbclock.c user/eri/pf45/head/contrib/ntp/ntpd/refclock_hopfser.c user/eri/pf45/head/contrib/ntp/ntpd/refclock_jjy.c user/eri/pf45/head/contrib/ntp/ntpd/refclock_nmea.c user/eri/pf45/head/contrib/ntp/ntpd/refclock_palisade.c user/eri/pf45/head/contrib/ntp/ntpdate/Makefile.in user/eri/pf45/head/contrib/ntp/ntpdc/Makefile.in user/eri/pf45/head/contrib/ntp/ntpdc/ntpdc-opts.c user/eri/pf45/head/contrib/ntp/ntpdc/ntpdc-opts.h user/eri/pf45/head/contrib/ntp/ntpdc/ntpdc-opts.texi user/eri/pf45/head/contrib/ntp/ntpdc/ntpdc.1 user/eri/pf45/head/contrib/ntp/ntpq/Makefile.in user/eri/pf45/head/contrib/ntp/ntpq/ntpq-opts.c user/eri/pf45/head/contrib/ntp/ntpq/ntpq-opts.h user/eri/pf45/head/contrib/ntp/ntpq/ntpq-opts.texi user/eri/pf45/head/contrib/ntp/ntpq/ntpq.1 user/eri/pf45/head/contrib/ntp/ntpq/ntpq.c user/eri/pf45/head/contrib/ntp/packageinfo.sh user/eri/pf45/head/contrib/ntp/parseutil/Makefile.in user/eri/pf45/head/contrib/ntp/scripts/Makefile.in user/eri/pf45/head/contrib/ntp/sntp/Makefile.in user/eri/pf45/head/contrib/ntp/sntp/aclocal.m4 user/eri/pf45/head/contrib/ntp/sntp/config.h.in user/eri/pf45/head/contrib/ntp/sntp/configure user/eri/pf45/head/contrib/ntp/sntp/configure.ac user/eri/pf45/head/contrib/ntp/sntp/libopts/Makefile.in user/eri/pf45/head/contrib/ntp/sntp/sntp-opts.c user/eri/pf45/head/contrib/ntp/sntp/sntp-opts.def user/eri/pf45/head/contrib/ntp/sntp/sntp-opts.h user/eri/pf45/head/contrib/ntp/sntp/sntp-opts.texi user/eri/pf45/head/contrib/ntp/sntp/sntp.1 user/eri/pf45/head/contrib/ntp/sntp/version.def user/eri/pf45/head/contrib/ntp/util/Makefile.in user/eri/pf45/head/contrib/ntp/util/ntp-keygen-opts.c user/eri/pf45/head/contrib/ntp/util/ntp-keygen-opts.h user/eri/pf45/head/contrib/ntp/util/ntp-keygen-opts.texi user/eri/pf45/head/contrib/ntp/util/ntp-keygen.1 user/eri/pf45/head/contrib/ntp/version user/eri/pf45/head/contrib/ntp/version.m4 user/eri/pf45/head/lib/libc/gen/sem_init.3 user/eri/pf45/head/lib/libc/stdio/getline.3 user/eri/pf45/head/lib/libc/stdio/sprintf.c user/eri/pf45/head/lib/libc/stdio/sscanf.c user/eri/pf45/head/lib/libc/stdio/vsscanf.c user/eri/pf45/head/lib/libc/stdlib/malloc.c user/eri/pf45/head/lib/libc/stdtime/localtime.c Directory Properties: user/eri/pf45/head/ (props changed) user/eri/pf45/head/cddl/contrib/opensolaris/ (props changed) user/eri/pf45/head/contrib/bind9/ (props changed) user/eri/pf45/head/contrib/cpio/ (props changed) user/eri/pf45/head/contrib/csup/ (props changed) user/eri/pf45/head/contrib/ee/ (props changed) user/eri/pf45/head/contrib/expat/ (props changed) user/eri/pf45/head/contrib/file/ (props changed) user/eri/pf45/head/contrib/gdb/ (props changed) user/eri/pf45/head/contrib/gdtoa/ (props changed) user/eri/pf45/head/contrib/less/ (props changed) user/eri/pf45/head/contrib/libpcap/ (props changed) user/eri/pf45/head/contrib/ncurses/ (props changed) user/eri/pf45/head/contrib/netcat/ (props changed) user/eri/pf45/head/contrib/ntp/ (props changed) user/eri/pf45/head/contrib/openbsm/ (props changed) user/eri/pf45/head/contrib/openpam/ (props changed) user/eri/pf45/head/contrib/pf/ (props changed) user/eri/pf45/head/contrib/sendmail/ (props changed) user/eri/pf45/head/contrib/tcpdump/ (props changed) user/eri/pf45/head/contrib/tcsh/ (props changed) user/eri/pf45/head/contrib/top/ (props changed) user/eri/pf45/head/contrib/top/install-sh (props changed) user/eri/pf45/head/contrib/wpa/ (props changed) user/eri/pf45/head/crypto/openssh/ (props changed) user/eri/pf45/head/crypto/openssl/ (props changed) user/eri/pf45/head/lib/libc/ (props changed) user/eri/pf45/head/lib/libc/stdtime/ (props changed) user/eri/pf45/head/lib/libutil/ (props changed) user/eri/pf45/head/sbin/ (props changed) user/eri/pf45/head/sbin/ipfw/ (props changed) user/eri/pf45/head/share/zoneinfo/ (props changed) user/eri/pf45/head/sys/ (props changed) user/eri/pf45/head/sys/amd64/include/xen/ (props changed) user/eri/pf45/head/sys/cddl/contrib/opensolaris/ (props changed) user/eri/pf45/head/sys/contrib/dev/acpica/ (props changed) user/eri/pf45/head/sys/contrib/pf/ (props changed) user/eri/pf45/head/sys/dev/xen/xenpci/ (props changed) user/eri/pf45/head/usr.bin/csup/ (props changed) user/eri/pf45/head/usr.bin/procstat/ (props changed) user/eri/pf45/head/usr.sbin/zic/ (props changed) Modified: user/eri/pf45/head/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c ============================================================================== --- user/eri/pf45/head/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c Tue Feb 9 13:07:32 2010 (r203701) +++ user/eri/pf45/head/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c Tue Feb 9 14:31:02 2010 (r203702) @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Print intent log header and statistics. */ @@ -345,8 +343,10 @@ dump_intent_log(zilog_t *zilog) if (zh->zh_log.blk_birth == 0 || verbose < 2) return; - (void) printf("\n ZIL header: claim_txg %llu, seq %llu\n", - (u_longlong_t)zh->zh_claim_txg, (u_longlong_t)zh->zh_replay_seq); + (void) printf("\n ZIL header: claim_txg %llu, claim_seq %llu", + (u_longlong_t)zh->zh_claim_txg, (u_longlong_t)zh->zh_claim_seq); + (void) printf(" replay_seq %llu, flags 0x%llx\n", + (u_longlong_t)zh->zh_replay_seq, (u_longlong_t)zh->zh_flags); if (verbose >= 4) print_log_bp(&zh->zh_log, "\n\tfirst block: "); Modified: user/eri/pf45/head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- user/eri/pf45/head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Tue Feb 9 13:07:32 2010 (r203701) +++ user/eri/pf45/head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Tue Feb 9 14:31:02 2010 (r203702) @@ -20,7 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -2457,7 +2457,7 @@ zfs_do_receive(int argc, char **argv) bzero(&flags, sizeof (recvflags_t)); /* check options */ - while ((c = getopt(argc, argv, ":dnvF")) != -1) { + while ((c = getopt(argc, argv, ":dnuvF")) != -1) { switch (c) { case 'd': flags.isprefix = B_TRUE; @@ -2465,6 +2465,9 @@ zfs_do_receive(int argc, char **argv) case 'n': flags.dryrun = B_TRUE; break; + case 'u': + flags.nomount = B_TRUE; + break; case 'v': flags.verbose = B_TRUE; break; Modified: user/eri/pf45/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h ============================================================================== --- user/eri/pf45/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Tue Feb 9 13:07:32 2010 (r203701) +++ user/eri/pf45/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Tue Feb 9 14:31:02 2010 (r203702) @@ -20,7 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -457,6 +457,9 @@ typedef struct recvflags { /* byteswap flag is used internally; callers need not specify */ int byteswap : 1; + + /* do not mount file systems as they are extracted (private) */ + int nomount : 1; } recvflags_t; extern int zfs_receive(libzfs_handle_t *, const char *, recvflags_t, Modified: user/eri/pf45/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c ============================================================================== --- user/eri/pf45/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Tue Feb 9 13:07:32 2010 (r203701) +++ user/eri/pf45/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Tue Feb 9 14:31:02 2010 (r203702) @@ -20,7 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -2080,7 +2080,7 @@ zfs_receive(libzfs_handle_t *hdl, const err = zfs_receive_impl(hdl, tosnap, flags, infd, stream_avl, &top_zfs); - if (err == 0 && top_zfs) { + if (err == 0 && !flags.nomount && top_zfs) { zfs_handle_t *zhp; prop_changelist_t *clp; Modified: user/eri/pf45/head/contrib/expat/lib/xmlparse.c ============================================================================== --- user/eri/pf45/head/contrib/expat/lib/xmlparse.c Tue Feb 9 13:07:32 2010 (r203701) +++ user/eri/pf45/head/contrib/expat/lib/xmlparse.c Tue Feb 9 14:31:02 2010 (r203702) @@ -3725,7 +3725,6 @@ doProlog(XML_Parser parser, return XML_ERROR_NO_ELEMENTS; default: tok = -tok; - next = end; break; } } Modified: user/eri/pf45/head/contrib/expat/lib/xmltok_impl.c ============================================================================== --- user/eri/pf45/head/contrib/expat/lib/xmltok_impl.c Tue Feb 9 13:07:32 2010 (r203701) +++ user/eri/pf45/head/contrib/expat/lib/xmltok_impl.c Tue Feb 9 14:31:02 2010 (r203702) @@ -1744,7 +1744,7 @@ PREFIX(updatePosition)(const ENCODING *e const char *end, POSITION *pos) { - while (ptr != end) { + while (ptr < end) { switch (BYTE_TYPE(enc, ptr)) { #define LEAD_CASE(n) \ case BT_LEAD ## n: \ Modified: user/eri/pf45/head/contrib/netcat/FREEBSD-vendor ============================================================================== --- user/eri/pf45/head/contrib/netcat/FREEBSD-vendor Tue Feb 9 13:07:32 2010 (r203701) +++ user/eri/pf45/head/contrib/netcat/FREEBSD-vendor Tue Feb 9 14:31:02 2010 (r203702) @@ -1,5 +1,5 @@ # $FreeBSD$ Project: netcat (aka src/usr.bin/nc in OpenBSD) ProjectURL: http://www.openbsd.org/ -Version: 4.4 +Version: 4.5 License: BSD Modified: user/eri/pf45/head/contrib/ntp/COPYRIGHT ============================================================================== --- user/eri/pf45/head/contrib/ntp/COPYRIGHT Tue Feb 9 13:07:32 2010 (r203701) +++ user/eri/pf45/head/contrib/ntp/COPYRIGHT Tue Feb 9 14:31:02 2010 (r203702) @@ -13,7 +13,7 @@ This file is automatically generated fro applies as if the text was explicitly included in the file. *********************************************************************** * * -* Copyright (c) David L. Mills 1992-2008 * +* Copyright (c) David L. Mills 1992-2009 * * * * Permission to use, copy, modify, and distribute this software and * * its documentation for any purpose with or without fee is hereby * Modified: user/eri/pf45/head/contrib/ntp/ChangeLog ============================================================================== --- user/eri/pf45/head/contrib/ntp/ChangeLog Tue Feb 9 13:07:32 2010 (r203701) +++ user/eri/pf45/head/contrib/ntp/ChangeLog Tue Feb 9 14:31:02 2010 (r203702) @@ -1,6 +1,85 @@ -(4.2.4p5) 2008/08/17 Released by Harlan Stenn --- -(4.2.4p5) 2008/08/17 Released by Harlan Stenn +(4.2.4p8) 2009/12/08 Released by Harlan Stenn + +* [Sec 1331] DoS with mode 7 packets - CVE-2009-3563. + +--- +(4.2.4p7) 2009/05/18 Released by Harlan Stenn + +* [Sec 1151] Remote exploit if autokey is enabled - CVE-2009-1252. +* [Bug 1187] Update the copyright date. +* [Bug 1191] ntpd fails on Win2000 - "Address already in use" after fix + for [Sec 1149]. + +--- +(4.2.4p7-RC7) 2009/05/12 Released by Harlan Stenn + +* ntp.isc.org -> ntp.org cleanup. +* [Bug 1178] Use prior FORCE_DNSRETRY behavior as needed at runtime, + add configure --enable-ignore-dns-errors to be even more stubborn + +--- +(4.2.4p7-RC6) 2009/05/08 Released by Harlan Stenn + +* [Bug 784] Make --enable-linuxcaps the default when available +* [Bug 1179] error messages for -u/--user and -i lacking droproot +* Updated JJY reference clock driver from Takao Abe +* [Bug 1071] Log a message and exit before trying to use FD_SET with a + descriptor larger than FD_SETSIZE, which will corrupt memory +* On corruption of the iface list head in add_interface, log and exit + +--- +(4.2.4p7-RC5) 2009/05/02 Released by Harlan Stenn + +* [Bug 1172] 4.2.4p7-RC{3,4} fail to build on linux. +* flock-build script unportable 'set -m' use removed + +--- +(4.2.4p7-RC4) 2009/04/29 Released by Harlan Stenn + +* [Bug 1167] use gcc -Winit-self only if it is understood + +--- +(4.2.4p7-RC3) 2009/04/22 Released by Harlan Stenn + +* [Bug 787] Bug fixes for 64-bit time_t on Windows +* [Bug 813] Conditional naming of Event +* [Bug 1147] System errors should be logged to msyslog() +* [Bug 1155] Fix compile problem on Windows with VS2005 +* [Bug 1156] lock_thread_to_processor() should be declared in header +* [Bug 1157] quiet OpenSSL warnings, clean up configure.ac +* [Bug 1158] support for aix6.1 +* [Bug 1160] MacOS X is like BSD regarding F_SETOWN + +--- +(4.2.4p7-RC2) 2009/04/09 Released by Harlan Stenn + +* [Sec 1144] limited buffer overflow in ntpq. CVE-2009-0159 +* [Sec 1149] use SO_EXCLUSIVEADDRUSE on Windows + +--- +(4.2.4p7-RC1) 2009/03/30 Released by Harlan Stenn + +* [Bug 1131] UDP sockets should not use SIGPOLL on Solaris. +* build system email address cleanup +* [Bug 774] parsesolaris.c does not compile under the new Solaris +* [Bug 873] Windows serial refclock proper TTY line discipline emulation +* [Bug 1014] Enable building with VC9 (in Visual Studio 2008, + Visual C++ 2008, or SDK) +* [Bug 1117] Deferred interface binding under Windows works only correctly + if FORCE_DNSRETRY is defined +* [BUG 1124] Lock QueryPerformanceCounter() client threads to same CPU +* DPRINTF macro made safer, always evaluates to a statement and will not + misassociate an else which follows the macro. + +--- +(4.2.4p6) 2009/01/08 Released by Harlan Stenn + +* [Bug 1113] Fixed build errors with recent versions of openSSL. +* [Sec 1111] Fix incorrect check of EVP_VerifyFinal()'s return value. +* Update the copyright year. + +--- (4.2.4p5) 2008/08/17 Released by Harlan Stenn * [BUG 1051] Month off by one in leap second message written to clockstats Modified: user/eri/pf45/head/contrib/ntp/CommitLog ============================================================================== --- user/eri/pf45/head/contrib/ntp/CommitLog Tue Feb 9 13:07:32 2010 (r203701) +++ user/eri/pf45/head/contrib/ntp/CommitLog Tue Feb 9 14:31:02 2010 (r203702) @@ -1,1772 +1,3496 @@ -ChangeSet@1.1541, 2008-08-17 05:30:47-04:00, stenn@whimsy.udel.edu +26 -0 - NTP_4_2_4P5 - TAG: NTP_4_2_4P5 +ChangeSet@1.1612, 2009-12-08 08:30:54-05:00, stenn@whimsy.udel.edu +1 -0 + ChangeLog: + typo - ChangeLog@1.44, 2008-08-17 05:30:27-04:00, stenn@whimsy.udel.edu +3 -0 - NTP_4_2_4P5 + ChangeLog@1.95, 2009-12-08 08:30:44-05:00, stenn@whimsy.udel.edu +0 -1 + typo - ntpd/ntpd-opts.c@1.74, 2008-08-17 05:30:28-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 +ChangeSet@1.1611, 2009-12-08 08:23:12-05:00, stenn@whimsy.udel.edu +26 -0 + NTP_4_2_4P8 + TAG: NTP_4_2_4P8 - ntpd/ntpd-opts.h@1.74, 2008-08-17 05:30:28-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5 + ChangeLog@1.94, 2009-12-08 08:23:01-05:00, stenn@whimsy.udel.edu +1 -0 + NTP_4_2_4P8 - ntpd/ntpd-opts.texi@1.73, 2008-08-17 05:30:29-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5 + ntpd/ntpd-opts.c@1.86, 2009-12-08 08:23:02-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - ntpd/ntpd.1@1.72, 2008-08-17 05:30:30-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + ntpd/ntpd-opts.h@1.86, 2009-12-08 08:23:02-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P8 - ntpd/ntpdsim-opts.c@1.74, 2008-08-17 05:30:30-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + ntpd/ntpd-opts.texi@1.85, 2009-12-08 08:23:03-05:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P8 - ntpd/ntpdsim-opts.h@1.74, 2008-08-17 05:30:31-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5 + ntpd/ntpd.1@1.84, 2009-12-08 08:23:03-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - ntpd/ntpdsim-opts.texi@1.72, 2008-08-17 05:30:32-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5 + ntpd/ntpdsim-opts.c@1.86, 2009-12-08 08:23:03-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - ntpd/ntpdsim.1@1.72, 2008-08-17 05:30:33-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + ntpd/ntpdsim-opts.h@1.86, 2009-12-08 08:23:04-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P8 - ntpdc/ntpdc-opts.c@1.74, 2008-08-17 05:30:33-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + ntpd/ntpdsim-opts.texi@1.84, 2009-12-08 08:23:05-05:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P8 - ntpdc/ntpdc-opts.h@1.74, 2008-08-17 05:30:34-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5 + ntpd/ntpdsim.1@1.84, 2009-12-08 08:23:05-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - ntpdc/ntpdc-opts.texi@1.72, 2008-08-17 05:30:34-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5 + ntpdc/ntpdc-opts.c@1.86, 2009-12-08 08:23:05-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - ntpdc/ntpdc.1@1.72, 2008-08-17 05:30:35-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + ntpdc/ntpdc-opts.h@1.86, 2009-12-08 08:23:05-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P8 - ntpq/ntpq-opts.c@1.76, 2008-08-17 05:30:35-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + ntpdc/ntpdc-opts.texi@1.84, 2009-12-08 08:23:06-05:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P8 - ntpq/ntpq-opts.h@1.76, 2008-08-17 05:30:36-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5 + ntpdc/ntpdc.1@1.84, 2009-12-08 08:23:06-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - ntpq/ntpq-opts.texi@1.73, 2008-08-17 05:30:36-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5 + ntpq/ntpq-opts.c@1.88, 2009-12-08 08:23:06-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - ntpq/ntpq.1@1.72, 2008-08-17 05:30:37-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + ntpq/ntpq-opts.h@1.88, 2009-12-08 08:23:06-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P8 - packageinfo.sh@1.101, 2008-08-17 05:30:37-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + ntpq/ntpq-opts.texi@1.85, 2009-12-08 08:23:07-05:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P8 - sntp/sntp-opts.c@1.72, 2008-08-17 05:30:38-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + ntpq/ntpq.1@1.84, 2009-12-08 08:23:07-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - sntp/sntp-opts.h@1.72, 2008-08-17 05:30:39-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5 + packageinfo.sh@1.118, 2009-12-08 08:23:07-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P8 - sntp/sntp-opts.texi@1.69, 2008-08-17 05:30:39-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5 + sntp/sntp-opts.c@1.84, 2009-12-08 08:23:07-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - sntp/sntp.1@1.72, 2008-08-17 05:30:40-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + sntp/sntp-opts.h@1.84, 2009-12-08 08:23:07-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P8 - util/ntp-keygen-opts.c@1.73, 2008-08-17 05:30:40-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + sntp/sntp-opts.texi@1.81, 2009-12-08 08:23:08-05:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P8 - util/ntp-keygen-opts.h@1.73, 2008-08-17 05:30:41-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5 + sntp/sntp.1@1.84, 2009-12-08 08:23:08-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - util/ntp-keygen-opts.texi@1.71, 2008-08-17 05:30:42-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5 + util/ntp-keygen-opts.c@1.85, 2009-12-08 08:23:08-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - util/ntp-keygen.1@1.71, 2008-08-17 05:30:42-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + util/ntp-keygen-opts.h@1.85, 2009-12-08 08:23:08-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P8 -ChangeSet@1.1540, 2008-08-17 05:29:47-04:00, stenn@whimsy.udel.edu +1 -0 - typo + util/ntp-keygen-opts.texi@1.83, 2009-12-08 08:23:09-05:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P8 - scripts/addChangeLogTag@1.2, 2008-08-17 05:29:37-04:00, stenn@whimsy.udel.edu +1 -1 - typo + util/ntp-keygen.1@1.83, 2009-12-08 08:23:09-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 -ChangeSet@1.1539, 2008-08-17 03:28:53-04:00, stenn@whimsy.udel.edu +5 -0 - 4.2.4p5 prep +ChangeSet@1.1610, 2009-12-08 07:45:28-05:00, stenn@whimsy.udel.edu +26 -0 + NTP_4_2_4P9_RC1 + TAG: NTP_4_2_4P9_RC1 - .point-changed-filelist@1.2, 2008-08-17 03:27:42-04:00, stenn@whimsy.udel.edu +1 -0 - 4.2.4p5 prep + ChangeLog@1.93, 2009-12-08 07:45:19-05:00, stenn@whimsy.udel.edu +1 -0 + NTP_4_2_4P9_RC1 - NEWS@1.99, 2008-08-17 03:27:42-04:00, stenn@whimsy.udel.edu +17 -0 - 4.2.4p5 prep + ntpd/ntpd-opts.c@1.85, 2009-12-08 07:45:19-05:00, stenn@whimsy.udel.edu +5 -5 + NTP_4_2_4P9_RC1 - packageinfo.sh@1.100, 2008-08-17 03:27:43-04:00, stenn@whimsy.udel.edu +1 -1 - 4.2.4p5 prep + ntpd/ntpd-opts.h@1.85, 2009-12-08 07:45:19-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 - scripts/addChangeLogTag@1.1, 2008-08-17 03:27:55-04:00, stenn@whimsy.udel.edu +27 -0 - BitKeeper file /deacon/backroom/ntp-stable/scripts/addChangeLogTag + ntpd/ntpd-opts.texi@1.84, 2009-12-08 07:45:20-05:00, stenn@whimsy.udel.edu +13 -6 + NTP_4_2_4P9_RC1 - scripts/addChangeLogTag@1.0, 2008-08-17 03:27:55-04:00, stenn@whimsy.udel.edu +0 -0 + ntpd/ntpd.1@1.83, 2009-12-08 07:45:20-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P9_RC1 - scripts/genChangeLogTag@1.1, 2008-08-17 03:27:55-04:00, stenn@whimsy.udel.edu +6 -0 - BitKeeper file /deacon/backroom/ntp-stable/scripts/genChangeLogTag + ntpd/ntpdsim-opts.c@1.85, 2009-12-08 07:45:20-05:00, stenn@whimsy.udel.edu +5 -5 + NTP_4_2_4P9_RC1 - scripts/genChangeLogTag@1.0, 2008-08-17 03:27:55-04:00, stenn@whimsy.udel.edu +0 -0 + ntpd/ntpdsim-opts.h@1.85, 2009-12-08 07:45:20-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 -ChangeSet@1.1538, 2008-08-16 22:42:08-04:00, stenn@whimsy.udel.edu +2 -0 - [BUG 1051] Month off by one in leap second message written to clockstats + ntpd/ntpdsim-opts.texi@1.83, 2009-12-08 07:45:21-05:00, stenn@whimsy.udel.edu +61 -2 + NTP_4_2_4P9_RC1 - ChangeLog@1.43, 2008-08-16 22:41:50-04:00, stenn@whimsy.udel.edu +2 -0 - [BUG 1051] Month off by one in leap second message written to clockstats + ntpd/ntpdsim.1@1.83, 2009-12-08 07:45:21-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P9_RC1 - ntpd/refclock_oncore.c@1.63, 2008-08-16 22:41:50-04:00, stenn@whimsy.udel.edu +1 -1 - [BUG 1051] Month off by one in leap second message written to clockstats + ntpdc/ntpdc-opts.c@1.85, 2009-12-08 07:45:21-05:00, stenn@whimsy.udel.edu +5 -5 + NTP_4_2_4P9_RC1 -ChangeSet@1.1537, 2008-08-10 07:44:31-04:00, stenn@whimsy.udel.edu +25 -0 - NTP_4_2_4P5_RC2 - TAG: NTP_4_2_4P5_RC2 + ntpdc/ntpdc-opts.h@1.85, 2009-12-08 07:45:21-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 - ntpd/ntpd-opts.c@1.73, 2008-08-10 07:44:09-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC2 + ntpdc/ntpdc-opts.texi@1.83, 2009-12-08 07:45:21-05:00, stenn@whimsy.udel.edu +7 -4 + NTP_4_2_4P9_RC1 - ntpd/ntpd-opts.h@1.73, 2008-08-10 07:44:09-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5_RC2 + ntpdc/ntpdc.1@1.83, 2009-12-08 07:45:22-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P9_RC1 - ntpd/ntpd-opts.texi@1.72, 2008-08-10 07:44:10-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5_RC2 + ntpq/ntpq-opts.c@1.87, 2009-12-08 07:45:22-05:00, stenn@whimsy.udel.edu +5 -5 + NTP_4_2_4P9_RC1 - ntpd/ntpd.1@1.71, 2008-08-10 07:44:10-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC2 + ntpq/ntpq-opts.h@1.87, 2009-12-08 07:45:22-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 - ntpd/ntpdsim-opts.c@1.73, 2008-08-10 07:44:11-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC2 + ntpq/ntpq-opts.texi@1.84, 2009-12-08 07:45:22-05:00, stenn@whimsy.udel.edu +8 -4 + NTP_4_2_4P9_RC1 - ntpd/ntpdsim-opts.h@1.73, 2008-08-10 07:44:12-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5_RC2 + ntpq/ntpq.1@1.83, 2009-12-08 07:45:23-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P9_RC1 - ntpd/ntpdsim-opts.texi@1.71, 2008-08-10 07:44:12-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5_RC2 + packageinfo.sh@1.117, 2009-12-08 07:45:23-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P9_RC1 - ntpd/ntpdsim.1@1.71, 2008-08-10 07:44:13-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC2 + sntp/sntp-opts.c@1.83, 2009-12-08 07:45:23-05:00, stenn@whimsy.udel.edu +5 -5 + NTP_4_2_4P9_RC1 - ntpdc/ntpdc-opts.c@1.73, 2008-08-10 07:44:14-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC2 + sntp/sntp-opts.h@1.83, 2009-12-08 07:45:23-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 - ntpdc/ntpdc-opts.h@1.73, 2008-08-10 07:44:15-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5_RC2 + sntp/sntp-opts.texi@1.80, 2009-12-08 07:45:24-05:00, stenn@whimsy.udel.edu +54 -2 + NTP_4_2_4P9_RC1 - ntpdc/ntpdc-opts.texi@1.71, 2008-08-10 07:44:16-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5_RC2 + sntp/sntp.1@1.83, 2009-12-08 07:45:24-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P9_RC1 - ntpdc/ntpdc.1@1.71, 2008-08-10 07:44:17-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC2 + util/ntp-keygen-opts.c@1.84, 2009-12-08 07:45:24-05:00, stenn@whimsy.udel.edu +5 -5 + NTP_4_2_4P9_RC1 - ntpq/ntpq-opts.c@1.75, 2008-08-10 07:44:17-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC2 + util/ntp-keygen-opts.h@1.84, 2009-12-08 07:45:24-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 - ntpq/ntpq-opts.h@1.75, 2008-08-10 07:44:18-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5_RC2 + util/ntp-keygen-opts.texi@1.82, 2009-12-08 07:45:24-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 - ntpq/ntpq-opts.texi@1.72, 2008-08-10 07:44:19-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5_RC2 + util/ntp-keygen.1@1.82, 2009-12-08 07:45:25-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P9_RC1 - ntpq/ntpq.1@1.71, 2008-08-10 07:44:20-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC2 +ChangeSet@1.1609, 2009-12-08 05:36:47-05:00, stenn@whimsy.udel.edu +2 -0 + [Sec 1331] DoS with mode 7 packets - CVE-2009-3563 - packageinfo.sh@1.99, 2008-08-10 07:44:20-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5_RC2 + NEWS@1.102, 2009-12-08 05:36:36-05:00, stenn@whimsy.udel.edu +34 -0 + [Sec 1331] DoS with mode 7 packets - CVE-2009-3563 - sntp/sntp-opts.c@1.71, 2008-08-10 07:44:22-04:00, stenn@whimsy.udel.edu +4 -5 - NTP_4_2_4P5_RC2 + packageinfo.sh@1.116, 2009-12-08 05:36:36-05:00, stenn@whimsy.udel.edu +2 -2 + [Sec 1331] DoS with mode 7 packets - CVE-2009-3563 - sntp/sntp-opts.h@1.71, 2008-08-10 07:44:23-04:00, stenn@whimsy.udel.edu +5 -6 - NTP_4_2_4P5_RC2 +ChangeSet@1.1608, 2009-10-07 01:33:22+00:00, davehart@shiny.ad.hartbrothers.com +2 -0 + [Sec 1331] DoS with mode 7 packets - CVE-2009-3563. - sntp/sntp-opts.texi@1.68, 2008-08-10 07:44:23-04:00, stenn@whimsy.udel.edu +2 -3 - NTP_4_2_4P5_RC2 + ChangeLog@1.92, 2009-10-07 01:33:21+00:00, davehart@shiny.ad.hartbrothers.com +4 -0 + [Sec 1331] DoS with mode 7 packets - CVE-2009-3563. - sntp/sntp.1@1.71, 2008-08-10 07:44:24-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5_RC2 + ntpd/ntp_request.c@1.68, 2009-10-07 01:33:21+00:00, davehart@shiny.ad.hartbrothers.com +9 -2 + [Sec 1331] DoS with mode 7 packets - CVE-2009-3563. - util/ntp-keygen-opts.c@1.72, 2008-08-10 07:44:25-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC2 +ChangeSet@1.1607, 2009-05-18 05:04:41-04:00, stenn@whimsy.udel.edu +26 -0 + NTP_4_2_4P7 + TAG: NTP_4_2_4P7 - util/ntp-keygen-opts.h@1.72, 2008-08-10 07:44:25-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5_RC2 + ChangeLog@1.91, 2009-05-18 05:04:18-04:00, stenn@whimsy.udel.edu +1 -0 + NTP_4_2_4P7 - util/ntp-keygen-opts.texi@1.70, 2008-08-10 07:44:27-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5_RC2 + ntpd/ntpd-opts.c@1.84, 2009-05-18 05:04:19-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 - util/ntp-keygen.1@1.70, 2008-08-10 07:44:27-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC2 + ntpd/ntpd-opts.h@1.84, 2009-05-18 05:04:20-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 -ChangeSet@1.1531.3.1, 2008-08-10 02:22:22-04:00, stenn@whimsy.udel.edu +1 -0 - triggert needs to handle rooted RESYNC paths now + ntpd/ntpd-opts.texi@1.83, 2009-05-18 05:04:21-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7 - BitKeeper/triggers/triggert@1.5, 2008-08-10 02:22:11-04:00, stenn@whimsy.udel.edu +3 -2 - triggert needs to handle rooted RESYNC paths now + ntpd/ntpd.1@1.82, 2009-05-18 05:04:22-04:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P7 -ChangeSet@1.1534, 2008-08-09 20:05:06-04:00, stenn@whimsy.udel.edu +2 -0 - AutoGen'd files must be writable + ntpd/ntpdsim-opts.c@1.84, 2009-05-18 05:04:22-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 - sntp/Makefile.am@1.23, 2008-08-09 20:04:56-04:00, stenn@whimsy.udel.edu +2 -2 - AutoGen'd files must be writable + ntpd/ntpdsim-opts.h@1.84, 2009-05-18 05:04:23-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 - sntp/sntp-opts.menu@1.3, 2008-08-09 20:04:10-04:00, stenn@whimsy.udel.edu +0 -0 - Change mode to -rw-rw-r-- + ntpd/ntpdsim-opts.texi@1.82, 2009-05-18 05:04:24-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7 -ChangeSet@1.1531.2.1, 2008-08-07 20:44:31+02:00, burnicki@pogo.udel.edu +3 -0 - [Bug 450] Windows only: Under original Windows NT we must not discard the - wildcard socket to workaround a bug in NT's getsockname(). + ntpd/ntpdsim.1@1.82, 2009-05-18 05:04:25-04:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P7 - ChangeLog@1.39.2.1, 2008-08-07 20:44:30+02:00, burnicki@pogo.udel.edu +2 -0 - [Bug 450] Windows only: Under original Windows NT we must not discard the - wildcard socket to workaround a bug in NT's getsockname(). + ntpdc/ntpdc-opts.c@1.84, 2009-05-18 05:04:26-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 - ntpd/ntp_peer.c@1.99.1.1, 2008-08-07 20:44:30+02:00, burnicki@pogo.udel.edu +10 -2 - [Bug 450] Windows only: Under original Windows NT we must not discard the - wildcard socket to workaround a bug in NT's getsockname(). + ntpdc/ntpdc-opts.h@1.84, 2009-05-18 05:04:26-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 - ports/winnt/ntpd/ntservice.c@1.11, 2008-08-07 20:44:30+02:00, burnicki@pogo.udel.edu +8 -1 - [Bug 450] Windows only: Under original Windows NT we must not discard the - wildcard socket to workaround a bug in NT's getsockname(). + ntpdc/ntpdc-opts.texi@1.82, 2009-05-18 05:04:27-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7 -ChangeSet@1.1531.1.2, 2008-08-05 09:56:08+02:00, burnicki@pogo.udel.edu +1 -0 - Removed Windows-specific debug code which has been added in ntp-dev and fails to compile in ntp-stable. + ntpdc/ntpdc.1@1.82, 2009-05-18 05:04:28-04:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P7 - ports/winnt/ntpd/ntp_iocompletionport.c@1.26, 2008-08-05 09:56:08+02:00, burnicki@pogo.udel.edu +0 -8 - Removed Windows-specific debug code which has been added in ntp-dev and fails to compile in ntp-stable. + ntpq/ntpq-opts.c@1.86, 2009-05-18 05:04:29-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 -ChangeSet@1.1531.1.1, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +10 -0 - [Bug 841] Obsolete the "dynamic" keyword and make deferred binding - to local interfaces the default. - Emit a warning if that keyword is used for configuration. + ntpq/ntpq-opts.h@1.86, 2009-05-18 05:04:29-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 - ChangeLog@1.39.1.1, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +3 -0 - [Bug 841] Obsolete the "dynamic" keyword and make deferred binding - to local interfaces the default. - Emit a warning if that keyword is used for configuration. + ntpq/ntpq-opts.texi@1.83, 2009-05-18 05:04:30-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7 - html/confopt.html@1.36, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +0 -2 - Bug 841: Obsolete the "dynamic" keyword. + ntpq/ntpq.1@1.82, 2009-05-18 05:04:31-04:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P7 - html/ntpdc.html@1.27, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +2 -3 - Bug 841: Obsolete the "dynamic" keyword. + packageinfo.sh@1.115, 2009-05-18 05:04:32-04:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P7 - include/ntp.h@1.129, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +0 -1 - Bug 841: Obsolete the "dynamic" keyword. + sntp/sntp-opts.c@1.82, 2009-05-18 05:04:32-04:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P7 - include/ntp_request.h@1.31, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +0 -1 - Bug 841: Obsolete the "dynamic" keyword. + sntp/sntp-opts.h@1.82, 2009-05-18 05:04:33-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7 - ntpd/ntp_config.c@1.144, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +4 -2 - [Bug 841] Obsolete the "dynamic" keyword and make deferred binding - to local interfaces the default. - Emit a warning if that keyword is used for configuration. + sntp/sntp-opts.texi@1.79, 2009-05-18 05:04:34-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7 - ntpd/ntp_intres.c@1.52, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +1 -3 - Bug 841: Obsolete the "dynamic" keyword. + sntp/sntp.1@1.82, 2009-05-18 05:04:34-04:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P7 - ntpd/ntp_peer.c@1.100, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +5 -25 - [Bug 841] Obsolete the "dynamic" keyword and make deferred binding - to local interfaces the default. + util/ntp-keygen-opts.c@1.83, 2009-05-18 05:04:35-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 - ntpd/ntp_request.c@1.66, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +1 -3 - Bug 841: Obsolete the "dynamic" keyword. + util/ntp-keygen-opts.h@1.83, 2009-05-18 05:04:36-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 - ntpdc/ntpdc_ops.c@1.50, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +3 -3 - [Bug 841] Obsolete the "dynamic" keyword and make deferred binding - to local interfaces the default. + util/ntp-keygen-opts.texi@1.81, 2009-05-18 05:04:37-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7 -ChangeSet@1.1532, 2008-07-22 11:41:26+02:00, burnicki@pogo.udel.edu +2 -0 - [Bug 1038] Built-in getpass() function also prompts for password if not built with DEBUG. + util/ntp-keygen.1@1.81, 2009-05-18 05:04:37-04:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P7 - ChangeLog@1.40, 2008-07-22 11:41:25+02:00, burnicki@pogo.udel.edu +1 -0 - [Bug 1038] Built-in getpass() function also prompts for password if not built with DEBUG. +ChangeSet@1.1606, 2009-05-18 03:14:59-04:00, stenn@whimsy.udel.edu +2 -0 + 4.2.4p7 - libntp/machines.c@1.19, 2008-07-22 11:41:25+02:00, burnicki@pogo.udel.edu +2 -2 - [Bug 1038] Built-in getpass() function also prompts for password if not built with DEBUG. + NEWS@1.101, 2009-05-18 03:14:49-04:00, stenn@whimsy.udel.edu +38 -0 + 4.2.4p7 -ChangeSet@1.1531, 2008-05-20 03:51:01-04:00, stenn@whimsy.udel.edu +25 -0 - NTP_4_2_4P5_RC1 - TAG: NTP_4_2_4P5_RC1 + packageinfo.sh@1.114, 2009-05-18 03:14:50-04:00, stenn@whimsy.udel.edu +1 -1 + 4.2.4p7 - ntpd/ntpd-opts.c@1.72, 2008-05-20 03:50:37-04:00, stenn@whimsy.udel.edu +6 -7 - NTP_4_2_4P5_RC1 +ChangeSet@1.1605, 2009-05-18 02:56:36-04:00, stenn@whimsy.udel.edu +2 -0 + [Sec 1151] Remote exploit if autokey is enabled - CVE-2009-1252 - ntpd/ntpd-opts.h@1.72, 2008-05-20 03:50:37-04:00, stenn@whimsy.udel.edu +6 -7 - NTP_4_2_4P5_RC1 + ChangeLog@1.90, 2009-05-18 02:56:22-04:00, stenn@whimsy.udel.edu +1 -0 + [Sec 1151] Remote exploit if autokey is enabled - CVE-2009-1252 - ntpd/ntpd-opts.texi@1.71, 2008-05-20 03:50:38-04:00, stenn@whimsy.udel.edu +8 -11 - NTP_4_2_4P5_RC1 + ntpd/ntp_crypto.c@1.110, 2009-05-18 02:56:22-04:00, stenn@whimsy.udel.edu +22 -17 + [Sec 1151] Remote exploit if autokey is enabled - CVE-2009-1252 - ntpd/ntpd.1@1.70, 2008-05-20 03:50:39-04:00, stenn@whimsy.udel.edu +4 -4 - NTP_4_2_4P5_RC1 +ChangeSet@1.1604, 2009-05-18 02:24:31-04:00, stenn@whimsy.udel.edu +2 -0 + [Bug 1187] Update the copyright date. - ntpd/ntpdsim-opts.c@1.72, 2008-05-20 03:50:40-04:00, stenn@whimsy.udel.edu +6 -7 - NTP_4_2_4P5_RC1 + ChangeLog@1.89, 2009-05-18 02:24:21-04:00, stenn@whimsy.udel.edu +1 -0 + [Bug 1187] Update the copyright date. - ntpd/ntpdsim-opts.h@1.72, 2008-05-20 03:50:41-04:00, stenn@whimsy.udel.edu +6 -7 - NTP_4_2_4P5_RC1 + include/copyright.def@1.8, 2009-05-18 02:24:22-04:00, stenn@whimsy.udel.edu +1 -1 + [Bug 1187] Update the copyright date. - ntpd/ntpdsim-opts.texi@1.70, 2008-05-20 03:50:42-04:00, stenn@whimsy.udel.edu +3 -4 - NTP_4_2_4P5_RC1 +ChangeSet@1.1603, 2009-05-17 08:59:06+00:00, davehart@shiny.ad.hartbrothers.com +2 -0 + [Bug 1191] ntpd fails on Win2000 - "Address already in use" after fix + for [Sec 1149]. - ntpd/ntpdsim.1@1.70, 2008-05-20 03:50:43-04:00, stenn@whimsy.udel.edu +4 -4 - NTP_4_2_4P5_RC1 + ChangeLog@1.88, 2009-05-17 08:59:05+00:00, davehart@shiny.ad.hartbrothers.com +5 -0 + [Bug 1191] ntpd fails on Win2000 - "Address already in use" after fix + for [Sec 1149]. - ntpdc/ntpdc-opts.c@1.72, 2008-05-20 03:50:44-04:00, stenn@whimsy.udel.edu +6 -7 - NTP_4_2_4P5_RC1 + ntpd/ntp_io.c@1.261, 2009-05-17 08:59:05+00:00, davehart@shiny.ad.hartbrothers.com +45 -34 + [Bug 1191] ntpd fails on Win2000 - "Address already in use" after fix + for [Sec 1149]. - ntpdc/ntpdc-opts.h@1.72, 2008-05-20 03:50:44-04:00, stenn@whimsy.udel.edu +6 -7 - NTP_4_2_4P5_RC1 +ChangeSet@1.1602, 2009-05-14 04:42:10+00:00, davehart@shiny.ad.hartbrothers.com +1 -0 + fix error from BitKeeper/triggers/pre-resolve.licfix triggered (ahem) + by recent BitKeeper/etc/config delta updating repologs email address - ntpdc/ntpdc-opts.texi@1.70, 2008-05-20 03:50:45-04:00, stenn@whimsy.udel.edu +5 -6 - NTP_4_2_4P5_RC1 + BitKeeper/triggers/pre-resolve.licfix@1.5, 2009-05-14 04:42:09+00:00, davehart@shiny.ad.hartbrothers.com +4 -1 + bk sccscat has been removed, replaced by bk annotate -R + -q grep -> grep -q (untested until recent BitKeeper/etc/config commit + changing repologs@ntp.isc.org to repologs@ntp.org - ntpdc/ntpdc.1@1.70, 2008-05-20 03:50:46-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5_RC1 +ChangeSet@1.1601, 2009-05-12 02:41:56-04:00, stenn@whimsy.udel.edu +26 -0 + NTP_4_2_4P7_RC7 + TAG: NTP_4_2_4P7_RC7 - ntpq/ntpq-opts.c@1.74, 2008-05-20 03:50:47-04:00, stenn@whimsy.udel.edu +6 -7 - NTP_4_2_4P5_RC1 + ChangeLog@1.87, 2009-05-12 02:41:33-04:00, stenn@whimsy.udel.edu +1 -0 + NTP_4_2_4P7_RC7 - ntpq/ntpq-opts.h@1.74, 2008-05-20 03:50:47-04:00, stenn@whimsy.udel.edu +6 -7 - NTP_4_2_4P5_RC1 + ntpd/ntpd-opts.c@1.83, 2009-05-12 02:41:33-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - ntpq/ntpq-opts.texi@1.71, 2008-05-20 03:50:48-04:00, stenn@whimsy.udel.edu +5 -6 - NTP_4_2_4P5_RC1 + ntpd/ntpd-opts.h@1.83, 2009-05-12 02:41:33-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - ntpq/ntpq.1@1.70, 2008-05-20 03:50:49-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5_RC1 + ntpd/ntpd-opts.texi@1.82, 2009-05-12 02:41:35-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7_RC7 - packageinfo.sh@1.98, 2008-05-20 03:50:50-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC1 + ntpd/ntpd.1@1.81, 2009-05-12 02:41:35-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - sntp/sntp-opts.c@1.70, 2008-05-20 03:50:51-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC1 + ntpd/ntpdsim-opts.c@1.83, 2009-05-12 02:41:36-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - sntp/sntp-opts.h@1.70, 2008-05-20 03:50:52-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5_RC1 + ntpd/ntpdsim-opts.h@1.83, 2009-05-12 02:41:37-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - sntp/sntp-opts.texi@1.67, 2008-05-20 03:50:52-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5_RC1 + ntpd/ntpdsim-opts.texi@1.81, 2009-05-12 02:41:37-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7_RC7 - sntp/sntp.1@1.70, 2008-05-20 03:50:53-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC1 + ntpd/ntpdsim.1@1.81, 2009-05-12 02:41:38-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - util/ntp-keygen-opts.c@1.71, 2008-05-20 03:50:54-04:00, stenn@whimsy.udel.edu +6 -7 - NTP_4_2_4P5_RC1 + ntpdc/ntpdc-opts.c@1.83, 2009-05-12 02:41:39-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - util/ntp-keygen-opts.h@1.71, 2008-05-20 03:50:54-04:00, stenn@whimsy.udel.edu +6 -7 - NTP_4_2_4P5_RC1 + ntpdc/ntpdc-opts.h@1.83, 2009-05-12 02:41:40-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - util/ntp-keygen-opts.texi@1.69, 2008-05-20 03:50:55-04:00, stenn@whimsy.udel.edu +7 -9 - NTP_4_2_4P5_RC1 + ntpdc/ntpdc-opts.texi@1.81, 2009-05-12 02:41:41-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7_RC7 - util/ntp-keygen.1@1.69, 2008-05-20 03:50:56-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5_RC1 + ntpdc/ntpdc.1@1.81, 2009-05-12 02:41:42-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 -ChangeSet@1.1530, 2008-05-18 05:14:37-04:00, stenn@whimsy.udel.edu +1 -0 - Start the 4.2.4p5 release candidate cycle + ntpq/ntpq-opts.c@1.85, 2009-05-12 02:41:43-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - packageinfo.sh@1.97, 2008-05-18 05:14:27-04:00, stenn@whimsy.udel.edu +1 -1 - Start the 4.2.4p5 release candidate cycle + ntpq/ntpq-opts.h@1.85, 2009-05-12 02:41:44-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 -ChangeSet@1.1529, 2008-04-11 18:41:57-04:00, stenn@whimsy.udel.edu +1 -0 - Solaris _XOPEN_SOURCE updates + ntpq/ntpq-opts.texi@1.82, 2009-05-12 02:41:45-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7_RC7 - configure.ac@1.401, 2008-04-11 18:41:47-04:00, stenn@whimsy.udel.edu +5 -1 - Solaris _XOPEN_SOURCE updates + ntpq/ntpq.1@1.81, 2009-05-12 02:41:46-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 -ChangeSet@1.1524.1.3, 2008-04-10 02:09:52-04:00, stenn@pogo.udel.edu +1 -0 - Changelog cleanup + packageinfo.sh@1.113, 2009-05-12 02:41:47-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7_RC7 - ChangeLog@1.37.1.2, 2008-04-10 02:08:57-04:00, stenn@pogo.udel.edu +2 -1 + sntp/sntp-opts.c@1.81, 2009-05-12 02:41:47-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 -ChangeSet@1.1524.1.2, 2008-04-08 12:20:22+02:00, burnicki@pogo.udel.edu +1 -0 - Always sleep a little before calling doconfigure() to make sure the network is completely up. + sntp/sntp-opts.h@1.81, 2009-05-12 02:41:48-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - ntpd/ntp_intres.c@1.51, 2008-04-08 12:20:21+02:00, burnicki@pogo.udel.edu +5 -6 - Always sleep a little before calling doconfigure() to make sure the network is completely up. + sntp/sntp-opts.texi@1.78, 2009-05-12 02:41:49-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7_RC7 -ChangeSet@1.1524.1.1, 2008-04-03 10:19:03-04:00, burnicki@pogo.udel.edu +5 -0 - [Bug 987] Wake up the resolver thread/process when a new interface has become available. + sntp/sntp.1@1.81, 2009-05-12 02:41:50-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - ChangeLog@1.37.1.1, 2008-04-03 10:18:59-04:00, burnicki@pogo.udel.edu +1 -0 - [Bug 987] Wake up the resolver thread/process when a new interface has become available. + util/ntp-keygen-opts.c@1.82, 2009-05-12 02:41:51-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - include/ntpd.h@1.98, 2008-04-03 10:18:59-04:00, burnicki@pogo.udel.edu +5 -0 - Added vars used to wake up the resolver process/thread. + util/ntp-keygen-opts.h@1.82, 2009-05-12 02:41:51-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - ntpd/ntp_config.c@1.143, 2008-04-03 10:18:59-04:00, burnicki@pogo.udel.edu +34 -1 - Initialize synchronization variables when the resolver process/thread is started. + util/ntp-keygen-opts.texi@1.80, 2009-05-12 02:41:52-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7_RC7 - ntpd/ntp_intres.c@1.50, 2008-04-03 10:18:59-04:00, burnicki@pogo.udel.edu +64 -65 - Enable the resolver to be woken up when a new interface has become available. + util/ntp-keygen.1@1.80, 2009-05-12 02:41:53-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - ntpd/ntp_io.c@1.256, 2008-04-03 10:19:00-04:00, burnicki@pogo.udel.edu +25 -5 - Wake up the resolver thread/process when a new interface has become available. +ChangeSet@1.1600, 2009-05-12 01:07:37-04:00, stenn@whimsy.udel.edu +9 -0 + ntp.isc.org -> ntp.org cleanup -ChangeSet@1.1527, 2008-03-24 22:12:42-04:00, mayer@pogo.udel.edu +1 -0 - bugs 993 a d 959 + BitKeeper/etc/config@1.10, 2009-05-12 01:06:49-04:00, stenn@whimsy.udel.edu +1 -1 + ntp.isc.org -> ntp.org cleanup - ChangeLog@1.38, 2008-03-24 22:12:26-04:00, mayer@pogo.udel.edu +2 -0 - bugs 993 a d 959 + ChangeLog@1.86, 2009-05-12 01:06:01-04:00, stenn@whimsy.udel.edu +1 -0 + ntp.isc.org -> ntp.org cleanup -ChangeSet@1.1526, 2008-03-24 21:41:55-04:00, mayer@pogo.udel.edu +1 -0 - [Bug 959] Refclock on Windows not properly releasing recvbuffs + README@1.23, 2009-05-12 01:06:02-04:00, stenn@whimsy.udel.edu +1 -1 + ntp.isc.org -> ntp.org cleanup - ports/winnt/ntpd/ntp_iocompletionport.c@1.25, 2008-03-24 21:41:37-04:00, mayer@pogo.udel.edu +25 -13 - [Bug 959] Refclock on Windows not properly releasing recvbuffs + README.bk@1.19, 2009-05-12 01:06:03-04:00, stenn@whimsy.udel.edu +1 -1 + ntp.isc.org -> ntp.org cleanup -ChangeSet@1.1525, 2008-03-24 21:40:32-04:00, mayer@pogo.udel.edu +1 -0 - [Bug 993] Windows: Fix memory leak when fetching system messages + README.patches@1.4, 2009-05-12 01:06:03-04:00, stenn@whimsy.udel.edu +1 -1 + ntp.isc.org -> ntp.org cleanup - ports/winnt/libisc/isc_strerror.c@1.5, 2008-03-24 21:40:07-04:00, mayer@pogo.udel.edu +78 -18 - [Bug 993] Windows: Fix memory leak when fetching system messages + WHERE-TO-START@1.7, 2009-05-12 01:06:03-04:00, stenn@whimsy.udel.edu +1 -1 + ntp.isc.org -> ntp.org cleanup -ChangeSet@1.1520.3.5, 2008-03-22 02:12:10-05:00, stenn@whimsy.udel.edu +2 -0 - [Bug 977] Fix mismatching #ifdefs for builds without IPv6 + configure.ac@1.418, 2009-05-12 01:06:04-04:00, stenn@whimsy.udel.edu +1 -1 + ntp.isc.org -> ntp.org cleanup - ChangeLog@1.35.3.4, 2008-03-22 02:11:57-05:00, stenn@whimsy.udel.edu +1 -0 - [Bug 977] Fix mismatching #ifdefs for builds without IPv6 + include/copyright.def@1.7, 2009-05-12 01:06:49-04:00, stenn@whimsy.udel.edu +1 -1 + ntp.isc.org -> ntp.org cleanup - libisc/net.c@1.9, 2008-03-22 02:11:58-05:00, stenn@whimsy.udel.edu +1 -1 - [Bug 977] Fix mismatching #ifdefs for builds without IPv6 + sntp/sntp-opts.def@1.11, 2009-05-12 01:06:49-04:00, stenn@whimsy.udel.edu +1 -1 + ntp.isc.org -> ntp.org cleanup -ChangeSet@1.1520.3.4, 2008-03-22 02:02:36-05:00, stenn@whimsy.udel.edu +3 -0 - Update the copyright year +ChangeSet@1.1597.1.1, 2009-05-08 18:11:36+00:00, davehart@shiny.ad.hartbrothers.com +1 -0 + configure.ac: + correct help text - ChangeLog@1.35.3.3, 2008-03-22 02:02:24-05:00, stenn@whimsy.udel.edu +8 -6 - Update the copyright year + configure.ac@1.415.1.1, 2009-05-08 18:11:24+00:00, davehart@shiny.ad.hartbrothers.com +11 -5 + correct help text - html/copyright.html@1.37, 2008-03-22 02:02:25-05:00, stenn@whimsy.udel.edu +1 -1 - Update the copyright year +ChangeSet@1.1598, 2009-05-08 17:50:37+00:00, davehart@shiny.ad.hartbrothers.com +3 -0 + add configure --enable-ignore-dns-errors to retry on any failure - include/copyright.def@1.6, 2008-03-22 02:02:25-05:00, stenn@whimsy.udel.edu +1 -1 - Update the copyright year + ChangeLog@1.85, 2009-05-08 17:50:35+00:00, davehart@shiny.ad.hartbrothers.com +2 -1 + add configure --enable-ignore-dns-errors to retry on any failure -ChangeSet@1.1520.3.3, 2008-03-22 01:58:52-05:00, stenn@whimsy.udel.edu +5 -0 - Make autogen-generated files writable + configure.ac@1.416, 2009-05-08 17:50:35+00:00, davehart@shiny.ad.hartbrothers.com +26 -4 + add configure --enable-ignore-dns-errors to retry on any failure - ntpd/Makefile.am@1.54, 2008-03-22 01:57:08-05:00, stenn@whimsy.udel.edu +1 -1 - Make autogen-generated files writable + ntpd/ntp_intres.c@1.55, 2009-05-08 17:50:35+00:00, davehart@shiny.ad.hartbrothers.com +2 -0 + add configure --enable-ignore-dns-errors to retry on any failure - ntpdc/Makefile.am@1.35, 2008-03-22 01:57:09-05:00, stenn@whimsy.udel.edu +1 -1 - Make autogen-generated files writable +ChangeSet@1.1597, 2009-05-08 15:34:46+00:00, davehart@shiny.ad.hartbrothers.com +4 -0 + Do not exceed FD_SETSIZE in ntp_intres.c + --- + ntp_intres.c: + typo + --- + ntp_intres.c: + missing comma typo + --- + ntp_intres.c: *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Tue Feb 9 15:23:16 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D5E7106570E; Tue, 9 Feb 2010 15:23:16 +0000 (UTC) (envelope-from eri@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2CB5D8FC13; Tue, 9 Feb 2010 15:23:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o19FNGeP005488; Tue, 9 Feb 2010 15:23:16 GMT (envelope-from eri@svn.freebsd.org) Received: (from eri@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o19FNFwm005482; Tue, 9 Feb 2010 15:23:15 GMT (envelope-from eri@svn.freebsd.org) Message-Id: <201002091523.o19FNFwm005482@svn.freebsd.org> From: Ermal Luçi Date: Tue, 9 Feb 2010 15:23:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203705 - in user/eri/pf45/head: contrib/pf/pfctl sys/contrib/pf/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Feb 2010 15:23:16 -0000 Author: eri Date: Tue Feb 9 15:23:15 2010 New Revision: 203705 URL: http://svn.freebsd.org/changeset/base/203705 Log: Cast some inputs to printf to avoid warnings on 64bit platforms. Reported-by: Denny Lin Modified: user/eri/pf45/head/contrib/pf/pfctl/parse.y user/eri/pf45/head/contrib/pf/pfctl/pf_print_state.c user/eri/pf45/head/contrib/pf/pfctl/pfctl_parser.c user/eri/pf45/head/sys/contrib/pf/net/if_pfsync.c user/eri/pf45/head/sys/contrib/pf/net/pf.c Modified: user/eri/pf45/head/contrib/pf/pfctl/parse.y ============================================================================== --- user/eri/pf45/head/contrib/pf/pfctl/parse.y Tue Feb 9 14:56:10 2010 (r203704) +++ user/eri/pf45/head/contrib/pf/pfctl/parse.y Tue Feb 9 15:23:15 2010 (r203705) @@ -709,7 +709,7 @@ varstring : numberstring varstring { numberstring : NUMBER { char *s; - if (asprintf(&s, "%lld", $1) == -1) { + if (asprintf(&s, "%lld", (int64_t)$1) == -1) { yyerror("string: asprintf"); YYERROR; } @@ -2858,7 +2858,11 @@ host : STRING { char *buf; /* ie. for 10/8 parsing */ +#ifdef __FreeBSD__ + if (asprintf(&buf, "%lld/%lld", (int64_t)$1, (int64_t)$3) == -1) +#else if (asprintf(&buf, "%lld/%lld", $1, $3) == -1) +#endif err(1, "host: asprintf"); if (($$ = host(buf)) == NULL) { /* error. "any" is handled elsewhere */ Modified: user/eri/pf45/head/contrib/pf/pfctl/pf_print_state.c ============================================================================== --- user/eri/pf45/head/contrib/pf/pfctl/pf_print_state.c Tue Feb 9 14:56:10 2010 (r203704) +++ user/eri/pf45/head/contrib/pf/pfctl/pf_print_state.c Tue Feb 9 15:23:15 2010 (r203705) @@ -322,10 +322,17 @@ print_state(struct pfsync_state *s, int bcopy(s->bytes[0], &bytes[0], sizeof(u_int64_t)); bcopy(s->bytes[1], &bytes[1], sizeof(u_int64_t)); printf(", %llu:%llu pkts, %llu:%llu bytes", +#ifdef __FreeBSD__ + (unsigned long long)betoh64(packets[0]), + (unsigned long long)betoh64(packets[1]), + (unsigned long long)betoh64(bytes[0]), + (unsigned long long)betoh64(bytes[1])); +#else betoh64(packets[0]), betoh64(packets[1]), betoh64(bytes[0]), betoh64(bytes[1])); +#endif if (ntohl(s->anchor) != -1) printf(", anchor %u", ntohl(s->anchor)); if (ntohl(s->rule) != -1) @@ -345,7 +352,11 @@ print_state(struct pfsync_state *s, int bcopy(&s->id, &id, sizeof(u_int64_t)); printf(" id: %016llx creatorid: %08x", +#ifdef __FreeBSD__ + (unsigned long long)betoh64(id), ntohl(s->creatorid)); +#else betoh64(id), ntohl(s->creatorid)); +#endif printf("\n"); } } Modified: user/eri/pf45/head/contrib/pf/pfctl/pfctl_parser.c ============================================================================== --- user/eri/pf45/head/contrib/pf/pfctl/pfctl_parser.c Tue Feb 9 14:56:10 2010 (r203704) +++ user/eri/pf45/head/contrib/pf/pfctl/pfctl_parser.c Tue Feb 9 15:23:15 2010 (r203705) @@ -575,7 +575,11 @@ print_status(struct pf_status *s, int op s->src_nodes, ""); for (i = 0; i < SCNT_MAX; i++) { printf(" %-25s %14lld ", pf_scounters[i], +#ifdef __FreeBSD__ + (int64_t)s->scounters[i]); +#else s->scounters[i]); +#endif if (runtime > 0) printf("%14.1f/s\n", (double)s->scounters[i] / (double)runtime); Modified: user/eri/pf45/head/sys/contrib/pf/net/if_pfsync.c ============================================================================== --- user/eri/pf45/head/sys/contrib/pf/net/if_pfsync.c Tue Feb 9 14:56:10 2010 (r203704) +++ user/eri/pf45/head/sys/contrib/pf/net/if_pfsync.c Tue Feb 9 15:23:15 2010 (r203705) @@ -2804,8 +2804,12 @@ pfsync_q_ins(struct pf_state *st, int q) #if 1 || defined(PFSYNC_DEBUG) if (sc->sc_len < PFSYNC_MINPKT) +#ifdef __FreeBSD__ + panic("pfsync pkt len is too low %ld", sc->sc_len); +#else panic("pfsync pkt len is too low %d", sc->sc_len); #endif +#endif if (TAILQ_EMPTY(&sc->sc_qs[q])) nlen += sizeof(struct pfsync_subheader); Modified: user/eri/pf45/head/sys/contrib/pf/net/pf.c ============================================================================== --- user/eri/pf45/head/sys/contrib/pf/net/pf.c Tue Feb 9 14:56:10 2010 (r203704) +++ user/eri/pf45/head/sys/contrib/pf/net/pf.c Tue Feb 9 15:23:15 2010 (r203705) @@ -1132,7 +1132,11 @@ pf_state_insert(struct pfi_kif *kif, str #endif printf("pf: state insert failed: " "id: %016llx creatorid: %08x", +#ifdef __FreeBSD__ + (unsigned long long)betoh64(s->id), ntohl(s->creatorid)); +#else betoh64(s->id), ntohl(s->creatorid)); +#endif printf("\n"); } pf_detach_state(s); @@ -4396,8 +4400,13 @@ pf_tcp_track_full(struct pf_state_peer * pf_print_flags(th->th_flags); printf(" seq=%u (%u) ack=%u len=%u ackskew=%d " "pkts=%llu:%llu dir=%s,%s\n", seq, orig_seq, ack, +#ifdef __FreeBSD__ + pd->p_len, ackskew, (unsigned long long)(*state)->packets[0], + (unsigned long long)(*state)->packets[1], +#else pd->p_len, ackskew, (*state)->packets[0], (*state)->packets[1], +#endif pd->dir == PF_IN ? "in" : "out", pd->dir == (*state)->direction ? "fwd" : "rev"); } @@ -4460,7 +4469,12 @@ pf_tcp_track_full(struct pf_state_peer * printf(" seq=%u (%u) ack=%u len=%u ackskew=%d " "pkts=%llu:%llu dir=%s,%s\n", seq, orig_seq, ack, pd->p_len, ackskew, +#ifdef __FreeBSD__ + (unsigned long long)(*state)->packets[0], + (unsigned long long)(*state)->packets[1], +#else (*state)->packets[0], (*state)->packets[1], +#endif pd->dir == PF_IN ? "in" : "out", pd->dir == (*state)->direction ? "fwd" : "rev"); printf("pf: State failure on: %c %c %c %c | %c %c\n", From owner-svn-src-user@FreeBSD.ORG Thu Feb 11 09:55:46 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5BBFA106568B; Thu, 11 Feb 2010 09:55:46 +0000 (UTC) (envelope-from eri@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 310988FC17; Thu, 11 Feb 2010 09:55:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1B9tkKG038606; Thu, 11 Feb 2010 09:55:46 GMT (envelope-from eri@svn.freebsd.org) Received: (from eri@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1B9tklJ038602; Thu, 11 Feb 2010 09:55:46 GMT (envelope-from eri@svn.freebsd.org) Message-Id: <201002110955.o1B9tklJ038602@svn.freebsd.org> From: Ermal Luçi Date: Thu, 11 Feb 2010 09:55:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203777 - in user/eri/pf45/head: contrib/pf/pfctl sys/contrib/pf/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Feb 2010 09:55:46 -0000 Author: eri Date: Thu Feb 11 09:55:45 2010 New Revision: 203777 URL: http://svn.freebsd.org/changeset/base/203777 Log: Cast to proper type. Requested-by: Jilles Tjoelker Modified: user/eri/pf45/head/contrib/pf/pfctl/parse.y user/eri/pf45/head/contrib/pf/pfctl/pfctl_parser.c user/eri/pf45/head/sys/contrib/pf/net/if_pfsync.c Modified: user/eri/pf45/head/contrib/pf/pfctl/parse.y ============================================================================== --- user/eri/pf45/head/contrib/pf/pfctl/parse.y Thu Feb 11 08:50:21 2010 (r203776) +++ user/eri/pf45/head/contrib/pf/pfctl/parse.y Thu Feb 11 09:55:45 2010 (r203777) @@ -709,7 +709,7 @@ varstring : numberstring varstring { numberstring : NUMBER { char *s; - if (asprintf(&s, "%lld", (int64_t)$1) == -1) { + if (asprintf(&s, "%lld", (long long)$1) == -1) { yyerror("string: asprintf"); YYERROR; } @@ -2843,7 +2843,7 @@ host : STRING { | STRING '/' NUMBER { char *buf; - if (asprintf(&buf, "%s/%lld", $1, $3) == -1) + if (asprintf(&buf, "%s/%lld", $1, (long long)$3) == -1) err(1, "host: asprintf"); free($1); if (($$ = host(buf)) == NULL) { @@ -2859,7 +2859,7 @@ host : STRING { /* ie. for 10/8 parsing */ #ifdef __FreeBSD__ - if (asprintf(&buf, "%lld/%lld", (int64_t)$1, (int64_t)$3) == -1) + if (asprintf(&buf, "%lld/%lld", (long long)$1, (long long)$3) == -1) #else if (asprintf(&buf, "%lld/%lld", $1, $3) == -1) #endif Modified: user/eri/pf45/head/contrib/pf/pfctl/pfctl_parser.c ============================================================================== --- user/eri/pf45/head/contrib/pf/pfctl/pfctl_parser.c Thu Feb 11 08:50:21 2010 (r203776) +++ user/eri/pf45/head/contrib/pf/pfctl/pfctl_parser.c Thu Feb 11 09:55:45 2010 (r203777) @@ -576,7 +576,7 @@ print_status(struct pf_status *s, int op for (i = 0; i < SCNT_MAX; i++) { printf(" %-25s %14lld ", pf_scounters[i], #ifdef __FreeBSD__ - (int64_t)s->scounters[i]); + (long long)s->scounters[i]); #else s->scounters[i]); #endif Modified: user/eri/pf45/head/sys/contrib/pf/net/if_pfsync.c ============================================================================== --- user/eri/pf45/head/sys/contrib/pf/net/if_pfsync.c Thu Feb 11 08:50:21 2010 (r203776) +++ user/eri/pf45/head/sys/contrib/pf/net/if_pfsync.c Thu Feb 11 09:55:45 2010 (r203777) @@ -2805,7 +2805,7 @@ pfsync_q_ins(struct pf_state *st, int q) #if 1 || defined(PFSYNC_DEBUG) if (sc->sc_len < PFSYNC_MINPKT) #ifdef __FreeBSD__ - panic("pfsync pkt len is too low %ld", sc->sc_len); + panic("pfsync pkt len is too low %zu", sc->sc_len); #else panic("pfsync pkt len is too low %d", sc->sc_len); #endif From owner-svn-src-user@FreeBSD.ORG Thu Feb 11 23:56:04 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4EE92106566B; Thu, 11 Feb 2010 23:56:04 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3E8318FC15; Thu, 11 Feb 2010 23:56:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1BNu4i9029035; Thu, 11 Feb 2010 23:56:04 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1BNu4X4029030; Thu, 11 Feb 2010 23:56:04 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002112356.o1BNu4X4029030@svn.freebsd.org> From: Kip Macy Date: Thu, 11 Feb 2010 23:56:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203791 - user/kmacy/head_flowtable_v6/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Feb 2010 23:56:04 -0000 Author: kmacy Date: Thu Feb 11 23:56:03 2010 New Revision: 203791 URL: http://svn.freebsd.org/changeset/base/203791 Log: - replace usage of sockaddr with sockaddr_storage to accomodate IPv6 Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c user/kmacy/head_flowtable_v6/sys/net/flowtable.h user/kmacy/head_flowtable_v6/sys/net/if_llatbl.c user/kmacy/head_flowtable_v6/sys/net/if_llatbl.h Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Thu Feb 11 22:51:44 2010 (r203790) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Thu Feb 11 23:56:03 2010 (r203791) @@ -535,7 +535,7 @@ ipv4_flow_lookup_hash_internal( static struct flentry * flowtable_lookup_mbuf4(struct flowtable *ft, struct mbuf *m) { - struct sockaddr ssa, dsa; + struct sockaddr_storage ssa, dsa; uint16_t flags; struct sockaddr_in *dsin, *ssin; @@ -738,7 +738,7 @@ ipv6_flow_lookup_hash_internal( static struct flentry * flowtable_lookup_mbuf6(struct flowtable *ft, struct mbuf *m) { - struct sockaddr ssa, dsa; + struct sockaddr_storage ssa, dsa; struct sockaddr_in6 *dsin6, *ssin6; uint16_t flags; @@ -939,8 +939,9 @@ skip: } int -kern_flowtable_insert(struct flowtable *ft, struct sockaddr *ssa, - struct sockaddr *dsa, struct route *ro, uint32_t fibnum, int flags) +kern_flowtable_insert(struct flowtable *ft, + struct sockaddr_storage *ssa, struct sockaddr_storage *dsa, + struct route *ro, uint32_t fibnum, int flags) { uint32_t key[9], hash; @@ -948,12 +949,12 @@ kern_flowtable_insert(struct flowtable * hash = 0; #ifdef INET - if (ssa->sa_family == AF_INET) + if (ssa->ss_family == AF_INET) hash = ipv4_flow_lookup_hash_internal((struct sockaddr_in *)ssa, (struct sockaddr_in *)dsa, key, flags); #endif #ifdef INET6 - if (ssa->sa_family == AF_INET6) + if (ssa->ss_family == AF_INET6) hash = ipv6_flow_lookup_hash_internal((struct sockaddr_in6 *)ssa, (struct sockaddr_in6 *)dsa, key, flags); #endif @@ -1008,8 +1009,8 @@ flowtable_lookup_mbuf(struct flowtable * } struct flentry * -flowtable_lookup(struct flowtable *ft, struct sockaddr *ssa, - struct sockaddr *dsa, uint32_t fibnum, int flags) +flowtable_lookup(struct flowtable *ft, struct sockaddr_storage *ssa, + struct sockaddr_storage *dsa, uint32_t fibnum, int flags) { uint32_t key[9], hash; struct flentry *fle; @@ -1018,17 +1019,18 @@ flowtable_lookup(struct flowtable *ft, s struct rtentry *rt; struct llentry *lle; struct route sro, *ro; + struct route_in6 sro6; ro = &sro; ro->ro_rt = NULL; ro->ro_lle = NULL; - ro->ro_dst = *dsa; hash = 0; flags |= ft->ft_flags; proto = flags_to_proto(flags); #ifdef INET - if (ssa->sa_family == AF_INET) { + if (ssa->ss_family == AF_INET) { struct sockaddr_in *ssin, *dsin; + memcpy(&ro->ro_dst, &dsa, sizeof(struct sockaddr_in)); dsin = (struct sockaddr_in *)dsa; ssin = (struct sockaddr_in *)ssa; @@ -1040,9 +1042,12 @@ flowtable_lookup(struct flowtable *ft, s } #endif #ifdef INET6 - if (ssa->sa_family == AF_INET6) { + if (ssa->ss_family == AF_INET6) { struct sockaddr_in6 *ssin6, *dsin6; + ro = (struct route *)&sro6; + memcpy(&ro->ro_dst, &dsa, + sizeof(struct sockaddr_in6)); dsin6 = (struct sockaddr_in6 *)dsa; ssin6 = (struct sockaddr_in6 *)ssa; @@ -1107,7 +1112,7 @@ uncached: error = ENETUNREACH; else { struct llentry *lle = NULL; - struct sockaddr *l3addr; + struct sockaddr_storage *l3addr; struct rtentry *rt = ro->ro_rt; struct ifnet *ifp = rt->rt_ifp; @@ -1116,17 +1121,25 @@ uncached: ro->ro_rt = NULL; return (NULL); } - if (rt->rt_flags & RTF_GATEWAY) - l3addr = rt->rt_gateway; - else - l3addr = &ro->ro_dst; #ifdef INET6 - if (ssa->sa_family == AF_INET6) + if (ssa->ss_family == AF_INET6) { + if (rt->rt_flags & RTF_GATEWAY) + l3addr = (struct sockaddr_storage *)rt->rt_gateway; + + else + l3addr = (struct sockaddr_storage *)&ro->ro_dst; llentry_update(&lle, LLTABLE6(ifp), l3addr, ifp); -#endif -#ifdef INET - if (ssa->sa_family == AF_INET) - llentry_update(&lle, LLTABLE(ifp), l3addr, ifp); + } +#endif +#ifdef INET + if (ssa->ss_family == AF_INET) { + if (rt->rt_flags & RTF_GATEWAY) + l3addr = (struct sockaddr_storage *)rt->rt_gateway; + else + l3addr = (struct sockaddr_storage *)&ro->ro_dst; + llentry_update(&lle, LLTABLE(ifp), l3addr, ifp); + } + #endif ro->ro_lle = lle; Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.h ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.h Thu Feb 11 22:51:44 2010 (r203790) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.h Thu Feb 11 23:56:03 2010 (r203791) @@ -62,11 +62,11 @@ struct flowtable *flowtable_alloc(char * */ struct flentry *flowtable_lookup_mbuf(struct flowtable *ft, struct mbuf *m, int af); -struct flentry *flowtable_lookup(struct flowtable *ft, struct sockaddr *ssa, - struct sockaddr *dsa, uint32_t fibnum, int flags); +struct flentry *flowtable_lookup(struct flowtable *ft, struct sockaddr_storage *ssa, + struct sockaddr_storage *dsa, uint32_t fibnum, int flags); -int kern_flowtable_insert(struct flowtable *ft, struct sockaddr *ssa, - struct sockaddr *dsa, struct route *ro, uint32_t fibnum, int flags); +int kern_flowtable_insert(struct flowtable *ft, struct sockaddr_storage *ssa, + struct sockaddr_storage *dsa, struct route *ro, uint32_t fibnum, int flags); void flow_invalidate(struct flentry *fl); void flowtable_route_flush(struct flowtable *ft, struct rtentry *rt); Modified: user/kmacy/head_flowtable_v6/sys/net/if_llatbl.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/if_llatbl.c Thu Feb 11 22:51:44 2010 (r203790) +++ user/kmacy/head_flowtable_v6/sys/net/if_llatbl.c Thu Feb 11 23:56:03 2010 (r203791) @@ -117,7 +117,7 @@ llentry_free(struct llentry *lle) */ int llentry_update(struct llentry **llep, struct lltable *lt, - struct sockaddr *dst, struct ifnet *ifp) + struct sockaddr_storage *dst, struct ifnet *ifp) { struct llentry *la; Modified: user/kmacy/head_flowtable_v6/sys/net/if_llatbl.h ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/if_llatbl.h Thu Feb 11 22:51:44 2010 (r203790) +++ user/kmacy/head_flowtable_v6/sys/net/if_llatbl.h Thu Feb 11 23:56:03 2010 (r203791) @@ -191,7 +191,7 @@ int lltable_sysctl_dumparp(int, struct void llentry_free(struct llentry *); int llentry_update(struct llentry **, struct lltable *, - struct sockaddr *, struct ifnet *); + struct sockaddr_storage *, struct ifnet *); /* * Generic link layer address lookup function. From owner-svn-src-user@FreeBSD.ORG Fri Feb 12 00:07:56 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C96D91065672; Fri, 12 Feb 2010 00:07:56 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BA05D8FC26; Fri, 12 Feb 2010 00:07:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1C07uHx031740; Fri, 12 Feb 2010 00:07:56 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1C07umq031738; Fri, 12 Feb 2010 00:07:56 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002120007.o1C07umq031738@svn.freebsd.org> From: Kip Macy Date: Fri, 12 Feb 2010 00:07:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203792 - user/kmacy/head_flowtable_v6/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Feb 2010 00:07:56 -0000 Author: kmacy Date: Fri Feb 12 00:07:56 2010 New Revision: 203792 URL: http://svn.freebsd.org/changeset/base/203792 Log: initialize ro_rt to NULL for both v4 and v6 Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Thu Feb 11 23:56:03 2010 (r203791) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Fri Feb 12 00:07:56 2010 (r203792) @@ -1021,9 +1021,9 @@ flowtable_lookup(struct flowtable *ft, s struct route sro, *ro; struct route_in6 sro6; + sro.ro_rt = sro6.ro_rt = NULL; + sro.ro_lle = sro6.ro_lle = NULL; ro = &sro; - ro->ro_rt = NULL; - ro->ro_lle = NULL; hash = 0; flags |= ft->ft_flags; proto = flags_to_proto(flags); From owner-svn-src-user@FreeBSD.ORG Fri Feb 12 00:45:29 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94577106566C; Fri, 12 Feb 2010 00:45:29 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6AF808FC08; Fri, 12 Feb 2010 00:45:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1C0jT5R040190; Fri, 12 Feb 2010 00:45:29 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1C0jTP3040187; Fri, 12 Feb 2010 00:45:29 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002120045.o1C0jTP3040187@svn.freebsd.org> From: Kip Macy Date: Fri, 12 Feb 2010 00:45:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203793 - user/kmacy/head_flowtable_v6/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Feb 2010 00:45:29 -0000 Author: kmacy Date: Fri Feb 12 00:45:29 2010 New Revision: 203793 URL: http://svn.freebsd.org/changeset/base/203793 Log: add assert of family type Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c user/kmacy/head_flowtable_v6/sys/net/flowtable.h Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Fri Feb 12 00:07:56 2010 (r203792) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Fri Feb 12 00:45:29 2010 (r203793) @@ -1023,15 +1023,16 @@ flowtable_lookup(struct flowtable *ft, s sro.ro_rt = sro6.ro_rt = NULL; sro.ro_lle = sro6.ro_lle = NULL; - ro = &sro; + ro = NULL; hash = 0; flags |= ft->ft_flags; proto = flags_to_proto(flags); #ifdef INET if (ssa->ss_family == AF_INET) { struct sockaddr_in *ssin, *dsin; - memcpy(&ro->ro_dst, &dsa, sizeof(struct sockaddr_in)); + ro = &sro; + memcpy(&ro->ro_dst, &dsa, sizeof(struct sockaddr_in)); dsin = (struct sockaddr_in *)dsa; ssin = (struct sockaddr_in *)ssa; if ((ntohl(dsin->sin_addr.s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET || @@ -1046,7 +1047,7 @@ flowtable_lookup(struct flowtable *ft, s struct sockaddr_in6 *ssin6, *dsin6; ro = (struct route *)&sro6; - memcpy(&ro->ro_dst, &dsa, + memcpy(&sro6.ro_dst, &dsa, sizeof(struct sockaddr_in6)); dsin6 = (struct sockaddr_in6 *)dsa; ssin6 = (struct sockaddr_in6 *)ssa; @@ -1107,6 +1108,10 @@ uncached: * receive the route locked */ + if ((ro->ro_dst.sa_family != AF_INET) && + (ro->ro_dst.sa_family != AF_INET6)) + panic("sa_family == %d\n", ro->ro_dst.sa_family); + ft->ft_rtalloc(ro, hash, fibnum); if (ro->ro_rt == NULL) error = ENETUNREACH; Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.h ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.h Fri Feb 12 00:07:56 2010 (r203792) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.h Fri Feb 12 00:45:29 2010 (r203793) @@ -46,6 +46,8 @@ $FreeBSD$ struct flowtable; struct flentry; +struct route; +struct route_in6; VNET_DECLARE(struct flowtable *, ip_ft); #define V_ip_ft VNET(ip_ft) From owner-svn-src-user@FreeBSD.ORG Fri Feb 12 02:26:12 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C083F1065676; Fri, 12 Feb 2010 02:26:12 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B0B9A8FC0C; Fri, 12 Feb 2010 02:26:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1C2QCB3062316; Fri, 12 Feb 2010 02:26:12 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1C2QCcr062314; Fri, 12 Feb 2010 02:26:12 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201002120226.o1C2QCcr062314@svn.freebsd.org> From: Kip Macy Date: Fri, 12 Feb 2010 02:26:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203795 - user/kmacy/head_flowtable_v6/sys/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Feb 2010 02:26:12 -0000 Author: kmacy Date: Fri Feb 12 02:26:12 2010 New Revision: 203795 URL: http://svn.freebsd.org/changeset/base/203795 Log: copy dsa not dsa* Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c ============================================================================== --- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Fri Feb 12 00:47:23 2010 (r203794) +++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Fri Feb 12 02:26:12 2010 (r203795) @@ -1032,7 +1032,7 @@ flowtable_lookup(struct flowtable *ft, s struct sockaddr_in *ssin, *dsin; ro = &sro; - memcpy(&ro->ro_dst, &dsa, sizeof(struct sockaddr_in)); + memcpy(&ro->ro_dst, dsa, sizeof(struct sockaddr_in)); dsin = (struct sockaddr_in *)dsa; ssin = (struct sockaddr_in *)ssa; if ((ntohl(dsin->sin_addr.s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET || @@ -1047,7 +1047,7 @@ flowtable_lookup(struct flowtable *ft, s struct sockaddr_in6 *ssin6, *dsin6; ro = (struct route *)&sro6; - memcpy(&sro6.ro_dst, &dsa, + memcpy(&sro6.ro_dst, dsa, sizeof(struct sockaddr_in6)); dsin6 = (struct sockaddr_in6 *)dsa; ssin6 = (struct sockaddr_in6 *)ssa; From owner-svn-src-user@FreeBSD.ORG Fri Feb 12 13:07:59 2010 Return-Path: Delivered-To: svn-src-user@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A7B601065670; Fri, 12 Feb 2010 13:07:59 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail02.syd.optusnet.com.au (mail02.syd.optusnet.com.au [211.29.132.183]) by mx1.freebsd.org (Postfix) with ESMTP id 23E7E8FC1B; Fri, 12 Feb 2010 13:07:58 +0000 (UTC) Received: from c122-106-163-215.carlnfd1.nsw.optusnet.com.au (c122-106-163-215.carlnfd1.nsw.optusnet.com.au [122.106.163.215]) by mail02.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id o1CD7s9q024432 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 13 Feb 2010 00:07:56 +1100 Date: Sat, 13 Feb 2010 00:07:54 +1100 (EST) From: Bruce Evans X-X-Sender: bde@delplex.bde.org To: =?X-UNKNOWN?Q?Ermal_Lu=E7i?= In-Reply-To: <201002110955.o1B9tklJ038602@svn.freebsd.org> Message-ID: <20100212231841.Q89449@delplex.bde.org> References: <201002110955.o1B9tklJ038602@svn.freebsd.org> MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="0-619413657-1265980074=:89449" Cc: src-committers@FreeBSD.org, svn-src-user@FreeBSD.org Subject: Re: svn commit: r203777 - in user/eri/pf45/head: contrib/pf/pfctl sys/contrib/pf/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Feb 2010 13:07:59 -0000 This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --0-619413657-1265980074=:89449 Content-Type: TEXT/PLAIN; charset=X-UNKNOWN; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE On Thu, 11 Feb 2010, Ermal Lu=E7i wrote: > Log: > Cast to proper type. > > Requested-by: Jilles Tjoelker Isn't the proper type [u]intmax_t (provided the format is also proper)? > Modified: user/eri/pf45/head/contrib/pf/pfctl/parse.y > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- user/eri/pf45/head/contrib/pf/pfctl/parse.y=09Thu Feb 11 08:50:21 201= 0=09(r203776) > +++ user/eri/pf45/head/contrib/pf/pfctl/parse.y=09Thu Feb 11 09:55:45 201= 0=09(r203777) > @@ -709,7 +709,7 @@ varstring=09: numberstring varstring =09=09{ > > numberstring=09: NUMBER=09=09=09=09{ > =09=09=09char=09*s; > -=09=09=09if (asprintf(&s, "%lld", (int64_t)$1) =3D=3D -1) { > +=09=09=09if (asprintf(&s, "%lld", (long long)$1) =3D=3D -1) { The long long type is always improper, as is the %lld format that goes with it. > @@ -2859,7 +2859,7 @@ host=09=09: STRING=09=09=09{ > > =09=09=09/* ie. for 10/8 parsing */ > #ifdef __FreeBSD__ > -=09=09=09if (asprintf(&buf, "%lld/%lld", (int64_t)$1, (int64_t)$3) =3D= =3D -1) > +=09=09=09if (asprintf(&buf, "%lld/%lld", (long long)$1, (long long)$3) = =3D=3D -1) > #else > =09=09=09if (asprintf(&buf, "%lld/%lld", $1, $3) =3D=3D -1) > #endif Why messy ifdefs to keep using the improper type typeof($1) for non-FreeBSD= ? Why these messy ifdefs in all places except the first one above? > Modified: user/eri/pf45/head/contrib/pf/pfctl/pfctl_parser.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- user/eri/pf45/head/contrib/pf/pfctl/pfctl_parser.c=09Thu Feb 11 08:50= :21 2010=09(r203776) > +++ user/eri/pf45/head/contrib/pf/pfctl/pfctl_parser.c=09Thu Feb 11 09:55= :45 2010=09(r203777) > @@ -576,7 +576,7 @@ print_status(struct pf_status *s, int op > =09=09for (i =3D 0; i < SCNT_MAX; i++) { > =09=09=09printf(" %-25s %14lld ", pf_scounters[i], > #ifdef __FreeBSD__ > -=09=09=09=09 (int64_t)s->scounters[i]); > +=09=09=09=09 (long long)s->scounters[i]); > #else > =09=09=09=09 s->scounters[i]); > #endif The type s->scounters is easier to see than the type of $[13] in the above. It is certainly not signed long long, at least in the public version. It is u_int64_t. This type should be printed by converting it to uintmax_t and printing it using format %ju. The above depends on the following assumptions: very old FreeBSD case (the public version): The cast seems to have been almost correct. It was to unsigned long long. That would work, but is ugly, provided the format is unbroken too. The format %lld is only suitable for printing signed values, but the value was unsigned long long. This gave undefined behaviour if the value was > LONGLONG_MAX (which is possible though unlikely). old version (in above): Casting to int64_t gives undefined behaviour if sizeof(int64_t) !=3D sizeof(long long). It happens that sizeof(int64_t) =3D=3D sizeof(long long) for all machines curently supported by FreeBSD, so there is no runtime error, but int64_t is carefully chosen so that the compiler can detect this type mismatch anyway on 64-bit arches, so that printf format errors don't need to be "fixed" for every generation of word sizes. There is still a sign mismatch between the variable type and the printf format. Now the cast is bug-for- bug compatible with the format, so there is no undefined behaviour for values > INT64_MAX. Such values are just corrupted by the cast in an implementation-defined way, probably to negative values. new version (in above): Since LONG_LONG_MAX >=3D INT64_MAX, values up to and including INT64_MAX can be printed correctly by converting them to long long and using %lld format. There is still a sign mismatch between the variable type and the printf format, as above. This could be fixed by converting to unsigned long long and %llu format. Then there would only be style bugs (use of the long long abomination). non-FreeBSD version: This remains plain broken. It depends on sizeof(uint64_t) =3D=3D sizeof(long long), which is true today on some machines, but will break someday (except I fear the people who broke long by requiring it to be 32-bits forever for binary compatibility will break long long similarly, requiring it to be 64 bits forever). It also depends on uint64_t being signed, which it isn't, or on the value never exceeding INT64_MAX. > Modified: user/eri/pf45/head/sys/contrib/pf/net/if_pfsync.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- user/eri/pf45/head/sys/contrib/pf/net/if_pfsync.c=09Thu Feb 11 08:50:= 21 2010=09(r203776) > +++ user/eri/pf45/head/sys/contrib/pf/net/if_pfsync.c=09Thu Feb 11 09:55:= 45 2010=09(r203777) > @@ -2805,7 +2805,7 @@ pfsync_q_ins(struct pf_state *st, int q) > #if 1 || defined(PFSYNC_DEBUG) > =09if (sc->sc_len < PFSYNC_MINPKT) > #ifdef __FreeBSD__ > -=09=09panic("pfsync pkt len is too low %ld", sc->sc_len); > +=09=09panic("pfsync pkt len is too low %zu", sc->sc_len); > #else > =09=09panic("pfsync pkt len is too low %d", sc->sc_len); > #endif > This is correct iff sc_len has type size_t in FreeBSD and int in non-FreeBS= D. Its type shouldn't be so different. Bruce --0-619413657-1265980074=:89449-- From owner-svn-src-user@FreeBSD.ORG Sat Feb 13 02:36:00 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B94B2106566B; Sat, 13 Feb 2010 02:36:00 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A9BAC8FC16; Sat, 13 Feb 2010 02:36:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1D2a09B002240; Sat, 13 Feb 2010 02:36:00 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1D2a0oe002238; Sat, 13 Feb 2010 02:36:00 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201002130236.o1D2a0oe002238@svn.freebsd.org> From: Warner Losh Date: Sat, 13 Feb 2010 02:36:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203812 - user/imp/tbemd/sys/boot/arm/uboot X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Feb 2010 02:36:00 -0000 Author: imp Date: Sat Feb 13 02:36:00 2010 New Revision: 203812 URL: http://svn.freebsd.org/changeset/base/203812 Log: Add support for: TARGET=arm TARGET_ARCH=armeb Added: user/imp/tbemd/sys/boot/arm/uboot/ldscript.armbe Added: user/imp/tbemd/sys/boot/arm/uboot/ldscript.armbe ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/imp/tbemd/sys/boot/arm/uboot/ldscript.armbe Sat Feb 13 02:36:00 2010 (r203812) @@ -0,0 +1,134 @@ +/* $FreeBSD: user/imp/tbemd/sys/boot/arm/uboot/ldscript.armbe -1 $ */ + +OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm") +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + /* Read-only sections, merged into text segment: */ + . = 0x1000000 + SIZEOF_HEADERS; + .interp : { *(.interp) } + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } + .gnu.version : { *(.gnu.version) } + .gnu.version_d : { *(.gnu.version_d) } + .gnu.version_r : { *(.gnu.version_r) } + .rela.text : + { *(.rela.text) *(.rela.gnu.linkonce.t*) } + .rela.data : + { *(.rela.data) *(.rela.gnu.linkonce.d*) } + .rela.rodata : + { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } + .rela.got : { *(.rela.got) } + .rela.got1 : { *(.rela.got1) } + .rela.got2 : { *(.rela.got2) } + .rela.ctors : { *(.rela.ctors) } + .rela.dtors : { *(.rela.dtors) } + .rela.init : { *(.rela.init) } + .rela.fini : { *(.rela.fini) } + .rela.bss : { *(.rela.bss) } + .rela.plt : { *(.rela.plt) } + .rela.sdata : { *(.rela.sdata) } + .rela.sbss : { *(.rela.sbss) } + .rela.sdata2 : { *(.rela.sdata2) } + .rela.sbss2 : { *(.rela.sbss2) } + .text : + { + *(.text) + /* .gnu.warning sections are handled specially by elf32.em. */ + *(.gnu.warning) + *(.gnu.linkonce.t*) + } =0 + _etext = .; + PROVIDE (etext = .); + .init : { *(.init) } =0 + .fini : { *(.fini) } =0 + .rodata : { *(.rodata) *(.gnu.linkonce.r*) } + .rodata1 : { *(.rodata1) } + .sdata2 : { *(.sdata2) } + .sbss2 : { *(.sbss2) } + /* Adjust the address for the data segment to the next page up. */ + . = ((. + 0x1000) & ~(0x1000 - 1)); + .data : + { + *(.data) + *(.gnu.linkonce.d*) + CONSTRUCTORS + } + .data1 : { *(.data1) } + .got1 : { *(.got1) } + .dynamic : { *(.dynamic) } + /* Put .ctors and .dtors next to the .got2 section, so that the pointers + get relocated with -mrelocatable. Also put in the .fixup pointers. + The current compiler no longer needs this, but keep it around for 2.7.2 */ + PROVIDE (_GOT2_START_ = .); + .got2 : { *(.got2) } + PROVIDE (__CTOR_LIST__ = .); + .ctors : { *(.ctors) } + PROVIDE (__CTOR_END__ = .); + PROVIDE (__DTOR_LIST__ = .); + .dtors : { *(.dtors) } + PROVIDE (__DTOR_END__ = .); + PROVIDE (_FIXUP_START_ = .); + .fixup : { *(.fixup) } + PROVIDE (_FIXUP_END_ = .); + PROVIDE (_GOT2_END_ = .); + PROVIDE (_GOT_START_ = .); + .got : { *(.got) } + .got.plt : { *(.got.plt) } + PROVIDE (_GOT_END_ = .); + /* We want the small data sections together, so single-instruction offsets + can access them all, and initialized data all before uninitialized, so + we can shorten the on-disk segment size. */ + .sdata : { *(.sdata) } + _edata = .; + PROVIDE (edata = .); + .sbss : + { + PROVIDE (__sbss_start = .); + *(.sbss) + *(.scommon) + *(.dynsbss) + PROVIDE (__sbss_end = .); + } + .plt : { *(.plt) } + .bss : + { + PROVIDE (__bss_start = .); + *(.dynbss) + *(.bss) + *(COMMON) + } + _end = . ; + PROVIDE (end = .); + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + /* DWARF debug sections. + Symbols in the DWARF debugging sections are relative to the beginning + of the section so we begin them at 0. */ + /* DWARF 1 */ + .debug 0 : { *(.debug) } + .line 0 : { *(.line) } + /* GNU DWARF 1 extensions */ + .debug_srcinfo 0 : { *(.debug_srcinfo) } + .debug_sfnames 0 : { *(.debug_sfnames) } + /* DWARF 1.1 and DWARF 2 */ + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + /* DWARF 2 */ + .debug_info 0 : { *(.debug_info) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_line 0 : { *(.debug_line) } + .debug_frame 0 : { *(.debug_frame) } + .debug_str 0 : { *(.debug_str) } + .debug_loc 0 : { *(.debug_loc) } + .debug_macinfo 0 : { *(.debug_macinfo) } + /* SGI/MIPS DWARF 2 extensions */ + .debug_weaknames 0 : { *(.debug_weaknames) } + .debug_funcnames 0 : { *(.debug_funcnames) } + .debug_typenames 0 : { *(.debug_typenames) } + .debug_varnames 0 : { *(.debug_varnames) } + /* These must appear regardless of . */ +} From owner-svn-src-user@FreeBSD.ORG Sat Feb 13 08:23:48 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E715106566B; Sat, 13 Feb 2010 08:23:48 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3D1CF8FC08; Sat, 13 Feb 2010 08:23:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1D8NmR1081677; Sat, 13 Feb 2010 08:23:48 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1D8Nm5r081673; Sat, 13 Feb 2010 08:23:48 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201002130823.o1D8Nm5r081673@svn.freebsd.org> From: Edwin Groothuis Date: Sat, 13 Feb 2010 08:23:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203814 - user/edwin/calendar X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Feb 2010 08:23:48 -0000 Author: edwin Date: Sat Feb 13 08:23:47 2010 New Revision: 203814 URL: http://svn.freebsd.org/changeset/base/203814 Log: Since moon-oriented events are not stuck to one day, let alone the same day around the globe, make sure we are able to specify where we are on this big marble and that events related to it are calculated properly (still have to do the sun-related calculations) Modified: user/edwin/calendar/Makefile user/edwin/calendar/calendar.1 user/edwin/calendar/calendar.c user/edwin/calendar/calendar.h user/edwin/calendar/io.c user/edwin/calendar/parsedata.c user/edwin/calendar/pom.c user/edwin/calendar/sunpos.c Modified: user/edwin/calendar/Makefile ============================================================================== --- user/edwin/calendar/Makefile Sat Feb 13 05:38:21 2010 (r203813) +++ user/edwin/calendar/Makefile Sat Feb 13 08:23:47 2010 (r203814) @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -CFLAGS= -pipe -g -pg -std=gnu99 -fstack-protector -Wall +CFLAGS= -pipe -g -std=gnu99 -fstack-protector -Wall PROG= calendar SRCS= calendar.c locale.c events.c dates.c parsedata.c io.c day.c \ Modified: user/edwin/calendar/calendar.1 ============================================================================== --- user/edwin/calendar/calendar.1 Sat Feb 13 05:38:21 2010 (r203813) +++ user/edwin/calendar/calendar.1 Sat Feb 13 08:23:47 2010 (r203814) @@ -285,10 +285,17 @@ command appeared in .Sh NOTES Chinese New Year is calculated at 120 degrees east of Greenwich, which roughly corresponds with the east coast of China. +For people west of China, this might result that the start of Chinese +New Year and the day of the related new moon might differ. .Pp The phases of the moon and the longitude of the sun are calculated against the local position which corresponds with 30 degrees times the time-difference towards Greenwich. +.Pp +The new and full moons are happening on the day indicated: They +might happen in the time period in the early night or in the late +evening. +It doesn't indicate that they are starting in the night on that date. .Sh BUGS The .Nm Modified: user/edwin/calendar/calendar.c ============================================================================== --- user/edwin/calendar/calendar.c Sat Feb 13 05:38:21 2010 (r203813) +++ user/edwin/calendar/calendar.c Sat Feb 13 08:23:47 2010 (r203814) @@ -52,14 +52,21 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include "calendar.h" +#define UTCOFFSET_NOTSET 100 /* Expected between -24 and +24 */ +#define LONGITUDE_NOTSET 1000 /* Expected between -360 and +360 */ + struct passwd *pw; int doall = 0; int debug = 0; +char *DEBUG = NULL; +double UTCoffset = UTCOFFSET_NOTSET; +int eastlongitude = LONGITUDE_NOTSET; time_t f_time = 0; int f_dayAfter = 0; /* days after current date */ @@ -75,7 +82,7 @@ main(int argc, char *argv[]) (void)setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "-A:aB:dF:f:t:W:")) != -1) + while ((ch = getopt(argc, argv, "-A:aB:dD:F:f:l:t:U:W:")) != -1) switch (ch) { case '-': /* backward contemptible */ case 'a': @@ -90,10 +97,6 @@ main(int argc, char *argv[]) calendarFile = optarg; break; - case 't': /* other date, undocumented, for tests */ - f_time = Mktime(optarg); - break; - case 'W': /* we don't need no steenking Fridays */ Friday = -1; /* FALLTHROUGH */ @@ -106,13 +109,25 @@ main(int argc, char *argv[]) f_dayBefore = atoi(optarg); break; - case 'F': + case 'F': /* Change the time: When does weekend start? */ Friday = atoi(optarg); break; + case 'l': /* Change longitudal position */ + eastlongitude = strtol(optarg, NULL, 10); + break; + case 'U': /* Change UTC offset */ + UTCoffset = strtod(optarg, NULL); + break; case 'd': debug = 1; break; + case 'D': + DEBUG = optarg; + break; + case 't': /* other date, undocumented, for tests */ + f_time = Mktime(optarg); + break; case '?': default: @@ -129,9 +144,61 @@ main(int argc, char *argv[]) if (f_time <= 0) (void)time(&f_time); + /* if not set, determine where I could be */ + { + if (UTCoffset == UTCOFFSET_NOTSET && + eastlongitude == LONGITUDE_NOTSET) { + /* Calculate on difference between here and UTC */ + time_t t; + struct tm tm; + long utcoffset, hh, mm, ss; + double uo; + + time(&t); + localtime_r(&t, &tm); + utcoffset = tm.tm_gmtoff; + /* seconds -> hh:mm:ss */ + hh = utcoffset / SECSPERHOUR; + utcoffset %= SECSPERHOUR; + mm = utcoffset / SECSPERMINUTE; + utcoffset %= SECSPERMINUTE; + ss = utcoffset; + + /* hh:mm:ss -> hh.mmss */ + uo = mm + (100.0 * (ss / 60.0)); + uo /= 60.0 / 100.0; + uo = hh + uo / 100; + + UTCoffset = uo; + eastlongitude = UTCoffset * 15; + } else if (UTCoffset == UTCOFFSET_NOTSET) { + /* Base on information given */ + UTCoffset = eastlongitude / 15; + } else { + /* Base on information given */ + eastlongitude = UTCoffset * 15; + } + } + settimes(f_time, f_dayBefore, f_dayAfter, &tp1, &tp2); generatedates(&tp1, &tp2); + /* + * FROM now on, we are working in UTC. + * This will only affect moon and sun related events anyway. + */ + if (setenv("TZ", "UTC", 1) != 0) + errx(1, "setenv: %s", strerror(errno)); + tzset(); + + if (debug) + dumpdates(); + + if (DEBUG != NULL) { + dodebug(DEBUG); + exit(0); + } + if (doall) while ((pw = getpwent()) != NULL) { (void)setegid(pw->pw_gid); Modified: user/edwin/calendar/calendar.h ============================================================================== --- user/edwin/calendar/calendar.h Sat Feb 13 05:38:21 2010 (r203813) +++ user/edwin/calendar/calendar.h Sat Feb 13 08:23:47 2010 (r203814) @@ -36,7 +36,17 @@ #include #include -#define SECSPERDAY 24 * 60 * 60 +#define SECSPERDAY (24 * 60 * 60) +#define SECSPERHOUR (60 * 60) +#define SECSPERMINUTE (60) +#define HOURSPERDAY (24) +#define FSECSPERDAY (24.0 * 60.0 * 60.0) +#define FSECSPERHOUR (60.0 * 60.0) +#define FSECSPERMINUTE (60.0) +#define FHOURSPERDAY (24.0) + +#define DAYSPERYEAR 365 +#define DAYSPERLEAPYEAR 366 /* Not yet categorized */ @@ -49,6 +59,8 @@ extern const char *calendarFile; extern int yrdays; extern struct fixs neaster, npaskha, ncny, nfullmoon, nnewmoon; extern struct fixs nmarequinox, nsepequinox, njunsolstice, ndecsolstice; +extern double UTCoffset; +extern int eastlongitude; #define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0) @@ -73,16 +85,22 @@ extern struct fixs nmarequinox, nsepequi #define F_JUNSOLSTICE 0x10000 #define F_DECSOLSTICE 0x20000 -#define STRING_EASTER "Easter" -#define STRING_PASKHA "Paskha" -#define STRING_CNY "ChineseNewYear" -#define STRING_NEWMOON "NewMoon" -#define STRING_FULLMOON "FullMoon" +#define STRING_EASTER "Easter" +#define STRING_PASKHA "Paskha" +#define STRING_CNY "ChineseNewYear" +#define STRING_NEWMOON "NewMoon" +#define STRING_FULLMOON "FullMoon" #define STRING_MAREQUINOX "MarEquinox" #define STRING_SEPEQUINOX "SepEquinox" #define STRING_JUNSOLSTICE "JunSolstice" #define STRING_DECSOLSTICE "DecSolstice" +/* + * All the astronomical calculations are carried out for the meridian 120 + * degrees east of Greenwich. + */ +#define UTCOFFSET_CNY 8.0 + extern int debug; /* show parsing of the input */ extern int f_dayAfter; /* days after current date */ extern int f_dayBefore; /* days before current date */ @@ -134,6 +152,7 @@ time_t Mktime(char *); /* parsedata.c */ int parsedaymonth(char *, int *, int *, int *, int *); +void dodebug(char *type); /* io.c */ void cal(void); @@ -158,8 +177,9 @@ int walkthrough_dates(struct event **e); void addtodate(struct event *e, int year, int month, int day); /* pom.c */ -#define MAXMOONS 15 -void pom(int year, int *fms, int *nms); +#define MAXMOONS 18 +void pom(int year, double UTCoffset, int *fms, int *nms); +void fpom(int year, double utcoffset, double *ffms, double *fnms); /* sunpos.c */ void equinoxsolstice(int year, double UTCoffset, int *equinoxdays, int *solsticedays); Modified: user/edwin/calendar/io.c ============================================================================== --- user/edwin/calendar/io.c Sat Feb 13 05:38:21 2010 (r203813) +++ user/edwin/calendar/io.c Sat Feb 13 08:23:47 2010 (r203814) @@ -189,6 +189,8 @@ cal(void) tm.tm_year = year[i] - 1900; (void)strftime(dbuf, sizeof(dbuf), d_first ? "%e %b" : "%b %e", &tm); + if (debug) + fprintf(stderr, "got %s\n", pp); events[i] = event_add(year[i], month[i], day[i], dbuf, ((flags &= F_VARIABLE) != 0) ? 1 : 0, pp); } Modified: user/edwin/calendar/parsedata.c ============================================================================== --- user/edwin/calendar/parsedata.c Sat Feb 13 05:38:21 2010 (r203813) +++ user/edwin/calendar/parsedata.c Sat Feb 13 08:23:47 2010 (r203814) @@ -28,6 +28,7 @@ __FBSDID("$FreeBSD: user/edwin/calendar/day.c 200813 2009-12-21 21:17:59Z edwin $"); #include +#include #include #include #include @@ -44,6 +45,7 @@ static int checkdayofweek(char *s, int * static int isonlydigits(char *s, int nostar); static int indextooffset(char *s); static int parseoffset(char *s); +static char *floattoday(int year, double f); /* * Expected styles: @@ -332,8 +334,9 @@ debug_determinestyle(int dateonly, char struct yearinfo { int year; int ieaster, ipaskha, firstcnyday; - int ifullmoon[MAXMOONS], inewmoon[MAXMOONS], - ichinesemonths[MAXMOONS], equinoxdays[2], solsticedays[2]; + double ffullmoon[MAXMOONS], fnewmoon[MAXMOONS]; + double ffullmooncny[MAXMOONS], fnewmooncny[MAXMOONS]; + int ichinesemonths[MAXMOONS], equinoxdays[2], solsticedays[2]; int *mondays; struct yearinfo *next; }; @@ -406,7 +409,10 @@ parsedaymonth(char *date, int *yearp, in yearinfo->mondays = mondaytab[isleap(year)]; yearinfo->ieaster = easter(year); - pom(year, yearinfo->ifullmoon, yearinfo->inewmoon); + fpom(year, UTCoffset, yearinfo->ffullmoon, + yearinfo->fnewmoon); + fpom(year, UTCOFFSET_CNY, yearinfo->ffullmooncny, + yearinfo->fnewmooncny); equinoxsolstice(year, 0.0, yearinfo->equinoxdays, yearinfo->solsticedays); @@ -415,12 +421,12 @@ parsedaymonth(char *date, int *yearp, in * moon */ yearinfo->firstcnyday = calculatesunlongitude30(year, - 120, yearinfo->ichinesemonths); - for (m = 0; yearinfo->inewmoon[m] != 0; m++) { - if (yearinfo->inewmoon[m] > + UTCOFFSET_CNY, yearinfo->ichinesemonths); + for (m = 0; yearinfo->fnewmooncny[m] >= 0; m++) { + if (yearinfo->fnewmooncny[m] > yearinfo->firstcnyday) { yearinfo->firstcnyday = - yearinfo->inewmoon[m - 1]; + floor(yearinfo->fnewmooncny[m - 1]); break; } } @@ -576,9 +582,10 @@ parsedaymonth(char *date, int *yearp, in offset = 0; if ((*flags & F_MODIFIEROFFSET) != 0) offset = parseoffset(modifieroffset); - for (i = 0; yearinfo->ifullmoon[i] != 0; i++) { + for (i = 0; yearinfo->ffullmoon[i] > 0; i++) { if (remember_yd(year, - yearinfo->ifullmoon[i] + offset, &rm, &rd)) + floor(yearinfo->ffullmoon[i]) + offset, + &rm, &rd)) remember(index++, yearp, monthp, dayp, year, rm, rd); } @@ -593,9 +600,10 @@ parsedaymonth(char *date, int *yearp, in offset = 0; if ((*flags & F_MODIFIEROFFSET) != 0) offset = parseoffset(modifieroffset); - for (i = 0; yearinfo->ifullmoon[i] != 0; i++) { + for (i = 0; yearinfo->ffullmoon[i] > 0; i++) { if (remember_yd(year, - yearinfo->inewmoon[i] + offset, &rm, &rd)) + floor(yearinfo->fnewmoon[i]) + offset, + &rm, &rd)) remember(index++, yearp, monthp, dayp, year, rm, rd); } @@ -844,3 +852,76 @@ parseoffset(char *s) return strtol(s, NULL, 10); } + +static char * +floattoday(int year, double f) +{ + static char buf[100]; + int i, m, d, hh, mm, ss; + int *cumdays = cumdaytab[isleap(year)]; + + for (i = 0; 1 + cumdays[i] < f; i++) + ;; + m = --i; + d = floor(f - 1 - cumdays[i]); + f -= floor(f); + i = f * SECSPERDAY; + + hh = i / SECSPERHOUR; + i %= SECSPERHOUR; + mm = i / SECSPERMINUTE; + i %= SECSPERMINUTE; + ss = i; + + sprintf(buf, "%02d-%02d %02d:%02d:%02d", m, d, hh, mm, ss); + return (buf); +} + +char * +inttoday(int year, int f) +{ + static char buf[100]; + int i, m, d; + int *cumdays = cumdaytab[isleap(year)]; + + for (i = 0; 1 + cumdays[i] < f; i++) + ;; + m = --i; + d = floor(f - 1 - cumdays[i]); + f -= floor(f); + + sprintf(buf, "%02d-%02d", m, d); + return (buf); +} + +void +dodebug(char *what) +{ + int year; + + printf("UTFOffset: %g\n", UTCoffset); + printf("eastlongitude: %d\n", eastlongitude); + + if (strcmp(what, "moon") == 0) { + double ffullmoon[MAXMOONS], fnewmoon[MAXMOONS]; + int i; + + for (year = year1; year <= year2; year++) { + fpom(year, UTCoffset, ffullmoon, fnewmoon); + printf("Full moon %d:\t", year); + for (i = 0; ffullmoon[i] >= 0; i++) { + printf("%g (%s) ", ffullmoon[i], + floattoday(year, ffullmoon[i])); + } + printf("\nNew moon %d:\t", year); + for (i = 0; fnewmoon[i] >= 0; i++) { + printf("%g (%s) ", fnewmoon[i], + floattoday(year, fnewmoon[i])); + } + printf("\n"); + + } + + return; + } +} Modified: user/edwin/calendar/pom.c ============================================================================== --- user/edwin/calendar/pom.c Sat Feb 13 05:38:21 2010 (r203813) +++ user/edwin/calendar/pom.c Sat Feb 13 08:23:47 2010 (r203814) @@ -65,6 +65,8 @@ __FBSDID("$FreeBSD: head/games/pom/pom.c #include #include +#include "calendar.h" + #ifndef PI #define PI 3.14159265358979323846 #endif @@ -80,9 +82,27 @@ __FBSDID("$FreeBSD: head/games/pom/pom.c static void adj360(double *); static double dtor(double); static double potm(double); +static double potm_minute(double days, int olddir); + +void +pom(int year, double utcoffset, int *fms, int *nms) +{ + double ffms[MAXMOONS]; + double fnms[MAXMOONS]; + int i, j; + + fpom(year, utcoffset, ffms, fnms); + + for (i = 0; ffms[i] != 0; i++) + fms[j++] = round(ffms[i]); + fms[i] = -1; + for (i = 0; fnms[i] != 0; i++) + nms[i] = round(fnms[i]); + nms[i] = -1; +} void -pom(int year, int *fms, int *nms) +fpom(int year, double utcoffset, double *ffms, double *fnms) { time_t tt; struct tm GMT, tmd_today, tmd_tomorrow; @@ -90,10 +110,10 @@ pom(int year, int *fms, int *nms) int cnt, d; int yeardays; int olddir, newdir; - int *pnms, *pfms; + double *pfnms, *pffms, t; - pnms = nms; - pfms = fms; + pfnms = fnms; + pffms = ffms; /* * We take the phase of the moon one second before and one second @@ -102,14 +122,14 @@ pom(int year, int *fms, int *nms) memset(&tmd_today, 0, sizeof(tmd_today)); tmd_today.tm_year = year - 1900; tmd_today.tm_mon = 0; - tmd_today.tm_mday = 0; /* 31 December */ + tmd_today.tm_mday = -1; /* 31 December */ tmd_today.tm_hour = 23; tmd_today.tm_min = 59; tmd_today.tm_sec = 59; memset(&tmd_tomorrow, 0, sizeof(tmd_tomorrow)); tmd_tomorrow.tm_year = year - 1900; tmd_tomorrow.tm_mon = 0; - tmd_tomorrow.tm_mday = 1; /* 1 January */ + tmd_tomorrow.tm_mday = 0; /* 01 January */ tmd_tomorrow.tm_hour = 0; tmd_tomorrow.tm_min = 0; tmd_tomorrow.tm_sec = 1; @@ -118,48 +138,85 @@ pom(int year, int *fms, int *nms) gmtime_r(&tt, &GMT); yeardays = 0; for (cnt = EPOCH; cnt < GMT.tm_year; ++cnt) - yeardays += isleap(1900 + cnt) ? 366 : 365; + yeardays += isleap(1900 + cnt) ? DAYSPERLEAPYEAR : DAYSPERYEAR; days_today = (GMT.tm_yday + 1) + ((GMT.tm_hour + - (GMT.tm_min / 60.0) + (GMT.tm_sec / 3600.0)) / 24.0); + (GMT.tm_min / FSECSPERMINUTE) + (GMT.tm_sec / FSECSPERHOUR)) / + FHOURSPERDAY); days_today += yeardays; tt = mktime(&tmd_tomorrow); gmtime_r(&tt, &GMT); yeardays = 0; for (cnt = EPOCH; cnt < GMT.tm_year; ++cnt) - yeardays += isleap(1900 + cnt) ? 366 : 365; + yeardays += isleap(1900 + cnt) ? DAYSPERLEAPYEAR : DAYSPERYEAR; days_tomorrow = (GMT.tm_yday + 1) + ((GMT.tm_hour + - (GMT.tm_min / 60.0) + (GMT.tm_sec / 3600.0)) / 24.0); + (GMT.tm_min / FSECSPERMINUTE) + (GMT.tm_sec / FSECSPERHOUR)) / + FHOURSPERDAY); days_tomorrow += yeardays; today = potm(days_today); /* 30 December 23:59:59 */ tomorrow = potm(days_tomorrow); /* 31 December 00:00:01 */ olddir = today > tomorrow ? -1 : +1; - yeardays = isleap(year) ? 366 : 365; /* reuse */ + yeardays = 1 + isleap(year) ? DAYSPERLEAPYEAR : DAYSPERYEAR; /* reuse */ for (d = 0; d <= yeardays; d++) { today = potm(days_today); tomorrow = potm(days_tomorrow); newdir = today > tomorrow ? -1 : +1; - if (olddir == -1 && newdir == +1) { - *pnms = d; - pnms++; - } - if (olddir == +1 && newdir == -1) { - *pfms = d; - pfms++; + if (olddir != newdir) { + t = potm_minute(days_today - 1, olddir) + + utcoffset / FHOURSPERDAY; + if (olddir == -1 && newdir == +1) { + *pfnms = d - 1 + t; + pfnms++; + } else if (olddir == +1 && newdir == -1) { + *pffms = d - 1 + t; + pffms++; + } } olddir = newdir; days_today++; days_tomorrow++; } - *pfms = 0; - *pnms = 0; + *pffms = -1; + *pfnms = -1; +} + +static double +potm_minute(double days, int olddir) { + double period = FSECSPERDAY / 2.0; + double p1, p2; + double before, after; + int newdir; + +// printf("---> days:%g olddir:%d\n", days, olddir); + + p1 = days + (period / SECSPERDAY); + period /= 2; + + while (period > 30) { /* half a minute */ +// printf("period:%g - p1:%g - ", period, p1); + p2 = p1 + (2.0 / SECSPERDAY); + before = potm(p1); + after = potm(p2); +// printf("before:%10.10g - after:%10.10g\n", before, after); + newdir = before < after ? -1 : +1; + if (olddir != newdir) + p1 += (period / SECSPERDAY); + else + p1 -= (period / SECSPERDAY); + period /= 2; +// printf("newdir:%d - p1:%10.10f - period:%g\n", +// newdir, p1, period); + } + p1 -= floor(p1); + //exit(0); + return (p1); } /* * potm -- - * return phase of the moon + * return phase of the moon, as a percentage [0 ... 100] */ static double potm(double days) Modified: user/edwin/calendar/sunpos.c ============================================================================== --- user/edwin/calendar/sunpos.c Sat Feb 13 05:38:21 2010 (r203813) +++ user/edwin/calendar/sunpos.c Sat Feb 13 08:23:47 2010 (r203814) @@ -102,9 +102,9 @@ sunpos(int inYY, int inMM, int inDD, dou if (inMM <= 2 && isleap(inYY)) ZJ -= 1.0; - UTHM = inHOUR + inMIN / 60.0 + UTCOFFSET; + UTHM = inHOUR + inMIN / FSECSPERMINUTE + UTCOFFSET; Y = inYY - 1900; /* 1 */ - D = floor(365.25 * Y) + ZJ + inDD + UTHM / 24; /* 3 */ + D = floor(365.25 * Y) + ZJ + inDD + UTHM / FHOURSPERDAY; /* 3 */ T = D / 36525.0; /* 4 */ *L = 279.697 + 36000.769 * T; /* 5 */ fixup(L); @@ -113,12 +113,12 @@ sunpos(int inYY, int inMM, int inDD, dou epsilon = 23.452 - 0.013 * T; /* 7 */ fixup(&epsilon); - lambda = *L + (1.919 - 0.005 * T) * SIN(M) + 0.020 * SIN(2 * M); /* 8 */ + lambda = *L + (1.919 - 0.005 * T) * SIN(M) + 0.020 * SIN(2 * M);/* 8 */ fixup(&lambda); alpha = ATAN(TAN(lambda) * COS(epsilon)); /* 9 */ /* Alpha should be in the same quadrant as lamba */ - if (1) { + { int lssign = sin(D2R(lambda)) < 0 ? -1 : 1; int lcsign = cos(D2R(lambda)) < 0 ? -1 : 1; while (((sin(D2R(alpha)) < 0) ? -1 : 1) != lssign @@ -206,7 +206,7 @@ equinoxsolstice(int year, double UTCoffs found = 0; prevdec = 350; for (d = 18; d < 31; d++) { - for (h = 0; h < 4 * 24; h++) { + for (h = 0; h < 4 * HOURSPERDAY; h++) { sunpos(year, 3, d, UTCoffset, HOUR(h), MIN(h), 0.0, 0.0, &L, &dec); if (SIGN(prevdec) != SIGN(dec)) { @@ -231,7 +231,7 @@ equinoxsolstice(int year, double UTCoffs found = 0; prevdec = 10; for (d = 18; d < 31; d++) { - for (h = 0; h < 4 * 24; h++) { + for (h = 0; h < 4 * HOURSPERDAY; h++) { sunpos(year, 9, d, UTCoffset, HOUR(h), MIN(h), 0.0, 0.0, &L, &dec); if (SIGN(prevdec) != SIGN(dec)) { @@ -258,7 +258,7 @@ equinoxsolstice(int year, double UTCoffs prevdec = 0; prevangle = 1; for (d = 18; d < 31; d++) { - for (h = 0; h < 4 * 24; h++) { + for (h = 0; h < 4 * HOURSPERDAY; h++) { sunpos(year, 6, d, UTCoffset, HOUR(h), MIN(h), 0.0, 0.0, &L, &dec); angle = ANGLE(prevdec, dec); @@ -287,7 +287,7 @@ equinoxsolstice(int year, double UTCoffs prevdec = 360; prevangle = -1; for (d = 18; d < 31; d++) { - for (h = 0; h < 4 * 24; h++) { + for (h = 0; h < 4 * HOURSPERDAY; h++) { sunpos(year, 12, d, UTCoffset, HOUR(h), MIN(h), 0.0, 0.0, &L, &dec); angle = ANGLE(prevdec, dec); @@ -329,7 +329,7 @@ calculatesunlongitude30(int year, int de for (m = 1; m <= 12; m++) { for (d = 1; d <= monthdays[m]; d++) { - for (h = 0; h < 4 * 24; h++) { + for (h = 0; h < 4 * HOURSPERDAY; h++) { sunpos(year, m, d, -24 * (degreeGMToffset / 360.0), HOUR(h), MIN(h), 0.0, 0.0, &curL, &dec); @@ -358,7 +358,7 @@ printf("%04d-%02d-%02d %02d:%02d - %d %g } } } - *pichinesemonths = 0; + *pichinesemonths = -1; return (firstmonth330); } From owner-svn-src-user@FreeBSD.ORG Sat Feb 13 15:35:54 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A4BFA106566B; Sat, 13 Feb 2010 15:35:54 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 930968FC0A; Sat, 13 Feb 2010 15:35:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1DFZs8j031109; Sat, 13 Feb 2010 15:35:54 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1DFZq9S031024; Sat, 13 Feb 2010 15:35:52 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201002131535.o1DFZq9S031024@svn.freebsd.org> From: Warner Losh Date: Sat, 13 Feb 2010 15:35:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203832 - in user/imp/tbemd: bin/ls bin/pkill bin/ps etc/defaults etc/rc.d games/fortune/datfiles games/grdc gnu/usr.bin/groff/tmac lib/libc/nls lib/libc/posix1e lib/libc/stdlib lib/lib... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Feb 2010 15:35:54 -0000 Author: imp Date: Sat Feb 13 15:35:51 2010 New Revision: 203832 URL: http://svn.freebsd.org/changeset/base/203832 Log: merge from head. Added: user/imp/tbemd/share/man/man4/alpm.4 - copied unchanged from r203812, head/share/man/man4/alpm.4 user/imp/tbemd/share/man/man4/amdpm.4 - copied unchanged from r203812, head/share/man/man4/amdpm.4 user/imp/tbemd/share/man/man4/mcd.4 - copied unchanged from r203812, head/share/man/man4/mcd.4 user/imp/tbemd/share/man/man4/padlock.4 - copied unchanged from r203812, head/share/man/man4/padlock.4 user/imp/tbemd/share/man/man4/pcf.4 - copied unchanged from r203812, head/share/man/man4/pcf.4 user/imp/tbemd/share/man/man4/scd.4 - copied unchanged from r203812, head/share/man/man4/scd.4 user/imp/tbemd/share/man/man4/viapm.4 - copied unchanged from r203812, head/share/man/man4/viapm.4 user/imp/tbemd/sys/mips/conf/SWARM_SMP - copied unchanged from r203812, head/sys/mips/conf/SWARM_SMP user/imp/tbemd/sys/mips/mips/mpboot.S - copied unchanged from r203812, head/sys/mips/mips/mpboot.S user/imp/tbemd/tools/regression/usr.bin/pkill/pgrep-q.t - copied unchanged from r203812, head/tools/regression/usr.bin/pkill/pgrep-q.t user/imp/tbemd/usr.bin/ee/nls/pt_BR.ISO8859-1/ - copied from r203812, head/usr.bin/ee/nls/pt_BR.ISO8859-1/ user/imp/tbemd/usr.sbin/pmcstat/pmcpl_annotate.c - copied unchanged from r203812, head/usr.sbin/pmcstat/pmcpl_annotate.c user/imp/tbemd/usr.sbin/pmcstat/pmcpl_annotate.h - copied unchanged from r203812, head/usr.sbin/pmcstat/pmcpl_annotate.h user/imp/tbemd/usr.sbin/pmcstat/pmcpl_callgraph.c - copied unchanged from r203812, head/usr.sbin/pmcstat/pmcpl_callgraph.c user/imp/tbemd/usr.sbin/pmcstat/pmcpl_callgraph.h - copied unchanged from r203812, head/usr.sbin/pmcstat/pmcpl_callgraph.h user/imp/tbemd/usr.sbin/pmcstat/pmcpl_calltree.c - copied unchanged from r203812, head/usr.sbin/pmcstat/pmcpl_calltree.c user/imp/tbemd/usr.sbin/pmcstat/pmcpl_calltree.h - copied unchanged from r203812, head/usr.sbin/pmcstat/pmcpl_calltree.h user/imp/tbemd/usr.sbin/pmcstat/pmcpl_gprof.c - copied unchanged from r203812, head/usr.sbin/pmcstat/pmcpl_gprof.c user/imp/tbemd/usr.sbin/pmcstat/pmcpl_gprof.h - copied unchanged from r203812, head/usr.sbin/pmcstat/pmcpl_gprof.h user/imp/tbemd/usr.sbin/pmcstat/pmcstat_log.h - copied unchanged from r203812, head/usr.sbin/pmcstat/pmcstat_log.h user/imp/tbemd/usr.sbin/pmcstat/pmcstat_top.h - copied unchanged from r203812, head/usr.sbin/pmcstat/pmcstat_top.h Deleted: user/imp/tbemd/share/man/man4/man4.i386/alpm.4 user/imp/tbemd/share/man/man4/man4.i386/amdpm.4 user/imp/tbemd/share/man/man4/man4.i386/mcd.4 user/imp/tbemd/share/man/man4/man4.i386/padlock.4 user/imp/tbemd/share/man/man4/man4.i386/pcf.4 user/imp/tbemd/share/man/man4/man4.i386/scd.4 user/imp/tbemd/share/man/man4/man4.i386/viapm.4 Modified: user/imp/tbemd/bin/ls/ls.c user/imp/tbemd/bin/pkill/pkill.1 user/imp/tbemd/bin/pkill/pkill.c user/imp/tbemd/bin/ps/ps.c user/imp/tbemd/etc/defaults/rc.conf user/imp/tbemd/etc/rc.d/ipfw user/imp/tbemd/games/fortune/datfiles/fortunes user/imp/tbemd/games/grdc/grdc.c user/imp/tbemd/gnu/usr.bin/groff/tmac/mdoc.local user/imp/tbemd/lib/libc/nls/msgcat.c user/imp/tbemd/lib/libc/posix1e/mac.3 user/imp/tbemd/lib/libc/stdlib/strfmon.c user/imp/tbemd/lib/libc/sys/ptrace.2 user/imp/tbemd/lib/libefi/libefi.3 user/imp/tbemd/lib/libufs/cgroup.c user/imp/tbemd/lib/libufs/sblock.c user/imp/tbemd/lib/libusb/libusb.h user/imp/tbemd/lib/libusb/libusb10.c user/imp/tbemd/lib/libusb/libusb10_desc.c user/imp/tbemd/lib/libusb/libusb10_io.c user/imp/tbemd/lib/libusb/libusb20_compat01.c user/imp/tbemd/lib/libusb/libusb20_desc.c user/imp/tbemd/lib/libusb/libusb20_ugen20.c user/imp/tbemd/lib/libusb/usb.h user/imp/tbemd/libexec/ftpd/logwtmp.c user/imp/tbemd/sbin/growfs/growfs.c user/imp/tbemd/sbin/mount/mount.8 user/imp/tbemd/sbin/newfs/mkfs.c user/imp/tbemd/sbin/newfs/newfs.c user/imp/tbemd/sbin/newfs/newfs.h user/imp/tbemd/sbin/sysctl/sysctl.c user/imp/tbemd/sbin/tunefs/tunefs.c user/imp/tbemd/share/man/man4/Makefile user/imp/tbemd/share/man/man4/acpi_asus.4 user/imp/tbemd/share/man/man4/acpi_fujitsu.4 user/imp/tbemd/share/man/man4/acpi_hp.4 user/imp/tbemd/share/man/man4/acpi_ibm.4 user/imp/tbemd/share/man/man4/acpi_panasonic.4 user/imp/tbemd/share/man/man4/acpi_sony.4 user/imp/tbemd/share/man/man4/acpi_toshiba.4 user/imp/tbemd/share/man/man4/acpi_wmi.4 user/imp/tbemd/share/man/man4/io.4 user/imp/tbemd/share/man/man4/iwn.4 user/imp/tbemd/share/man/man4/iwnfw.4 user/imp/tbemd/share/man/man4/linux.4 user/imp/tbemd/share/man/man4/man4.i386/Makefile user/imp/tbemd/share/man/man4/ndis.4 user/imp/tbemd/share/man/man4/nvram.4 user/imp/tbemd/share/man/man4/sctp.4 user/imp/tbemd/share/man/man5/rc.conf.5 user/imp/tbemd/share/man/man9/VFS.9 user/imp/tbemd/share/man/man9/alloc_unr.9 user/imp/tbemd/share/man/man9/locking.9 user/imp/tbemd/share/man/man9/vnode.9 user/imp/tbemd/share/zoneinfo/Makefile user/imp/tbemd/sys/amd64/conf/GENERIC user/imp/tbemd/sys/amd64/conf/NOTES user/imp/tbemd/sys/amd64/conf/XENHVM user/imp/tbemd/sys/arm/arm/pmap.c user/imp/tbemd/sys/arm/conf/AVILA user/imp/tbemd/sys/arm/conf/BWCT user/imp/tbemd/sys/arm/conf/CAMBRIA user/imp/tbemd/sys/arm/conf/CNS11XXNAS user/imp/tbemd/sys/arm/conf/CRB user/imp/tbemd/sys/arm/conf/DB-78XXX user/imp/tbemd/sys/arm/conf/DB-88F5XXX user/imp/tbemd/sys/arm/conf/DB-88F6XXX user/imp/tbemd/sys/arm/conf/EP80219 user/imp/tbemd/sys/arm/conf/GUMSTIX user/imp/tbemd/sys/arm/conf/HL200 user/imp/tbemd/sys/arm/conf/IQ31244 user/imp/tbemd/sys/arm/conf/KB920X user/imp/tbemd/sys/arm/conf/NSLU user/imp/tbemd/sys/arm/conf/SIMICS user/imp/tbemd/sys/arm/conf/SKYEYE user/imp/tbemd/sys/arm/xscale/ixp425/cambria_fled.c user/imp/tbemd/sys/compat/freebsd32/syscalls.master user/imp/tbemd/sys/compat/linux/linux_socket.c user/imp/tbemd/sys/compat/svr4/syscalls.master user/imp/tbemd/sys/conf/NOTES user/imp/tbemd/sys/conf/files.amd64 user/imp/tbemd/sys/conf/files.i386 user/imp/tbemd/sys/conf/files.ia64 user/imp/tbemd/sys/conf/files.mips user/imp/tbemd/sys/conf/files.pc98 user/imp/tbemd/sys/conf/files.sparc64 user/imp/tbemd/sys/conf/options.mips user/imp/tbemd/sys/ddb/db_thread.c user/imp/tbemd/sys/dev/aac/aac.c user/imp/tbemd/sys/dev/aac/aac_pci.c user/imp/tbemd/sys/dev/aac/aacreg.h user/imp/tbemd/sys/dev/aac/aacvar.h user/imp/tbemd/sys/dev/acpi_support/acpi_asus.c user/imp/tbemd/sys/dev/acpica/acpi.c user/imp/tbemd/sys/dev/acpica/acpi_cpu.c user/imp/tbemd/sys/dev/acpica/acpi_video.c user/imp/tbemd/sys/dev/aic7xxx/aic79xx_osm.c user/imp/tbemd/sys/dev/ath/ath_hal/ah_eeprom_v14.h user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar5416phy.h user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar9280.c user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar9280.h user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c user/imp/tbemd/sys/dev/ath/if_ath.c user/imp/tbemd/sys/dev/ath/if_athvar.h user/imp/tbemd/sys/dev/bge/if_bge.c user/imp/tbemd/sys/dev/sound/usb/uaudio.c user/imp/tbemd/sys/dev/sound/usb/uaudioreg.h user/imp/tbemd/sys/dev/usb/controller/ehci.c user/imp/tbemd/sys/dev/usb/controller/ehci.h user/imp/tbemd/sys/dev/usb/controller/ehci_pci.c user/imp/tbemd/sys/i386/conf/GENERIC user/imp/tbemd/sys/i386/conf/NOTES user/imp/tbemd/sys/i386/conf/XEN user/imp/tbemd/sys/i386/ibcs2/syscalls.master user/imp/tbemd/sys/ia64/conf/GENERIC user/imp/tbemd/sys/kern/kern_umtx.c user/imp/tbemd/sys/kern/makesyscalls.sh user/imp/tbemd/sys/kern/sys_process.c user/imp/tbemd/sys/kern/syscalls.master user/imp/tbemd/sys/mips/conf/ADM5120 user/imp/tbemd/sys/mips/conf/ALCHEMY user/imp/tbemd/sys/mips/conf/AR71XX user/imp/tbemd/sys/mips/conf/IDT user/imp/tbemd/sys/mips/conf/MALTA user/imp/tbemd/sys/mips/conf/MALTA64 user/imp/tbemd/sys/mips/conf/OCTEON1 user/imp/tbemd/sys/mips/conf/OCTEON1-32 user/imp/tbemd/sys/mips/conf/QEMU user/imp/tbemd/sys/mips/conf/SENTRY5 user/imp/tbemd/sys/mips/conf/SWARM user/imp/tbemd/sys/mips/conf/XLR user/imp/tbemd/sys/mips/include/asm.h user/imp/tbemd/sys/mips/include/cpu.h user/imp/tbemd/sys/mips/include/hwfunc.h user/imp/tbemd/sys/mips/include/intr_machdep.h user/imp/tbemd/sys/mips/include/pcpu.h user/imp/tbemd/sys/mips/include/smp.h user/imp/tbemd/sys/mips/mips/exception.S user/imp/tbemd/sys/mips/mips/intr_machdep.c user/imp/tbemd/sys/mips/mips/machdep.c user/imp/tbemd/sys/mips/mips/mp_machdep.c user/imp/tbemd/sys/mips/mips/nexus.c user/imp/tbemd/sys/mips/mips/pmap.c user/imp/tbemd/sys/mips/mips/tick.c user/imp/tbemd/sys/mips/rmi/dev/xlr/rge.c user/imp/tbemd/sys/mips/sibyte/sb_asm.S user/imp/tbemd/sys/mips/sibyte/sb_machdep.c user/imp/tbemd/sys/mips/sibyte/sb_scd.c user/imp/tbemd/sys/mips/sibyte/sb_scd.h user/imp/tbemd/sys/mips/sibyte/sb_zbbus.c user/imp/tbemd/sys/mips/sibyte/sb_zbpci.c user/imp/tbemd/sys/net/vnet.c user/imp/tbemd/sys/net80211/ieee80211_crypto_tkip.c user/imp/tbemd/sys/netinet/tcp_hostcache.c user/imp/tbemd/sys/nfs/nfs_common.c user/imp/tbemd/sys/nfs/nfs_common.h user/imp/tbemd/sys/nfsclient/nfs_krpc.c user/imp/tbemd/sys/nfsserver/nfs.h user/imp/tbemd/sys/nfsserver/nfs_fha.c user/imp/tbemd/sys/nfsserver/nfs_srvkrpc.c user/imp/tbemd/sys/pc98/conf/GENERIC user/imp/tbemd/sys/powerpc/conf/GENERIC user/imp/tbemd/sys/powerpc/conf/MPC85XX user/imp/tbemd/sys/sparc64/conf/GENERIC user/imp/tbemd/sys/sun4v/conf/GENERIC user/imp/tbemd/sys/sys/ptrace.h user/imp/tbemd/sys/teken/teken_scs.h user/imp/tbemd/sys/ufs/ffs/ffs_alloc.c user/imp/tbemd/sys/ufs/ffs/ffs_vfsops.c user/imp/tbemd/sys/ufs/ffs/fs.h user/imp/tbemd/tools/build/mk/OptionalObsoleteFiles.inc user/imp/tbemd/tools/regression/bin/sh/parameters/mail2.0 user/imp/tbemd/tools/regression/file/newfileops_on_fork/newfileops_on_fork.c user/imp/tbemd/tools/regression/gaithrstress/gaithrstress.c user/imp/tbemd/tools/tools/mctest/mctest.cc user/imp/tbemd/tools/tools/netrate/http/http.c user/imp/tbemd/tools/tools/netrate/httpd/httpd.c user/imp/tbemd/tools/tools/netrate/juggle/juggle.c user/imp/tbemd/usr.bin/Makefile user/imp/tbemd/usr.bin/ee/Makefile user/imp/tbemd/usr.bin/elf2aout/elf2aout.1 user/imp/tbemd/usr.bin/elf2aout/elf2aout.c user/imp/tbemd/usr.bin/find/Makefile user/imp/tbemd/usr.bin/find/extern.h user/imp/tbemd/usr.bin/find/function.c user/imp/tbemd/usr.bin/find/getdate.y user/imp/tbemd/usr.bin/uname/uname.1 user/imp/tbemd/usr.bin/uname/uname.c user/imp/tbemd/usr.bin/w/w.c user/imp/tbemd/usr.sbin/pmcstat/Makefile user/imp/tbemd/usr.sbin/pmcstat/pmcstat.8 user/imp/tbemd/usr.sbin/pmcstat/pmcstat.c user/imp/tbemd/usr.sbin/pmcstat/pmcstat.h user/imp/tbemd/usr.sbin/pmcstat/pmcstat_log.c user/imp/tbemd/usr.sbin/rpcbind/rpcbind.c user/imp/tbemd/usr.sbin/rpcbind/rpcbind.h user/imp/tbemd/usr.sbin/rpcbind/util.c user/imp/tbemd/usr.sbin/sysinstall/package.c user/imp/tbemd/usr.sbin/wake/Makefile user/imp/tbemd/usr.sbin/wake/wake.8 user/imp/tbemd/usr.sbin/wake/wake.c Directory Properties: user/imp/tbemd/ (props changed) Modified: user/imp/tbemd/bin/ls/ls.c ============================================================================== --- user/imp/tbemd/bin/ls/ls.c Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/bin/ls/ls.c Sat Feb 13 15:35:51 2010 (r203832) @@ -113,6 +113,7 @@ static int f_listdir; /* list actual di static int f_listdot; /* list files beginning with . */ static int f_noautodot; /* do not automatically enable -A for root */ int f_longform; /* long listing format */ +static int f_nofollow; /* don't follow symbolic link arguments */ int f_nonprint; /* show unprintables as ? */ static int f_nosort; /* don't sort output */ int f_notabs; /* don't use tab-separated multi-col output */ @@ -234,6 +235,7 @@ main(int argc, char *argv[]) break; case 'H': fts_options |= FTS_COMFOLLOW; + f_nofollow = 0; break; case 'G': setenv("CLICOLOR", "", 1); @@ -241,11 +243,13 @@ main(int argc, char *argv[]) case 'L': fts_options &= ~FTS_PHYSICAL; fts_options |= FTS_LOGICAL; + f_nofollow = 0; break; case 'P': fts_options &= ~FTS_COMFOLLOW; fts_options &= ~FTS_LOGICAL; fts_options |= FTS_PHYSICAL; + f_nofollow = 1; break; case 'R': f_recursive = 1; @@ -396,10 +400,10 @@ main(int argc, char *argv[]) fts_options |= FTS_NOSTAT; /* - * If not -F, -d or -l options, follow any symbolic links listed on + * If not -F, -P, -d or -l options, follow any symbolic links listed on * the command line. */ - if (!f_longform && !f_listdir && (!f_type || f_slash)) + if (!f_nofollow && !f_longform && !f_listdir && (!f_type || f_slash)) fts_options |= FTS_COMFOLLOW; /* Modified: user/imp/tbemd/bin/pkill/pkill.1 ============================================================================== --- user/imp/tbemd/bin/pkill/pkill.1 Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/bin/pkill/pkill.1 Sat Feb 13 15:35:51 2010 (r203832) @@ -36,7 +36,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd May 16, 2009 +.Dd February 11, 2010 .Dt PKILL 1 .Os .Sh NAME @@ -44,7 +44,7 @@ .Nd find or signal processes by name .Sh SYNOPSIS .Nm pgrep -.Op Fl LSafilnovx +.Op Fl LSafilnoqvx .Op Fl F Ar pidfile .Op Fl G Ar gid .Op Fl M Ar core @@ -175,6 +175,8 @@ command. Select only the newest (most recently started) of the matching processes. .It Fl o Select only the oldest (least recently started) of the matching processes. +.It Fl q +Do not write anything to standard output. .It Fl s Ar sid Restrict matches to processes with a session ID in the comma-separated list Modified: user/imp/tbemd/bin/pkill/pkill.c ============================================================================== --- user/imp/tbemd/bin/pkill/pkill.c Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/bin/pkill/pkill.c Sat Feb 13 15:35:51 2010 (r203832) @@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -110,6 +111,7 @@ static int matchargs; static int fullmatch; static int kthreads; static int cflags = REG_EXTENDED; +static int quiet; static kvm_t *kd; static pid_t mypid; @@ -180,9 +182,11 @@ main(int argc, char **argv) debug_opt = 0; pidfile = NULL; pidfilelock = 0; - execf = coref = _PATH_DEVNULL; + quiet = 0; + execf = NULL; + coref = _PATH_DEVNULL; - while ((ch = getopt(argc, argv, "DF:G:ILM:N:P:SU:ad:fg:ij:lnos:t:u:vx")) != -1) + while ((ch = getopt(argc, argv, "DF:G:ILM:N:P:SU:ad:fg:ij:lnoqs:t:u:vx")) != -1) switch (ch) { case 'D': debug_opt++; @@ -257,6 +261,11 @@ main(int argc, char **argv) oldest = 1; criteria = 1; break; + case 'q': + if (!pgrep) + usage(); + quiet = 1; + break; case 's': makelist(&sidlist, LT_SID, optarg); criteria = 1; @@ -548,7 +557,7 @@ usage(void) const char *ustr; if (pgrep) - ustr = "[-LSfilnovx] [-d delim]"; + ustr = "[-LSfilnoqvx] [-d delim]"; else ustr = "[-signal] [-ILfinovx]"; @@ -566,6 +575,10 @@ show_process(const struct kinfo_proc *kp { char **argv; + if (quiet) { + assert(pgrep); + return; + } if ((longfmt || !pgrep) && matchargs && (argv = kvm_getargv(kd, kp, 0)) != NULL) { printf("%d ", (int)kp->ki_pid); @@ -622,7 +635,8 @@ grepact(const struct kinfo_proc *kp) { show_process(kp); - printf("%s", delim); + if (!quiet) + printf("%s", delim); return (1); } Modified: user/imp/tbemd/bin/ps/ps.c ============================================================================== --- user/imp/tbemd/bin/ps/ps.c Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/bin/ps/ps.c Sat Feb 13 15:35:51 2010 (r203832) @@ -212,7 +212,8 @@ main(int argc, char *argv[]) init_list(&sesslist, addelem_pid, sizeof(pid_t), "session id"); init_list(&ttylist, addelem_tty, sizeof(dev_t), "tty"); init_list(&uidlist, addelem_uid, sizeof(uid_t), "user"); - memf = nlistf = _PATH_DEVNULL; + memf = _PATH_DEVNULL; + nlistf = NULL; while ((ch = getopt(argc, argv, PS_ARGS)) != -1) switch (ch) { case 'A': Modified: user/imp/tbemd/etc/defaults/rc.conf ============================================================================== --- user/imp/tbemd/etc/defaults/rc.conf Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/etc/defaults/rc.conf Sat Feb 13 15:35:51 2010 (r203832) @@ -118,6 +118,8 @@ firewall_type="UNKNOWN" # Firewall type firewall_quiet="NO" # Set to YES to suppress rule display firewall_logging="NO" # Set to YES to enable events logging firewall_flags="" # Flags passed to ipfw when type is a file +firewall_coscripts="" # List of executables/scripts to run after + # firewall starts/stops firewall_client_net="192.0.2.0/24" # IPv4 Network address for "client" # firewall. #firewall_client_net_ipv6="2001:db8:2:1::/64" # IPv6 network prefix for Modified: user/imp/tbemd/etc/rc.d/ipfw ============================================================================== --- user/imp/tbemd/etc/rc.d/ipfw Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/etc/rc.d/ipfw Sat Feb 13 15:35:51 2010 (r203832) @@ -14,6 +14,7 @@ name="ipfw" rcvar="firewall_enable" start_cmd="ipfw_start" start_precmd="ipfw_prestart" +start_postcmd="ipfw_poststart" stop_cmd="ipfw_stop" required_modules="ipfw" @@ -42,9 +43,6 @@ ipfw_start() [ -z "${firewall_script}" ] && firewall_script=/etc/rc.firewall if [ -r "${firewall_script}" ]; then - if [ -f /etc/rc.d/natd ] ; then - /etc/rc.d/natd quietstart - fi /bin/sh "${firewall_script}" "${_firewall_type}" echo 'Firewall rules loaded.' elif [ "`ipfw list 65535`" = "65535 deny ip from any to any" ]; then @@ -59,6 +57,19 @@ ipfw_start() echo 'Firewall logging enabled.' sysctl net.inet.ip.fw.verbose=1 >/dev/null fi +} + +ipfw_poststart() +{ + local _coscript + + # Start firewall coscripts + # + for _coscript in ${firewall_coscripts} ; do + if [ -f "${_coscript}" ]; then + ${_coscript} quietstart + fi + done # Enable the firewall # @@ -75,16 +86,25 @@ ipfw_start() ipfw_stop() { + local _coscript + # Disable the firewall # ${SYSCTL_W} net.inet.ip.fw.enable=0 if afexists inet6; then ${SYSCTL_W} net.inet6.ip6.fw.enable=0 fi - if [ -f /etc/rc.d/natd ] ; then - /etc/rc.d/natd quietstop - fi + + # Stop firewall coscripts + # + for _coscript in `reverse_list ${firewall_coscripts}` ; do + if [ -f "${_coscript}" ]; then + ${_coscript} quietstop + fi + done } load_rc_config $name +firewall_coscripts="/etc/rc.d/natd ${firewall_coscripts}" + run_rc_command $* Modified: user/imp/tbemd/games/fortune/datfiles/fortunes ============================================================================== --- user/imp/tbemd/games/fortune/datfiles/fortunes Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/games/fortune/datfiles/fortunes Sat Feb 13 15:35:51 2010 (r203832) @@ -33335,6 +33335,12 @@ Miss, n.: % Mistakes are often the stepping stones to utter failure. % +Mistakeholder, n.: + A person who depends on accidental features or + implementation errors and so now has a vested + interest in keeping things from being fixed. + -- Chip Morningstar +% Mistrust first impulses; they are always right. % MIT: Modified: user/imp/tbemd/games/grdc/grdc.c ============================================================================== --- user/imp/tbemd/games/grdc/grdc.c Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/games/grdc/grdc.c Sat Feb 13 15:35:51 2010 (r203832) @@ -59,6 +59,7 @@ main(argc, argv) int argc; char **argv; { +struct timespec ts; long t, a; int i, j, s, k; int n; @@ -136,9 +137,9 @@ int t12; attrset(COLOR_PAIR(2)); } + time(&now); do { mask = 0; - time(&now); tm = localtime(&now); set(tm->tm_sec%10, 0); set(tm->tm_sec/10, 4); @@ -193,7 +194,19 @@ int t12; } movto(6, 0); refresh(); - sleep(1); + clock_gettime(CLOCK_REALTIME_FAST, &ts); + if (ts.tv_sec == now) { + if (ts.tv_nsec > 0) { + ts.tv_sec = 0; + ts.tv_nsec = 1000000000 - ts.tv_nsec; + } else { + ts.tv_sec = 1; + ts.tv_nsec = 0; + } + nanosleep(&ts, NULL); + now = ts.tv_sec + 1; + } else + now = ts.tv_sec; if (sigtermed) { standend(); clear(); Modified: user/imp/tbemd/gnu/usr.bin/groff/tmac/mdoc.local ============================================================================== --- user/imp/tbemd/gnu/usr.bin/groff/tmac/mdoc.local Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/gnu/usr.bin/groff/tmac/mdoc.local Sat Feb 13 15:35:51 2010 (r203832) @@ -43,6 +43,7 @@ .ds doc-str-Lb-libdevstat Device Statistics Library (libdevstat, \-ldevstat) .ds doc-str-Lb-libdisk Interface to Slice and Partition Labels Library (libdisk, \-ldisk) .ds doc-str-Lb-libedit Line Editor and History Library (libedit, \-ledit) +.ds doc-str-Lb-libefi EFI Runtime Services Library (libefi, \-lefi) .ds doc-str-Lb-libelf ELF Parsing Library (libelf, \-lelf) .ds doc-str-Lb-libfetch File Transfer Library (libfetch, \-lfetch) .ds doc-str-Lb-libgeom Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom) Modified: user/imp/tbemd/lib/libc/nls/msgcat.c ============================================================================== --- user/imp/tbemd/lib/libc/nls/msgcat.c Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/lib/libc/nls/msgcat.c Sat Feb 13 15:35:51 2010 (r203832) @@ -77,19 +77,22 @@ __FBSDID("$FreeBSD$"); #define NLERR ((nl_catd) -1) #define NLRETERR(errc) { errno = errc; return (NLERR); } -#define SAVEFAIL(n, e) { WLOCK(NLERR); \ - np = malloc(sizeof(struct catentry)); \ - if (np != NULL) { \ - np->name = strdup(n); \ - np->caterrno = e; \ - SLIST_INSERT_HEAD(&cache, np, list); \ - } \ - UNLOCK; \ - } +#define SAVEFAIL(n, l, e) { WLOCK(NLERR); \ + np = malloc(sizeof(struct catentry)); \ + if (np != NULL) { \ + np->name = strdup(n); \ + np->path = NULL; \ + np->lang = (l == NULL) ? NULL : strdup(l); \ + np->caterrno = e; \ + SLIST_INSERT_HEAD(&cache, np, list); \ + } \ + UNLOCK; \ + errno = e; \ + } static nl_catd load_msgcat(const char *, const char *, const char *); -static pthread_rwlock_t rwlock; +static pthread_rwlock_t rwlock = PTHREAD_RWLOCK_INITIALIZER; struct catentry { SLIST_ENTRY(catentry) list; @@ -114,10 +117,12 @@ catopen(const char *name, int type) int saverr, spcleft; char path[PATH_MAX]; + /* sanity checking */ if (name == NULL || *name == '\0') NLRETERR(EINVAL); if (strchr(name, '/') != NULL) + /* have a pathname */ lang = NULL; else { if (type == NL_CAT_LOCALE) @@ -135,12 +140,14 @@ catopen(const char *name, int type) /* Try to get it from the cache first */ RLOCK(NLERR); SLIST_FOREACH(np, &cache, list) { - if (strcmp(np->name, name) == 0) { + if ((strcmp(np->name, name) == 0) && + ((lang != NULL && np->lang != NULL && + strcmp(np->lang, lang) == 0) || (np->lang == lang))) { if (np->caterrno != 0) { /* Found cached failing entry */ UNLOCK; NLRETERR(np->caterrno); - } else if (strcmp(np->lang, lang) == 0) { + } else { /* Found cached successful entry */ np->refcount++; UNLOCK; @@ -154,6 +161,7 @@ catopen(const char *name, int type) if (strchr(name, '/') != NULL) return (load_msgcat(name, name, lang)); + /* sanity checking */ if ((plang = cptr1 = strdup(lang)) == NULL) return (NLERR); if ((cptr = strchr(cptr1, '@')) != NULL) @@ -218,6 +226,7 @@ catopen(const char *name, int type) too_long: free(plang); free(base); + SAVEFAIL(name, lang, ENAMETOOLONG); NLRETERR(ENAMETOOLONG); } pathP += strlen(tmpptr); @@ -241,6 +250,7 @@ catopen(const char *name, int type) } free(plang); free(base); + SAVEFAIL(name, lang, ENOENT); NLRETERR(ENOENT); } @@ -317,6 +327,7 @@ catclose(nl_catd catd) { struct catentry *np; + /* sanity checking */ if (catd == NULL || catd == NLERR) { errno = EBADF; return (-1); @@ -325,13 +336,15 @@ catclose(nl_catd catd) /* Remove from cache if not referenced any more */ WLOCK(-1); SLIST_FOREACH(np, &cache, list) { - if ((np->catd->__size == catd->__size) && - memcmp((const void *)np->catd, (const void *)catd, np->catd->__size) == 0) { + if (catd == np->catd) { np->refcount--; if (np->refcount == 0) { munmap(catd->__data, (size_t)catd->__size); free(catd); SLIST_REMOVE(&cache, np, catentry, list); + free(np->name); + free(np->path); + free(np->lang); free(np); } break; @@ -357,10 +370,11 @@ load_msgcat(const char *path, const char /* path/name will never be NULL here */ /* One more try in cache; if it was not found by name, - it might still be found by absolute path. */ + * it might still be found by absolute path. + */ RLOCK(NLERR); SLIST_FOREACH(np, &cache, list) { - if (strcmp(np->path, path) == 0) { + if ((np->path != NULL) && (strcmp(np->path, path) == 0)) { np->refcount++; UNLOCK; return (np->catd); @@ -369,36 +383,46 @@ load_msgcat(const char *path, const char UNLOCK; if ((fd = _open(path, O_RDONLY)) == -1) { - SAVEFAIL(name, errno); - return (NLERR); + SAVEFAIL(name, lang, errno); + NLRETERR(errno); } if (_fstat(fd, &st) != 0) { - SAVEFAIL(name, errno); _close(fd); - return (NLERR); + SAVEFAIL(name, lang, EFTYPE); + NLRETERR(EFTYPE); } - data = mmap(0, (size_t)st.st_size, PROT_READ, MAP_FILE|MAP_SHARED, fd, - (off_t)0); - _close(fd); + /* If the file size cannot be held in size_t we cannot mmap() + * it to the memory. Probably, this will not be a problem given + * that catalog files are usually small. + */ + if (st.st_size > SIZE_T_MAX) { + _close(fd); + SAVEFAIL(name, lang, EFBIG); + NLRETERR(EFBIG); + } - if (data == MAP_FAILED) { - SAVEFAIL(name, errno); - return (NLERR); + if ((data = mmap(0, (size_t)st.st_size, PROT_READ, + MAP_FILE|MAP_SHARED, fd, (off_t)0)) == MAP_FAILED) { + int saved_errno = errno; + _close(fd); + SAVEFAIL(name, lang, saved_errno); + NLRETERR(saved_errno); } + _close(fd); if (ntohl((u_int32_t)((struct _nls_cat_hdr *)data)->__magic) != _NLS_MAGIC) { - SAVEFAIL(name, errno); munmap(data, (size_t)st.st_size); - NLRETERR(EINVAL); + SAVEFAIL(name, lang, EFTYPE); + NLRETERR(EFTYPE); } if ((catd = malloc(sizeof (*catd))) == NULL) { - SAVEFAIL(name, errno); munmap(data, (size_t)st.st_size); - return (NLERR); + SAVEFAIL(name, lang, ENOMEM); + NLRETERR(ENOMEM); } catd->__data = data; Modified: user/imp/tbemd/lib/libc/posix1e/mac.3 ============================================================================== --- user/imp/tbemd/lib/libc/posix1e/mac.3 Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/lib/libc/posix1e/mac.3 Sat Feb 13 15:35:51 2010 (r203832) @@ -154,8 +154,8 @@ system objects, but without policy-speci .Sh STANDARDS These APIs are loosely based on the APIs described in POSIX.1e, as described in IEEE POSIX.1e draft 17. -However, the resemblence of these APIS to the POSIX APIs is loose, as the -PSOXI APIS were unable to express some notinos required for flexible and +However, the resemblence of these APIs to the POSIX APIs is loose, as the +POSIX APIs were unable to express some notions required for flexible and extensible access control. .Sh HISTORY Support for Mandatory Access Control was introduced in Modified: user/imp/tbemd/lib/libc/stdlib/strfmon.c ============================================================================== --- user/imp/tbemd/lib/libc/stdlib/strfmon.c Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/lib/libc/stdlib/strfmon.c Sat Feb 13 15:35:51 2010 (r203832) @@ -413,7 +413,7 @@ __setup_vars(int flags, char *cs_precede *cs_precedes = lc->int_n_cs_precedes; *sep_by_space = lc->int_n_sep_by_space; *sign_posn = (flags & PARENTH_POSN) ? 0 : lc->int_n_sign_posn; - *signstr = (lc->negative_sign == '\0') ? "-" + *signstr = (lc->negative_sign[0] == '\0') ? "-" : lc->negative_sign; } else if (flags & USE_INTL_CURRENCY) { *cs_precedes = lc->int_p_cs_precedes; @@ -424,7 +424,7 @@ __setup_vars(int flags, char *cs_precede *cs_precedes = lc->n_cs_precedes; *sep_by_space = lc->n_sep_by_space; *sign_posn = (flags & PARENTH_POSN) ? 0 : lc->n_sign_posn; - *signstr = (lc->negative_sign == '\0') ? "-" + *signstr = (lc->negative_sign[0] == '\0') ? "-" : lc->negative_sign; } else { *cs_precedes = lc->p_cs_precedes; Modified: user/imp/tbemd/lib/libc/sys/ptrace.2 ============================================================================== --- user/imp/tbemd/lib/libc/sys/ptrace.2 Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/lib/libc/sys/ptrace.2 Sat Feb 13 15:35:51 2010 (r203832) @@ -2,7 +2,7 @@ .\" $NetBSD: ptrace.2,v 1.2 1995/02/27 12:35:37 cgd Exp $ .\" .\" This file is in the public domain. -.Dd March 27, 2009 +.Dd February 11, 2010 .Dt PTRACE 2 .Os .Sh NAME @@ -327,6 +327,68 @@ This request will trace the specified pr .It PT_SYSCALL This request will trace the specified process on each system call entry and exit. +.It PT_VM_TIMESTAMP +This request returns the generation number or timestamp of the memory map of +the traced process as the return value from +.Fn ptrace . +This provides a low-cost way for the tracing process to determine if the +VM map changed since the last time this request was made. +.It PT_VM_ENTRY +This request is used to iterate over the entries of the VM map of the traced +process. +The +.Fa addr +argument specifies a pointer to a +.Vt "struct ptrace_vm_entry" , +which is defined as follows: +.Bd -literal +struct ptrace_vm_entry { + int pve_entry; + int pve_timestamp; + u_long pve_start; + u_long pve_end; + u_long pve_offset; + u_int pve_prot; + u_int pve_pathlen; + long pve_fileid; + uint32_t pve_fsid; + char *pve_path; +}; +.Ed +.Pp +The first entry is returned by setting +.Va pve_entry +to zero. +Subsequent entries are returned by leaving +.Va pve_entry +unmodified from the value returned by previous requests. +The +.Va pve_timestamp +field can be used to detect changes to the VM map while iterating over the +entries. +The tracing process can then take appropriate action, such as restarting. +By setting +.Va pve_pathlen +to a non-zero value on entry, the pathname of the backing object is returned +in the buffer pointed to by +.Va pve_path , +provided the entry is backed by a vnode. +The +.Va pve_pathlen +field is updated with the actual length of the pathname (including the +terminating null character). +The +.Va pve_offset +field is the offset within the backing object at which the range starts. +The range is located in the VM space at +.Va pve_start +and extends up to +.Va pve_end +(inclusive). +.Pp +The +.Fa data +argument is ignored. .El .Pp Additionally, machine-specific requests can exist. @@ -376,6 +438,11 @@ or .Dv PT_SETDBREGS was attempted on a process with no valid register set. (This is normally true only of system processes.) +.It +.Dv PT_VM_ENTRY +was given an invalid value for +.Fa pve_entry . +This can also be caused by changes to the VM map of the process. .El .It Bq Er EBUSY .Bl -bullet -compact @@ -405,6 +472,22 @@ on a process in violation of the require .Dv PT_ATTACH above. .El +.It Bq Er ENOENT +.Bl -bullet -compact +.It +.Dv PT_VM_ENTRY +previously returned the last entry of the memory map. +No more entries exist. +.El +.It Bq Er ENAMETOOLONG +.Bl -bullet -compact +.It +.Dv PT_VM_ENTRY +cannot return the pathname of the backing object because the buffer is not big +enough. +.Fa pve_pathlen +holds the minimum buffer size required on return. +.El .El .Sh SEE ALSO .Xr execve 2 , Modified: user/imp/tbemd/lib/libefi/libefi.3 ============================================================================== --- user/imp/tbemd/lib/libefi/libefi.3 Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/lib/libefi/libefi.3 Sat Feb 13 15:35:51 2010 (r203832) @@ -25,24 +25,28 @@ .\" .\" $FreeBSD$ .\" -.Dd Januari 29, 2010 +.Dd January 29, 2010 .Dt LIBEFI 3 .Os .Sh NAME .Nm efi_getvar , efi_nextvarname , efi_setvar -.Nd Interface for accessing the EFI variable services +.Nd "interface for accessing the EFI variable services" .Sh LIBRARY .Lb libefi .Sh SYNOPSIS .In libefi.h .Ft int -.Fn efi_getvar "char *name" "uuid_t *vendor" "uint32_t *attrib" \ - "size_t *datasize" "void *data" +.Fo efi_getvar +.Fa "char *name" "uuid_t *vendor" "uint32_t *attrib" +.Fa "size_t *datasize" "void *data" +.Fc .Ft int .Fn efi_nextvarname "size_t *namesize" "char *name" "uuid_t *vendor" .Ft int -.Fn efi_setvar "char *name" "uuid_t *vendor" "uint32_t attrib" \ - "size_t datasize" "void *data" +.Fo efi_setvar +.Fa "char *name" "uuid_t *vendor" "uint32_t attrib" +.Fa "size_t datasize" "void *data" +.Fc .Sh DESCRIPTION The .Nm libefi @@ -53,18 +57,19 @@ The .Fn efi_nextvarname function is used to enumerate the variables. The -.Nm namesize +.Fa namesize parameter needs to be set to the size of the buffer pointed to by -.Nm name . +.Fa name . On return, -.Nm namesize -is set to the length of the variable name (including the terminating '\\0') +.Fa namesize +is set to the length of the variable name (including the terminating +.Ql \e0 ) irrespective of whether the buffer was big enough. The buffer pointed to by -.Nm name +.Fa name contains the full or partial variable name on return. Only on successful completion of the request is the -.Nm vendor +.Fa vendor updated. The values returned should be passed to successive calls to .Fn efi_nextvarname @@ -76,11 +81,11 @@ can be passed to .Fn efi_getvar to obtain the value and attribute of the variable. The buffer that is to contain the value is specified by -.Nm data +.Fa data and the size of the buffer is given by -.Nm datasize . +.Fa datasize . The attribute pointed to by -.Nm attrib +.Fa attrib consists of the bit values defined by the EFI specification. .Pp Variables can be created, modified and deleted using the @@ -91,15 +96,17 @@ order for the request to succeed. Note that for runtime accessable variables the boottime accessable bit must be set as well. To delete a variable, set -.Nm datasize +.Fa datasize to 0. .Pp The vendor UUID is used to avoid collisions between variable names of different vendors. -Variables created for use by FreeBSD should use the -.Nm EFI_FREEBSD_VARIABLE +Variables created for use by +.Fx +should use the +.Dv EFI_FREEBSD_VARIABLE UUID as defined in the -.Nm libefi +.In libefi.h header file. .Sh RETURN VALUES Upon successful completion, these functions return 0. @@ -127,10 +134,10 @@ the buffer provided. The .Nm libefi library first appeared in -.Fx 9 +.Fx 9.0 for the ia64 architecture. .Sh AUTHORS The .Nm libefi -library and corresponding manual page were written by +library and this manual page were written by .An Marcel Moolenaar Aq marcel@FreeBSD.org . Modified: user/imp/tbemd/lib/libufs/cgroup.c ============================================================================== --- user/imp/tbemd/lib/libufs/cgroup.c Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/lib/libufs/cgroup.c Sat Feb 13 15:35:51 2010 (r203832) @@ -59,7 +59,7 @@ cgread1(struct uufsd *disk, int c) fs = &disk->d_fs; - if (c >= fs->fs_ncg) { + if ((unsigned)c >= fs->fs_ncg) { return (0); } ccg = fsbtodb(fs, cgtod(fs, c)) * disk->d_bsize; Modified: user/imp/tbemd/lib/libufs/sblock.c ============================================================================== --- user/imp/tbemd/lib/libufs/sblock.c Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/lib/libufs/sblock.c Sat Feb 13 15:35:51 2010 (r203832) @@ -93,7 +93,7 @@ int sbwrite(struct uufsd *disk, int all) { struct fs *fs; - int i; + unsigned i; ERROR(disk, NULL); Modified: user/imp/tbemd/lib/libusb/libusb.h ============================================================================== --- user/imp/tbemd/lib/libusb/libusb.h Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/lib/libusb/libusb.h Sat Feb 13 15:35:51 2010 (r203832) @@ -29,12 +29,7 @@ #include #include -#include -#include -#include -#include -#include #ifdef __cplusplus Modified: user/imp/tbemd/lib/libusb/libusb10.c ============================================================================== --- user/imp/tbemd/lib/libusb/libusb10.c Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/lib/libusb/libusb10.c Sat Feb 13 15:35:51 2010 (r203832) @@ -25,17 +25,16 @@ * SUCH DAMAGE. */ +#include #include #include #include #include #include -#include #include #include -#include +#include #include -#include #include "libusb20.h" #include "libusb20_desc.h" @@ -73,6 +72,7 @@ libusb_init(libusb_context **context) { struct libusb_context *ctx; char *debug; + int flag; int ret; ctx = malloc(sizeof(*ctx)); @@ -103,10 +103,12 @@ libusb_init(libusb_context **context) return (LIBUSB_ERROR_OTHER); } /* set non-blocking mode on the control pipe to avoid deadlock */ - ret = 1; - ioctl(ctx->ctrl_pipe[0], FIONBIO, &ret); - ret = 1; - ioctl(ctx->ctrl_pipe[1], FIONBIO, &ret); + flag = 1; + ret = fcntl(ctx->ctrl_pipe[0], O_NONBLOCK, &flag); + assert(ret != -1 && "Couldn't set O_NONBLOCK for ctx->ctrl_pipe[0]"); + flag = 1; + ret = fcntl(ctx->ctrl_pipe[1], O_NONBLOCK, &flag); + assert(ret != -1 && "Couldn't set O_NONBLOCK for ctx->ctrl_pipe[1]"); libusb10_add_pollfd(ctx, &ctx->ctx_poll, NULL, ctx->ctrl_pipe[0], POLLIN); Modified: user/imp/tbemd/lib/libusb/libusb10_desc.c ============================================================================== --- user/imp/tbemd/lib/libusb/libusb10_desc.c Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/lib/libusb/libusb10_desc.c Sat Feb 13 15:35:51 2010 (r203832) @@ -26,7 +26,6 @@ #include #include -#include #include #include "libusb20.h" Modified: user/imp/tbemd/lib/libusb/libusb10_io.c ============================================================================== --- user/imp/tbemd/lib/libusb/libusb10_io.c Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/lib/libusb/libusb10_io.c Sat Feb 13 15:35:51 2010 (r203832) @@ -32,7 +32,6 @@ #include #include #include -#include #include "libusb20.h" #include "libusb20_desc.h" Modified: user/imp/tbemd/lib/libusb/libusb20_compat01.c ============================================================================== --- user/imp/tbemd/lib/libusb/libusb20_compat01.c Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/lib/libusb/libusb20_compat01.c Sat Feb 13 15:35:51 2010 (r203832) @@ -829,6 +829,7 @@ usb_find_devices(void) struct libusb20_device *pdev; struct usb_device *udev; struct LIBUSB20_DEVICE_DESC_DECODED *ddesc; + int devnum; int err; /* cleanup after last device search */ @@ -855,6 +856,7 @@ usb_find_devices(void) } /* iterate all devices */ + devnum = 1; pdev = NULL; while ((pdev = libusb20_be_device_foreach(usb_backend, pdev))) { udev = malloc(sizeof(*udev)); @@ -891,6 +893,7 @@ usb_find_devices(void) /* truncate number of configurations */ udev->descriptor.bNumConfigurations = USB_MAXCONFIG; } + udev->devnum = devnum++; /* link together the two structures */ udev->dev = pdev; pdev->privLuData = udev; Modified: user/imp/tbemd/lib/libusb/libusb20_desc.c ============================================================================== --- user/imp/tbemd/lib/libusb/libusb20_desc.c Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/lib/libusb/libusb20_desc.c Sat Feb 13 15:35:51 2010 (r203832) @@ -27,7 +27,6 @@ #include #include #include -#include #include #include "libusb20.h" Modified: user/imp/tbemd/lib/libusb/libusb20_ugen20.c ============================================================================== --- user/imp/tbemd/lib/libusb/libusb20_ugen20.c Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/lib/libusb/libusb20_ugen20.c Sat Feb 13 15:35:51 2010 (r203832) @@ -31,7 +31,6 @@ #include #include #include -#include #include #include Modified: user/imp/tbemd/lib/libusb/usb.h ============================================================================== --- user/imp/tbemd/lib/libusb/usb.h Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/lib/libusb/usb.h Sat Feb 13 15:35:51 2010 (r203832) @@ -27,8 +27,7 @@ #ifndef _LIBUSB20_COMPAT_01_H_ #define _LIBUSB20_COMPAT_01_H_ -#include -#include +#include #include #include Modified: user/imp/tbemd/libexec/ftpd/logwtmp.c ============================================================================== --- user/imp/tbemd/libexec/ftpd/logwtmp.c Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/libexec/ftpd/logwtmp.c Sat Feb 13 15:35:51 2010 (r203832) @@ -75,6 +75,7 @@ ftpd_logwtmp(char *id, char *user, struc ut.ut_pid = getpid(); gettimeofday(&ut.ut_tv, NULL); (void)strncpy(ut.ut_id, id, sizeof(ut.ut_id)); + (void)strncpy(ut.ut_line, "ftpd", sizeof(ut.ut_line)); pututxline(&ut); } Modified: user/imp/tbemd/sbin/growfs/growfs.c ============================================================================== --- user/imp/tbemd/sbin/growfs/growfs.c Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/sbin/growfs/growfs.c Sat Feb 13 15:35:51 2010 (r203832) @@ -174,10 +174,9 @@ static void growfs(int fsi, int fso, unsigned int Nflag) { DBG_FUNC("growfs") - int i; - int cylno, j; time_t utime; - int width; + uint cylno; + int i, j, width; char tmpbuf[100]; #ifdef FSIRAND static int randinit=0; @@ -373,10 +372,11 @@ initcg(int cylno, time_t utime, int fso, { DBG_FUNC("initcg") static void *iobuf; - long d, dlower, dupper, blkno, start; + long blkno, start; ufs2_daddr_t i, cbase, dmax; struct ufs1_dinode *dp1; struct csum *cs; + uint d, dupper, dlower; if (iobuf == NULL && (iobuf = malloc(sblock.fs_bsize)) == NULL) { errx(37, "panic: cannot allocate I/O buffer"); @@ -436,7 +436,7 @@ initcg(int cylno, time_t utime, int fso, acg.cg_nextfreeoff = acg.cg_clusteroff + howmany(fragstoblks(&sblock, sblock.fs_fpg), CHAR_BIT); } - if (acg.cg_nextfreeoff > sblock.fs_cgsize) { + if (acg.cg_nextfreeoff > (unsigned)sblock.fs_cgsize) { /* * This should never happen as we would have had that panic * already on file system creation @@ -751,7 +751,7 @@ updjcg(int cylno, time_t utime, int fsi, * needed, update the free space in the superblock. */ acg.cg_time = utime; - if (cylno == sblock.fs_ncg - 1) { + if ((unsigned)cylno == sblock.fs_ncg - 1) { /* * This is still the last cylinder group. */ @@ -945,8 +945,8 @@ updcsloc(time_t utime, int fsi, int fso, int ocscg, ncscg; int blocks; ufs2_daddr_t cbase, dupper, odupper, d, f, g; - int ind; - int cylno, inc; + int ind, inc; + uint cylno; struct gfs_bpp *bp; int i, l; int lcs=0; Modified: user/imp/tbemd/sbin/mount/mount.8 ============================================================================== --- user/imp/tbemd/sbin/mount/mount.8 Sat Feb 13 15:12:46 2010 (r203831) +++ user/imp/tbemd/sbin/mount/mount.8 Sat Feb 13 15:35:51 2010 (r203832) @@ -28,7 +28,7 @@ .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 .\" $FreeBSD$ .\" -.Dd March 11, 2008 +.Dd February 10, 2010 .Dt MOUNT 8 .Os .Sh NAME @@ -433,8 +433,8 @@ However, for the following file system t .Cm cd9660 , *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***