From owner-svn-src-stable-6@FreeBSD.ORG Tue Apr 28 08:24:16 2009 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 3FE0B10656E0; Tue, 28 Apr 2009 08:24: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 127AF8FC14; Tue, 28 Apr 2009 08:24:16 +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 n3S8OFX1042823; Tue, 28 Apr 2009 08:24:15 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3S8OFoW042822; Tue, 28 Apr 2009 08:24:15 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <200904280824.n3S8OFoW042822@svn.freebsd.org> From: Edwin Groothuis Date: Tue, 28 Apr 2009 08:24: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: r191619 - 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 Apr 2009 08:24:17 -0000 Author: edwin Date: Tue Apr 28 08:24:15 2009 New Revision: 191619 URL: http://svn.freebsd.org/changeset/base/191619 Log: MFC of tzdata2009g: Egypt will have DST till the end of September the coming years. Modified: stable/6/share/zoneinfo/ (props changed) stable/6/share/zoneinfo/africa Modified: stable/6/share/zoneinfo/africa ============================================================================== --- stable/6/share/zoneinfo/africa Tue Apr 28 08:20:32 2009 (r191618) +++ stable/6/share/zoneinfo/africa Tue Apr 28 08:24:15 2009 (r191619) @@ -1,4 +1,4 @@ -# @(#)africa 8.18 +# @(#)africa 8.19 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -236,7 +236,46 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	23:00s
 # unless discontinued, next DST may end Thursday 28 August 2008.
 # From Paul Eggert (2007-08-17):
 # For lack of better info, assume the new rule is last Thursday in August.
-Rule	Egypt	2008	max	-	Aug	lastThu	23:00s	0	-
+
+# From Petr Machata (2009-04-06):
+# The following appeared in Red Hat bugzilla[1] (edited):
+#
+# > $ zdump -v /usr/share/zoneinfo/Africa/Cairo | grep 2009
+# > /usr/share/zoneinfo/Africa/Cairo  Thu Apr 23 21:59:59 2009 UTC =3D Thu =
+# Apr 23
+# > 23:59:59 2009 EET isdst=3D0 gmtoff=3D7200
+# > /usr/share/zoneinfo/Africa/Cairo  Thu Apr 23 22:00:00 2009 UTC =3D Fri =
+# Apr 24
+# > 01:00:00 2009 EEST isdst=3D1 gmtoff=3D10800
+# > /usr/share/zoneinfo/Africa/Cairo  Thu Aug 27 20:59:59 2009 UTC =3D Thu =
+# Aug 27
+# > 23:59:59 2009 EEST isdst=3D1 gmtoff=3D10800
+# > /usr/share/zoneinfo/Africa/Cairo  Thu Aug 27 21:00:00 2009 UTC =3D Thu =
+# Aug 27
+# > 23:00:00 2009 EET isdst=3D0 gmtoff=3D7200
+#
+# > end date should be Thu Sep 24 2009 (Last Thursday in September at 23:59=
+# :59)
+# > http://support.microsoft.com/kb/958729/
+#
+# timeanddate[2] and another site I've found[3] also support that.
+#
+# [1] 
+# https://bugzilla.redhat.com/show_bug.cgi?id=3D492263
+# 
+# [2] 
+# http://www.timeanddate.com/worldclock/clockchange.html?n=3D53
+# 
+# [3] 
+# http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
+# 
+
+# From Arthur David Olson (2009-04-20):
+# In 2009 (and for the next several years), Ramadan ends before the fourth
+# Thursday in September; Egypt is expected to revert to the last Thursday
+# in September.
+Rule	Egypt	2008	only	-	Aug	lastThu	23:00s	0	-
+Rule	Egypt	2009	max	-	Sep	lastThu	23:00s	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Cairo	2:05:00 -	LMT	1900 Oct

From owner-svn-src-stable-6@FreeBSD.ORG  Tue Apr 28 20:39:22 2009
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 562E3106564A;
	Tue, 28 Apr 2009 20:39:22 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4403E8FC1C;
	Tue, 28 Apr 2009 20:39:22 +0000 (UTC)
	(envelope-from emaste@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 n3SKdMks059366;
	Tue, 28 Apr 2009 20:39:22 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3SKdMpl059365;
	Tue, 28 Apr 2009 20:39:22 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <200904282039.n3SKdMpl059365@svn.freebsd.org>
From: Ed Maste 
Date: Tue, 28 Apr 2009 20:39:22 +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: r191637 - stable/6/libexec/rtld-elf
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 Apr 2009 20:39:23 -0000

Author: emaste
Date: Tue Apr 28 20:39:21 2009
New Revision: 191637
URL: http://svn.freebsd.org/changeset/base/191637

Log:
  MFC r155084:
  
    Fix a malloc overrun in 32-bit compat libmap lookup code.

Modified:
  stable/6/libexec/rtld-elf/   (props changed)
  stable/6/libexec/rtld-elf/libmap.c

Modified: stable/6/libexec/rtld-elf/libmap.c
==============================================================================
--- stable/6/libexec/rtld-elf/libmap.c	Tue Apr 28 20:36:07 2009	(r191636)
+++ stable/6/libexec/rtld-elf/libmap.c	Tue Apr 28 20:39:21 2009	(r191637)
@@ -263,14 +263,12 @@ lm_findn (const char *p, const char *f, 
 {
 	char pathbuf[64], *s, *t;
 
-	if (n < sizeof(pathbuf) - 1) {
-		memcpy(pathbuf, f, n);
-		pathbuf[n] = '\0';
+	if (n < sizeof(pathbuf) - 1)
 		s = pathbuf;
-	} else {
+	else
 		s = xmalloc(n + 1);
-		strcpy(s, f);
-	}
+	memcpy(s, f, n);
+	s[n] = '\0';
 	t = lm_find(p, s);
 	if (s != pathbuf)
 		free(s);

From owner-svn-src-stable-6@FreeBSD.ORG  Sat May  2 18:06:15 2009
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 959D91065675;
	Sat,  2 May 2009 18:06:15 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 82A128FC15;
	Sat,  2 May 2009 18:06:15 +0000 (UTC)
	(envelope-from marius@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 n42I6FGe091536;
	Sat, 2 May 2009 18:06:15 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n42I6Fmh091535;
	Sat, 2 May 2009 18:06:15 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <200905021806.n42I6Fmh091535@svn.freebsd.org>
From: Marius Strobl 
Date: Sat, 2 May 2009 18:06: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: r191749 - in stable/6/sys: . contrib/pf dev/cxgb
	dev/dcons
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: Sat, 02 May 2009 18:06:16 -0000

Author: marius
Date: Sat May  2 18:06:15 2009
New Revision: 191749
URL: http://svn.freebsd.org/changeset/base/191749

Log:
  MFC: r190756
  
  Fix logic in MOD_LOAD handler to call dcons_attach after all successful
  dcons_drv_init invocations. Testing return value for 0 does not work for
  cases where dcons_drv_init was called already as part of low level
  console initialization.

Modified:
  stable/6/sys/   (props changed)
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)
  stable/6/sys/dev/dcons/dcons_os.c

Modified: stable/6/sys/dev/dcons/dcons_os.c
==============================================================================
--- stable/6/sys/dev/dcons/dcons_os.c	Sat May  2 16:23:44 2009	(r191748)
+++ stable/6/sys/dev/dcons/dcons_os.c	Sat May  2 18:06:15 2009	(r191749)
@@ -674,8 +674,9 @@ dcons_modevent(module_t mode, int type, 
 	case MOD_LOAD:
 		ret = dcons_drv_init(1);
 #if __FreeBSD_version >= 500000
-		if (ret == 0) {
+		if (ret != -1)
 			dcons_attach();
+		if (ret == 0) {
 			dcons_cnprobe(&dcons_consdev);
 			dcons_cninit(&dcons_consdev);
 			cnadd(&dcons_consdev);