From owner-svn-src-stable-6@FreeBSD.ORG Sun Oct 26 19:22:10 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9376E106567B; Sun, 26 Oct 2008 19:22:10 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7DBD68FC17; Sun, 26 Oct 2008 19:22:10 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QJMAeo092650; Sun, 26 Oct 2008 19:22:10 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9QJMAqV092649; Sun, 26 Oct 2008 19:22:10 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <200810261922.m9QJMAqV092649@svn.freebsd.org> From: Brooks Davis Date: Sun, 26 Oct 2008 19:22:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184296 - releng/6.4/usr.sbin/pkg_install releng/6.4/usr.sbin/pkg_install/add stable/6/usr.sbin/pkg_install stable/6/usr.sbin/pkg_install/add stable/7/usr.sbin/pkg_install stable/7/usr.... X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Oct 2008 19:22:10 -0000 Author: brooks Date: Sun Oct 26 19:22:10 2008 New Revision: 184296 URL: http://svn.freebsd.org/changeset/base/184296 Log: MFC r183979: Display usage when pkg_add is called with no arguments. PR: bin/121093 Submitted by: volker Approved by: re (kensmith) Modified: stable/6/usr.sbin/pkg_install/ (props changed) stable/6/usr.sbin/pkg_install/add/main.c Changes in other areas also in this revision: Modified: releng/6.4/usr.sbin/pkg_install/ (props changed) releng/6.4/usr.sbin/pkg_install/add/main.c stable/7/usr.sbin/pkg_install/ (props changed) stable/7/usr.sbin/pkg_install/add/main.c Modified: stable/6/usr.sbin/pkg_install/add/main.c ============================================================================== --- stable/6/usr.sbin/pkg_install/add/main.c Sun Oct 26 19:17:25 2008 (r184295) +++ stable/6/usr.sbin/pkg_install/add/main.c Sun Oct 26 19:22:10 2008 (r184296) @@ -261,7 +261,7 @@ main(int argc, char **argv) } } /* If no packages, yelp */ - else if (!ch) { + if (!ch) { warnx("missing package name(s)"); usage(); } From owner-svn-src-stable-6@FreeBSD.ORG Sun Oct 26 19:28:05 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 834CA1065674; Sun, 26 Oct 2008 19:28:05 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6F7718FC18; Sun, 26 Oct 2008 19:28:05 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QJS5wc092860; Sun, 26 Oct 2008 19:28:05 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9QJS5V0092857; Sun, 26 Oct 2008 19:28:05 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <200810261928.m9QJS5V0092857@svn.freebsd.org> From: Brooks Davis Date: Sun, 26 Oct 2008 19:28:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184297 - releng/6.4/sbin/dhclient stable/6/sbin/dhclient stable/7/sbin/dhclient X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Oct 2008 19:28:05 -0000 Author: brooks Date: Sun Oct 26 19:28:04 2008 New Revision: 184297 URL: http://svn.freebsd.org/changeset/base/184297 Log: MFC r183974: Support the remaining options listed in dhcp-options(5) and RFC 2132. PR: bin/127076 Submitted by: jkim Approved by: re (kensmith) Modified: stable/6/sbin/dhclient/ (props changed) stable/6/sbin/dhclient/dhclient.c stable/6/sbin/dhclient/dhcp.h stable/6/sbin/dhclient/tables.c Changes in other areas also in this revision: Modified: releng/6.4/sbin/dhclient/ (props changed) releng/6.4/sbin/dhclient/dhclient.c releng/6.4/sbin/dhclient/dhcp.h releng/6.4/sbin/dhclient/tables.c stable/7/sbin/dhclient/ (props changed) stable/7/sbin/dhclient/dhclient.c stable/7/sbin/dhclient/dhcp.h stable/7/sbin/dhclient/tables.c Modified: stable/6/sbin/dhclient/dhclient.c ============================================================================== --- stable/6/sbin/dhclient/dhclient.c Sun Oct 26 19:22:10 2008 (r184296) +++ stable/6/sbin/dhclient/dhclient.c Sun Oct 26 19:28:04 2008 (r184297) @@ -2301,12 +2301,16 @@ check_option(struct client_lease *l, int case DHO_NETBIOS_DD_SERVER: case DHO_FONT_SERVERS: case DHO_DHCP_SERVER_IDENTIFIER: + case DHO_NISPLUS_SERVERS: + case DHO_MOBILE_IP_HOME_AGENT: case DHO_SMTP_SERVER: case DHO_POP_SERVER: case DHO_NNTP_SERVER: case DHO_WWW_SERVER: case DHO_FINGER_SERVER: case DHO_IRC_SERVER: + case DHO_STREETTALK_SERVER: + case DHO_STREETTALK_DA_SERVER: if (!ipv4addrs(opbuf)) { warning("Invalid IP address in option: %s", opbuf); return (0); @@ -2314,6 +2318,8 @@ check_option(struct client_lease *l, int return (1) ; case DHO_HOST_NAME: case DHO_NIS_DOMAIN: + case DHO_NISPLUS_DOMAIN: + case DHO_TFTP_SERVER_NAME: if (!res_hnok(sbuf)) { warning("Bogus Host Name option %d: %s (%s)", option, sbuf, opbuf); @@ -2372,6 +2378,7 @@ check_option(struct client_lease *l, int case DHO_DHCP_REBINDING_TIME: case DHO_DHCP_CLASS_IDENTIFIER: case DHO_DHCP_CLIENT_IDENTIFIER: + case DHO_BOOTFILE_NAME: case DHO_DHCP_USER_CLASS_ID: case DHO_END: return (1); Modified: stable/6/sbin/dhclient/dhcp.h ============================================================================== --- stable/6/sbin/dhclient/dhcp.h Sun Oct 26 19:22:10 2008 (r184296) +++ stable/6/sbin/dhclient/dhcp.h Sun Oct 26 19:28:04 2008 (r184297) @@ -155,12 +155,19 @@ struct dhcp_packet { #define DHO_DHCP_REBINDING_TIME 59 #define DHO_DHCP_CLASS_IDENTIFIER 60 #define DHO_DHCP_CLIENT_IDENTIFIER 61 +#define DHO_NISPLUS_DOMAIN 64 +#define DHO_NISPLUS_SERVERS 65 +#define DHO_TFTP_SERVER_NAME 66 +#define DHO_BOOTFILE_NAME 67 +#define DHO_MOBILE_IP_HOME_AGENT 68 #define DHO_SMTP_SERVER 69 #define DHO_POP_SERVER 70 #define DHO_NNTP_SERVER 71 #define DHO_WWW_SERVER 72 #define DHO_FINGER_SERVER 73 #define DHO_IRC_SERVER 74 +#define DHO_STREETTALK_SERVER 75 +#define DHO_STREETTALK_DA_SERVER 76 #define DHO_DHCP_USER_CLASS_ID 77 #define DHO_CLASSLESS_ROUTES 121 #define DHO_END 255 Modified: stable/6/sbin/dhclient/tables.c ============================================================================== --- stable/6/sbin/dhclient/tables.c Sun Oct 26 19:22:10 2008 (r184296) +++ stable/6/sbin/dhclient/tables.c Sun Oct 26 19:28:04 2008 (r184297) @@ -387,13 +387,25 @@ unsigned char dhcp_option_default_priori DHO_FONT_SERVERS, DHO_X_DISPLAY_MANAGER, DHO_DHCP_PARAMETER_REQUEST_LIST, + DHO_NISPLUS_DOMAIN, + DHO_NISPLUS_SERVERS, + DHO_TFTP_SERVER_NAME, + DHO_BOOTFILE_NAME, + DHO_MOBILE_IP_HOME_AGENT, + DHO_SMTP_SERVER, + DHO_POP_SERVER, + DHO_NNTP_SERVER, + DHO_WWW_SERVER, + DHO_FINGER_SERVER, + DHO_IRC_SERVER, + DHO_STREETTALK_SERVER, + DHO_STREETTALK_DA_SERVER, /* Presently-undefined options... */ - 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, - 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, - 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 122, 123, 124, 125, 126, 127, 128, 129, 130, + 62, 63, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, + 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, + 118, 119, 120, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, From owner-svn-src-stable-6@FreeBSD.ORG Sun Oct 26 21:56:06 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9C734106566C; Sun, 26 Oct 2008 21:56:06 +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 89B238FC12; Sun, 26 Oct 2008 21:56:06 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QLu6N2096998; Sun, 26 Oct 2008 21:56:06 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9QLu65I096995; Sun, 26 Oct 2008 21:56:06 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <200810262156.m9QLu65I096995@svn.freebsd.org> From: Ed Schouten Date: Sun, 26 Oct 2008 21:56:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184301 - in stable/6/lib: libc/stdlib libutil X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Oct 2008 21:56:06 -0000 Author: ed Date: Sun Oct 26 21:56:06 2008 New Revision: 184301 URL: http://svn.freebsd.org/changeset/base/184301 Log: MFC r183565: Small cleanups to openpty(). - Pass O_NOCTTY to posix_openpt(2). This makes the implementation work consistently on implementations that make the PTY the controlling TTY by default. - Call unlockpt() before opening the slave device. POSIX mentions that de slave device should only be opened after grantpt() and unlockpt() have been called. - Replace some redundant code by a label. As a safety net, add a call to revoke() to unlockpt(). All applications out there use openpty(), explicitly call revoke() or implement their own PTY allocation routines. Adding the call to unlockpt() won't hurt, but will prevent foot-shooting. Reviewed by: jhb, kib Approved by: re Modified: stable/6/lib/libc/stdlib/grantpt.3 stable/6/lib/libc/stdlib/grantpt.c stable/6/lib/libutil/pty.c Modified: stable/6/lib/libc/stdlib/grantpt.3 ============================================================================== --- stable/6/lib/libc/stdlib/grantpt.3 Sun Oct 26 21:55:19 2008 (r184300) +++ stable/6/lib/libc/stdlib/grantpt.3 Sun Oct 26 21:56:06 2008 (r184301) @@ -212,11 +212,6 @@ and functions appeared in .Fx 5.0 . .Sh NOTES -The purpose of the -.Fn unlockpt -function has no meaning in -.Fx . -.Pp The flag .Dv O_NOCTTY is included for compatibility; in Modified: stable/6/lib/libc/stdlib/grantpt.c ============================================================================== --- stable/6/lib/libc/stdlib/grantpt.c Sun Oct 26 21:55:19 2008 (r184300) +++ stable/6/lib/libc/stdlib/grantpt.c Sun Oct 26 21:56:06 2008 (r184301) @@ -237,14 +237,20 @@ invalid: int unlockpt(int fildes) { + const char *slave; /* - * Unlocking a master/slave pseudo-terminal pair has no meaning in a - * non-streams PTY environment. However, we do ensure fildes is a - * valid master pseudo-terminal device. + * Even though unlocking a PTY has no meaning in a non-streams + * PTY environment, make this function call revoke() to ensure + * the PTY slave device is not being evesdropped. */ - if (ptsname(fildes) == NULL) + if ((slave = ptsname(fildes)) == NULL) return (-1); + if (revoke(slave) == -1) { + errno = EINVAL; + return (-1); + } + return (0); } Modified: stable/6/lib/libutil/pty.c ============================================================================== --- stable/6/lib/libutil/pty.c Sun Oct 26 21:55:19 2008 (r184300) +++ stable/6/lib/libutil/pty.c Sun Oct 26 21:56:06 2008 (r184301) @@ -60,37 +60,26 @@ openpty(int *amaster, int *aslave, char const char *slavename; int master, slave; - master = posix_openpt(O_RDWR); + master = posix_openpt(O_RDWR|O_NOCTTY); if (master == -1) return (-1); - if (grantpt(master) == -1) { - close(master); - return (-1); - } + if (grantpt(master) == -1) + goto bad; + + if (unlockpt(master) == -1) + goto bad; slavename = ptsname(master); - if (slavename == NULL) { - close(master); - return (-1); - } + if (slavename == NULL) + goto bad; - if (revoke(slavename) == -1) { - close(master); - return (-1); - } + if (revoke(slavename) == -1) + goto bad; slave = open(slavename, O_RDWR); - if (slave == -1) { - close(master); - return (-1); - } - - if (unlockpt(master) == -1) { - close(master); - close(slave); - return (-1); - } + if (slave == -1) + goto bad; *amaster = master; *aslave = slave; @@ -103,6 +92,9 @@ openpty(int *amaster, int *aslave, char ioctl(slave, TIOCSWINSZ, (char *)winp); return (0); + +bad: close(master); + return (-1); } int From owner-svn-src-stable-6@FreeBSD.ORG Sun Oct 26 22:11:31 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7C6021065674; Sun, 26 Oct 2008 22:11:31 +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 50E398FC32; Sun, 26 Oct 2008 22:11:31 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QMBVPP097972; Sun, 26 Oct 2008 22:11:31 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9QMBV2d097971; Sun, 26 Oct 2008 22:11:31 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <200810262211.m9QMBV2d097971@svn.freebsd.org> From: Ed Schouten Date: Sun, 26 Oct 2008 22:11:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184306 - stable/6/lib/libutil X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Oct 2008 22:11:31 -0000 Author: ed Date: Sun Oct 26 22:11:31 2008 New Revision: 184306 URL: http://svn.freebsd.org/changeset/base/184306 Log: Add mergeinfo for r184301. Approved by: re Modified: stable/6/lib/libutil/ (props changed) From owner-svn-src-stable-6@FreeBSD.ORG Sun Oct 26 23:05:55 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A2121065670; Sun, 26 Oct 2008 23:05:55 +0000 (UTC) (envelope-from marck@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EB1A58FC0C; Sun, 26 Oct 2008 23:05:54 +0000 (UTC) (envelope-from marck@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QN5sSA001727; Sun, 26 Oct 2008 23:05:54 GMT (envelope-from marck@svn.freebsd.org) Received: (from marck@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9QN5sv6001726; Sun, 26 Oct 2008 23:05:54 GMT (envelope-from marck@svn.freebsd.org) Message-Id: <200810262305.m9QN5sv6001726@svn.freebsd.org> From: Dmitry Morozovsky Date: Sun, 26 Oct 2008 23:05:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184312 - stable/6/release/doc/en_US.ISO8859-1/hardware/amd64 X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Oct 2008 23:05:55 -0000 Author: marck (doc committer) Date: Sun Oct 26 23:05:54 2008 New Revision: 184312 URL: http://svn.freebsd.org/changeset/base/184312 Log: MFH: r184200 Correct a typo in Nocona core name Approved by: re (hrs, kib) Modified: stable/6/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml Modified: stable/6/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml ============================================================================== --- stable/6/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml Sun Oct 26 22:56:17 2008 (r184311) +++ stable/6/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml Sun Oct 26 23:05:54 2008 (r184312) @@ -29,7 +29,7 @@ - Intel 64-bit Xeon (Nacona). + Intel 64-bit Xeon (Nocona). This processor is fabricated on 90nm process technology, and operates with 2.80 to 3.60 GHz (FSB 800MHz) and Intel E7520/E7525/E7320 chipsets. From owner-svn-src-stable-6@FreeBSD.ORG Mon Oct 27 14:27:44 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5AF7D1065671; Mon, 27 Oct 2008 14:27:44 +0000 (UTC) (envelope-from gallatin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 47DE08FC1C; Mon, 27 Oct 2008 14:27:44 +0000 (UTC) (envelope-from gallatin@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9RERiKH041852; Mon, 27 Oct 2008 14:27:44 GMT (envelope-from gallatin@svn.freebsd.org) Received: (from gallatin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9RERh36041850; Mon, 27 Oct 2008 14:27:43 GMT (envelope-from gallatin@svn.freebsd.org) Message-Id: <200810271427.m9RERh36041850@svn.freebsd.org> From: Andrew Gallatin Date: Mon, 27 Oct 2008 14:27:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184338 - in stable/6/sys: . dev/mxge X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Oct 2008 14:27:44 -0000 Author: gallatin Date: Mon Oct 27 14:27:43 2008 New Revision: 184338 URL: http://svn.freebsd.org/changeset/base/184338 Log: Merge r183515 and r184211 (mxge firmware updates) into stable/6 Approved by: re (kensmith) Sponsored by: Myricom Inc Modified: stable/6/sys/ (props changed) stable/6/sys/dev/mxge/eth_z8e.h stable/6/sys/dev/mxge/ethp_z8e.h stable/6/sys/dev/mxge/mxge_mcp.h stable/6/sys/dev/mxge/rss_eth_z8e.h stable/6/sys/dev/mxge/rss_ethp_z8e.h Modified: stable/6/sys/dev/mxge/eth_z8e.h ============================================================================== --- stable/6/sys/dev/mxge/eth_z8e.h Mon Oct 27 14:22:34 2008 (r184337) +++ stable/6/sys/dev/mxge/eth_z8e.h Mon Oct 27 14:27:43 2008 (r184338) @@ -28,13151 +28,7074 @@ POSSIBILITY OF SUCH DAMAGE. $FreeBSD$ ***************************************************************************/ -/* Using zlib-1.1.3. gendat version $Name: $ */ -static unsigned int eth_z8e_uncompressed_length = 606168; -#define U (unsigned char) -static unsigned int eth_z8e_length = 52566; -static unsigned char eth_z8e[52566] = { -U 0x78,U 0xDA,U 0xEC,U 0xBD, -U 0x0F,U 0x74,U 0x54,U 0xD5, -U 0xB5,U 0x3F,U 0xBE,U 0x67, -U 0x32,U 0xC0,U 0x24,U 0x46, -U 0x26,U 0xDA,U 0x88,U 0x23, -U 0xA2,U 0x8E,U 0x16,U 0xDB, -U 0xC1,U 0x82,U 0x44,U 0x8B, -U 0x2D,U 0xFA,U 0xA0,U 0xC6, -U 0x0A,U 0x1A,U 0x6A,U 0x20, -U 0x51,U 0x40,U 0x63,U 0x4B, -U 0x0D,U 0x68,U 0xD0,U 0x80, -U 0x88,U 0x03,U 0x04,U 0x0C, -U 0x18,U 0x32,U 0x61,U 0xC0, -U 0x36,U 0xA1,U 0x40,U 0x52, -U 0x4D,U 0x35,U 0x92,U 0x90, -U 0xA4,U 0x4A,U 0x5B,U 0xBE, -U 0x88,U 0x85,U 0x56,U 0xEC, -U 0x0F,U 0x5B,U 0xD4,U 0xB1, -U 0xE0,U 0x93,U 0xDA,U 0x90, -U 0xA1,U 0xFD,U 0xF1,U 0xD6, -U 0x2F,U 0x52,U 0xFC,U 0x32, -U 0xF2,U 0x22,U 0x4D,U 0x79, -U 0x41,U 0x07,U 0x32,U 0x90, -U 0x18,U 0x26,U 0x73,U 0xBE, -U 0x9F,U 0x7D,U 0xCE,U 0xBD, -U 0x93,U 0x3B,U 0x93,U 0x3B, -U 0x41,U 0x5E,U 0xDF,U 0xFA, -U 0xFD,U 0xD6,U 0x6F,U 0xAD, -U 0x66,U 0xAD,U 0x93,U 0x3B, -U 0xF7,U 0x9C,U 0x7D,U 0xF6, -U 0xD9,U 0x7B,U 0x9F,U 0x7D, -U 0xF6,U 0xD9,U 0xE7,U 0xCF, -U 0x3D,U 0x87,U 0xE8,U 0x9F, -U 0xF8,U 0xB3,U 0xEE,U 0x72, -U 0xD1,U 0xBF,U 0xFE,U 0xFE, -U 0xF5,U 0xF7,U 0xAF,U 0xBF, -U 0x7F,U 0xFD,U 0xFD,U 0xEB, -U 0xEF,U 0x5F,U 0x7F,U 0xFF, -U 0xFA,U 0xFB,U 0xFF,U 0xDD, -U 0xDF,U 0x19,U 0xAB,U 0x8D, -U 0xFE,U 0x58,U 0x43,U 0xD4, -U 0xED,U 0xB3,U 0x3B,U 0x83, -U 0x96,U 0xCC,U 0x03,U 0x2F, -U 0xBD,U 0x20,U 0x22,U 0x88, -U 0xB6,U 0x04,U 0xC9,U 0xEE, -U 0xE4,U 0xA7,U 0x16,U 0xE8, -U 0x79,U 0xC4,U 0x5B,U 0x6B, -U 0xC8,U 0x7E,U 0x43,U 0x06, -U 0xA5,U 0xDF,U 0xBD,U 0x85, -U 0xA8,U 0x76,U 0x84,U 0xE8, -U 0x7C,U 0xE1,U 0x45,U 0x11, -U 0x5A,U 0xFB,U 0xA2,U 0xE8, -U 0x9C,U 0xF2,U 0x0B,U 0xA2, -U 0xFD,U 0xA3,U 0x89,U 0x5E, -U 0x18,U 0x21,U 0xC2,U 0xC0, -U 0x33,U 0x27,U 0x48,U 0x2B, -U 0x4B,U 0x18,U 0xCF,U 0x5A, -U 0xBC,U 0x73,U 0xFA,U 0xBA, -U 0x11,U 0x22,U 0x84,U 0xF8, -U 0x12,U 0xC4,U 0x77,U 0x72, -U 0xFC,U 0x9A,U 0x11,U 0xC0, -U 0x95,U 0x49,U 0xE4,U 0x7B, -U 0x51,U 0xF4,U 0x18,U 0xF0, -U 0xDA,U 0x38,U 0x7F,U 0x97, -U 0x8F,U 0x9C,U 0x61,U 0x2B, -U 0x59,U 0xC2,U 0x3E,U 0xFF, -U 0x15,U 0xC8,U 0xB3,U 0x0D, -U 0x74,U 0xB8,U 0x75,U 0x5C, -U 0x48,U 0x23,U 0x2D,U 0xCD, -U 0x82,U 0xB4,U 0xFD,U 0xF1, -U 0x69,U 0x19,U 0xA9,U 0x5A, -U 0x9A,U 0x15,U 0x69,U 0xC1, -U 0xF8,U 0x34,U 0xEB,U 0x34, -U 0x2D,U 0xED,U 0x12,U 0xA4, -U 0x45,U 0xE2,U 0xD3,U 0x6C, -U 0xCF,U 0x6B,U 0x69,U 0xE9, -U 0xDD,U 0xBE,U 0x54,U 0x67, -U 0x92,U 0xF2,U 0x2E,U 0x43, -U 0xDA,U 0x84,U 0x24,U 0x69, -U 0x97,U 0x23,U 0x2D,U 0x3F, -U 0x3E,U 0xED,U 0x9D,U 0x2C, -U 0x2D,U 0xED,U 0x4A,U 0xA4, -U 0x2D,U 0x8A,U 0x4F,U 0xB3, -U 0xE8,U 0xF9,U 0x9C,U 0x48, -U 0xAB,U 0xD4,U 0xD3,U 0x8C, -U 0x32,U 0x31,U 0xCA,U 0x7B, -U 0x99,U 0x53,U 0x44,U 0xBD, -U 0x57,U 0x91,U 0x4D,U 0xAC, -U 0xDF,U 0x4C,U 0x51,U 0x9F, -U 0xA0,U 0x40,U 0x69,U 0x0F, -U 0xB9,U 0x46,U 0x92,U 0xF7, -U 0x38,U 0xA5,U 0x76,U 0x00, -U 0x0F,U 0x6D,U 0x5A,U 0x45, -U 0x76,U 0xAF,U 0x47,U 0xF4, -U 0x04,U 0x4A,U 0x3B,U 0xA9, -U 0x35,U 0xD4,U 0x49,U 0xDE, -U 0x90,U 0xE8,U 0x08,U 0x44, -U 0xCE,U 0x52,U 0xF9,U 0x59, -U 0xB2,U 0x07,U 0x22,U 0xA7, -U 0xA8,U 0x7C,U 0x09,U 0x39, -U 0xF7,U 0x97,U 0x7D,U 0x4A, -U 0x66,U 0x32,U 0x8F,U 0x5A, -U 0x05,U 0x79,U 0x47,U 0x71, -U 0xDE,U 0x76,U 0x6A,U 0x6D, -U 0x68,U 0x27,U 0x6F,U 0x43, -U 0x7C,U 0x5E,U 0xEF,U 0x35, -U 0xE4,U 0x3C,U 0x88,U 0x77, -U 0xE1,U 0x23,U 0x47,U 0x49, -U 0x9D,U 0x88,U 0xEE,U 0x77, -U 0x45,U 0x28,U 0x92,U 0xB6, -U 0x99,U 0xCA,U 0x7E,U 0x41, -U 0x36,U 0xEF,U 0xF5,U 0x64, -U 0x3D,U 0x58,U 0xE4,U 0x27, -U 0xD7,U 0xD7,U 0x98,U 0x96, -U 0xB4,U 0x5D,U 0x4C,U 0xCB, -U 0xBA,U 0x85,U 0x64,U 0x7F, -U 0xF5,U 0x71,U 0xBF,U 0x55, -U 0xAC,U 0x7F,U 0x85,U 0x7E, -U 0xDD,U 0xDB,U 0x63,U 0x5D, -U 0x7B,U 0x92,U 0x6C,U 0xFB, -U 0x9C,U 0x53,U 0x68,U 0x9F, -U 0xF3,U 0x28,U 0x05,U 0xEA, -U 0x26,U 0x53,U 0x20,U 0x1C, -U 0xA1,U 0x4D,U 0x0B,U 0x29, -U 0x7D,U 0x5F,U 0x78,U 0x12, -U 0x05,U 0xD6,U 0x45,U 0x89, -U 0xF1,U 0x05,U 0x16,U 0x4D, -U 0xC2,U 0xF3,U 0x2C,U 0x60, -U 0x3A,U 0xC9,U 0xB5,U 0x94, -U 0xE8,U 0x04,U 0xA5,U 0x35, -U 0xD7,U 0x02,U 0x4F,U 0x50, -U 0xE1,U 0x44,U 0x3D,U 0xA7, -U 0xED,U 0x78,U 0xCF,U 0x43, -U 0xC4,U 0x32,U 0xE2,U 0xF7, -U 0x24,U 0xBA,U 0x93,U 0x01, -U 0xDD,U 0xE9,U 0x14,U 0xA0, -U 0x01,U 0x32,U 0xEE,U 0x6C, -U 0x1A,U 0x21,U 0x3A,U 0xBE, -U 0x5A,U 0x4B,U 0x99,U 0x80, -U 0xCF,U 0x40,U 0xFE,U 0xCE, -U 0xA0,U 0xF5,U 0xF9,U 0x1E, -U 0xCE,U 0x5F,U 0x8D,U 0xF8, -U 0xF1,U 0xB5,U 0x94,U 0xB1, -U 0xBB,U 0x3C,U 0x64,U 0xAB, -U 0x86,U 0x5E,U 0x3A,U 0x4A, -U 0xC9,U 0xE2,U 0x5A,U 0x45, -U 0x43,U 0x1C,U 0x11,U 0xB2, -U 0x80,U 0x87,U 0xBF,U 0x34, -U 0x21,U 0xEE,U 0xAB,U 0x99, -U 0x9C,U 0xE7,U 0x12,U 0x57, -U 0x90,U 0x1A,U 0x27,U 0x71, -U 0x1E,U 0x71,U 0xE5,U 0x0F, -U 0x4E,U 0x47,U 0xAF,U 0xFC, -U 0x41,U 0x28,U 0xFA,U 0xD2, -U 0x0F,U 0xCE,U 0x88,U 0x97, -U 0x7E,U 0xD0,U 0xD5,U 0xF7, -U 0xD2,U 0x0F,U 0xC2,U 0xDE, -U 0x95,U 0x64,U 0xEF,U 0xBB, -U 0xF2,U 0x07,U 0x67,U 0x5B, -U 0x3D,U 0x52,U 0x56,U 0x19, -U 0xAD,U 0x1E,U 0xC8,U 0xAA, -U 0x8F,U 0xEC,U 0xAB,U 0x4F, -U 0x51,U 0xC6,U 0x23,U 0x4B, -U 0x50,U 0x47,U 0x91,U 0x8F, -U 0x69,U 0xF5,U 0x02,U 0x72, -U 0x46,U 0x53,U 0x9B,U 0xF7, -U 0x04,U 0x22,U 0xFF,U 0x41, -U 0x8F,U 0x94,U 0x91,U 0xC0, -U 0xEF,U 0x03,U 0x66,U 0xB4, -U 0x77,U 0xA5,U 0xBD,U 0x92, -U 0xAD,U 0x74,U 0xC9,U 0x8E, -U 0x36,U 0x78,U 0x49,U 0x5D, -U 0xD0,U 0xFA,U 0x82,U 0x93, -U 0xCB,U 0xED,U 0x4A,U 0xDB, -U 0xAE,U 0xC5,U 0x4B,U 0x7A, -U 0x76,U 0xE9,U 0xF1,U 0x22, -U 0xED,U 0x95,U 0x5C,U 0xD4, -U 0x87,U 0x77,U 0xF8,U 0x1A, -U 0x0B,U 0x35,U 0xF6,U 0x12, -U 0x8D,U 0x8F,U 0x92,U 0xE5, -U 0x24,U 0x5D,U 0xB2,U 0x17, -U 0xBC,U 0x64,U 0x18,U 0xF1, -U 0x3F,U 0x30,U 0xF5,U 0xC1, -U 0xC9,U 0x94,U 0x75,U 0xFB, -U 0xB8,U 0xAC,U 0x6F,U 0x7E, -U 0x7B,U 0xE2,U 0x37,U 0x69, -U 0xFA,U 0x5D,U 0x77,U 0x4F, -U 0xA6,U 0xFC,U 0x87,U 0x1E, -U 0xC0,U 0xBF,U 0x19,U 0x93, -U 0xA9,U 0xE0,U 0x9E,U 0x69, -U 0xF8,U 0x71,U 0xF7,U 0xE4, -U 0x5B,U 0xB2,U 0xEE,U 0x1D, -U 0x97,U 0x7F,U 0xF7,U 0xB4, -U 0xA9,U 0xE3,U 0x26,U 0xDE, -U 0x45,U 0xF7,U 0xCF,U 0xBA, -U 0x35,U 0xEB,U 0xD6,U 0x5B, -U 0xE9,U 0xAE,U 0xA9,U 0xB9, -U 0xB7,U 0x64,U 0x65,U 0x69, -U 0xCF,U 0x5B,U 0xB2,U 0x68, -U 0xDC,U 0xDD,U 0x94,U 0x8B, -U 0x30,U 0x6E,U 0x1A,U 0x8D, -U 0xBB,U 0x1F,U 0xBF,U 0xEE, -U 0xA7,U 0x71,U 0x0F,U 0xD0, -U 0x54,U 0x84,U 0x5C,U 0x04, -U 0xA3,U 0x4D,U 0x70,U 0x8A, -U 0x15,U 0x51,U 0x82,U 0xDC, -U 0xC3,U 0xE2,U 0x7C,U 0x0E, -U 0x71,U 0x3D,U 0xF8,U 0xCB, -U 0xCF,U 0xA0,U 0x2E,U 0xD3, -U 0xFF,U 0x03,U 0x71,U 0x21, -U 0xA5,U 0xF7,U 0x97,U 0xB4, -U 0x81,U 0x17,U 0x5B,U 0xB7, -U 0x2F,U 0xBD,U 0x0C,U 0xBC, -U 0x14,U 0x30,U 0x2F,U 0xAE, -U 0x1B,U 0xB8,U 0xBE,U 0x2F, -U 0xCD,U 0xD9,U 0xD7,U 0x4C, -U 0x84,U 0xFA,U 0x08,U 0x33, -U 0xAF,U 0x29,U 0x65,U 0x12, -U 0xA6,U 0x59,U 0xAF,U 0x33, -U 0x91,U 0xB6,U 0xD9,U 0x1D, -U 0x7E,U 0xB6,U 0x38,U 0x65, -U 0xAD,U 0xB4,U 0x2D,U 0xE9, -U 0x7B,U 0x82,U 0xD6,U 0x5A, -U 0x97,U 0xAC,U 0x4B,U 0xC0, -U 0xEF,U 0x2F,U 0xCB,U 0x26, -U 0xF1,U 0x6A,U 0x8E,U 0xC5, -U 0xE6,U 0x42,U 0x3D,U 0x96, -U 0x33,U 0xAE,U 0xF4,U 0xA2, -U 0x5A,U 0xA6,U 0xC1,U 0xBE, -U 0x3D,U 0x1F,U 0xF5,U 0xCA, -U 0xB8,U 0x09,U 0xCF,U 0x14, -U 0x51,U 0xB9,U 0x7D,U 0x96, -U 0x4A,U 0xBF,U 0xD4,U 0x22, -U 0xDF,U 0xAD,U 0x08,U 0xA9, -U 0x12,U 0x26,U 0xE5,U 0x04, -U 0x65,U 0x64,U 0xB0,U 0x8D, -U 0xEB,U 0x87,U 0xC9,U 0xC8, -U 0x00,U 0xAD,U 0x1F,U 0xA3, -U 0xBC,U 0x10,U 0x68,U 0x0F, -U 0x76,U 0xFB,U 0x2E,U 0x1D, -U 0x8B,U 0x32,U 0x0B,U 0x34, -U 0xFD,U 0x09,U 0x6A,U 0x34, -U 0xDF,U 0x25,U 0xF3,U 0x58, -U 0xC9,U 0x1A,U 0x04,U 0x3C, -U 0x70,U 0xCD,U 0xD2,U 0x78, -U 0x3C,U 0xA1,U 0x78,U 0xBC, -U 0x74,U 0x6E,U 0x02,U 0x8F, -U 0x95,U 0x48,U 0xFB,U 0x2F, -U 0xA6,U 0x59,U 0xF1,U 0x77, -U 0x69,U 0x05,U 0xF4,U 0x7B, -U 0x2F,U 0xA7,U 0x07,U 0x29, -U 0x7D,U 0x1B,U 0xE3,U 0xE2, -U 0xFC,U 0x5A,U 0xDE,U 0x86, -U 0x84,U 0xBC,U 0x07,U 0xA4, -U 0x7C,U 0x54,U 0x7A,U 0x5A, -U 0x4A,U 0xA9,U 0x84,U 0xF1, -U 0xEB,U 0xF2,U 0xE1,U 0xFC, -U 0xE1,U 0xD4,U 0xDD,U 0x35, -U 0x5A,U 0xF9,U 0x21,U 0xC0, -U 0xA4,U 0x20,U 0x3D,U 0x98, -U 0x80,U 0x23,U 0x82,U 0xB4, -U 0x30,U 0x97,U 0x0F,U 0x5D, -U 0x4F,U 0xE1,U 0x3C,U 0x4D, -U 0x2F,U 0xAA,U 0x7A,U 0x51, -U 0x65,U 0x0E,U 0xCF,U 0x88, -U 0x87,U 0x1F,U 0xDE,U 0x0C, -U 0xF8,U 0x2F,U 0xAA,U 0x25, -U 0xCE,U 0x74,U 0x3B,U 0x74, -U 0xCB,U 0x06,U 0x59,U 0x74, -U 0xEE,U 0x2B,U 0xE5,U 0x7E, -U 0x62,U 0xF8,U 0x24,U 0x5D, -U 0x1E,U 0x1A,U 0x6C,U 0x3E, -U 0xF4,U 0xD1,U 0xCA,U 0x38, -U 0x45,U 0x95,U 0x94,U 0x43, -U 0x27,U 0xF2,U 0x38,U 0x00, -U 0x57,U 0x94,U 0x00,U 0x57, -U 0xCA,U 0x72,U 0x97,U 0x70, -U 0xA9,U 0x31,U 0x38,U 0xD8, -U 0xC7,U 0xE1,U 0x1B,U 0x12, -U 0xE0,U 0x3C,U 0x80,U 0x43, -U 0xFF,U 0x33,U 0x3C,U 0x07, -U 0x78,U 0x6D,U 0x1A,U 0x8D, -U 0xC3,U 0x01,U 0xB7,U 0x3B, -U 0x9E,U 0xC6,U 0xF4,U 0x6D, -U 0xA8,U 0xEB,U 0x0E,U 0xE6, -U 0x09,U 0x78,U 0xAE,U 0x03, -U 0x8C,U 0x15,U 0xBC,U 0x0D, -U 0x07,U 0x5F,U 0xED,U 0xFB, -U 0xCA,U 0x24,U 0x9D,U 0xED, -U 0x09,U 0x3C,U 0x41,U 0x06, -U 0xE9,U 0x37,U 0x28,U 0xDC, -U 0x92,U 0x86,U 0x7C,U 0xE0, -U 0x6E,U 0x57,U 0xF2,U 0x72, -U 0x24,U 0xF2,U 0x7F,U 0x96, -U 0xE1,U 0x38,U 0x1D,U 0x79, -U 0xBE,U 0xC6,U 0xB8,U 0x01, -U 0x33,U 0x21,U 0x1E,U 0xC6, -U 0x21,U 0xE9,U 0xD3,U 0xF8, -U 0xCE,U 0xD7,U 0x60,U 0xC7, -U 0x68,U 0xB0,U 0x09,U 0xF5, -U 0xEF,U 0x28,U 0x41,U 0xDA, -U 0x58,U 0xF0,U 0x14,U 0x66, -U 0x9D,U 0x31,U 0x94,U 0x5B, -U 0x69,U 0x52,U 0xAE,U 0x55, -U 0xC3,U 0x95,U 0xA5,U 0xE1, -U 0xDA,U 0x91,U 0x80,U 0xCB, -U 0x8F,U 0xB4,U 0x6F,U 0x06, -U 0xC9,U 0x91,U 0x8D,U 0xF2, -U 0x53,U 0x0C,U 0xB8,U 0x0E, -U 0x27,U 0xC0,U 0xDD,U 0xA5, -U 0xA7,U 0x03,U 0xFE,U 0xDB, -U 0x1A,U 0x4C,U 0x8F,U 0x19, -U 0x0C,U 0xDB,U 0x45,U 0x5D, -U 0x26,U 0x66,U 0x36,U 0xEA, -U 0xBC,U 0x35,U 0xF3,U 0x3D, -U 0xF4,U 0x3F,U 0x69,U 0xE7, -U 0xBD,U 0x6E,U 0x12,U 0x95, -U 0x9B,U 0x9D,U 0xE3,U 0x30, -U 0xF2,U 0x1F,U 0x5B,U 0x41, -U 0xA9,U 0x81,U 0xC8,U 0x61, -U 0xCA,U 0x8B,U 0x88,U 0x3E, -U 0x84,U 0xF3,U 0x63,U 0x88, -U 0x2E,U 0x0B,U 0x44,U 0x5A, -U 0xE8,U 0xEB,U 0x44,U 0xD7, -U 0x07,U 0x22,U 0xB5,U 0xB0, -U 0x81,U 0x25,U 0x9C,U 0xF6, -U 0xEE,U 0x57,U 0xC9,U 0x62, -U 0xC1,U 0xD3,U 0x3B,U 0xA6, -U 0xC2,U 0x6A,U 0x09,U 0x44, -U 0x26,U 0x20,U 0xBE,U 0x81, -U 0x46,U 0x93,U 0xCD,U 0x72, -U 0xCF,U 0x73,U 0xA2,U 0x3B, -U 0x10,U 0x99,U 0x82,U 0xF7, -U 0x45,U 0x54,U 0xD8,U 0x47, -U 0x19,U 0xB9,U 0x43,U 0x84, -U 0x37,U 0xAF,U 0x4F,U 0x1C, -U 0xBB,U 0x67,U 0x48,U 0x54, -U 0x04,U 0x22,U 0xFB,U 0x11, -U 0x5F,U 0x44,U 0x79,U 0x7D, -U 0x5F,U 0x88,U 0xBC,U 0xBE, -U 0x6E,U 0x84,U 0xCF,U 0x11, -U 0x8E,U 0x21,U 0xBC,U 0x8B, -U 0xE0,U 0x15,U 0xA2,U 0x6A, -U 0xB3,U 0xF3,U 0x3C,U 0x6C, -U 0x23,U 0x68,U 0x72,U 0x9F, -U 0x17,U 0xC5,U 0x68,U 0xDF, -U 0x9B,U 0xDD,U 0xB0,U 0x95, -U 0x02,U 0xB6,U 0x62,U 0x62, -U 0x20,U 0x32,U 0x09,U 0xF8, -U 0xAC,U 0x04,U 0x18,U 0xF7, -U 0xF9,U 0xF3,U 0x48,U 0x5B, -U 0xBF,U 0xF9,U 0xDB,U 0x12, -U 0x26,U 0x6D,U 0xF3,U 0xB7, -U 0xE4,U 0x7B,U 0xE5,U 0xE6, -U 0x1C,U 0x61,U 0xDF,U 0x3C, -U 0x71,U 0x5C,U 0x05,U 0x0D, -U 0x63,U 0xFA,U 0xA3,U 0xD0, -U 0xFF,U 0x40,U 0x04,U 0xFD, -U 0x53,U 0xE4,U 0x53,U 0xCA, -U 0x5B,U 0x19,U 0x12,U 0xCC, -U 0xC3,U 0xF0,U 0x35,U 0x02, -U 0xBF,U 0xDF,U 0x15,U 0xC3, -U 0xC3,U 0xE4,U 0xC8,U 0x5B, -U 0xE9,U 0x15,U 0x85,U 0x11, -U 0xB2,U 0x8B,U 0x54,U 0xC6, -U 0xDD,U 0xC9,U 0x78,U 0x73, -U 0x80,U 0x6B,U 0xAA,U 0x86, -U 0xAB,U 0x18,U 0xB0,U 0x21, -U 0x86,U 0x63,U 0x5C,U 0x3A, -U 0x1E,U 0xC6,U 0xC1,U 0xB0, -U 0x79,U 0x7D,U 0xE4,U 0x00, -U 0x7C,U 0xF1,U 0xF9,U 0xAA, -U 0xCD,U 0x05,U 0x08,U 0xA5, -U 0x08,U 0xDB,U 0x90,U 0xF7, -U 0xF7,U 0xE7,U 0x9F,U 0x95, -U 0x72,U 0x3C,U 0x80,U 0xDF, -U 0x6D,U 0x3D,U 0x3E,U 0xB2, -U 0x48,U 0x39,U 0xF6,U 0xD1, -U 0x30,U 0xC0,U 0x1E,U 0xE8, -U 0xF6,U 0xD1,U 0x94,U 0x6E, -U 0x45,U 0x77,U 0x8F,U 0xA4, -U 0x7B,U 0xFD,U 0xE6,U 0xEE, -U 0x1E,U 0x45,U 0xFF,U 0x39, -U 0x8D,U 0x9F,U 0xB3,U 0x1C, -U 0x1F,U 0xF6,U 0xD1,U 0x10, -U 0xB1,U 0xBE,U 0xDE,U 0x19, -U 0x96,U 0x69,U 0xF5,U 0x68, -U 0x47,U 0x34,U 0x4B,U 0xE6, -U 0xAB,U 0xAC,U 0x77,U 0x0A, -U 0x7B,U 0xBD,U 0x3B,U 0x8A, -U 0x7A,U 0x85,U 0x3C,U 0x2B, -U 0x58,U 0x96,U 0x90,U 0x6F, -U 0x05,U 0xFB,U 0x07,U 0x2C, -U 0x53,U 0x51,U 0x85,U 0xF4, -U 0xD4,U 0x7A,U 0xF7,U 0xF9, -U 0xAA,U 0xFA,U 0x89,U 0xC8, -U 0xFF,U 0xBD,U 0xF3,U 0x02, -U 0xB4,U 0xA4,U 0xD5,U 0x17, -U 0xF4,U 0x48,U 0xDC,U 0xF5, -U 0x0F,U 0x01,U 0xCF,U 0x9C, -U 0x6E,U 0xC6,U 0x69,U 0xAF, -U 0x2F,U 0x00,U 0xAE,U 0xE2, -U 0x5E,U 0xAB,U 0x0B,U 0xB2, -U 0x10,U 0x3D,U 0x79,U 0x91, -U 0x35,U 0x91,U 0xC2,U 0x95, -U 0x64,U 0x0D,U 0x44,U 0x7E, -U 0x41,U 0x6E,U 0xAA,U 0xB0, -U 0x04,U 0x4A,U 0x17,U 0x01, -U 0xDF,U 0x3A,U 0x4E,U 0x3B, -U 0x96,U 0xB7,U 0x92,U 0x2E, -U 0x47,U 0x59,U 0xEF,U 0x02, -U 0x6F,U 0x01,U 0x97,U 0x87, -U 0x32,U 0x8A,U 0x81,U 0x73, -U 0x3E,U 0x70,U 0x15,U 0x31, -U 0x4D,U 0xBD,U 0x3E,U 0xCA, -U 0xC0,U 0x7B,U 0x69,U 0xAF, -U 0xA2,U 0xAF,U 0x2E,U 0x5A, -U 0x59,U 0xBF,U 0x27,U 0x6A, -U 0xAF,U 0xDF,U 0x66,U 0xD4, -U 0x1F,U 0x25,U 0x33,U 0xD6, -U 0x9B,U 0xD7,U 0x39,U 0x2E, -U 0x43,U 0xD7,U 0x95,U 0xBE, -U 0xCA,U 0xFA,U 0xCA,U 0x6F, -U 0x10,U 0x65,U 0xCC,U 0x08, -U 0x8B,U 0x08,U 0xEB,U 0xCB, -U 0x78,U 0xF2,U 0x58,U 0x5A, -U 0xC3,U 0x2D,U 0x54,U 0x18, -U 0xB1,U 0x53,U 0xAB,U 0x67, -U 0x37,U 0x8D,U 0xA9,U 0x60, -U 0x5F,U 0x25,U 0x4C,U 0xAD, -U 0xE1,U 0x5A,U 0xBC,U 0x6F, -U 0x24,U 0xA6,U 0xAF,U 0x35, -U 0x5C,U 0x42,U 0x07,U 0x3B, -U 0x1B,U 0x68,U 0x86,U 0x27, -U 0xBC,U 0xA6,U 0xCF,U 0xDE, -U 0x60,U 0x3F,U 0xD8,U 0x39, -U 0x9D,U 0x90,U 0xFF,U 0x5D, -U 0xD0,U 0x18,U 0x7D,U 0xC4, -U 0x63,U 0xAB,U 0xF8,U 0xDE, -U 0x10,U 0x11,U 0x6A,U 0xF5, -U 0x84,U 0x39,U 0xCE,U 0x7B, -U 0xB0,U 0x13,U 0x7A,U 0xDA, -U 0x27,U 0xFA,U 0x22,U 0x95, -U 0xF5,U 0xA5,U 0x11,U 0x7B, -U 0x83,U 0x73,U 0x7A,U 0x67, -U 0xC5,U 0x90,U 0xD6,U 0xF0, -U 0x56,U 0x8E,U 0x3B,U 0xEF, -U 0xB0,U 0x88,U 0x88,U 0xA3, -U 0xD4,U 0x2B,U 0x0E,U 0x76, -U 0xAE,U 0xA3,U 0x47,U 0xCE, -U 0x92,U 0xE5,U 0x60,U 0xF1, -U 0x6E,U 0xA9,U 0xAF,U 0x8F, -U 0x78,U 0x3C,U 0x24,U 0xF3, -U 0x9F,U 0x8D,U 0x38,U 0x7E, -U 0xD8,U 0x59,U 0x41,U 0x3F, -U 0x2C,U 0xA6,U 0xE1,U 0x80, -U 0xFF,U 0x9C,U 0xF5,U 0x57, -U 0x0C,U 0xAF,U 0xA0,U 0x96, -U 0xF6,U 0x22,U 0x9A,U 0x7E, -U 0x2A,U 0x92,U 0x32,U 0x03, -U 0x35,U 0xD5,U 0x32,U 0xB7, -U 0x96,U 0x0E,U 0x16,U 0xD7, -U 0xB2,U 0x4C,U 0xEA,U 0xD8, -U 0x5F,U 0x98,U 0x7E,U 0xAA, -U 0x4B,U 0xCC,U 0x38,U 0xDB, -U 0x2D,U 0x0E,U 0x16,U 0xBF, -U 0x4E,U 0x2D,U 0x73,U 0x77, -U 0x53,U 0xEE,U 0xA7,U 0x7E, -U 0x47,U 0x5F,U 0x55,U 0x7D, -U 0x65,U 0x34,U 0xB5,U 0x7E, -U 0x5B,U 0xB4,U 0xAA,U 0x7E, -U 0x4F,U 0xA4,U 0xAA,U 0xBE, -U 0xB4,U 0x2F,U 0xB5,U 0xC1, -U 0x1E,U 0x49,U 0x6D,U 0x70, -U 0x8A,U 0xF5,U 0x0D,U 0x95, -U 0x90,U 0x61,U 0xAA,U 0xAC, -U 0x8F,U 0xB4,U 0x86,U 0x1F, -U 0xE1,U 0xF7,U 0x28,U 0x59, -U 0xC7,U 0xF6,U 0x86,U 0x3A, -U 0x51,U 0xD9,U 0xB0,U 0xE7, -U 0x7C,U 0x55,U 0xC3,U 0xB6, -U 0x40,U 0xE9,U 0x24,U 0x12, -U 0xA9,U 0x0D,U 0x75,U 0xAC, -U 0xF7,U 0xA2,U 0xAA,U 0x61, -U 0x0F,U 0xE0,U 0xF6,U 0x28, -U 0x3D,U 0x69,U 0x38,U 0xC0, -U 0x7A,U 0x02,U 0x98,U 0x36, -U 0x84,U 0x0E,U 0xB1,U 0x7E, -U 0x4B,U 0x0E,U 0xF2,U 0x5F, -U 0xA6,U 0x70,U 0x6D,U 0xB9, -U 0x97,U 0x61,U 0xA2,U 0xF6, -U 0x2D,U 0x39,U 0xD1,U 0xCA, -U 0x2D,U 0x05,U 0xC2,U 0xBE, -U 0xA5,U 0x98,U 0x6D,U 0xF8, -U 0x8C,U 0x25,U 0x3D,U 0x90, -U 0x5D,U 0x03,U 0x7C,U 0x4C, -U 0x0E,U 0x7D,U 0xF8,U 0xDD, -U 0x47,U 0x7D,U 0x3E,U 0x1A, -U 0xF6,U 0xC8,U 0x12,U 0xF2, -U 0x8A,U 0x77,U 0x6A,U 0x68, -U 0xC6,U 0x92,U 0x77,U 0x45, -U 0xA0,U 0xF4,U 0x28,U 0xE2, -U 0x8F,U 0xCA,U 0xF4,U 0x19, -U 0x4B,U 0xBC,U 0x02,U 0x72, -U 0x71,U 0x44,U 0x53,U 0x81, -U 0xA7,U 0x0A,U 0x78,U 0x52, -U 0x81,U 0x67,U 0x7D,U 0x63, -U 0x5A,U 0x0F,U 0xEB,U 0x54, -U 0x65,U 0xA3,U 0x5D,U 0xD8, -U 0x1B,U 0x8B,U 0xA3,U 0x43, -U 0x09,U 0x32,U 0xDB,U 0x4A, -U 0xD1,U 0x77,U 0x84,U 0x50, -U 0x6D,U 0xA3,U 0x13,U 0xFA, -U 0x38,U 0xB2,U 0xA2,U 0xB0, -U 0x94,U 0x9A,U 0x45,U 0x15, -U 0x60,U 0x52,U 0x1B,U 0x91, -U 0xA7,U 0x79,U 0xBB,U 0xEC, -U 0x93,U 0xA5,U 0x7D,U 0x69, -U 0xDE,U 0x76,U 0xBE,U 0xAA, -U 0xF9,U 0x00,U 0xC2,U 0x1E, -U 0xCE,U 0xA7,U 0xE7,U 0x11, -U 0x55,U 0xCD,U 0xDB,U 0xE2, -U 0x7D,U 0x64,U 0x1B,U 0xBA, -U 0xCD,U 0x21,U 0x76,U 0xA2, -U 0xA1,U 0x08,U 0xC3,U 0xEC, -U 0xBA,U 0xAD,U 0xEA,U 0xF6, -U 0x65,U 0x1E,U 0x0D,U 0xD2, -U 0x7B,U 0x5B,U 0xD9,U 0xC6, -U 0xE1,U 0x37,U 0xEC,U 0xDA, -U 0x1F,U 0x4B,U 0xB5,U 0xDF, -U 0xE1,U 0x20,U 0x6D,U 0x1B, -U 0x2D,U 0x7D,U 0x0A,U 0xD8, -U 0x30,U 0x4F,U 0x39,U 0x5D, -U 0x71,U 0x92,U 0xAE,U 0xD8, -U 0x06,U 0xFE,U 0x08,U 0xBF, -U 0xD3,U 0xF1,U 0x7B,U 0x47, -U 0xDE,U 0x98,U 0x77,U 0x45, -U 0xB4,U 0xF2,U 0x58,U 0x01, -U 0xEA,U 0xB1,U 0x9B,U 0x6D, -U 0x8C,U 0xF0,U 0x4D,U 0x40, -U 0x3F,U 0x42,U 0xD9,U 0xDD, -U 0xDD,U 0xC5,U 0x76,U 0xD1, -U 0xED,U 0x4E,U 0x17,U 0x69, -U 0xDB,U 0xCB,U 0xC5,U 0x79, -U 0x27,U 0xFB,U 0x7A,U 0x0E, -U 0xBC,U 0x0F,U 0x87,U 0xCC, -U 0x46,U 0xE3,U 0x79,U 0xF9, -U 0x96,U 0x73,U 0x94,U 0x89, -U 0xE0,U 0xDC,U 0xE2,U 0x8B, -U 0x56,U 0x70,U 0x5F,U 0x8E, -U 0xDF,U 0x59,U 0xE2,U 0x19, -U 0x67,U 0xDA,U 0xA6,U 0x15, -U 0x34,U 0xD6,U 0x11,U 0x26, -U 0x7B,U 0x93,U 0x2F,U 0x5A, -U 0xE0,U 0x58,U 0x93,U 0x41, -U 0xE8,U 0x9F,U 0x32,U 0xF9, -U 0xB7,U 0xF0,U 0xED,U 0xC8, -U 0x69,U 0x3A,U 0x47,U 0x36, -U 0xF6,U 0x3F,U 0xA3,U 0xA9, -U 0x28,U 0xAF,U 0xD4,U 0x21, -U 0xC4,U 0x32,U 0x37,U 0x35, -U 0x2D,U 0x85,U 0x9D,U 0xF1, -U 0x91,U 0xBB,U 0xC9,U 0x27, -U 0x76,U 0xF5,U 0x75,U 0xBB, -U 0xAD,U 0x4C,U 0xA7,U 0x4E, -U 0x0B,U 0xD3,U 0x06,U 0x3A, -U 0xAF,U 0x01,U 0x9D,U 0x7B, -U 0x67,U 0xAF,U 0xCC,U 0xA6, -U 0xF7,U 0xD1,U 0x17,U 0x9B, -U 0xD9,U 0xEA,U 0x6E,U 0xDF, -U 0x15,U 0x31,U 0xFE,U 0x93, -U 0xA4,U 0x47,U 0x74,U 0x99, -U 0x98,U 0xA7,U 0x8F,U 0x18, -U 0xA5,U 0xCB,U 0x29,U 0xD9, -U 0x38,U 0x8D,U 0xDB,U 0x70, -U 0xDF,U 0x0A,U 0x11,U 0xAA, -U 0x5E,U 0x48,U 0x2C,U 0x0B, -U 0xA7,U 0x37,U 0x22,U 0xFE, -U 0x13,U 0x72,U 0xAC,U 0x28, -U 0xEF,U 0xA3,U 0x6B,U 0xF2, -U 0x56,U 0x5E,U 0x27,U 0x02, -U 0x9D,U 0xC2,U 0x1F,U 0x28, -U 0x3D,U 0x45,U 0x4D,U 0x48, -U 0x2F,U 0x2F,U 0x13,U 0x51, -U 0xF4,U 0x8F,U 0x45,U 0x5D, -U 0x2B,U 0x44,U 0x64,U 0x0B, -U 0xFA,U 0xEA,U 0x68,U 0xEA, -U 0xF6,U 0x62,U 0x94,U 0x01, -U 0xFF,U 0xC7,U 0xBD,U 0x5B, -U 0xD5,U 0x45,U 0x7D,U 0xDD, -U 0x46,U 0xEE,U 0xC3,U 0xED, -U 0xDB,U 0x8B,U 0x80,U 0xEB, -U 0x32,U 0xC6,U 0x75,U 0x10, -U 0xF9,U 0xFB,U 0xAA,U 0xB6, -U 0x2F,U 0x02,U 0x1C,U 0xC6, -U 0x7F,U 0xAD,U 0xEB,U 0x06, -U 0x8C,U 0x8F,U 0xE4,U 0x88, -U 0x94,U 0x20,U 0x6B,U 0xC3, -U 0xF4,U 0x33,U 0xC7,U 0xD9, -U 0x0C,U 0x03,U 0x5B,U 0xF6, -U 0xEA,U 0xB2,U 0xCD,U 0x93, -U 0x75,U 0x5E,U 0xD0,U 0x86, -U 0x9C,U 0x5D,U 0xF0,U 0x55, -U 0xBD,U 0xAB,U 0x69,U 0x14, -U 0x64,U 0x7B,U 0xF5,U 0x49, -U 0xBA,U 0xF2,U 0x1A,U 0x6F, -U 0xA9,U 0x38,U 0x21,U 0x7C, -U 0x23,U 0x76,U 0xBF,U 0xBA, -U 0xAA,U 0x07,U 0x7D,U 0xEF, -U 0x95,U 0xEE,U 0x20,U 0xD5, -U 0x76,U 0x24,U 0x93,U 0x85, -U 0x60,U 0x3B,U 0x76,U 0x0E, -U 0x3E,U 0xC8,U 0x8A,U 0x98, -U 0x1C,U 0x3E,U 0xC9,U 0x5B, -U 0x19,U 0x15,U 0xFC,U 0x9B, -U 0xDB,U 0x47,U 0x13,U 0xE2, -U 0x99,U 0x6F,U 0xE0,U 0xF1, -U 0xE8,U 0xFC,U 0x26,U 0x97, -U 0xE9,U 0xF6,U 0x52,U 0xE5, -U 0x7F,U 0x5E,U 0x79,U 0x48, -U 0x60,U 0x9C,U 0xE7,U 0xBF, -U 0x36,U 0xC2,U 0xBF,U 0xFF, -U 0xA2,U 0x7C,U 0xD3,U 0x86, -U 0x6D,U 0x5D,U 0x68,U 0xF3, -U 0x3C,U 0xC6,U 0x80,U 0x7F, -U 0x13,U 0xC6,U 0x98,U 0xB0, -U 0x07,U 0x38,U 0x31,U 0xFE, -U 0xBD,U 0xAE,U 0x40,U 0xF7, -U 0x85,U 0x03,U 0x91,U 0xA9, -U 0xDC,U 0xFE,U 0xB7,U 0x25, -U 0xC1,U 0x9F,U 0xD9,U 0x8F, -U 0x7F,U 0xA4,U 0x5F,U 0xC3, -U 0xB9,U 0x47,U 0xD8,U 0x77, -U 0x1F,U 0x2E,U 0x57,U 0x74, -U 0xF7,U 0x94,U 0x87,U 0x45, -U 0x07,U 0xE3,U 0x66,U 0xBF, -U 0xBD,U 0x1D,U 0x30,U 0x8D, -U 0xF0,U 0x0F,U 0x45,U 0xE5, -U 0xEE,U 0x03,U 0x9B,U 0x38, -U 0x6E,U 0x45,U 0x2F,U 0xC7, -U 0xBD,U 0x07,U 0xDD,U 0x14, -U 0x8A,U 0xAE,U 0x91,U 0xEF, -U 0x41,U 0x6E,U 0x57,U 0xC2, -U 0x6F,U 0x08,U 0xF9,U 0x57, -U 0xF5,U 0xD2,U 0x89,U 0x32, -U 0x4A,U 0xE1,U 0xB1,U 0x53, -U 0xB7,U 0xCF,U 0x59,U 0x10, -U 0xA4,U 0x09,U 0xB9,U 0x72, -U 0xFC,U 0xE2,U 0xA3,U 0xED, -U 0x5D,U 0xD6,U 0xD9,U 0xB3, -U 0x11,U 0x87,U 0xF1,U 0xEF, -U 0x6D,U 0x1E,U 0x19,U 0x67, -U 0x25,U 0x8C,U 0xE9,U 0x9D, -U 0x65,U 0x31,U 0x18,U 0xE0, -U 0xC0,U 0xFB,U 0x06,U 0x43, -U 0x9E,U 0xD9,U 0x5D,U 0xD6, -U 0x9B,U 0xB6,U 0x23,U 0xAE, -U 0x39,U 0x21,U 0xCF,U 0xAE, -U 0x84,U 0x3C,U 0x7E,U 0xFD, -U 0x1D,U 0xF4,U 0x75,U 0xBA, -U 0x56,U 0x48,U 0xBE,U 0xD6, -U 0x20,U 0x3F,U 0xFC,U 0x56, -U 0xAA,U 0xD0,U 0xCA,U 0x6D, -U 0x4F,U 0xC0,U 0x11,U 0x8E, -U 0xC7,U 0x71,U 0x95,U 0x6D, -U 0x20,U 0xAD,U 0x57,U 0x39, -U 0xE3,U 0xF3,U 0x5C,U 0xE5, -U 0x4E,U 0xC8,U 0x33,U 0x71, -U 0x20,U 0xAD,U 0x57,U 0xE5, -U 0x26,U 0xE4,U 0x99,U 0x93, -U 0x90,U 0x67,U 0x91,U 0xFE, -U 0xAE,U 0xCD,U 0x1B,U 0x64, -U 0x21,U 0xAE,U 0x22,U 0x21, -U 0x4F,U 0x4D,U 0x42,U 0x9E, -U 0x66,U 0xC3,U 0xFB,U 0x57, -U 0xF0,U 0x1E,U 0xE3,U 0x9F, -U 0xEB,U 0x1A,U 0x7D,U 0xBB, -U 0xE0,U 0xB1,U 0x21,U 0xF4, -U 0x96,U 0x75,U 0xB8,U 0x8E, -U 0xED,U 0x23,U 0x8F,U 0xDB, -U 0x97,U 0x95,U 0x89,U 0x1E, -U 0xE8,U 0x40,U 0x1D,U 0xE0, -U 0x83,U 0x3A,U 0x7E,U 0x5D, -U 0x77,U 0x24,U 0xBC,U 0xD2, -U 0x9F,U 0x0E,U 0xA5,U 0x3F, -U 0x23,U 0x6D,U 0x31,U 0x18, -U 0xB8,U 0x4B,U 0xFB,U 0x5D, -U 0x61,U 0x82,U 0x2C,U 0x3B, -U 0x50,U 0xA7,U 0x9D,U 0x81, -U 0xF0,U 0x54,U 0x52,U 0xE3, -U 0xA7,U 0x91,U 0x39,U 0xAC, -U 0x53,U 0x7A,U 0x99,U 0x8E, -U 0x32,U 0xA5,U 0x37,U 0x3C, -U 0xFE,U 0xD5,U 0xCB,U 0x0C, -U 0x42,U 0x57,U 0xB8,U 0xDF, -U 0x31,U 0xE8,U 0x67,U 0x3B, -U 0x97,U 0xA5,U 0x95,U 0x51, -U 0xAC,U 0x97,U 0x01,U 0xDC, -U 0xED,U 0xAC,U 0x3F,U 0x72, -U 0xCC,U 0x0F,U 0xFC,U 0x5A, -U 0xBE,U 0x6D,U 0x4A,U 0xEE, -U 0x23,U 0x6B,U 0xE2,U 0xE5, -U 0x31,U 0xB2,U 0x39,U 0x5E, -U 0x1E,U 0x23,U 0x77,U 0x19, -U 0x65,U 0xB8,U 0x16,U 0xBA, -U 0x19,U 0xA4,U 0xAB,U 0x4A, -U 0x58,U 0x8F,U 0x4D,U 0xDB, -U 0xA5,U 0xBD,U 0xBE,U 0xD8, -U 0xFB,U 0x05,U 0x5D,U 0xEB, -U 0x8D,U 0x8A,U 0xE3,U 0x27, -U 0xE8,U 0xEA,U 0xA9,U 0xD0, -U 0xFB,U 0x14,U 0x7E,U 0x4A, -U 0x9F,U 0xA8,U 0x07,U 0xFC, -U 0xDA,U 0x77,U 0xEE,U 0x95, -U 0xFE,U 0x50,U 0xD9,U 0x59, -U 0xF4,U 0x9D,U 0x12,U 0xF6, -U 0x2B,U 0x80,U 0x6D,U 0x07, -U 0xCC,U 0x6D,U 0x1A,U 0x2C, -U 0x3F,U 0x6D,U 0xDA,U 0x73, -U 0x18,U 0x3F,U 0xE1,U 0x1B, -U 0xCD,U 0x0F,U 0xD2,U 0xD5, -U 0xB9,U 0x21,U 0x2F,U 0xF7, -U 0xBF,U 0xBB,U 0x6B,U 0xF4, -U 0x77,U 0x81,U 0x77,U 0x3C, -U 0x6D,U 0xA2,U 0x6A,U 0xE7, -U 0x5E,U 0x73,U 0x7B,U 0x7A, -U 0xF5,U 0x22,U 0xDD,U 0x9E, -U 0x46,U 0x2B,U 0x1B,U 0x8B, -U 0xFB,U 0xCE,U 0x89,U 0xCE, -U 0xEA,U 0xC5,U 0xA8,U 0x8B, -U 0xB3,U 0x74,U 0x25,U 0x7C, -U 0xCF,U 0xEB,U 0x0E,U 0xD2, -U 0x71,U 0x3A,U 0x58,U 0xF6, -U 0xFF,U 0x54,U 0x78,U 0xFF, -U 0x41,U 0x5F,U 0x81,U 0x2F, -U 0xD5,U 0xCD,U 0x76,U 0xA3, -U 0xFC,U 0x2C,U 0x5D,U 0x15, -U 0xA8,U 0x38,U 0x0E,U 0x39, -U 0x89,U 0x8A,U 0x26,U 0xC0, -U 0xC2,U 0x7E,U 0x96,U 0x29, -U 0x3B,U 0x72,U 0xF5,U 0x9E, -U 0xC1,U 0xEC,U 0x08,U 0xEA, -U 0xA6,U 0x03,U 0xF4,U 0x5A, -U 0x4F,U 0xD0,U 0xA8,U 0x1B, -U 0xB9,U 0x0E,U 0x8E,U 0xD3, -U 0xA8,U 0x0C,U 0xE6,U 0x07, -U 0xC1,U 0x82,U 0x38,U 0x8B, -U 0x38,U 0x27,U 0xE6,U 0x08, -U 0xF6,U 0x9B,U 0xE1,U 0x13, -U 0x04,U 0x69,U 0xD4,U 0x24, -U 0xC1,U 0x7E,U 0x01,U 0x07, -U 0x1F,U 0xCD,U 0xD5,U 0xDE, -U 0xDB,U 0xC0,U 0x6B,U 0x48, -U 0x9C,U 0x8B,U 0x32,U 0x0C, -U 0xFA,U 0xCE,U 0x51,U 0xE8, -U 0x8F,U 0x2C,U 0x6C,U 0xC3, -U 0xF6,U 0x76,U 0xFB,U 0x46, -U 0x4D,U 0x08,U 0xD2,U 0x37, -U 0x4A,U 0xD5,U 0x98,U 0x73, -U 0x14,U 0x31,U 0xAE,U 0x24, -U 0x34,U 0xB4,U 0xF5,U 0x8F, -U 0xFF,U 0x47,U 0x6D,U 0x71, -U 0x95,U 0x5B,U 0x98,U 0x8E, -U 0x25,U 0xD2,U 0xE6,U 0x00, -U 0x57,U 0x93,U 0x55,U 0xF5, -U 0x91,U 0x51,U 0xD0,U 0xDA, -U 0xE8,U 0x8B,U 0x16,U 0xA3, -U 0x3F,U 0x2C,U 0x8E,U 0xAE, -U 0xFF,U 0xCD,U 0x21,U 0xF9, -U 0x5B,U 0x4B,U 0x63,U 0x3A, -U 0xA2,U 0x28,U 0xDF,U 0x14, -U 0x7F,U 0xCC,U 0x06,U 0x5D, -U 0x33,U 0x4D,U 0xB3,U 0x63, -U 0x07,U 0xA2,U 0xF6,U 0x86, -U 0x0E,U 0xCD,U 0xFE,U 0x32, -U 0xFF,U 0xA9,U 0xC7,U 0xE9, -U 0x9A,U 0x1C,U 0xBC,U 0x5B, -U 0x85,U 0x75,U 0x54,U 0xE7, -U 0xAF,U 0xA3,U 0x21,U 0xEB, -U 0x7B,U 0x25,U 0x7A,U 0x17, -U 0x70,U 0x4D,U 0x8E,U 0x49, -U 0x40,U 0x09,U 0xD7,U 0x8C, -U 0x46,U 0xC8,U 0xD2,U 0xDE, -U 0x27,U 0x49,U 0x1E,U 0xBA, -U 0x8A,U 0x30,U 0x4E,U 0xBC, -U 0x26,U 0x27,U 0x9A,U 0x0A, -U 0xF9,U 0x54,U 0xB2,U 0xBC, -U 0xAE,U 0x19,U 0x25,U 0xBA, -U 0x46,U 0x5B,U 0xF5,U 0xDF, -U 0x4D,U 0xA7,U 0x79,U 0xDC, -U 0x7C,U 0x4D,U 0x0E,U 0x64, -U 0x91,U 0x93,U 0xB4,U 0x3E, -U 0x62,U 0xB4,U 0x5E,U 0x3B, -U 0xC4,U 0x40,U 0x6B,U 0x9B, -U 0x81,U 0x56,U 0xFB,U 0x71, -U 0xBA,U 0xD6,U 0xA6,U 0x68, -U 0xBD,U 0xA6,U 0x2E,U 0x9E, -U 0xD6,U 0x6B,U 0xD1,U 0x5D, -U 0x5D,U 0x73,U 0x08,U 0xA1, -U 0x03,U 0xA1,U 0x47,U 0xBD, -U 0x1B,U 0xC3,U 0x35,U 0xA8, -U 0x93,U 0x6B,U 0x0E,U 0x40, -U 0xF7,U 0xF6,U 0xAB,U 0x3A, -U 0xE1,U 0x38,U 0x94,U 0xC1, -U 0xB2,U 0x38,U 0x4D,U 0xF6, -U 0xE8,U 0xF9,U 0x02,U 0xE2, -U 0x39,U 0x3C,U 0x8E,U 0x67, -U 0x79,U 0x72,U 0x7C,U 0x14, -U 0xBE,U 0x0B,U 0x68,U 0x3F, -U 0x8A,U 0xF4,U 0x0C,U 0xD6, -U 0x95,U 0xEA,U 0xA8,U 0xD2, -U 0x05,U 0x73,U 0xBD,U 0xBD, -U 0x76,U 0x74,U 0xCC,U 0x5F, -U 0x82,U 0x9F,U 0xC8,U 0xF6, -U 0xA0,U 0x93,U 0xAE,U 0xCB, -U 0x42,U 0x5B,U 0x01,U 0x1F, -U 0xBF,U 0x3D,U 0xA4,U 0xFA, -U 0x92,U 0xEB,U 0x6E,U 0xE1, -U 0x77,U 0xB4,U 0x9D,U 0x4F, -U 0xF0,U 0x7B,U 0xEC,U 0x41, -U 0x8C,U 0xBB,U 0x7B,U 0xD7, -U 0x6F,U 0xCF,U 0x3E,U 0x6F, -U 0xA5,U 0x61,U 0xBD,U 0x56, -U 0xCA,U 0x8E,U 0xAC,U 0x3F, -U 0x56,U 0x16,U 0x49,U 0x7B, -U 0x25,U 0x37,U 0xD0,U 0xB1, -U 0x9B,U 0x5A,U 0x23,U 0xBF, -U 0x25,U 0xD7,U 0x42,U 0x89, -U 0xE3,U 0xC6,U 0x40,U 0x31, -U 0xF4,U 0x7F,U 0xA5,U 0xE8, -U 0xDB,U 0xD9,U 0xBB,U 0x0D, -U 0x63,U 0xAF,U 0xCF,U 0xFD, -U 0xE8,U 0x7B,U 0xAF,U 0x3B, -U 0x49,U 0xD7,U 0x49,U 0xFA, -U 0x7F,U 0x72,U 0x1C,U 0xBD, -U 0xFA,U 0x23,U 0x12,U 0xB7, -U 0xC6,U 0xCF,U 0xB1,U 0x82, -U 0x4D,U 0x8F,U 0xC3,U 0x7E, -U 0x9C,U 0xE0,U 0xB9,U 0x25, -U 0x67,U 0xDA,U 0xC6,U 0x5E, -U 0x1A,U 0xBB,U 0x79,U 0x15, -U 0x65,U 0x35,U 0xF4,U 0xD2, -U 0xE8,U 0xC6,U 0x5E,U 0x72, -U 0x8B,U 0xBF,U 0xBB,U 0xAD, -U 0x0D,U 0xF0,U 0xA9,U 0x1E, -U 0x39,U 0x9B,U 0x41,U 0xD0, -U 0xA1,U 0x82,U 0xE1,U 0x1E, -U 0xB2,U 0x37,U 0xAE,U 0x82, -U 0x6F,U 0x15,U 0x21,U 0x4B, -U 0x5F,U 0x15,U 0x7C,U 0xAB, -U 0x08,U 0x7C,U 0xAB,U 0xCF, -U 0xE1,U 0x5B,U 0x7D,U 0xD6, -U 0xEF,U 0x5B,U 0x9D,U 0x3F, -U 0xCF,U 0xBE,U 0xD5,U 0xF6, -U 0xA3,U 0x0C,U 0x83,U 0xB6, -U 0x75,U 0xF4,U 0xD2,U 0x62, -U 0xB2,U 0xA4,U 0xCF,U 0xA5, -U 0x0C,U 0xD0,U 0xE7,U 0xFD, -U 0x8C,U 0xAE,U 0x9D,U 0x9F, -U 0xDE,U 0x0E,U 0xBF,U 0x0E, -U 0x3C,U 0x07,U 0x35,U 0x7E, -U 0x21,U 0xC3,U 0x52,U 0x47, -U 0x31,U 0x0D,U 0x93,U 0xBC, -U 0xA2,U 0x8F,U 0x17,U 0x55, -U 0xBF,U 0x3D,U 0x94,U 0x38, -U 0x5F,U 0x9B,U 0xCC,U 0x1F, -U 0x8D,U 0xCD,U 0x6B,U 0x4B, -U 0x3B,U 0x7E,U 0x5D,U 0x69, -U 0x42,U 0x5F,U 0x00,U 0xFF, -U 0xF2,U 0xBA,U 0x0D,U 0xBA, -U 0xED,U 0x2B,U 0xB9,U 0x9E, -U 0x9C,U 0x25,U 0x2E,U 0xD1, -U 0x31,U 0xC8,U 0x1C,U 0x67, -U 0x98,U 0xE7,U 0xDC,U 0x79, -U 0xEE,U 0x7D,U 0xDF,U 0x28, -U 0x99,U 0xF7,U 0x40,U 0xCC, -U 0x07,U 0xE0,U 0xF9,U 0x4F, -U 0x9F,U 0x6A,U 0x77,U 0xED, -U 0xE4,U 0xBA,U 0x86,U 0x65, -U 0xC7,U 0xFD,U 0x33,U 0xDB, -U 0x7B,U 0xF6,U 0x33,U 0x79, -U 0x1E,U 0x4E,U 0xCD,U 0xDF, -U 0x5C,U 0x17,U 0x31,U 0xF8, -U 0x0D,U 0x6C,U 0xEF,U 0xC3, -U 0xBB,U 0x57,U 0xF5,U 0xD8, -U 0x38,U 0x3F,U 0xCB,U 0x43, -U 0xE5,U 0xBF,U 0xEE,U 0x68, -U 0x32,U 0xDB,U 0xCA,U 0xF3, -U 0xFF,U 0xF0,U 0x0B,U 0xF6, -U 0xB4,U 0x36,U 0x10,U 0xB5, -U 0xC2,U 0xFD,U 0x3A,U 0xD8, -U 0x90,U 0x0D,U 0x5F,U 0xA5, -U 0x57,U 0xCE,U 0xFD,U 0x1F, -U 0x27,U 0x57,U 0x91,U 0x6C, -U 0xFB,U 0x8B,U 0x7B,U 0x89, -U 0x7F,U 0x07,U 0xCA,U 0xEE, -U 0xA0,U 0x00,U 0x60,U 0x54, -U 0x5F,U 0xE2,U 0x6A,U 0xD8, -U 0x5F,U 0xAA,U 0xE6,U 0xF9, -U 0xF6,U 0x7B,U 0xCE,U 0x10, -U 0x8F,U 0xD7,U 0xFD,U 0x4B, -U 0xD9,U 0x46,U 0xB8,U 0xFE, -U 0xB4,U 0xAF,U 0x2C,U 0x04, -U 0xBA,U 0x5C,U 0xB5,U 0xFA, -U 0x1C,U 0x67,U 0x90,U 0x5C, -U 0x07,U 0xB8,U 0xFC,U 0xAE, -U 0xCA,U 0xDD,U 0xBB,U 0x1A, -U 0xD5,U 0x3C,U 0x5C,U 0xE7, -U 0xBE,U 0xF0,U 0x44,U 0x86, -U 0x81,U 0xFD,U 0xBB,U 0xAE, -U 0x59,U 0xE7,U 0x77,U 0xD3, -U 0x08,U 0xEE,U 0x07,U 0x5C, -U 0x9E,U 0x41,U 0x68,U 0xCD, -U 0x50,U 0xFD,U 0x87,U 0x2B, -U 0x14,U 0xDF,U 0xD7,U 0x0F, -U 0x41,U 0x9F,U 0x73,U 0xBD, -U 0x2D,U 0xBE,U 0xCF,U 0xB9, -U 0x3E,U 0x33,U 0xBE,U 0xCF, -U 0xB9,U 0x7E,U 0x74,U 0x7C, -U 0x5F,U 0x6F,U 0x45,U 0x5F, -U 0x7F,U 0xFD,U 0xC4,U 0x84, -U 0x3C,U 0x39,U 0x09,U 0x79, -U 0x8C,U 0xFE,U 0x4F,U 0x8D, -U 0x56,U 0x4E,U 0x82,U 0xFF, -U 0x73,U 0x7D,U 0x82,U 0xFF, -U 0x73,U 0xFD,U 0x06,U 0xC3, -U 0x3B,U 0x78,U 0xBC,U 0xBE, -U 0x41,U 0xAF,U 0x9F,U 0x2E, -U 0x39,U 0xFF,U 0x7D,U 0xFD, -U 0x0E,U 0xC3,U 0xBB,U 0xB5, -U 0x56,U 0xAE,U 0xA5,U 0x5C, -U 0xEF,U 0xD7,U 0xE3,U 0xD0, -U 0xA7,U 0x11,U 0x7C,U 0xB5, -U 0x30,U 0xEB,U 0x84,U 0x86, -U 0xEF,U 0x68,U 0x82,U 0x8E, -U 0x31,U 0x7C,U 0x28,U 0x9E, -U 0x86,U 0x1B,U 0x28,U 0x9E, -U 0x86,U 0x1B,U 0x32,U 0x62, -U 0xFE,U 0x05,U 0xF0,U 0xA3, -U 0xBE,U 0xFE,U 0x78,U 0x82, -U 0x6E,U 0xE8,U 0x90,U 0x3A, -U 0xC4,U 0xFE,U 0x55,U 0x39, -U 0xE5,U 0xF1,U 0x3B,U 0x70, -U 0xD5,U 0x01,U 0x1E,U 0x72, -U 0xB8,U 0x21,U 0x3B,U 0x01, -U 0x5F,U 0x7E,U 0x02,U 0xBE, -U 0xB9,U 0x86,U 0xF7,U 0x0C, -U 0xBC,U 0x7B,U 0x0C,U 0x3C, -U 0x64,U 0xA4,U 0x38,U 0xC9, -U 0x02,U 0x7D,U 0xE9,U 0x40, -U 0x7C,U 0xA5,U 0x1E,U 0xCF, -U 0x7E,U 0x26,U 0xE8,U 0xED, -U 0xF0,U 0xCA,U 0xB5,U 0x87, -U 0x6C,U 0x5E,U 0xE3,U 0xB8, -U 0xFC,U 0x38,U 0xDD,U 0xB0, -U 0x9C,U 0x7D,U 0x52,U 0x0D, -U 0xE7,U 0x6E,U 0xA3,U 0x9C, -U 0x14,U 0x5F,U 0x37,U 0x1C, -U 0x48,U 0xA0,U 0xA3,U 0x2D, -U 0x81,U 0x8E,U 0x0E,U 0x03, -U 0x5F,U 0x61,U 0xC7,U 0x1A, -U 0xBA,U 0xDF,U 0x11,U 0x79, -U 0xE0,U 0x61,U 0xF6,U 0x59, -U 0xC1,U 0x57,U 0x88,U 0x7D, -U 0x47,U 0xF8,U 0x50,U 0x4E, -U 0x94,U 0x99,U 0xC1,U 0xEB, -U 0x2A,U 0x27,U 0x4A,U 0x28, -U 0x25,U 0x50,U 0xDA,U 0x01, -U 0x9F,U 0x60,U 0x7B,U 0x5B, -U 0x52,U 0x7D,U 0x4A,U 0xDB, -U 0xED,U 0xD7,U 0xE6,U 0xE5, -U 0x5D,U 0xDD,U 0xBE,U 0xAF, -U 0xE6,U 0xE8,U 0xFA,U 0x88, -U 0xDF,U 0xB3,U 0xA0,U 0x8B, -U 0x87,U 0xA5,U 0xBD,U 0x5C, -U 0xBF,U 0xCB,U 0x25,U 0xBC, -U 0x05,U 0x75,U 0x90,U 0x23, -U 0xFA,U 0xDD,U 0xD1,U 0x93, -U 0x95,U 0xED,U 0xDF,U 0x7D, -U 0x98,U 0xDB,U 0x22,U 0x7C, -U 0x97,U 0x8E,U 0xAF,U 0x66, -U 0x52,U 0xBA,U 0x9A,U 0x77, -U 0xFD,U 0x6A,U 0xA5,U 0x41, -U 0x9F,U 0xC3,U 0xAE,U 0x55, -U 0x77,U 0x8A,U 0xE3,U 0x34, -U 0x7A,U 0x1A,U 0xAF,U 0x41, -U 0xB0,U 0x2F,U 0xC6,U 0xFE, -U 0xF7,U 0xBE,U 0x70,U 0x08, -U 0x76,U 0xFC,U 0x24,U 0x31, *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable-6@FreeBSD.ORG Tue Oct 28 21:08:27 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0746C10656AB; Tue, 28 Oct 2008 21:08:27 +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 A904F904A7; Tue, 28 Oct 2008 19:50:50 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9SJoonJ002446; Tue, 28 Oct 2008 19:50:50 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9SJoo4F002444; Tue, 28 Oct 2008 19:50:50 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <200810281950.m9SJoo4F002444@svn.freebsd.org> From: Edwin Groothuis Date: Tue, 28 Oct 2008 19:50:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184421 - stable/6/share/zoneinfo X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Oct 2008 21:08:27 -0000 Author: edwin Date: Tue Oct 28 19:50:50 2008 New Revision: 184421 URL: http://svn.freebsd.org/changeset/base/184421 Log: MFV of r184404 - tzdata2008i MFC of r184406 - United States zone reordering and recommenting - Argentina DST changes update. Approved by: re (kib) Modified: stable/6/share/zoneinfo/ (props changed) stable/6/share/zoneinfo/southamerica stable/6/share/zoneinfo/zone.tab Modified: stable/6/share/zoneinfo/southamerica ============================================================================== --- stable/6/share/zoneinfo/southamerica Tue Oct 28 19:50:33 2008 (r184420) +++ stable/6/share/zoneinfo/southamerica Tue Oct 28 19:50:50 2008 (r184421) @@ -1,4 +1,4 @@ -# @(#)southamerica 8.30 +# @(#)southamerica 8.33 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -193,6 +193,26 @@ Rule	Arg	2000	only	-	Mar	3	0:00	0	-
 # 
 # So there is no summer time in Argentina for now.
 
+# From Mariano Absatz (2008-10-20):
+# Decree 1693/2008 applies Law 26.350 for the summer 2008/2009 establishing DST in Argentina
+# From 2008-10-19 until 2009-03-15
+# 
+# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=16102008&pi=3&pf=4&s=0&sec=01
+# 
+#
+# Decree 1705/2008 excepting 12 Provinces from applying DST in the summer 2008/2009:
+# Catamarca, La Rioja, Mendoza, Salta, San Juan, San Luis, La Pampa, Neuquen, Rio Negro, Chubut, Santa Cruz
+# and Tierra del Fuego
+# 
+# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=17102008&pi=1&pf=1&s=0&sec=01
+# 
+#
+# Press release 235 dated Saturday October 18th, from the Government of the Province of Jujuy saying
+# it will not apply DST either (even when it was not included in Decree 1705/2008)
+# 
+# http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
+# 
+
 Rule	Arg	2007	only	-	Dec	30	0:00	1:00	S
 Rule	Arg	2008	max	-	Mar	Sun>=15	0:00	0	-
 Rule	Arg	2008	max	-	Oct	Sun>=15	0:00	1:00	S
@@ -343,9 +363,8 @@ Zone America/Argentina/Buenos_Aires -3:5
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	Arg	AR%sT
 #
-# Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN), Chaco (CC),
-# Formosa (FM), Salta (SA), Santiago del Estero (SE), Cordoba (CB),
-# La Pampa (LP), Neuquen (NQ), Rio Negro (RN)
+# Cordoba (CB), Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN),
+# Chaco (CC), Formosa (FM), Santiago del Estero (SE)
 #
 # Shanks & Pottenger also make the following claims, which we haven't verified:
 # - Formosa switched to -3:00 on 1991-01-07.
@@ -364,6 +383,18 @@ Zone America/Argentina/Cordoba -4:16:48 
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	Arg	AR%sT
 #
+# Salta (SA), La Pampa (LP), Neuquen (NQ), Rio Negro (RN)
+Zone America/Argentina/Salta -4:21:40 - LMT	1894 Oct 31
+			-4:16:48 -	CMT	1920 May
+			-4:00	-	ART	1930 Dec
+			-4:00	Arg	AR%sT	1969 Oct  5
+			-3:00	Arg	AR%sT	1991 Mar  3
+			-4:00	-	WART	1991 Oct 20
+			-3:00	Arg	AR%sT	1999 Oct  3
+			-4:00	Arg	AR%sT	2000 Mar  3
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
+#
 # Tucuman (TM)
 Zone America/Argentina/Tucuman -4:20:52 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May
@@ -388,7 +419,8 @@ Zone America/Argentina/La_Rioja -4:27:24
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 Jun  1
 			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # San Juan (SJ)
 Zone America/Argentina/San_Juan -4:34:04 - LMT	1894 Oct 31
@@ -401,7 +433,8 @@ Zone America/Argentina/San_Juan -4:34:04
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 May 31
 			-4:00	-	WART	2004 Jul 25
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # Jujuy (JY)
 Zone America/Argentina/Jujuy -4:21:12 -	LMT	1894 Oct 31
@@ -415,7 +448,8 @@ Zone America/Argentina/Jujuy -4:21:12 -	
 			-3:00	1:00	ARST	1992
 			-3:00	Arg	AR%sT	1999 Oct  3
 			-4:00	Arg	AR%sT	2000 Mar  3
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # Catamarca (CT), Chubut (CH)
 Zone America/Argentina/Catamarca -4:23:08 - LMT	1894 Oct 31
@@ -428,7 +462,8 @@ Zone America/Argentina/Catamarca -4:23:0
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 Jun  1
 			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # Mendoza (MZ)
 Zone America/Argentina/Mendoza -4:35:16 - LMT	1894 Oct 31
@@ -445,7 +480,8 @@ Zone America/Argentina/Mendoza -4:35:16 
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 May 23
 			-4:00	-	WART	2004 Sep 26
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # San Luis (SL)
 Zone America/Argentina/San_Luis -4:25:24 - LMT	1894 Oct 31
@@ -473,7 +509,8 @@ Zone America/Argentina/Rio_Gallegos -4:3
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 Jun  1
 			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # Tierra del Fuego, Antartida e Islas del Atlantico Sur (TF)
 Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31
@@ -484,7 +521,8 @@ Zone America/Argentina/Ushuaia -4:33:12 
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 May 30
 			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 
 # Aruba
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]

Modified: stable/6/share/zoneinfo/zone.tab
==============================================================================
--- stable/6/share/zoneinfo/zone.tab	Tue Oct 28 19:50:33 2008	(r184420)
+++ stable/6/share/zoneinfo/zone.tab	Tue Oct 28 19:50:50 2008	(r184421)
@@ -1,4 +1,4 @@
-# @(#)zone.tab	8.19
+# @(#)zone.tab	8.21
 #
 # TZ zone descriptions
 #
@@ -42,14 +42,15 @@ AQ	-7824+10654	Antarctica/Vostok	Vostok 
 AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Terre Adelie
 AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
 AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
-AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, LP, MN, NQ, RN, SA, SE, SF)
-AR	-3319-06621	America/Argentina/San_Luis	San Luis (SL)
+AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
 AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
 AR	-2649-06513	America/Argentina/Tucuman	Tucuman (TM)
 AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
 AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
 AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
 AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
+AR	-3319-06621	America/Argentina/San_Luis	San Luis (SL)
 AR	-5138-06913	America/Argentina/Rio_Gallegos	Santa Cruz (SC)
 AR	-5448-06818	America/Argentina/Ushuaia	Tierra del Fuego (TF)
 AS	-1416-17042	Pacific/Pago_Pago
@@ -384,13 +385,13 @@ US	+381515-0854534	America/Kentucky/Loui
 US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
 US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
 US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
-US	+411745-0863730	America/Indiana/Knox	Eastern Time - Indiana - Starke County
 US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
 US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
+US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
 US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
 US	+415100-0873900	America/Chicago	Central Time
 US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
-US	+382931-0871643	America/Indiana/Petersburg	Central Time - Indiana - Pike County
+US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
 US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
 US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
 US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)

From owner-svn-src-stable-6@FreeBSD.ORG  Wed Oct 29 21:12:19 2008
Return-Path: 
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ED310106567E;
	Wed, 29 Oct 2008 21:12:19 +0000 (UTC)
	(envelope-from sobomax@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E1C978FC28;
	Wed, 29 Oct 2008 21:12:19 +0000 (UTC)
	(envelope-from sobomax@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9TLCJ5J033236;
	Wed, 29 Oct 2008 21:12:19 GMT (envelope-from sobomax@svn.freebsd.org)
Received: (from sobomax@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9TLCJ9I033234;
	Wed, 29 Oct 2008 21:12:19 GMT (envelope-from sobomax@svn.freebsd.org)
Message-Id: <200810292112.m9TLCJ9I033234@svn.freebsd.org>
From: Maxim Sobolev 
Date: Wed, 29 Oct 2008 21:12:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184455 - in stable/6/sys: . amd64/amd64 i386/i386
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 29 Oct 2008 21:12:20 -0000

Author: sobomax
Date: Wed Oct 29 21:12:19 2008
New Revision: 184455
URL: http://svn.freebsd.org/changeset/base/184455

Log:
  MFC: don't panic when HZ value is below 32. This change may need a bit
  of refinement later, as bde says that 4BSD expects stathz of 128, while
  in this case stathz would be in the range 40-128.
  
  Approved by:	re (kib, kensmith)

Modified:
  stable/6/sys/   (props changed)
  stable/6/sys/amd64/amd64/local_apic.c
  stable/6/sys/i386/i386/local_apic.c

Modified: stable/6/sys/amd64/amd64/local_apic.c
==============================================================================
--- stable/6/sys/amd64/amd64/local_apic.c	Wed Oct 29 21:08:34 2008	(r184454)
+++ stable/6/sys/amd64/amd64/local_apic.c	Wed Oct 29 21:12:19 2008	(r184455)
@@ -392,7 +392,10 @@ lapic_setup_clock(void)
 		lapic_timer_hz = hz * 2;
 	else
 		lapic_timer_hz = hz * 4;
-	stathz = lapic_timer_hz / (lapic_timer_hz / 128);
+	if (lapic_timer_hz < 128)
+		stathz = lapic_timer_hz;
+	else
+		stathz = lapic_timer_hz / (lapic_timer_hz / 128);
 	profhz = lapic_timer_hz;
 	lapic_timer_period = value / lapic_timer_hz;
 

Modified: stable/6/sys/i386/i386/local_apic.c
==============================================================================
--- stable/6/sys/i386/i386/local_apic.c	Wed Oct 29 21:08:34 2008	(r184454)
+++ stable/6/sys/i386/i386/local_apic.c	Wed Oct 29 21:12:19 2008	(r184455)
@@ -393,7 +393,10 @@ lapic_setup_clock(void)
 		lapic_timer_hz = hz * 2;
 	else
 		lapic_timer_hz = hz * 4;
-	stathz = lapic_timer_hz / (lapic_timer_hz / 128);
+	if (lapic_timer_hz < 128)
+		stathz = lapic_timer_hz;
+	else
+		stathz = lapic_timer_hz / (lapic_timer_hz / 128);
 	profhz = lapic_timer_hz;
 	lapic_timer_period = value / lapic_timer_hz;
 

From owner-svn-src-stable-6@FreeBSD.ORG  Thu Oct 30 13:10:33 2008
Return-Path: 
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A67AC106564A;
	Thu, 30 Oct 2008 13:10:33 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 92B118FC24;
	Thu, 30 Oct 2008 13:10:33 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9UDAXMj052163;
	Thu, 30 Oct 2008 13:10:33 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9UDAXm0052162;
	Thu, 30 Oct 2008 13:10:33 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <200810301310.m9UDAXm0052162@svn.freebsd.org>
From: Konstantin Belousov 
Date: Thu, 30 Oct 2008 13:10:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184468 - in stable/6/sys: . dev/ata
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 30 Oct 2008 13:10:33 -0000

Author: kib
Date: Thu Oct 30 13:10:33 2008
New Revision: 184468
URL: http://svn.freebsd.org/changeset/base/184468

Log:
  MFC of the r179312 by sos:
  Do not call ata_start() when ata_reinit fails in the ioctl path.
  
  Approved by:	re (kensmith), sos
  Prodded by:	Andrey V. Elsukov 

Modified:
  stable/6/sys/   (props changed)
  stable/6/sys/dev/ata/ata-all.c

Modified: stable/6/sys/dev/ata/ata-all.c
==============================================================================
--- stable/6/sys/dev/ata/ata-all.c	Thu Oct 30 10:13:53 2008	(r184467)
+++ stable/6/sys/dev/ata/ata-all.c	Thu Oct 30 13:10:33 2008	(r184468)
@@ -375,7 +375,6 @@ ata_ioctl(struct cdev *dev, u_long cmd, 
 	    !(device = devclass_get_device(ata_devclass, *value)))
 	    return ENXIO;
 	error = ata_reinit(device);
-	ata_start(device);
 	break;
 
     case IOCATAATTACH:

From owner-svn-src-stable-6@FreeBSD.ORG  Fri Oct 31 13:00:34 2008
Return-Path: 
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E60B21065675;
	Fri, 31 Oct 2008 13:00:34 +0000 (UTC)
	(envelope-from oleg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D29888FC1B;
	Fri, 31 Oct 2008 13:00:34 +0000 (UTC)
	(envelope-from oleg@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9VD0YSt081252;
	Fri, 31 Oct 2008 13:00:34 GMT (envelope-from oleg@svn.freebsd.org)
Received: (from oleg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9VD0Yvo081251;
	Fri, 31 Oct 2008 13:00:34 GMT (envelope-from oleg@svn.freebsd.org)
Message-Id: <200810311300.m9VD0Yvo081251@svn.freebsd.org>
From: Oleg Bulyzhin 
Date: Fri, 31 Oct 2008 13:00:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184505 - stable/6/sys/netinet
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 31 Oct 2008 13:00:35 -0000

Author: oleg
Date: Fri Oct 31 13:00:34 2008
New Revision: 184505
URL: http://svn.freebsd.org/changeset/base/184505

Log:
  Direct commit (r184414 is not applicable to stable due to ABI change):
  
  Workaround possible q_time overflow (will happen after 2^32/(86400*hz)
  days of uptime (~50days for hz = 1000)), which may lead to:
  - broken shaping in 'fast' io mode.
  - incorrect average queue length calculation in RED/GRED algorithm.
  
  PR:		kern/128401
  Approved by:	re (kensmith)

Modified:
  stable/6/sys/netinet/ip_dummynet.c

Modified: stable/6/sys/netinet/ip_dummynet.c
==============================================================================
--- stable/6/sys/netinet/ip_dummynet.c	Fri Oct 31 12:58:12 2008	(r184504)
+++ stable/6/sys/netinet/ip_dummynet.c	Fri Oct 31 13:00:34 2008	(r184505)
@@ -1186,7 +1186,8 @@ red_drops(struct dn_flow_set *fs, struct
 		 * XXX check wraps...
 		 */
 		if (q->avg) {
-			u_int t = (curr_time - q->q_time) / fs->lookup_step;
+			u_int t = ((uint32_t)curr_time - q->q_time) /
+			    fs->lookup_step;
 
 			q->avg = (t < fs->lookup_depth) ?
 			    SCALE_MUL(q->avg, fs->w_q_lookup[t]) : 0;
@@ -1382,7 +1383,7 @@ dummynet_io(struct mbuf **m0, int dir, s
 	if (q->head != m)		/* Flow was not idle, we are done. */
 		goto done;
 
-	if (q->q_time < curr_time)
+	if (q->q_time < (uint32_t)curr_time)
 		q->numbytes = io_fast ? fs->pipe->bandwidth : 0;
 	q->q_time = curr_time;