From owner-svn-src-stable-6@FreeBSD.ORG Sun Oct 12 23:47: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 C928E106564A; Sun, 12 Oct 2008 23:47:06 +0000 (UTC) (envelope-from csjp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B5F268FC08; Sun, 12 Oct 2008 23:47:06 +0000 (UTC) (envelope-from csjp@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 m9CNl61r058516; Sun, 12 Oct 2008 23:47:06 GMT (envelope-from csjp@svn.freebsd.org) Received: (from csjp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9CNl63T058515; Sun, 12 Oct 2008 23:47:06 GMT (envelope-from csjp@svn.freebsd.org) Message-Id: <200810122347.m9CNl63T058515@svn.freebsd.org> From: "Christian S.J. Peron" Date: Sun, 12 Oct 2008 23:47: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: r183813 - in stable/6/sys: . netinet/libalias 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, 12 Oct 2008 23:47:06 -0000 Author: csjp Date: Sun Oct 12 23:47:06 2008 New Revision: 183813 URL: http://svn.freebsd.org/changeset/base/183813 Log: MFC revision 183744 Improve entropy in source port generation for libalias consumers. Approved by: re (kib) Modified: stable/6/sys/ (props changed) stable/6/sys/netinet/libalias/alias_db.c Modified: stable/6/sys/netinet/libalias/alias_db.c ============================================================================== --- stable/6/sys/netinet/libalias/alias_db.c Sun Oct 12 23:19:23 2008 (r183812) +++ stable/6/sys/netinet/libalias/alias_db.c Sun Oct 12 23:47:06 2008 (r183813) @@ -603,7 +603,7 @@ GetNewPort(struct libalias *la, struct a port_sys = ntohs(port_net); } else { /* First trial and all subsequent are random. */ - port_sys = random() & ALIAS_PORT_MASK; + port_sys = arc4random() & ALIAS_PORT_MASK; port_sys += ALIAS_PORT_BASE; port_net = htons(port_sys); } @@ -654,7 +654,7 @@ GetNewPort(struct libalias *la, struct a } #endif } - port_sys = random() & ALIAS_PORT_MASK; + port_sys = arc4random() & ALIAS_PORT_MASK; port_sys += ALIAS_PORT_BASE; port_net = htons(port_sys); } @@ -767,9 +767,9 @@ FindNewPortGroup(struct libalias *la, /* First trial and all subsequent are random. */ if (align == FIND_EVEN_ALIAS_BASE) - port_sys = random() & ALIAS_PORT_MASK_EVEN; + port_sys = arc4random() & ALIAS_PORT_MASK_EVEN; else - port_sys = random() & ALIAS_PORT_MASK; + port_sys = arc4random() & ALIAS_PORT_MASK; port_sys += ALIAS_PORT_BASE; } @@ -791,9 +791,9 @@ FindNewPortGroup(struct libalias *la, /* Find a new base to try */ if (align == FIND_EVEN_ALIAS_BASE) - port_sys = random() & ALIAS_PORT_MASK_EVEN; + port_sys = arc4random() & ALIAS_PORT_MASK_EVEN; else - port_sys = random() & ALIAS_PORT_MASK; + port_sys = arc4random() & ALIAS_PORT_MASK; port_sys += ALIAS_PORT_BASE; } From owner-svn-src-stable-6@FreeBSD.ORG Mon Oct 13 18:32:52 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 3C2731065686 for ; Mon, 13 Oct 2008 18:32:52 +0000 (UTC) (envelope-from max@love2party.net) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.188]) by mx1.freebsd.org (Postfix) with ESMTP id BE5F28FC26 for ; Mon, 13 Oct 2008 18:32:51 +0000 (UTC) (envelope-from max@love2party.net) Received: from vampire.homelinux.org (dslb-088-066-027-214.pools.arcor-ip.net [88.66.27.214]) by mrelayeu.kundenserver.de (node=mrelayeu5) with ESMTP (Nemesis) id 0ML25U-1KpS1f2np3-0006ND; Mon, 13 Oct 2008 20:20:16 +0200 Received: (qmail 86778 invoked from network); 13 Oct 2008 18:20:14 -0000 Received: from fbsd8.laiers.local (192.168.4.151) by router.laiers.local with SMTP; 13 Oct 2008 18:20:14 -0000 From: Max Laier Organization: FreeBSD To: "Christian S.J. Peron" Date: Mon, 13 Oct 2008 20:20:12 +0200 User-Agent: KMail/1.10.1 (FreeBSD/8.0-CURRENT; KDE/4.1.1; i386; ; ) References: <200810122347.m9CNl63T058515@svn.freebsd.org> In-Reply-To: <200810122347.m9CNl63T058515@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200810132020.13577.max@love2party.net> X-Provags-ID: V01U2FsdGVkX18GH5eYjc7Jfz02MB5TFzxaeKywDUvMjMFWD// lSuE616viycxhWbIeyLrR/LGUEb7TU9B+nP2UZ0VxVDmh4+cld soi7UhmveUzOnRjprsFMQ== Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-6@freebsd.org Subject: Re: svn commit: r183813 - in stable/6/sys: . netinet/libalias 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, 13 Oct 2008 18:32:52 -0000 On Monday 13 October 2008 01:47:06 Christian S.J. Peron wrote: > Author: csjp > Date: Sun Oct 12 23:47:06 2008 > New Revision: 183813 > URL: http://svn.freebsd.org/changeset/base/183813 > > Log: > MFC revision 183744 > > Improve entropy in source port generation for libalias consumers. > > Approved by: re (kib) Thanks! > > Modified: > stable/6/sys/ (props changed) > stable/6/sys/netinet/libalias/alias_db.c > > Modified: stable/6/sys/netinet/libalias/alias_db.c > =========================================================================== >=== --- stable/6/sys/netinet/libalias/alias_db.c Sun Oct 12 23:19:23 > 2008 (r183812) +++ stable/6/sys/netinet/libalias/alias_db.c Sun Oct 12 > 23:47:06 2008 (r183813) @@ -603,7 +603,7 @@ GetNewPort(struct libalias *la, > struct a > port_sys = ntohs(port_net); > } else { > /* First trial and all subsequent are random. */ > - port_sys = random() & ALIAS_PORT_MASK; > + port_sys = arc4random() & ALIAS_PORT_MASK; > port_sys += ALIAS_PORT_BASE; > port_net = htons(port_sys); > } > @@ -654,7 +654,7 @@ GetNewPort(struct libalias *la, struct a > } > #endif > } > - port_sys = random() & ALIAS_PORT_MASK; > + port_sys = arc4random() & ALIAS_PORT_MASK; > port_sys += ALIAS_PORT_BASE; > port_net = htons(port_sys); > } > @@ -767,9 +767,9 @@ FindNewPortGroup(struct libalias *la, > > /* First trial and all subsequent are random. */ > if (align == FIND_EVEN_ALIAS_BASE) > - port_sys = random() & ALIAS_PORT_MASK_EVEN; > + port_sys = arc4random() & ALIAS_PORT_MASK_EVEN; > else > - port_sys = random() & ALIAS_PORT_MASK; > + port_sys = arc4random() & ALIAS_PORT_MASK; > > port_sys += ALIAS_PORT_BASE; > } > @@ -791,9 +791,9 @@ FindNewPortGroup(struct libalias *la, > > /* Find a new base to try */ > if (align == FIND_EVEN_ALIAS_BASE) > - port_sys = random() & ALIAS_PORT_MASK_EVEN; > + port_sys = arc4random() & ALIAS_PORT_MASK_EVEN; > else > - port_sys = random() & ALIAS_PORT_MASK; > + port_sys = arc4random() & ALIAS_PORT_MASK; > > port_sys += ALIAS_PORT_BASE; > } -- /"\ Best regards, | mlaier@freebsd.org \ / Max Laier | ICQ #67774661 X http://pf4freebsd.love2party.net/ | mlaier@EFnet / \ ASCII Ribbon Campaign | Against HTML Mail and News From owner-svn-src-stable-6@FreeBSD.ORG Mon Oct 13 19:14:26 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 2CD6B106569E; Mon, 13 Oct 2008 19:14:26 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from mx-02queue01.mts.net (mx-02queue01.mts.net [142.161.131.10]) by mx1.freebsd.org (Postfix) with ESMTP id A82A88FC1A; Mon, 13 Oct 2008 19:14:25 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from wnpgmb021pw-sp03.mts.net ([10.204.128.23]) by mx-02mtaout02.mts.net with ESMTP id <20081013184830.UPHT12498.mx-02mtaout02.mts.net@wnpgmb021pw-sp03.mts.net>; Mon, 13 Oct 2008 13:48:30 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ah4FAIM080iOoRZn/2dsb2JhbACBcrtbgWw X-IronPort-AV: E=Sophos;i="4.33,404,1220245200"; d="scan'208";a="39456416" Received: from wnpgmb1308w-ad04-22-103.dynamic.mts.net (HELO jnz.my.domain) ([142.161.22.103]) by wnpgmb021pw-sp03.mts.net with ESMTP; 13 Oct 2008 13:48:30 -0500 Received: from jnz.my.domain (localhost [127.0.0.1]) by jnz.my.domain (8.14.2/8.14.2) with ESMTP id m9DImUus089754; Mon, 13 Oct 2008 13:48:30 -0500 (CDT) (envelope-from csjp@jnz.my.domain) Received: (from csjp@localhost) by jnz.my.domain (8.14.2/8.14.2/Submit) id m9DImUQw089753; Mon, 13 Oct 2008 13:48:30 -0500 (CDT) (envelope-from csjp) Date: Mon, 13 Oct 2008 13:48:30 -0500 From: Christian Peron To: Max Laier Message-ID: <20081013184830.GA89745@jnz> References: <200810122347.m9CNl63T058515@svn.freebsd.org> <200810132020.13577.max@love2party.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200810132020.13577.max@love2party.net> User-Agent: Mutt/1.4.2.3i Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, svn-src-stable-6@FreeBSD.org, "Christian S.J. Peron" Subject: Re: svn commit: r183813 - in stable/6/sys: . netinet/libalias 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, 13 Oct 2008 19:14:26 -0000 On Mon, Oct 13, 2008 at 08:20:12PM +0200, Max Laier wrote: [..] > > Thanks! > No problem. Apologies for the delay on this! From owner-svn-src-stable-6@FreeBSD.ORG Mon Oct 13 21:35:11 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 3B14C1065727; Mon, 13 Oct 2008 21:35:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 281478FC1F; Mon, 13 Oct 2008 21:35:11 +0000 (UTC) (envelope-from jhb@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 m9DLZBHx087163; Mon, 13 Oct 2008 21:35:11 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9DLZA70087159; Mon, 13 Oct 2008 21:35:10 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200810132135.m9DLZA70087159@svn.freebsd.org> From: John Baldwin Date: Mon, 13 Oct 2008 21:35: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: r183852 - in stable/6: contrib/top usr.bin/top 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, 13 Oct 2008 21:35:11 -0000 Author: jhb Date: Mon Oct 13 21:35:10 2008 New Revision: 183852 URL: http://svn.freebsd.org/changeset/base/183852 Log: MFC: Several top '-P' fixes originally from ru@. This fixes top -P on i386. Approved by: re (kib) Modified: stable/6/contrib/top/machine.h stable/6/contrib/top/top.X stable/6/contrib/top/top.c stable/6/usr.bin/top/machine.c Modified: stable/6/contrib/top/machine.h ============================================================================== --- stable/6/contrib/top/machine.h Mon Oct 13 21:20:50 2008 (r183851) +++ stable/6/contrib/top/machine.h Mon Oct 13 21:35:10 2008 (r183852) @@ -44,7 +44,6 @@ struct system_info int *memory; int *swap; struct timeval boottime; - unsigned long cpumask; /* bitfield of cpu states represented */ int ncpus; }; Modified: stable/6/contrib/top/top.X ============================================================================== --- stable/6/contrib/top/top.X Mon Oct 13 21:20:50 2008 (r183851) +++ stable/6/contrib/top/top.X Mon Oct 13 21:35:10 2008 (r183852) @@ -10,7 +10,7 @@ top \- display and update information ab .SH SYNOPSIS .B top [ -.B \-bCHIijnqStuv +.B \-bCHIijnPqStuv ] [ .BI \-d count ] [ @@ -113,6 +113,9 @@ Display either 'cpu' or 'io' statistics. Use \*(lqnon-interactive\*(rq mode. This is identical to \*(lqbatch\*(rq mode. .TP +.B \-P +Display per-cpu CPU usage statistics. +.TP .B \-q Renice .I top Modified: stable/6/contrib/top/top.c ============================================================================== --- stable/6/contrib/top/top.c Mon Oct 13 21:20:50 2008 (r183851) +++ stable/6/contrib/top/top.c Mon Oct 13 21:35:10 2008 (r183852) @@ -283,7 +283,7 @@ char *argv[]; optind = 1; } - while ((i = getopt(ac, av, "CSIHPbijnpquvs:d:U:m:o:t")) != EOF) + while ((i = getopt(ac, av, "CSIHPbijnquvs:d:U:m:o:t")) != EOF) { switch(i) { @@ -408,14 +408,10 @@ char *argv[]; pcpu_stats = Yes; break; - case 'p': - pcpu_stats = No; - break; - default: fprintf(stderr, "Top version %s\n" -"Usage: %s [-bCHIijnqStuv] [-d count] [-m io | cpu] [-o field] [-s time]\n" +"Usage: %s [-bCHIijnPqStuv] [-d count] [-m io | cpu] [-o field] [-s time]\n" " [-U username] [number]\n", version_string(), myname); exit(1); Modified: stable/6/usr.bin/top/machine.c ============================================================================== --- stable/6/usr.bin/top/machine.c Mon Oct 13 21:20:50 2008 (r183851) +++ stable/6/usr.bin/top/machine.c Mon Oct 13 21:35:10 2008 (r183852) @@ -305,6 +305,7 @@ machine_init(struct statics *statics) err(1, "malloc %zd bytes", size); if (sysctlbyname("kern.cp_times", times, &size, NULL, 0) == -1) err(1, "sysctlbyname kern.cp_times"); + pcpu_cp_time = calloc(1, size); maxid = (size / CPUSTATES / sizeof(long)) - 1; for (i = 0; i <= maxid; i++) { empty = 1; @@ -328,14 +329,9 @@ machine_init(struct statics *statics) Header_lines += ncpus - 1; /* 7 */ } size = sizeof(long) * ncpus * CPUSTATES; - pcpu_cp_time = malloc(size); - pcpu_cp_old = malloc(size); - pcpu_cp_diff = malloc(size); - pcpu_cpu_states = malloc(size); - bzero(pcpu_cp_time, size); - bzero(pcpu_cp_old, size); - bzero(pcpu_cp_diff, size); - bzero(pcpu_cpu_states, size); + pcpu_cp_old = calloc(1, size); + pcpu_cp_diff = calloc(1, size); + pcpu_cpu_states = calloc(1, size); statics->ncpus = ncpus; } else { statics->ncpus = 1; @@ -410,14 +406,15 @@ get_system_info(struct system_info *si) si->load_avg[i] = (double)sysload.ldavg[i] / sysload.fscale; if (pcpu_stats) { - for (i = j = 0; i <= maxid; i++, j++) { - if (cpumask && (1ul << i) == 0) + for (i = j = 0; i <= maxid; i++) { + if ((cpumask & (1ul << i)) == 0) continue; /* convert cp_time counts to percentages */ percentages(CPUSTATES, &pcpu_cpu_states[j * CPUSTATES], &pcpu_cp_time[j * CPUSTATES], &pcpu_cp_old[j * CPUSTATES], &pcpu_cp_diff[j * CPUSTATES]); + j++; } } else { /* convert cp_time counts to percentages */ @@ -478,11 +475,9 @@ get_system_info(struct system_info *si) /* set arrays and strings */ if (pcpu_stats) { si->cpustates = pcpu_cpu_states; - si->cpumask = cpumask; si->ncpus = ncpus; } else { si->cpustates = cpu_states; - si->cpumask = 1; si->ncpus = 1; } si->memory = memory_stats; From owner-svn-src-stable-6@FreeBSD.ORG Tue Oct 14 10:16:16 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 0900D1065692; Tue, 14 Oct 2008 10:16:16 +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 EA1E78FC08; Tue, 14 Oct 2008 10:16:15 +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 m9EAGF2M002438; Tue, 14 Oct 2008 10:16:15 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9EAGFPO002434; Tue, 14 Oct 2008 10:16:15 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <200810141016.m9EAGFPO002434@svn.freebsd.org> From: Edwin Groothuis Date: Tue, 14 Oct 2008 10:16:15 +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: r183879 - 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, 14 Oct 2008 10:16:16 -0000 Author: edwin Date: Tue Oct 14 10:16:15 2008 New Revision: 183879 URL: http://svn.freebsd.org/changeset/base/183879 Log: MFC of r183536: tzdata2008g MFC of r183864: tzdata2008h Approved by: re (blackend) Modified: stable/6/share/zoneinfo/ (props changed) stable/6/share/zoneinfo/africa stable/6/share/zoneinfo/asia stable/6/share/zoneinfo/southamerica stable/6/share/zoneinfo/zone.tab Modified: stable/6/share/zoneinfo/africa ============================================================================== --- stable/6/share/zoneinfo/africa Tue Oct 14 10:11:14 2008 (r183878) +++ stable/6/share/zoneinfo/africa Tue Oct 14 10:16:15 2008 (r183879) @@ -1,4 +1,4 @@ -# @(#)africa 8.16 +# @(#)africa 8.17 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -453,11 +453,19 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 # year 2008 - 2009 will, therefore, be effective as from 26 October 2008
 # and end on 29 March 2009.
 
+# From Ed Maste (2008-10-07):
+# THE TIME BILL (No. XXVII of 2008) Explanatory Memorandum states the
+# beginning / ending of summer time is 2 o'clock standard time in the
+# morning of the last Sunday of October / last Sunday of March.
+# 
+# http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf
+# 
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule Mauritius	1982	only	-	Oct	10	0:00	1:00	S
 Rule Mauritius	1983	only	-	Mar	21	0:00	0	-
-Rule Mauritius	2008	max	-	Oct	lastSun	2:00	1:00	S
-Rule Mauritius	2009	max	-	Mar	lastSun	2:00	0	-
+Rule Mauritius	2008	max	-	Oct	lastSun	2:00s	1:00	S
+Rule Mauritius	2009	max	-	Mar	lastSun	2:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Indian/Mauritius	3:50:00 -	LMT	1907		# Port Louis
 			4:00 Mauritius	MU%sT	# Mauritius Time

Modified: stable/6/share/zoneinfo/asia
==============================================================================
--- stable/6/share/zoneinfo/asia	Tue Oct 14 10:11:14 2008	(r183878)
+++ stable/6/share/zoneinfo/asia	Tue Oct 14 10:16:15 2008	(r183879)
@@ -1,4 +1,4 @@
-# @(#)asia	8.23
+# @(#)asia	8.24
 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -1957,8 +1957,20 @@ Rule	Syria	2007	only	-	Nov	 Fri>=1	0:00	
 # compilers can't handle  or having multiple Rules (a la Israel).
 # For now, use "Apr Fri>=1", and go with IATA on a uniform Sep 30 end.
 
+# From Steffen Thorsen (2008-10-07):
+# Syria has now officially decided to end DST on 2008-11-01 this year,
+# according to the following article in the Syrian Arab News Agency (SANA).
+#
+# The article is in Arabic, and seems to tell that they will go back to
+# winter time on 2008-11-01 at 00:00 local daylight time (delaying/setting
+# clocks back 60 minutes).
+#
+# 
+# http://sana.sy/ara/2/2008/10/07/195459.htm
+# 
+
 Rule	Syria	2008	max	-	Apr	Fri>=1	0:00	1:00	S
-Rule	Syria	2008	max	-	Oct	1	0:00	0	-
+Rule	Syria	2008	max	-	Nov	1	0:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Damascus	2:25:12 -	LMT	1920	# Dimashq

Modified: stable/6/share/zoneinfo/southamerica
==============================================================================
--- stable/6/share/zoneinfo/southamerica	Tue Oct 14 10:11:14 2008	(r183878)
+++ stable/6/share/zoneinfo/southamerica	Tue Oct 14 10:16:15 2008	(r183879)
@@ -1,4 +1,4 @@
-# @(#)southamerica	8.27
+# @(#)southamerica	8.30
 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -177,6 +177,22 @@ Rule	Arg	2000	only	-	Mar	3	0:00	0	-
 # http://www.impulsobaires.com.ar/nota.php?id=57832 (in spanish)
 # 
 
+# From Rodrigo Severo (2008-10-06):
+# Here is some info available at a Gentoo bug related to TZ on Argentina's DST:
+# ...
+# ------- Comment #1 from [jmdocile]  2008-10-06 16:28 0000 -------
+# Hi, there is a problem with timezone-data-2008e and maybe with
+# timezone-data-2008f
+# Argentinian law [Number] 25.155 is no longer valid.
+# 
+# http://www.infoleg.gov.ar/infolegInternet/anexos/60000-64999/60036/norma.htm
+# 
+# The new one is law [Number] 26.350
+# 
+# http://www.infoleg.gov.ar/infolegInternet/anexos/135000-139999/136191/norma.htm
+# 
+# So there is no summer time in Argentina for now.
+
 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
@@ -619,7 +635,7 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 # 
 # Note that this link does not always work directly, but must be accessed
 # by going to
-# 
 # http://www.mme.gov.br/first
 # 
 #
@@ -768,12 +784,33 @@ Rule	Brazil	2007	only	-	Feb	25	 0:00	0	-
 # Decree 6,212 (2007-09-26),
 # adopted by the same states as before.
 Rule	Brazil	2007	only	-	Oct	Sun>=8	 0:00	1:00	S
-Rule	Brazil	2008	max	-	Feb	Sun>=15	 0:00	0	-
-Rule	Brazil	2008	max	-	Oct	Sun>=15	 0:00	1:00	S
+# From Frederico A. C. Neves (2008-09-10):
+# Acording to this decree
+# 
+# http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm
+# 
+# [t]he DST period in Brazil now on will be from the 3rd Oct Sunday to the
+# 3rd Feb Sunday. There is an exception on the return date when this is
+# the Carnival Sunday then the return date will be the next Sunday...
+Rule	Brazil	2008	max	-	Oct	Sun>=15	0:00	1:00	S
+Rule	Brazil	2008	2011	-	Feb	Sun>=15	0:00	0	-
+Rule	Brazil	2012	only	-	Feb	Sun>=22	0:00	0	-
+Rule	Brazil	2013	2014	-	Feb	Sun>=15	0:00	0	-
+Rule	Brazil	2015	only	-	Feb	Sun>=22	0:00	0	-
+Rule	Brazil	2016	2022	-	Feb	Sun>=15	0:00	0	-
+Rule	Brazil	2023	only	-	Feb	Sun>=22	0:00	0	-
+Rule	Brazil	2024	2025	-	Feb	Sun>=15	0:00	0	-
+Rule	Brazil	2026	only	-	Feb	Sun>=22	0:00	0	-
+Rule	Brazil	2027	2033	-	Feb	Sun>=15	0:00	0	-
+Rule	Brazil	2034	only	-	Feb	Sun>=22	0:00	0	-
+Rule	Brazil	2035	2036	-	Feb	Sun>=15	0:00	0	-
+Rule	Brazil	2037	only	-	Feb	Sun>=22	0:00	0	-
+# From Arthur David Olson (2008-09-29):
+# The next is wrong in some years but is better than nothing.
+Rule	Brazil	2038	max	-	Feb	Sun>=15	0:00	0	-
+
 # The latest ruleset listed above says that the following states observe DST:
 # DF, ES, GO, MG, MS, MT, PR, RJ, RS, SC, SP.
-# For dates after mid-2008, the above rules with TO="max" are guesses
-# and are quite possibly wrong, but are more likely than no DST at all.
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #

Modified: stable/6/share/zoneinfo/zone.tab
==============================================================================
--- stable/6/share/zoneinfo/zone.tab	Tue Oct 14 10:11:14 2008	(r183878)
+++ stable/6/share/zoneinfo/zone.tab	Tue Oct 14 10:16:15 2008	(r183879)
@@ -1,4 +1,4 @@
-# @(#)zone.tab	8.18
+# @(#)zone.tab	8.19
 #
 # TZ zone descriptions
 #
@@ -293,7 +293,7 @@ NL	+5222+00454	Europe/Amsterdam
 NO	+5955+01045	Europe/Oslo
 NP	+2743+08519	Asia/Katmandu
 NR	-0031+16655	Pacific/Nauru
-NU	-1901+16955	Pacific/Niue
+NU	-1901-16955	Pacific/Niue
 NZ	-3652+17446	Pacific/Auckland	most locations
 NZ	-4357-17633	Pacific/Chatham	Chatham Islands
 OM	+2336+05835	Asia/Muscat

From owner-svn-src-stable-6@FreeBSD.ORG  Fri Oct 17 15:06: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 809081065701;
	Fri, 17 Oct 2008 15:06:34 +0000 (UTC)
	(envelope-from roberto@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6A79E8FC16;
	Fri, 17 Oct 2008 15:06:34 +0000 (UTC)
	(envelope-from roberto@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 m9HF6YBo091225;
	Fri, 17 Oct 2008 15:06:34 GMT (envelope-from roberto@svn.freebsd.org)
Received: (from roberto@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9HF6Ybr091223;
	Fri, 17 Oct 2008 15:06:34 GMT (envelope-from roberto@svn.freebsd.org)
Message-Id: <200810171506.m9HF6Ybr091223@svn.freebsd.org>
From: Ollivier Robert 
Date: Fri, 17 Oct 2008 15:06: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: r183978 - in stable/6/sys: . dev/usb
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, 17 Oct 2008 15:06:34 -0000

Author: roberto
Date: Fri Oct 17 15:06:34 2008
New Revision: 183978
URL: http://svn.freebsd.org/changeset/base/183978

Log:
  Merge r179057 into stable/6, sorry it won't be in 6.4.
  Add device ID for Nikon D300 digital camera.
  
  PR:		usb/118741
  Submitted by:	Yuri 
  Approved by:	re (rwatson)

Modified:
  stable/6/sys/   (props changed)
  stable/6/sys/dev/usb/umass.c
  stable/6/sys/dev/usb/usbdevs

Modified: stable/6/sys/dev/usb/umass.c
==============================================================================
--- stable/6/sys/dev/usb/umass.c	Fri Oct 17 14:40:03 2008	(r183977)
+++ stable/6/sys/dev/usb/umass.c	Fri Oct 17 15:06:34 2008	(r183978)
@@ -424,6 +424,10 @@ Static struct umass_devdescr_t umass_dev
 	  UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
 	  FORCE_SHORT_INQUIRY
 	},
+	{ USB_VENDOR_NIKON, USB_PRODUCT_NIKON_D300, RID_WILDCARD,
+	  UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
+	  NO_QUIRKS
+	},
 	{ USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C1, RID_WILDCARD,
 	  UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
 	  WRONG_CSWSIG

Modified: stable/6/sys/dev/usb/usbdevs
==============================================================================
--- stable/6/sys/dev/usb/usbdevs	Fri Oct 17 14:40:03 2008	(r183977)
+++ stable/6/sys/dev/usb/usbdevs	Fri Oct 17 15:06:34 2008	(r183978)
@@ -1356,6 +1356,7 @@ product NETGEAR FA120		0x1040	USB 2.0 Et
 /* Nikon products */
 product NIKON E990		0x0102	Digital Camera E990
 product NIKON LS40		0x4000	CoolScan LS40 ED
+product NIKON D300		0x041a  Digital Camera D300
 
 /* NovaTech Products */
 product NOVATECH NV902		0x9020  NovaTech NV-902W