From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 00:17:35 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94B89106566C for ; Sun, 13 Jun 2010 00:17:35 +0000 (UTC) (envelope-from brucec@muon.cran.org.uk) Received: from muon.cran.org.uk (muon.cran.org.uk [204.109.60.94]) by mx1.freebsd.org (Postfix) with ESMTP id 77B598FC1F for ; Sun, 13 Jun 2010 00:17:35 +0000 (UTC) Received: by muon.cran.org.uk (Postfix, from userid 1002) id 4A9BD5D17; Sun, 13 Jun 2010 00:17:50 +0000 (UTC) Date: Sun, 13 Jun 2010 00:17:50 +0000 From: Bruce Cran To: ticso@cicely.de Message-ID: <20100613001750.GA30380@muon.cran.org.uk> References: <20100611162118.GR39829@acme.spoerlein.net> <867hm5tl6u.fsf@ds4.des.no> <20100612153526.GA3632@acme.spoerlein.net> <20100612163208.GS87112@cicely7.cicely.de> <864oh86tnl.fsf@ds4.des.no> <20100612225216.GT87112@cicely7.cicely.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100612225216.GT87112@cicely7.cicely.de> User-Agent: Mutt/1.4.2.3i Cc: Dag-Erling Sm?rgrav , current@freebsd.org Subject: Re: Cleanup for cryptographic algorithms vs. compiler optimizations X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 00:17:35 -0000 On Sun, Jun 13, 2010 at 12:52:16AM +0200, Bernd Walter wrote: > I'm at least sure that the compiler can't if it is linked from another > object file. Is that still true if LTO is enabled? -- Bruce Cran From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 00:22:45 2010 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B26F1065687; Sun, 13 Jun 2010 00:22:45 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 183B68FC1A; Sun, 13 Jun 2010 00:22:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id o5CNGClF012670; Sat, 12 Jun 2010 17:16:12 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Sat, 12 Jun 2010 17:16:14 -0600 (MDT) Message-Id: <20100612.171614.561808600377024654.imp@bsdimp.com> To: dougb@FreeBSD.org From: "M. Warner Losh" In-Reply-To: <4C13F53F.3050106@FreeBSD.org> References: <4C1315F9.6000300@FreeBSD.org> <20100612.091058.242248466057850673.imp@bsdimp.com> <4C13F53F.3050106@FreeBSD.org> X-Mailer: Mew version 6.3 on Emacs 22.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: freebsd-current@FreeBSD.org, ed@80386.nl, andreast-list@fgznet.ch Subject: Re: How to disable CLANG & co build in buildworld? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 00:22:45 -0000 In message: <4C13F53F.3050106@FreeBSD.org> Doug Barton writes: : On 06/12/10 08:10, M. Warner Losh wrote: : > In message:<4C1315F9.6000300@FreeBSD.org> : > Doug Barton writes: : > : On 06/11/10 14:18, M. Warner Losh wrote: : > :> "This" is building the proper set of tools for the target. It is : > easy : > :> to do, and only a couple lines of Makefile foo in Makefile.inc1 : > :> instead of in bsd.own.mk. It is a fairly natural consequence of : > the : > :> tbemd stuff I have been working on and have started merging. : > :> : > :> The consequences today are that you build some extra tools that are : > :> only needed to build clang when in fact you aren't really going to : > be : > :> building clang. The "cost" is however long it takes to do this on : > the : > :> platform you are building on. This can range from a minute or two : > to : > :> tens of minutes depending on the power of your build system. : > : : > : Ok, obviously I'm dense because I didn't understand an answer to my : > : question anywhere in there. :) So let me try again. Why are we not : > : optimizing for the common case, where the world is built on the : > system : > : it's going to run on, which means that WITHOUT_CLANG can easily mean : > : exactly that? : > : > Because if we optimize for that case, we break the other cases. : > Broken trumps fast, so we always build the clang tools. : > : > The reason it is broke is that the default for clang varies between : > architectures, which makes the usual tests for MK_CLANG not work for : > the bootstrap tools phase. : : Sorry, still dense here. I explained it already, but I'll show the exact code... : Can you point to code where simply testing : for MK_CLANG won't work? from Makefile.inc1 # XXX: There is no way to specify bootstrap tools depending on MK-flags # with different per-architecture default values. Always build tblgen. _clang_tblgen= \ lib/clang/libllvmsupport \ lib/clang/libllvmsystem \ usr.bin/clang/tblgen coupled with: from bsd.own.mk: # # Default behaviour of MK_CLANG depends on the architecture. # .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \ ${MACHINE_ARCH} == "powerpc" _clang_yes=CLANG _clang_no= .else _clang_yes= _clang_no=CLANG .endif so, if you add the test of MK_CLANG above for setting _clang_tblgen, you break the following case: neither WITH_CLANG or WITHOUT_CLANG, we go with the default: running on sparc64 (so MACHINE_ARCH=sparc64) building for i386 (so TARGET_ARCH=i386) o MK_CLANG will be 'no' o so clang's tblgen won't be built (if we added the test above you suggest) o during the build phase MACHINE_ARCH is set to i386, so clang fails later because MK_CLANG will be 'yes'. We would do extra work for the converse (building sparc64 on a i386 host), since MK_CLANG is "yes" so we build tblgen, but never use it. Since we always build tblgen, we fix this by degrading to this case. This also has no change from the typical case (amd64 or i386 built on amd64 or i386). I plan on fixing this problem, since it also applies to WITH_FDT. The root cause is that WITH_foo/WITHOUT_foo works great for optional components of the system that are basically the same everywhere (sendmail, lpr, old toolchain), but it is horrible for communicating intrinsic properties of the architecture (which is what is being done here) since there's two sets of contexts where you have to ask the question. One where TARGET_ARCH matters, and one where MACHINE_ARCH matters. While the specific examples in this case might not be too interesting, the problem it exposes is interesting to solve... Warner From owner-freebsd-current@FreeBSD.ORG Sat Jun 12 23:30:04 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D3B2A1065676 for ; Sat, 12 Jun 2010 23:30:04 +0000 (UTC) (envelope-from freebsd-current@m.gmane.org) Received: from lo.gmane.org (lo.gmane.org [80.91.229.12]) by mx1.freebsd.org (Postfix) with ESMTP id 598298FC0A for ; Sat, 12 Jun 2010 23:30:04 +0000 (UTC) Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1ONa9F-0003kS-El for freebsd-current@freebsd.org; Sun, 13 Jun 2010 01:29:57 +0200 Received: from k.saper.info ([91.121.151.35]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 13 Jun 2010 01:29:57 +0200 Received: from saper by k.saper.info with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 13 Jun 2010 01:29:57 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: freebsd-current@freebsd.org connect(): No such file or directory From: Marcin Cieslak Date: Sat, 12 Jun 2010 23:29:47 +0000 (UTC) Organization: http://saper.info Lines: 85 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: k.saper.info User-Agent: slrn/0.9.9p1 (FreeBSD) X-Mailman-Approved-At: Sun, 13 Jun 2010 00:24:07 +0000 Cc: heimdal-discuss@sics.se Subject: Re: Our aging base system heimdal X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2010 23:30:04 -0000 (from the freebsd-current mailing list) Dnia 06.06.2010 b. f. napisaÅ‚/a: > Is anybody planning to update the base system heimdal, which has been > largely untouched since May 2008? In addition to the many other > bug-fixes and improvements in the current version 1.3.3 (see, for > example: I decided to give it a try. My first steup is to make it compile on FreeBSD. As you know, as of recently FreeBSD-current has no I have hacked up a small patch to fix this: --- appl/ftp/ftpd/logwtmp.c 2010-05-26 23:53:13.000000000 +0200 +++ appl/ftp/ftpd/logwtmp.c 2010-06-12 22:32:57.373647840 +0200 @@ -104,16 +104,16 @@ static void ftpd_logwtmp_wtmp(char *line, char *name, char *host) { +#ifdef HAVE_UTMP_H static int init = 0; static int fd; -#ifdef WTMPX_FILE - static int fdx; -#endif struct utmp ut; -#ifdef WTMPX_FILE +#endif +#ifdef HAVE_UTMPX_H struct utmpx utx; #endif +#ifdef HAVE_UTMP_H memset(&ut, 0, sizeof(struct utmp)); #ifdef HAVE_STRUCT_UTMP_UT_TYPE if(name[0]) @@ -130,8 +130,9 @@ strncpy(ut.ut_host, host, sizeof(ut.ut_host)); #endif ut.ut_time = time(NULL); +#endif -#ifdef WTMPX_FILE +#ifdef HAVE_UTMPX_H strncpy(utx.ut_line, line, sizeof(utx.ut_line)); strncpy(utx.ut_user, name, sizeof(utx.ut_user)); strncpy(utx.ut_host, host, sizeof(utx.ut_host)); @@ -140,6 +141,7 @@ if (utx.ut_syslen > sizeof(utx.ut_host)) utx.ut_syslen = sizeof(utx.ut_host); #endif +#endif { struct timeval tv; @@ -152,21 +154,18 @@ utx.ut_type = USER_PROCESS; else utx.ut_type = DEAD_PROCESS; -#endif +#ifdef HAVE_UTMPX_H + pututxline(&utx); +#else if(!init){ fd = open(WTMP_FILE, O_WRONLY|O_APPEND, 0); -#ifdef WTMPX_FILE - fdx = open(WTMPX_FILE, O_WRONLY|O_APPEND, 0); -#endif init = 1; } if(fd >= 0) { write(fd, &ut, sizeof(struct utmp)); /* XXX */ -#ifdef WTMPX_FILE - write(fdx, &utx, sizeof(struct utmpx)); -#endif } +#endif } #endif /* !HAVE_ASL_H */ -- << Marcin Cieslak // saper@saper.info >> From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 00:44:39 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0E4E0106566B for ; Sun, 13 Jun 2010 00:44:39 +0000 (UTC) (envelope-from moonlightakkiy@yahoo.ca) Received: from web51801.mail.re2.yahoo.com (web51801.mail.re2.yahoo.com [206.190.38.232]) by mx1.freebsd.org (Postfix) with SMTP id A2BA18FC16 for ; Sun, 13 Jun 2010 00:44:38 +0000 (UTC) Received: (qmail 50531 invoked by uid 60001); 13 Jun 2010 00:44:37 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.ca; s=s1024; t=1276389877; bh=JPynWy6DUh3eF+C+G/yeXY4DWAzm2P+shxPvdxRhYFY=; h=Message-ID:X-YMail-OSG:Received:X-Mailer:References:Date:From:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type; b=apGrrAfZLngxRb0GMDThEixbulyvuWFzz9j5jGAB0P/8YdJVUz4UVI6oRc+1PFZs86/d47+1liDdOh+S3HUgQoh9Z6u+uUfB2E0gvRDROaTLUgeyWQd0p4fK/Nrf3sQZqPr757jMW8u6yQEEwjLx6kwR46uv+10MlUyIBoXBYO0= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.ca; h=Message-ID:X-YMail-OSG:Received:X-Mailer:References:Date:From:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type; b=Hk13iGma5M7wfHeyEOU50ar0xyKylr8thVKyJvqM9PXt+5AQ8J7PAxcaOURLHuozeqWXVNMbyxAqy0PuitVA9F5tlbTEegG/NomBXntXML6NNNfw3Tet9vHdxiv6ipHwPLTrKqsN2s0lNL9rcdHBjgk/RO4Kip4awtanbMsGh9I=; Message-ID: <605908.49280.qm@web51801.mail.re2.yahoo.com> X-YMail-OSG: par_GukVM1kEpW4HFM3d2exf8iFqE3Idh1t1eFsxGRW.6GT doEbvg0mZPne.FVBsIHayIIzdkUQN75YmdwYo1JEQ8GSmqe81J9XkAn34eHP SJVfRsjRaH6XQGoQwmIj8iRut8TiZS2sS40GB6QHcje.DxCs.rmTIGsnWodl Fy05WgLaRIH7Ai9N8bdjJlYZP3tF33WCs93nMqH_KNr0ZVj3HJGYWB9Mzb3v UoyRJeiUBJRxrY2AE8mxbk.0VdpvRYZ.hsLIp14VfA1xn449jYdznoUQC_3N 32UDFn2OeFjiu_FIrQ3bU4Hy8nP.v0Ob2Qun9xjiWc.g93ACz89zl5gTvloA N6zHVqQ2DlIk- Received: from [173.183.132.20] by web51801.mail.re2.yahoo.com via HTTP; Sat, 12 Jun 2010 17:44:37 PDT X-Mailer: YahooMailRC/397.8 YahooMailWebService/0.8.103.269680 References: <16641.96608.qm@web51806.mail.re2.yahoo.com> <201005110146.47943.hselasky@c2i.net> <889555.51620.qm@web51804.mail.re2.yahoo.com> <201006120830.18074.hselasky@c2i.net> Date: Sat, 12 Jun 2010 17:44:37 -0700 (PDT) From: PseudoCylon To: Hans Petter Selasky In-Reply-To: <201006120830.18074.hselasky@c2i.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: freebsd-current@freebsd.org, freebsd-usb@freebsd.org Subject: Re: run(4) patch X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 00:44:39 -0000 ----- Original Message ---- > From: Hans Petter Selasky > To: PseudoCylon > Cc: freebsd-usb@freebsd.org; freebsd-current@freebsd.org > Sent: Sat, June 12, 2010 12:30:18 AM > Subject: Re: run(4) patch > >> On Friday 11 June 2010 08:27:53 PseudoCylon wrote: >> Hello, >> >> >> Here is a patch for recent fix. >> >> href="http://lists.freebsd.org/pipermail/freebsd-current/2010-June/017749.html" >> target=_blank http://lists.freebsd.org/pipermail/freebsd-current/2010-June/017749.html >> >> Please update codes in your repository. >> >> Diff against the latest >> change, 178418. >> * if_run.c - rev. 11 >> * if_runvar.h - rev. 7 >> >> summary of changes >> * Because hostapd calls iv_key_set() before if_init(), made sure key_set >> callback function will be executed, and the key won't be deleted during >> init process. * txmic and rxmic are written into the chip the same >> place regardless of opmode. * Made hardware generate 802.11 sequence numbers. >> >> Thank you. >> >> AK >> > >Hi, > >Please verify USB P4 change #179518. > > >> href="http://p4web.freebsd.org/@@179518?ac=10" target=_blank http://p4web.freebsd.org/@@179518?ac=10 > >--HPS Hello, All files are up-to-date. if_run.c change #179518 (rev.12), and http://p4web.freebsd.org/@@179518?ac=10 if_runvar.h change #179519 (rev. 8) http://p4web.freebsd.org/@@179519?ac=10 if_runreg.h is listed in change #179518 without any change in code. Thank you. AK From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 01:49:13 2010 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 236F61065679 for ; Sun, 13 Jun 2010 01:49:12 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id 73B528FC0C for ; Sun, 13 Jun 2010 01:49:12 +0000 (UTC) Received: (qmail 4438 invoked by uid 399); 13 Jun 2010 01:49:11 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 13 Jun 2010 01:49:11 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4C143915.9080100@FreeBSD.org> Date: Sat, 12 Jun 2010 18:49:09 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100330 Thunderbird/3.0.4 MIME-Version: 1.0 To: "M. Warner Losh" References: <4C1315F9.6000300@FreeBSD.org> <20100612.091058.242248466057850673.imp@bsdimp.com> <4C13F53F.3050106@FreeBSD.org> <20100612.171614.561808600377024654.imp@bsdimp.com> In-Reply-To: <20100612.171614.561808600377024654.imp@bsdimp.com> X-Enigmail-Version: 1.0.1 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-current@FreeBSD.org, ed@80386.nl, andreast-list@fgznet.ch Subject: Re: How to disable CLANG & co build in buildworld? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 01:49:13 -0000 On 06/12/10 16:16, M. Warner Losh wrote: > I plan on fixing this problem That's good news, since I'm obviously too stupid to understand why it exists. :) I look forward to seeing your solution. Doug -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/ From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 07:02:36 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 835921065678; Sun, 13 Jun 2010 07:02:36 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id 371B58FC1A; Sun, 13 Jun 2010 07:02:35 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5D72ZNQ063612; Sun, 13 Jun 2010 03:02:35 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5D72ZUB063600; Sun, 13 Jun 2010 07:02:35 GMT (envelope-from tinderbox@freebsd.org) Date: Sun, 13 Jun 2010 07:02:35 GMT Message-Id: <201006130702.o5D72ZUB063600@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on ia64/ia64 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 07:02:36 -0000 TB --- 2010-06-13 05:40:45 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-13 05:40:45 - starting HEAD tinderbox run for ia64/ia64 TB --- 2010-06-13 05:40:45 - cleaning the object tree TB --- 2010-06-13 05:40:57 - cvsupping the source tree TB --- 2010-06-13 05:40:57 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/ia64/ia64/supfile TB --- 2010-06-13 05:41:33 - building world TB --- 2010-06-13 05:41:33 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-13 05:41:33 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-13 05:41:33 - TARGET=ia64 TB --- 2010-06-13 05:41:33 - TARGET_ARCH=ia64 TB --- 2010-06-13 05:41:33 - TZ=UTC TB --- 2010-06-13 05:41:33 - __MAKE_CONF=/dev/null TB --- 2010-06-13 05:41:33 - cd /src TB --- 2010-06-13 05:41:33 - /usr/bin/make -B buildworld >>> World build started on Sun Jun 13 05:41:33 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything [...] cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/command.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/config.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/devices.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/dhcp.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/disks.c cc1: warnings being treated as errors /src/usr.sbin/sysinstall/disks.c: In function 'diskPartitionWrite': /src/usr.sbin/sysinstall/disks.c:877: warning: unused variable 'boot1' *** Error code 1 Stop in /src/usr.sbin/sysinstall. *** Error code 1 Stop in /src/usr.sbin. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-13 07:02:34 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-13 07:02:34 - ERROR: failed to build world TB --- 2010-06-13 07:02:34 - 3819.82 user 633.77 system 4909.10 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-ia64-ia64.full From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 08:09:27 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F6E91065673 for ; Sun, 13 Jun 2010 08:09:27 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 0DFC38FC17 for ; Sun, 13 Jun 2010 08:09:26 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 0CC291FFC33; Sun, 13 Jun 2010 08:09:26 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id C745D84430; Sun, 13 Jun 2010 10:07:15 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: ticso@cicely.de References: <20100611162118.GR39829@acme.spoerlein.net> <867hm5tl6u.fsf@ds4.des.no> <20100612153526.GA3632@acme.spoerlein.net> <20100612163208.GS87112@cicely7.cicely.de> <864oh86tnl.fsf@ds4.des.no> <20100612225216.GT87112@cicely7.cicely.de> Date: Sun, 13 Jun 2010 10:07:15 +0200 In-Reply-To: <20100612225216.GT87112@cicely7.cicely.de> (Bernd Walter's message of "Sun, 13 Jun 2010 00:52:16 +0200") Message-ID: <86wru3we30.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.95 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: current@freebsd.org Subject: Re: Cleanup for cryptographic algorithms vs. compiler optimizations X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 08:09:27 -0000 Bernd Walter writes: > Dag-Erling Sm=C3=B8rgrav writes: > > Bernd Walter writes: > > > I'm not sure when removing a memset is allowed. > > Always, if the compiler can determine that the data will not be used > > later. > I'm at least sure that the compiler can't if it is linked from another > object file. When running in hosted mode, the compiler can *always* inline a memset() call or eliminate it if it can determine that the result is not used. > The problem with memset is that the compiler has an internal > implementation. That's a feature, not a problem. > On the other hand I wonder what the deep sense is to clear memory > which is unused later. I know that crypto code can be tricky > sometimes, but if someone is willing to explain the specific reason my > curiosity would be satified. You always overwrite passphrases, keys etc. as soon as you're done with them so they don't end up in a crash dump or on a swap disk or something. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 08:12:03 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F163106566B for ; Sun, 13 Jun 2010 08:12:03 +0000 (UTC) (envelope-from lstewart@freebsd.org) Received: from lauren.room52.net (lauren.room52.net [210.50.193.198]) by mx1.freebsd.org (Postfix) with ESMTP id 145D98FC18 for ; Sun, 13 Jun 2010 08:12:02 +0000 (UTC) Received: from lawrence1.loshell.room52.net (unknown [59.167.184.191]) by lauren.room52.net (Postfix) with ESMTPSA id 71EDF7E871 for ; Sun, 13 Jun 2010 18:12:01 +1000 (EST) Message-ID: <4C1492D0.6020704@freebsd.org> Date: Sun, 13 Jun 2010 18:12:00 +1000 From: Lawrence Stewart User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-AU; rv:1.9.1.9) Gecko/20100405 Thunderbird/3.0.4 MIME-Version: 1.0 To: freebsd-current@freebsd.org Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: [CFT] SIFTR - Statistical Information For TCP Research X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 08:12:03 -0000 Hi all, The time has come to solicit some external testing for my SIFTR tool. I'm hoping to commit it within a week or so unless problems are discovered. SIFTR is a kernel module that logs a range of statistics on active TCP connections to a log file. It provides the ability to make highly granular measurements of TCP connection state, aimed at system administrators, developers and researchers. You can use the data to find bugs in the stack, understand why connections are performing badly and test new code to name a few uses. Development has been made possible in part by grants from the Cisco University Research Program Fund at Community Foundation Silicon Valley, and the FreeBSD Foundation. Bringing it into FreeBSD proper is being carried out under the auspices of the "Enhancing the FreeBSD TCP Implementation" FreeBSD Foundation project. More details are available at [1,2,3]. If you can help out, please read on! Before continuing, make sure you're running with at least svn revision 209119 (my commit to ), or you can manually apply the r209119 diff to to your earlier rev source tree. The SIFTR patch is here: http://people.freebsd.org/~lstewart/patches/tcp_ffcaia2008/siftr_9.x.r209119.patch Copy it to the root of your source tree and run the following: patch -p1 < siftr_9.x.r209119.patch It's a loadable kernel module so you can build it for testing like so: cd /sys/modules/siftr make kldload ./siftr.ko (don't forget to "make cleandir" to remove cruft when finished testing) After applying the patch, you can read the man page by running: man -M /share/man siftr If I've done a decent job, all the info you need to understand what it does and how to use it should be in the man page. I'm interested in all feedback and reports of success/failure, along with details of the architecture tested and number of CPUs if you would be so kind. That should be enough to get the ball rolling. Thanks and I look forward to hearing from you! Cheers, Lawrence [1] http://caia.swin.edu.au/freebsd/etcp09/ [2] http://www.freebsdfoundation.org/projects.shtml#Swinburne [3] http://caia.swin.edu.au/urp/newtcp/ From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 08:13:41 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 43F3A1065676 for ; Sun, 13 Jun 2010 08:13:41 +0000 (UTC) (envelope-from ticso@cicely7.cicely.de) Received: from raven.bwct.de (raven.bwct.de [85.159.14.73]) by mx1.freebsd.org (Postfix) with ESMTP id BB2788FC0C for ; Sun, 13 Jun 2010 08:13:40 +0000 (UTC) Received: from mail.cicely.de ([10.1.1.37]) by raven.bwct.de (8.13.4/8.13.4) with ESMTP id o5D8DZoi091456 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 13 Jun 2010 10:13:35 +0200 (CEST) (envelope-from ticso@cicely7.cicely.de) Received: from cicely7.cicely.de (cicely7.cicely.de [10.1.1.9]) by mail.cicely.de (8.14.3/8.14.3) with ESMTP id o5D8CDNw042328 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 13 Jun 2010 10:12:13 +0200 (CEST) (envelope-from ticso@cicely7.cicely.de) Received: from cicely7.cicely.de (localhost [127.0.0.1]) by cicely7.cicely.de (8.14.2/8.14.2) with ESMTP id o5D8CDCO000829; Sun, 13 Jun 2010 10:12:13 +0200 (CEST) (envelope-from ticso@cicely7.cicely.de) Received: (from ticso@localhost) by cicely7.cicely.de (8.14.2/8.14.2/Submit) id o5D8CCWw000828; Sun, 13 Jun 2010 10:12:12 +0200 (CEST) (envelope-from ticso) Date: Sun, 13 Jun 2010 10:12:12 +0200 From: Bernd Walter To: Bruce Cran Message-ID: <20100613081212.GX87112@cicely7.cicely.de> References: <20100611162118.GR39829@acme.spoerlein.net> <867hm5tl6u.fsf@ds4.des.no> <20100612153526.GA3632@acme.spoerlein.net> <20100612163208.GS87112@cicely7.cicely.de> <864oh86tnl.fsf@ds4.des.no> <20100612225216.GT87112@cicely7.cicely.de> <20100613001750.GA30380@muon.cran.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100613001750.GA30380@muon.cran.org.uk> X-Operating-System: FreeBSD cicely7.cicely.de 7.0-STABLE i386 User-Agent: Mutt/1.5.11 X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED=-1, BAYES_00=-1.9, T_RP_MATCHES_RCVD=-0.01 autolearn=unavailable version=3.3.0 X-Spam-Checker-Version: SpamAssassin 3.3.0 (2010-01-18) on spamd.cicely.de Cc: Dag-Erling Sm?rgrav , ticso@cicely.de, current@freebsd.org Subject: Re: Cleanup for cryptographic algorithms vs. compiler optimizations X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: ticso@cicely.de List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 08:13:41 -0000 On Sun, Jun 13, 2010 at 12:17:50AM +0000, Bruce Cran wrote: > On Sun, Jun 13, 2010 at 12:52:16AM +0200, Bernd Walter wrote: > > I'm at least sure that the compiler can't if it is linked from another > > object file. > > Is that still true if LTO is enabled? Good question - I wasn't aware of LTO. My precondition was that the function doesn't see what is done with the result and LTO invalidates this. -- B.Walter http://www.bwct.de Modbus/TCP Ethernet I/O Baugruppen, ARM basierte FreeBSD Rechner uvm. From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 08:41:27 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C051106566B; Sun, 13 Jun 2010 08:41:27 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id C589F8FC0C; Sun, 13 Jun 2010 08:41:26 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5D8fPT8035338; Sun, 13 Jun 2010 04:41:26 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5D8fP4E035337; Sun, 13 Jun 2010 08:41:25 GMT (envelope-from tinderbox@freebsd.org) Date: Sun, 13 Jun 2010 08:41:25 GMT Message-Id: <201006130841.o5D8fP4E035337@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on sparc64/sparc64 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 08:41:27 -0000 TB --- 2010-06-13 07:39:07 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-13 07:39:07 - starting HEAD tinderbox run for sparc64/sparc64 TB --- 2010-06-13 07:39:07 - cleaning the object tree TB --- 2010-06-13 07:39:16 - cvsupping the source tree TB --- 2010-06-13 07:39:16 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/sparc64/sparc64/supfile TB --- 2010-06-13 07:41:18 - building world TB --- 2010-06-13 07:41:18 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-13 07:41:18 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-13 07:41:18 - TARGET=sparc64 TB --- 2010-06-13 07:41:18 - TARGET_ARCH=sparc64 TB --- 2010-06-13 07:41:18 - TZ=UTC TB --- 2010-06-13 07:41:18 - __MAKE_CONF=/dev/null TB --- 2010-06-13 07:41:18 - cd /src TB --- 2010-06-13 07:41:18 - /usr/bin/make -B buildworld >>> World build started on Sun Jun 13 07:41:18 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything [...] cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/index.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/install.c cc1: warnings being treated as errors /src/usr.sbin/sysinstall/install.c: In function 'installStandard': /src/usr.sbin/sysinstall/install.c:632: warning: unused variable 'devs' /src/usr.sbin/sysinstall/install.c:631: warning: unused variable 'tries' /src/usr.sbin/sysinstall/install.c: In function 'installFixupBase': /src/usr.sbin/sysinstall/install.c:877: warning: unused variable 'fp' *** Error code 1 Stop in /src/usr.sbin/sysinstall. *** Error code 1 Stop in /src/usr.sbin. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-13 08:41:25 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-13 08:41:25 - ERROR: failed to build world TB --- 2010-06-13 08:41:25 - 2730.92 user 569.55 system 3738.56 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-sparc64-sparc64.full From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 08:52:43 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 91D611065675; Sun, 13 Jun 2010 08:52:43 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id 3696E8FC13; Sun, 13 Jun 2010 08:52:42 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5D8qg9K084704; Sun, 13 Jun 2010 04:52:42 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5D8qg6U084697; Sun, 13 Jun 2010 08:52:42 GMT (envelope-from tinderbox@freebsd.org) Date: Sun, 13 Jun 2010 08:52:42 GMT Message-Id: <201006130852.o5D8qg6U084697@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on powerpc/powerpc X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 08:52:43 -0000 TB --- 2010-06-13 07:11:24 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-13 07:11:24 - starting HEAD tinderbox run for powerpc/powerpc TB --- 2010-06-13 07:11:24 - cleaning the object tree TB --- 2010-06-13 07:11:35 - cvsupping the source tree TB --- 2010-06-13 07:11:35 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/powerpc/powerpc/supfile TB --- 2010-06-13 07:14:58 - building world TB --- 2010-06-13 07:14:58 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-13 07:14:58 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-13 07:14:58 - TARGET=powerpc TB --- 2010-06-13 07:14:58 - TARGET_ARCH=powerpc TB --- 2010-06-13 07:14:58 - TZ=UTC TB --- 2010-06-13 07:14:58 - __MAKE_CONF=/dev/null TB --- 2010-06-13 07:14:58 - cd /src TB --- 2010-06-13 07:14:58 - /usr/bin/make -B buildworld >>> World build started on Sun Jun 13 07:14:59 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything [...] cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/index.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/install.c cc1: warnings being treated as errors /src/usr.sbin/sysinstall/install.c: In function 'installStandard': /src/usr.sbin/sysinstall/install.c:632: warning: unused variable 'devs' /src/usr.sbin/sysinstall/install.c:631: warning: unused variable 'tries' /src/usr.sbin/sysinstall/install.c: In function 'installFixupBase': /src/usr.sbin/sysinstall/install.c:877: warning: unused variable 'fp' *** Error code 1 Stop in /src/usr.sbin/sysinstall. *** Error code 1 Stop in /src/usr.sbin. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-13 08:52:42 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-13 08:52:42 - ERROR: failed to build world TB --- 2010-06-13 08:52:42 - 4778.73 user 734.32 system 6077.99 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-powerpc-powerpc.full From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 08:56:45 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2FEE91065673; Sun, 13 Jun 2010 08:56:45 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id C84DA8FC1B; Sun, 13 Jun 2010 08:56:44 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5D8ui7G092276; Sun, 13 Jun 2010 04:56:44 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5D8uiug092275; Sun, 13 Jun 2010 08:56:44 GMT (envelope-from tinderbox@freebsd.org) Date: Sun, 13 Jun 2010 08:56:44 GMT Message-Id: <201006130856.o5D8uiug092275@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on sparc64/sun4v X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 08:56:45 -0000 TB --- 2010-06-13 07:57:08 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-13 07:57:08 - starting HEAD tinderbox run for sparc64/sun4v TB --- 2010-06-13 07:57:08 - cleaning the object tree TB --- 2010-06-13 07:57:17 - cvsupping the source tree TB --- 2010-06-13 07:57:17 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/sparc64/sun4v/supfile TB --- 2010-06-13 07:58:42 - building world TB --- 2010-06-13 07:58:42 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-13 07:58:42 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-13 07:58:42 - TARGET=sun4v TB --- 2010-06-13 07:58:42 - TARGET_ARCH=sparc64 TB --- 2010-06-13 07:58:42 - TZ=UTC TB --- 2010-06-13 07:58:42 - __MAKE_CONF=/dev/null TB --- 2010-06-13 07:58:42 - cd /src TB --- 2010-06-13 07:58:42 - /usr/bin/make -B buildworld >>> World build started on Sun Jun 13 07:58:43 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything [...] cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/index.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/install.c cc1: warnings being treated as errors /src/usr.sbin/sysinstall/install.c: In function 'installStandard': /src/usr.sbin/sysinstall/install.c:632: warning: unused variable 'devs' /src/usr.sbin/sysinstall/install.c:631: warning: unused variable 'tries' /src/usr.sbin/sysinstall/install.c: In function 'installFixupBase': /src/usr.sbin/sysinstall/install.c:877: warning: unused variable 'fp' *** Error code 1 Stop in /src/usr.sbin/sysinstall. *** Error code 1 Stop in /src/usr.sbin. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-13 08:56:44 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-13 08:56:44 - ERROR: failed to build world TB --- 2010-06-13 08:56:44 - 2717.34 user 559.16 system 3575.33 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-sparc64-sun4v.full From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 10:44:08 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47D581065674 for ; Sun, 13 Jun 2010 10:44:08 +0000 (UTC) (envelope-from matthias.andree@gmx.de) Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by mx1.freebsd.org (Postfix) with SMTP id 876D68FC1B for ; Sun, 13 Jun 2010 10:44:07 +0000 (UTC) Received: (qmail invoked by alias); 13 Jun 2010 10:44:05 -0000 Received: from g227137149.adsl.alicedsl.de (EHLO mandree.no-ip.org) [92.227.137.149] by mail.gmx.net (mp056) with SMTP; 13 Jun 2010 12:44:05 +0200 X-Authenticated: #428038 X-Provags-ID: V01U2FsdGVkX1/Innh+mBTIPj8OE2troAe79j2ODhpk858S8TxYZD pyBGk5E1ajNkOy Received: from merlin.emma.line.org (localhost [127.0.0.1]) by merlin.emma.line.org (Postfix) with ESMTP id 6C29094831 for ; Sun, 13 Jun 2010 12:44:04 +0200 (CEST) Content-Type: text/plain; charset=utf-8; format=flowed; delsp=yes To: "freebsd-current@freebsd.org" References: <20100611162118.GR39829@acme.spoerlein.net> <867hm5tl6u.fsf@ds4.des.no> <20100612153526.GA3632@acme.spoerlein.net> <20100612163208.GS87112@cicely7.cicely.de> <864oh86tnl.fsf@ds4.des.no> <20100612225216.GT87112@cicely7.cicely.de> Date: Sun, 13 Jun 2010 12:44:03 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Matthias Andree" Organization: Message-ID: In-Reply-To: <20100612225216.GT87112@cicely7.cicely.de> User-Agent: Opera Mail/10.53 (Linux) X-Y-GMX-Trusted: 0 Subject: Re: Cleanup for cryptographic algorithms vs. compiler optimizations X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 10:44:08 -0000 Am 13.06.2010, 00:52 Uhr, schrieb Bernd Walter: >> In more general terms, the compiler is allowed to make any changes it >> likes to the program as long as the end result behaves exactly like it >> would if it hadn't been changed. This is called the "as if" rule. For >> instance, if you call printf() or fprintf() with a format string that >> does not contain any conversion specifiers, gcc will call gets() or >> fgets() instead. > > Amazing - this is one of the things which can get nasty if you try some > kind of microtuning. > Recently I had to implement my own atoi on a controller because using the > library one magically had blown my RAM usage by 1k on a controller with > just 8k RAM. There are certain compiler flags to affect that. For GCC, -Os is one (which doesn't necessarily work in FreeBSD though, on some versions the compiler would go into unterminated loop, leak memory and ultimately fail with OOM), flags to tell the compiler that the implementation is freestanding, and attributes to select builtins and the likes. -- Matthias Andree From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 09:20:42 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 84115106566B for ; Sun, 13 Jun 2010 09:20:41 +0000 (UTC) (envelope-from haba@kth.se) Received: from smtp-2.sys.kth.se (smtp-2.sys.kth.se [130.237.32.160]) by mx1.freebsd.org (Postfix) with ESMTP id 3A3488FC14 for ; Sun, 13 Jun 2010 09:20:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp-2.sys.kth.se (Postfix) with ESMTP id 2270A14DC41; Sun, 13 Jun 2010 10:59:33 +0200 (CEST) X-Virus-Scanned: by amavisd-new at kth.se Received: from smtp-2.sys.kth.se ([127.0.0.1]) by localhost (smtp-2.sys.kth.se [127.0.0.1]) (amavisd-new, port 10024) with LMTP id ljbxgwASdrCQ; Sun, 13 Jun 2010 10:59:32 +0200 (CEST) X-KTH-Auth: haba [80.251.207.11] X-KTH-mail-from: haba@kth.se Received: from localhost (cust-IP-11.data.tre.se [80.251.207.11]) by smtp-2.sys.kth.se (Postfix) with ESMTP id 429A814C022; Sun, 13 Jun 2010 10:59:30 +0200 (CEST) Date: Sun, 13 Jun 2010 10:59:29 +0200 (CEST) Message-Id: <20100613.105929.183737534.haba@habanero.pdc.kth.se> To: heimdal-discuss@sics.se, saper@saper.info From: Harald Barth In-Reply-To: References: X-Mailer: Mew version 5.2.51 on Emacs 22.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Sun, 13 Jun 2010 11:10:38 +0000 Cc: freebsd-current@freebsd.org Subject: Re: Our aging base system heimdal X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 09:20:42 -0000 > Dnia 06.06.2010 b. f. napisaÅ‚/a: > > Is anybody planning to update the base system heimdal, which has been > > largely untouched since May 2008? In addition to the many other > > bug-fixes and improvements in the current version 1.3.3 (see, for > > example: > > I decided to give it a try. My first steup is to make it compile on > FreeBSD. As you know, as of recently FreeBSD-current has no You want at least 2 or 3 patches to make 1.3.3 useful: 1. The patch that fixes http access to the kdc 2. The patch that makes kxd work again 3. If your freebsd version needs strerror_r from libroken, the patch that fixes the broken call to strlcpy. Harald. From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 11:23:54 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94AF81065670 for ; Sun, 13 Jun 2010 11:23:54 +0000 (UTC) (envelope-from bounces@nabble.com) Received: from kuber.nabble.com (kuber.nabble.com [216.139.236.158]) by mx1.freebsd.org (Postfix) with ESMTP id 71FDC8FC16 for ; Sun, 13 Jun 2010 11:23:54 +0000 (UTC) Received: from isper.nabble.com ([192.168.236.156]) by kuber.nabble.com with esmtp (Exim 4.63) (envelope-from ) id 1ONlI9-00023g-NC for freebsd-current@freebsd.org; Sun, 13 Jun 2010 04:23:53 -0700 Message-ID: <28870665.post@talk.nabble.com> Date: Sun, 13 Jun 2010 04:23:53 -0700 (PDT) From: Jakub Lach To: freebsd-current@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Nabble-From: jakub_lach@mailplus.pl Subject: wpa_supplicant update? CTRL-EVENT-SCAN-RESULTS X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 11:23:54 -0000 Hello. Is update of wpa_supplicant planned? Current version in STABLE as well as CURRENT (v0.6.8) is suffering from CTRL-EVENT-SCAN-RESULTS log spam. If it's the same problem, looks like it's fixed in v0.6.10 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=539915 best regards, Jakub Lach -- View this message in context: http://old.nabble.com/wpa_supplicant-update--CTRL-EVENT-SCAN-RESULTS-tp28870665p28870665.html Sent from the freebsd-current mailing list archive at Nabble.com. From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 12:07:28 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B37F1065670 for ; Sun, 13 Jun 2010 12:07:28 +0000 (UTC) (envelope-from ticso@cicely7.cicely.de) Received: from raven.bwct.de (raven.bwct.de [85.159.14.73]) by mx1.freebsd.org (Postfix) with ESMTP id E90728FC21 for ; Sun, 13 Jun 2010 12:07:27 +0000 (UTC) Received: from mail.cicely.de ([10.1.1.37]) by raven.bwct.de (8.13.4/8.13.4) with ESMTP id o5DC7QqN001024 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 13 Jun 2010 14:07:26 +0200 (CEST) (envelope-from ticso@cicely7.cicely.de) Received: from cicely7.cicely.de (cicely7.cicely.de [10.1.1.9]) by mail.cicely.de (8.14.3/8.14.3) with ESMTP id o5DC7NDp050702 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 13 Jun 2010 14:07:23 +0200 (CEST) (envelope-from ticso@cicely7.cicely.de) Received: from cicely7.cicely.de (localhost [127.0.0.1]) by cicely7.cicely.de (8.14.2/8.14.2) with ESMTP id o5DC7NgJ001826; Sun, 13 Jun 2010 14:07:23 +0200 (CEST) (envelope-from ticso@cicely7.cicely.de) Received: (from ticso@localhost) by cicely7.cicely.de (8.14.2/8.14.2/Submit) id o5DC7N1Z001825; Sun, 13 Jun 2010 14:07:23 +0200 (CEST) (envelope-from ticso) Date: Sun, 13 Jun 2010 14:07:22 +0200 From: Bernd Walter To: Matthias Andree Message-ID: <20100613120722.GZ87112@cicely7.cicely.de> References: <20100611162118.GR39829@acme.spoerlein.net> <867hm5tl6u.fsf@ds4.des.no> <20100612153526.GA3632@acme.spoerlein.net> <20100612163208.GS87112@cicely7.cicely.de> <864oh86tnl.fsf@ds4.des.no> <20100612225216.GT87112@cicely7.cicely.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Operating-System: FreeBSD cicely7.cicely.de 7.0-STABLE i386 User-Agent: Mutt/1.5.11 X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED=-1, BAYES_00=-1.9, T_RP_MATCHES_RCVD=-0.01 autolearn=ham version=3.3.0 X-Spam-Checker-Version: SpamAssassin 3.3.0 (2010-01-18) on spamd.cicely.de Cc: "freebsd-current@freebsd.org" Subject: Re: Cleanup for cryptographic algorithms vs. compiler optimizations X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: ticso@cicely.de List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 12:07:28 -0000 On Sun, Jun 13, 2010 at 12:44:03PM +0200, Matthias Andree wrote: > Am 13.06.2010, 00:52 Uhr, schrieb Bernd Walter: > > >>In more general terms, the compiler is allowed to make any changes it > >>likes to the program as long as the end result behaves exactly like it > >>would if it hadn't been changed. This is called the "as if" rule. For > >>instance, if you call printf() or fprintf() with a format string that > >>does not contain any conversion specifiers, gcc will call gets() or > >>fgets() instead. > > > >Amazing - this is one of the things which can get nasty if you try some > >kind of microtuning. > >Recently I had to implement my own atoi on a controller because using the > >library one magically had blown my RAM usage by 1k on a controller with > >just 8k RAM. > > There are certain compiler flags to affect that. For GCC, -Os is one > (which doesn't necessarily work in FreeBSD though, on some versions the > compiler would go into unterminated loop, leak memory and ultimately fail > with OOM), flags to tell the compiler that the implementation is > freestanding, and attributes to select builtins and the likes. I know -Os - the problem was more complicated and at linker stage. It was because atoi sucked more hardly related library parts in, of which one had 1k static RAM requirement. Quite surprising outcome from using atoi. But this isn't related to FreeBSD at all, since it happened with newlibc. -- B.Walter http://www.bwct.de Modbus/TCP Ethernet I/O Baugruppen, ARM basierte FreeBSD Rechner uvm. From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 14:37:25 2010 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from hub.freebsd.org (localhost [127.0.0.1]) by hub.freebsd.org (Postfix) with SMTP id 21A981065673; Sun, 13 Jun 2010 14:37:24 +0000 (UTC) (envelope-from nork@FreeBSD.org) Date: Sun, 13 Jun 2010 23:37:23 +0900 From: Norikatsu Shigemura To: yongari@FreeBSD.org Message-Id: <20100613233723.ed2c3a30.nork@FreeBSD.org> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; i386-portbld-freebsd8.1) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: Kristof Provost , freebsd-arm@FreeBSD.org, freebsd-current@FreeBSD.org, nork@FreeBSD.org Subject: [OpenRD Ultimate] e1000phy(88E1149/88E1121) has a initialize issue X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 14:37:25 -0000 Hi yongari! I have a OpenRD Ultimate, which has two GbE ports - if_mge(4). But I couldn't use mge1 like following. So I tried to investigate. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Jun 13 05:02:14 sidearms kernel: mge1: watchdog timeout Jun 13 05:02:14 sidearms kernel: mge1: Timeout on link-up - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - I found a initialize issue in e1000phy.c. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --- sys/dev/mii/e1000phy.c.orig 2010-05-01 10:17:15.282196000 +0900 +++ sys/dev/mii/e1000phy.c 2010-06-13 16:19:46.616650536 +0900 @@ -278,6 +278,7 @@ case MII_MODEL_MARVELL_E1118: break; case MII_MODEL_MARVELL_E1116: + case MII_MODEL_MARVELL_E1149: page = PHY_READ(sc, E1000_EADR); /* Select page 3, LED control register. */ PHY_WRITE(sc, E1000_EADR, 3); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - I confirmed OK on my environment, OpenRD Ultimate has a 88E1121(I saw it, physically): - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Jun 13 15:20:01 sidearms kernel: miibus0: miibus_probe: ma.mii_id1 = 0x141, ma.mii_id2 = 0xcb3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - And I confirmed that MII chipset ID is same as 88E1249. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - mge0 Marvell OBIO Memory: 4043776000-4043784191 Marvell OBIO IRQ: 11 12 13 14 46 miibus0 e1000phy0 pnpinfo oui=0x5043 model=0xb rev=0x3 at phyno=0 mge1 Marvell OBIO Memory: 4043792384-4043800575 Marvell OBIO IRQ: 15 16 17 18 47 miibus1 e1000phy1 pnpinfo oui=0x5043 model=0xb rev=0x3 at phyno=1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - BTW, I knew same issue on OpenRD Client, it has a 88E1116R, maybe. Sorry, I don't already have it. I couldn't confirm. So accordingly my memo: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - miibus0: ma.mii_id1 = 0x141, ma.mii_id2 = 0xe40 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - I found many initialize issues on 88E1116R by not existing on e1000phy.c. Maybe 88E1116 = 88E1116R like following: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - switch (esc->mii_model) { case MII_MODEL_MARVELL_E1111: case MII_MODEL_MARVELL_E1112: case MII_MODEL_MARVELL_E1116: + case MII_MODEL_MARVELL_E1116R: case MII_MODEL_MARVELL_E1118: case MII_MODEL_MARVELL_E1149: case MII_MODEL_MARVELL_PHYG65G: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - But there are many points, I don't know that this modify is right. -- Hayabusa, Okaerinasai! Norikatsu Shigemura From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 15:46:41 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 296A41065677 for ; Sun, 13 Jun 2010 15:46:41 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id DF7A78FC17 for ; Sun, 13 Jun 2010 15:46:40 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 976111FFC33; Sun, 13 Jun 2010 15:46:39 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id 76AFC84492; Sun, 13 Jun 2010 17:44:29 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: ticso@cicely.de References: <20100611162118.GR39829@acme.spoerlein.net> <867hm5tl6u.fsf@ds4.des.no> <20100612153526.GA3632@acme.spoerlein.net> <20100612163208.GS87112@cicely7.cicely.de> <864oh86tnl.fsf@ds4.des.no> <20100612225216.GT87112@cicely7.cicely.de> Date: Sun, 13 Jun 2010 17:44:29 +0200 In-Reply-To: <20100612225216.GT87112@cicely7.cicely.de> (Bernd Walter's message of "Sun, 13 Jun 2010 00:52:16 +0200") Message-ID: <86k4q33pk2.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.95 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: current@freebsd.org Subject: Re: Cleanup for cryptographic algorithms vs. compiler optimizations X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 15:46:41 -0000 Bernd Walter writes: > Amazing - this is one of the things which can get nasty if you try some > kind of microtuning. Only if you break the rules. Bad code is always bad, even if it sometimes works by accident. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 16:00:46 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8B381065676 for ; Sun, 13 Jun 2010 16:00:46 +0000 (UTC) (envelope-from ticso@cicely7.cicely.de) Received: from raven.bwct.de (raven.bwct.de [85.159.14.73]) by mx1.freebsd.org (Postfix) with ESMTP id 3D4258FC1D for ; Sun, 13 Jun 2010 16:00:45 +0000 (UTC) Received: from mail.cicely.de ([10.1.1.37]) by raven.bwct.de (8.13.4/8.13.4) with ESMTP id o5DG0iFg007806 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 13 Jun 2010 18:00:44 +0200 (CEST) (envelope-from ticso@cicely7.cicely.de) Received: from cicely7.cicely.de (cicely7.cicely.de [10.1.1.9]) by mail.cicely.de (8.14.3/8.14.3) with ESMTP id o5DG0ZCT059281 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 13 Jun 2010 18:00:35 +0200 (CEST) (envelope-from ticso@cicely7.cicely.de) Received: from cicely7.cicely.de (localhost [127.0.0.1]) by cicely7.cicely.de (8.14.2/8.14.2) with ESMTP id o5DG0ZQ7002833; Sun, 13 Jun 2010 18:00:35 +0200 (CEST) (envelope-from ticso@cicely7.cicely.de) Received: (from ticso@localhost) by cicely7.cicely.de (8.14.2/8.14.2/Submit) id o5DG0Z9P002832; Sun, 13 Jun 2010 18:00:35 +0200 (CEST) (envelope-from ticso) Date: Sun, 13 Jun 2010 18:00:35 +0200 From: Bernd Walter To: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= Message-ID: <20100613160035.GD87112@cicely7.cicely.de> References: <20100611162118.GR39829@acme.spoerlein.net> <867hm5tl6u.fsf@ds4.des.no> <20100612153526.GA3632@acme.spoerlein.net> <20100612163208.GS87112@cicely7.cicely.de> <864oh86tnl.fsf@ds4.des.no> <20100612225216.GT87112@cicely7.cicely.de> <86k4q33pk2.fsf@ds4.des.no> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <86k4q33pk2.fsf@ds4.des.no> X-Operating-System: FreeBSD cicely7.cicely.de 7.0-STABLE i386 User-Agent: Mutt/1.5.11 X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED=-1, BAYES_00=-1.9, T_RP_MATCHES_RCVD=-0.01 autolearn=ham version=3.3.0 X-Spam-Checker-Version: SpamAssassin 3.3.0 (2010-01-18) on spamd.cicely.de Cc: ticso@cicely.de, current@freebsd.org Subject: Re: Cleanup for cryptographic algorithms vs. compiler optimizations X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: ticso@cicely.de List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 16:00:46 -0000 On Sun, Jun 13, 2010 at 05:44:29PM +0200, Dag-Erling Smørgrav wrote: > Bernd Walter writes: > > Amazing - this is one of the things which can get nasty if you try some > > kind of microtuning. > > Only if you break the rules. Bad code is always bad, even if it > sometimes works by accident. To expect that function calls are replaced with other functions isn't a very obvious rule. -- B.Walter http://www.bwct.de Modbus/TCP Ethernet I/O Baugruppen, ARM basierte FreeBSD Rechner uvm. From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 16:16:23 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 46B66106566B for ; Sun, 13 Jun 2010 16:16:23 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 0771B8FC1B for ; Sun, 13 Jun 2010 16:16:22 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 102421FFC33; Sun, 13 Jun 2010 16:16:21 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id CCE5C84461; Sun, 13 Jun 2010 18:14:11 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: ticso@cicely.de References: <20100611162118.GR39829@acme.spoerlein.net> <867hm5tl6u.fsf@ds4.des.no> <20100612153526.GA3632@acme.spoerlein.net> <20100612163208.GS87112@cicely7.cicely.de> <864oh86tnl.fsf@ds4.des.no> <20100612225216.GT87112@cicely7.cicely.de> <86k4q33pk2.fsf@ds4.des.no> <20100613160035.GD87112@cicely7.cicely.de> Date: Sun, 13 Jun 2010 18:14:11 +0200 In-Reply-To: <20100613160035.GD87112@cicely7.cicely.de> (Bernd Walter's message of "Sun, 13 Jun 2010 18:00:35 +0200") Message-ID: <86fx0q52r0.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.95 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: current@freebsd.org Subject: Re: Cleanup for cryptographic algorithms vs. compiler optimizations X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 16:16:23 -0000 Bernd Walter writes: > Dag-Erling Sm=C3=B8rgrav writes: > > Bernd Walter writes: > > > Amazing - this is one of the things which can get nasty if you try > > > some kind of microtuning. > > Only if you break the rules. Bad code is always bad, even if it > > sometimes works by accident. > To expect that function calls are replaced with other functions isn't a > very obvious rule. You don't need to know that gcc replaces printf() with puts(). That's the whole point of the as-if rule: the compiler can only modify the program in ways that do not change observable behavior. The only way you can tell that gcc did it is if you break the rules, such as by defining your own version of printf() or puts(). DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 16:20:35 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7C2C1065675 for ; Sun, 13 Jun 2010 16:20:35 +0000 (UTC) (envelope-from akm@theinternet.com.au) Received: from mail05.syd.optusnet.com.au (mail05.syd.optusnet.com.au [211.29.132.186]) by mx1.freebsd.org (Postfix) with ESMTP id 454158FC1C for ; Sun, 13 Jun 2010 16:20:34 +0000 (UTC) Received: from camelot.theinternet.com.au (d110-32-224-17.bla800.nsw.optusnet.com.au [110.32.224.17]) by mail05.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id o5DGKRHa028087; Mon, 14 Jun 2010 02:20:27 +1000 Received: by camelot.theinternet.com.au (Postfix, from userid 1000) id C05CC17022; Mon, 14 Jun 2010 02:20:26 +1000 (EST) Date: Mon, 14 Jun 2010 02:20:26 +1000 From: Andrew Milton To: ticso@cicely.de Message-ID: <20100613162026.GQ40531@camelot.theinternet.com.au> References: <20100611162118.GR39829@acme.spoerlein.net> <867hm5tl6u.fsf@ds4.des.no> <20100612153526.GA3632@acme.spoerlein.net> <20100612163208.GS87112@cicely7.cicely.de> <864oh86tnl.fsf@ds4.des.no> <20100612225216.GT87112@cicely7.cicely.de> <86k4q33pk2.fsf@ds4.des.no> <20100613160035.GD87112@cicely7.cicely.de> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20100613160035.GD87112@cicely7.cicely.de> User-Agent: Mutt/1.4.2.3i Cc: current@freebsd.org Subject: Re: Cleanup for cryptographic algorithms vs. compiler optimizations X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 16:20:35 -0000 +-------[ Bernd Walter ]---------------------- | On Sun, Jun 13, 2010 at 05:44:29PM +0200, Dag-Erling Smørgrav wrote: | > Bernd Walter writes: | > > Amazing - this is one of the things which can get nasty if you try some | > > kind of microtuning. | > | > Only if you break the rules. Bad code is always bad, even if it | > sometimes works by accident. | | To expect that function calls are replaced with other functions isn't a | very obvious rule. Don't turn on compiler optimisation then. You're explicitly telling the compiler to make your code better/faster/smaller. Optimisation flags always come with the caveat that your code may not work exactly the same... -- Andrew Milton akm@theinternet.com.au From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 16:28:55 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 95ABE1065670 for ; Sun, 13 Jun 2010 16:28:55 +0000 (UTC) (envelope-from ticso@cicely7.cicely.de) Received: from raven.bwct.de (raven.bwct.de [85.159.14.73]) by mx1.freebsd.org (Postfix) with ESMTP id F10C78FC08 for ; Sun, 13 Jun 2010 16:28:54 +0000 (UTC) Received: from mail.cicely.de ([10.1.1.37]) by raven.bwct.de (8.13.4/8.13.4) with ESMTP id o5DGSrFK008727 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 13 Jun 2010 18:28:53 +0200 (CEST) (envelope-from ticso@cicely7.cicely.de) Received: from cicely7.cicely.de (cicely7.cicely.de [10.1.1.9]) by mail.cicely.de (8.14.3/8.14.3) with ESMTP id o5DGSfBR060308 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 13 Jun 2010 18:28:41 +0200 (CEST) (envelope-from ticso@cicely7.cicely.de) Received: from cicely7.cicely.de (localhost [127.0.0.1]) by cicely7.cicely.de (8.14.2/8.14.2) with ESMTP id o5DGSfIc002922; Sun, 13 Jun 2010 18:28:41 +0200 (CEST) (envelope-from ticso@cicely7.cicely.de) Received: (from ticso@localhost) by cicely7.cicely.de (8.14.2/8.14.2/Submit) id o5DGSfX8002921; Sun, 13 Jun 2010 18:28:41 +0200 (CEST) (envelope-from ticso) Date: Sun, 13 Jun 2010 18:28:41 +0200 From: Bernd Walter To: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= Message-ID: <20100613162841.GE87112@cicely7.cicely.de> References: <20100611162118.GR39829@acme.spoerlein.net> <867hm5tl6u.fsf@ds4.des.no> <20100612153526.GA3632@acme.spoerlein.net> <20100612163208.GS87112@cicely7.cicely.de> <864oh86tnl.fsf@ds4.des.no> <20100612225216.GT87112@cicely7.cicely.de> <86k4q33pk2.fsf@ds4.des.no> <20100613160035.GD87112@cicely7.cicely.de> <86fx0q52r0.fsf@ds4.des.no> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <86fx0q52r0.fsf@ds4.des.no> X-Operating-System: FreeBSD cicely7.cicely.de 7.0-STABLE i386 User-Agent: Mutt/1.5.11 X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED=-1, BAYES_00=-1.9, T_RP_MATCHES_RCVD=-0.01 autolearn=unavailable version=3.3.0 X-Spam-Checker-Version: SpamAssassin 3.3.0 (2010-01-18) on spamd.cicely.de Cc: ticso@cicely.de, current@freebsd.org Subject: Re: Cleanup for cryptographic algorithms vs. compiler optimizations X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: ticso@cicely.de List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 16:28:55 -0000 On Sun, Jun 13, 2010 at 06:14:11PM +0200, Dag-Erling Smørgrav wrote: > Bernd Walter writes: > > Dag-Erling Smørgrav writes: > > > Bernd Walter writes: > > > > Amazing - this is one of the things which can get nasty if you try > > > > some kind of microtuning. > > > Only if you break the rules. Bad code is always bad, even if it > > > sometimes works by accident. > > To expect that function calls are replaced with other functions isn't a > > very obvious rule. > > You don't need to know that gcc replaces printf() with puts(). That's > the whole point of the as-if rule: the compiler can only modify the > program in ways that do not change observable behavior. Well in ways the compiler _thinks_ it is not observeable. I'm not saying that it is doing wrong per definition, but if it is really not observeable and obvious we wouldn't need to talk about it. > The only way you can tell that gcc did it is if you break the rules, > such as by defining your own version of printf() or puts(). Our loader stages do this for good reasons. And in microcontroller programming (surely out of FreeBSD scope) it is done very regulary. All I say is that the rules are not obvious in many cases. Most people using compilers don't have the deep knowledge as you have. Of course we are talking about corner cases which most people also never have to face. In any case - I've learned something new. -- B.Walter http://www.bwct.de Modbus/TCP Ethernet I/O Baugruppen, ARM basierte FreeBSD Rechner uvm. From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 17:54:02 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D81E91065672; Sun, 13 Jun 2010 17:54:02 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id 91AC48FC14; Sun, 13 Jun 2010 17:54:02 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5DHs1vl003926; Sun, 13 Jun 2010 13:54:01 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5DHs1NR003925; Sun, 13 Jun 2010 17:54:01 GMT (envelope-from tinderbox@freebsd.org) Date: Sun, 13 Jun 2010 17:54:01 GMT Message-Id: <201006131754.o5DHs1NR003925@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on ia64/ia64 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 17:54:03 -0000 TB --- 2010-06-13 16:32:45 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-13 16:32:45 - starting HEAD tinderbox run for ia64/ia64 TB --- 2010-06-13 16:32:45 - cleaning the object tree TB --- 2010-06-13 16:32:54 - cvsupping the source tree TB --- 2010-06-13 16:32:54 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/ia64/ia64/supfile TB --- 2010-06-13 16:33:19 - building world TB --- 2010-06-13 16:33:19 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-13 16:33:19 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-13 16:33:19 - TARGET=ia64 TB --- 2010-06-13 16:33:19 - TARGET_ARCH=ia64 TB --- 2010-06-13 16:33:19 - TZ=UTC TB --- 2010-06-13 16:33:19 - __MAKE_CONF=/dev/null TB --- 2010-06-13 16:33:19 - cd /src TB --- 2010-06-13 16:33:19 - /usr/bin/make -B buildworld >>> World build started on Sun Jun 13 16:33:20 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything [...] cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/command.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/config.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/devices.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/dhcp.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/disks.c cc1: warnings being treated as errors /src/usr.sbin/sysinstall/disks.c: In function 'diskPartitionWrite': /src/usr.sbin/sysinstall/disks.c:877: warning: unused variable 'boot1' *** Error code 1 Stop in /src/usr.sbin/sysinstall. *** Error code 1 Stop in /src/usr.sbin. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-13 17:54:01 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-13 17:54:01 - ERROR: failed to build world TB --- 2010-06-13 17:54:01 - 3812.89 user 610.40 system 4875.87 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-ia64-ia64.full From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 19:03:08 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CAA701065675 for ; Sun, 13 Jun 2010 19:03:08 +0000 (UTC) (envelope-from rpaulo@freebsd.org) Received: from karen.lavabit.com (karen.lavabit.com [72.249.41.33]) by mx1.freebsd.org (Postfix) with ESMTP id 8CA878FC16 for ; Sun, 13 Jun 2010 19:03:08 +0000 (UTC) Received: from e.earth.lavabit.com (e.earth.lavabit.com [192.168.111.14]) by karen.lavabit.com (Postfix) with ESMTP id 55F93157544; Sun, 13 Jun 2010 14:03:07 -0500 (CDT) Received: from 10.0.128.34 (75.16.26.133) by lavabit.com with ESMTP id 3J84R57STZHP; Sun, 13 Jun 2010 14:03:07 -0500 References: <28870665.post@talk.nabble.com> In-Reply-To: <28870665.post@talk.nabble.com> Mime-Version: 1.0 (Apple Message framework v1078) Content-Type: text/plain; charset=us-ascii Message-Id: <2BD1167C-E2B3-49FA-89D0-7B1DA487BB71@FreeBSD.org> Content-Transfer-Encoding: 7bit From: Rui Paulo Date: Sun, 13 Jun 2010 12:03:05 -0700 To: Jakub Lach X-Mailer: Apple Mail (2.1078) Cc: freebsd-current@freebsd.org Subject: Re: wpa_supplicant update? CTRL-EVENT-SCAN-RESULTS X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 19:03:08 -0000 On 13 Jun 2010, at 04:23, Jakub Lach wrote: > > Hello. > > Is update of wpa_supplicant planned? > > Current version in STABLE as well as CURRENT > (v0.6.8) is suffering from CTRL-EVENT-SCAN-RESULTS > log spam. > > If it's the same problem, looks like it's fixed in v0.6.10 > > http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=539915 I'll likely work on this soon. -- Rui Paulo From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 19:28:28 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2972E106566C; Sun, 13 Jun 2010 19:28:28 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id C10828FC08; Sun, 13 Jun 2010 19:28:27 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5DJSQ8V064625; Sun, 13 Jun 2010 15:28:26 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5DJSQJ8064617; Sun, 13 Jun 2010 19:28:26 GMT (envelope-from tinderbox@freebsd.org) Date: Sun, 13 Jun 2010 19:28:26 GMT Message-Id: <201006131928.o5DJSQJ8064617@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on sparc64/sparc64 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 19:28:28 -0000 TB --- 2010-06-13 18:27:13 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-13 18:27:13 - starting HEAD tinderbox run for sparc64/sparc64 TB --- 2010-06-13 18:27:13 - cleaning the object tree TB --- 2010-06-13 18:27:22 - cvsupping the source tree TB --- 2010-06-13 18:27:22 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/sparc64/sparc64/supfile TB --- 2010-06-13 18:27:39 - building world TB --- 2010-06-13 18:27:39 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-13 18:27:39 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-13 18:27:39 - TARGET=sparc64 TB --- 2010-06-13 18:27:39 - TARGET_ARCH=sparc64 TB --- 2010-06-13 18:27:39 - TZ=UTC TB --- 2010-06-13 18:27:39 - __MAKE_CONF=/dev/null TB --- 2010-06-13 18:27:39 - cd /src TB --- 2010-06-13 18:27:39 - /usr/bin/make -B buildworld >>> World build started on Sun Jun 13 18:27:40 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything [...] cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/index.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/install.c cc1: warnings being treated as errors /src/usr.sbin/sysinstall/install.c: In function 'installStandard': /src/usr.sbin/sysinstall/install.c:632: warning: unused variable 'devs' /src/usr.sbin/sysinstall/install.c:631: warning: unused variable 'tries' /src/usr.sbin/sysinstall/install.c: In function 'installFixupBase': /src/usr.sbin/sysinstall/install.c:877: warning: unused variable 'fp' *** Error code 1 Stop in /src/usr.sbin/sysinstall. *** Error code 1 Stop in /src/usr.sbin. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-13 19:28:26 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-13 19:28:26 - ERROR: failed to build world TB --- 2010-06-13 19:28:26 - 2727.27 user 566.72 system 3673.15 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-sparc64-sparc64.full From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 19:39:24 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4DFD3106566B; Sun, 13 Jun 2010 19:39:24 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id E5F138FC16; Sun, 13 Jun 2010 19:39:23 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5DJdNIf005816; Sun, 13 Jun 2010 15:39:23 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5DJdNB4005815; Sun, 13 Jun 2010 19:39:23 GMT (envelope-from tinderbox@freebsd.org) Date: Sun, 13 Jun 2010 19:39:23 GMT Message-Id: <201006131939.o5DJdNB4005815@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on powerpc/powerpc X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 19:39:24 -0000 TB --- 2010-06-13 18:00:52 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-13 18:00:52 - starting HEAD tinderbox run for powerpc/powerpc TB --- 2010-06-13 18:00:52 - cleaning the object tree TB --- 2010-06-13 18:01:03 - cvsupping the source tree TB --- 2010-06-13 18:01:03 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/powerpc/powerpc/supfile TB --- 2010-06-13 18:01:29 - building world TB --- 2010-06-13 18:01:29 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-13 18:01:29 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-13 18:01:29 - TARGET=powerpc TB --- 2010-06-13 18:01:29 - TARGET_ARCH=powerpc TB --- 2010-06-13 18:01:29 - TZ=UTC TB --- 2010-06-13 18:01:29 - __MAKE_CONF=/dev/null TB --- 2010-06-13 18:01:29 - cd /src TB --- 2010-06-13 18:01:29 - /usr/bin/make -B buildworld >>> World build started on Sun Jun 13 18:01:29 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything [...] cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/index.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/install.c cc1: warnings being treated as errors /src/usr.sbin/sysinstall/install.c: In function 'installStandard': /src/usr.sbin/sysinstall/install.c:632: warning: unused variable 'devs' /src/usr.sbin/sysinstall/install.c:631: warning: unused variable 'tries' /src/usr.sbin/sysinstall/install.c: In function 'installFixupBase': /src/usr.sbin/sysinstall/install.c:877: warning: unused variable 'fp' *** Error code 1 Stop in /src/usr.sbin/sysinstall. *** Error code 1 Stop in /src/usr.sbin. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-13 19:39:23 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-13 19:39:23 - ERROR: failed to build world TB --- 2010-06-13 19:39:23 - 4768.15 user 723.59 system 5910.27 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-powerpc-powerpc.full From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 19:40:31 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20ACC106566C for ; Sun, 13 Jun 2010 19:40:31 +0000 (UTC) (envelope-from bounces@nabble.com) Received: from kuber.nabble.com (kuber.nabble.com [216.139.236.158]) by mx1.freebsd.org (Postfix) with ESMTP id F06568FC1A for ; Sun, 13 Jun 2010 19:40:30 +0000 (UTC) Received: from isper.nabble.com ([192.168.236.156]) by kuber.nabble.com with esmtp (Exim 4.63) (envelope-from ) id 1ONt2k-0002fD-AE for freebsd-current@freebsd.org; Sun, 13 Jun 2010 12:40:30 -0700 Message-ID: <28873483.post@talk.nabble.com> Date: Sun, 13 Jun 2010 12:40:30 -0700 (PDT) From: Jakub Lach To: freebsd-current@freebsd.org In-Reply-To: <2BD1167C-E2B3-49FA-89D0-7B1DA487BB71@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Nabble-From: jakub_lach@mailplus.pl References: <28870665.post@talk.nabble.com> <2BD1167C-E2B3-49FA-89D0-7B1DA487BB71@FreeBSD.org> Subject: Re: wpa_supplicant update? CTRL-EVENT-SCAN-RESULTS X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 19:40:31 -0000 Rui Paulo-3 wrote: > > On 13 Jun 2010, at 04:23, Jakub Lach wrote: > >> Hello. >> >> Is update of wpa_supplicant planned? > > > I'll likely work on this soon. > > -- > Rui Paulo > That's splendid, thanks for fast reply. Is MFC to 8 feasible? regards, - Jakub Lach -- View this message in context: http://old.nabble.com/wpa_supplicant-update--CTRL-EVENT-SCAN-RESULTS-tp28870665p28873483.html Sent from the freebsd-current mailing list archive at Nabble.com. From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 19:46:17 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 72E921065672; Sun, 13 Jun 2010 19:46:17 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id 151C38FC0A; Sun, 13 Jun 2010 19:46:16 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5DJkGCm021278; Sun, 13 Jun 2010 15:46:16 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5DJkGiL021277; Sun, 13 Jun 2010 19:46:16 GMT (envelope-from tinderbox@freebsd.org) Date: Sun, 13 Jun 2010 19:46:16 GMT Message-Id: <201006131946.o5DJkGiL021277@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on sparc64/sun4v X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 19:46:17 -0000 TB --- 2010-06-13 18:47:41 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-13 18:47:41 - starting HEAD tinderbox run for sparc64/sun4v TB --- 2010-06-13 18:47:41 - cleaning the object tree TB --- 2010-06-13 18:47:51 - cvsupping the source tree TB --- 2010-06-13 18:47:51 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/sparc64/sun4v/supfile TB --- 2010-06-13 18:48:10 - building world TB --- 2010-06-13 18:48:10 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-13 18:48:10 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-13 18:48:10 - TARGET=sun4v TB --- 2010-06-13 18:48:10 - TARGET_ARCH=sparc64 TB --- 2010-06-13 18:48:10 - TZ=UTC TB --- 2010-06-13 18:48:10 - __MAKE_CONF=/dev/null TB --- 2010-06-13 18:48:10 - cd /src TB --- 2010-06-13 18:48:10 - /usr/bin/make -B buildworld >>> World build started on Sun Jun 13 18:48:11 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything [...] cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/index.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/install.c cc1: warnings being treated as errors /src/usr.sbin/sysinstall/install.c: In function 'installStandard': /src/usr.sbin/sysinstall/install.c:632: warning: unused variable 'devs' /src/usr.sbin/sysinstall/install.c:631: warning: unused variable 'tries' /src/usr.sbin/sysinstall/install.c: In function 'installFixupBase': /src/usr.sbin/sysinstall/install.c:877: warning: unused variable 'fp' *** Error code 1 Stop in /src/usr.sbin/sysinstall. *** Error code 1 Stop in /src/usr.sbin. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-13 19:46:16 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-13 19:46:16 - ERROR: failed to build world TB --- 2010-06-13 19:46:16 - 2716.34 user 551.34 system 3514.29 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-sparc64-sun4v.full From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 19:47:34 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0E3F41065679 for ; Sun, 13 Jun 2010 19:47:34 +0000 (UTC) (envelope-from rpaulo@freebsd.org) Received: from karen.lavabit.com (karen.lavabit.com [72.249.41.33]) by mx1.freebsd.org (Postfix) with ESMTP id C301A8FC20 for ; Sun, 13 Jun 2010 19:47:33 +0000 (UTC) Received: from e.earth.lavabit.com (e.earth.lavabit.com [192.168.111.14]) by karen.lavabit.com (Postfix) with ESMTP id 723E9157544; Sun, 13 Jun 2010 14:47:32 -0500 (CDT) Received: from 10.0.128.34 (75.16.26.133) by lavabit.com with ESMTP id WPQP2W5OIBDX; Sun, 13 Jun 2010 14:47:32 -0500 References: <28870665.post@talk.nabble.com> <2BD1167C-E2B3-49FA-89D0-7B1DA487BB71@FreeBSD.org> <28873483.post@talk.nabble.com> In-Reply-To: <28873483.post@talk.nabble.com> Mime-Version: 1.0 (Apple Message framework v1078) Content-Type: text/plain; charset=us-ascii Message-Id: Content-Transfer-Encoding: 7bit From: Rui Paulo Date: Sun, 13 Jun 2010 12:47:30 -0700 To: Jakub Lach X-Mailer: Apple Mail (2.1078) Cc: freebsd-current@freebsd.org Subject: Re: wpa_supplicant update? CTRL-EVENT-SCAN-RESULTS X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 19:47:34 -0000 On 13 Jun 2010, at 12:40, Jakub Lach wrote: > > > Rui Paulo-3 wrote: >> >> On 13 Jun 2010, at 04:23, Jakub Lach wrote: >> >>> Hello. >>> >>> Is update of wpa_supplicant planned? >> >> >> I'll likely work on this soon. >> >> -- >> Rui Paulo >> > > That's splendid, thanks for fast reply. > > Is MFC to 8 feasible? Possibly, but it won't make it in time for 8.1. -- Rui Paulo From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 20:01:38 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6E97C106567F for ; Sun, 13 Jun 2010 20:01:38 +0000 (UTC) (envelope-from bounces@nabble.com) Received: from kuber.nabble.com (kuber.nabble.com [216.139.236.158]) by mx1.freebsd.org (Postfix) with ESMTP id 48AFB8FC08 for ; Sun, 13 Jun 2010 20:01:37 +0000 (UTC) Received: from isper.nabble.com ([192.168.236.156]) by kuber.nabble.com with esmtp (Exim 4.63) (envelope-from ) id 1ONtNB-00041X-39 for freebsd-current@freebsd.org; Sun, 13 Jun 2010 13:01:37 -0700 Message-ID: <28873587.post@talk.nabble.com> Date: Sun, 13 Jun 2010 13:01:37 -0700 (PDT) From: Jakub Lach To: freebsd-current@freebsd.org In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Nabble-From: jakub_lach@mailplus.pl References: <28870665.post@talk.nabble.com> <2BD1167C-E2B3-49FA-89D0-7B1DA487BB71@FreeBSD.org> <28873483.post@talk.nabble.com> Subject: Re: wpa_supplicant update? CTRL-EVENT-SCAN-RESULTS X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 20:01:38 -0000 Rui Paulo-3 wrote: > > > On 13 Jun 2010, at 12:40, Jakub Lach wrote: > >> Rui Paulo-3 wrote: >>> >>> On 13 Jun 2010, at 04:23, Jakub Lach wrote: >>> >>>> Hello. >>>> >>>> Is update of wpa_supplicant planned? >>> >>> >>> I'll likely work on this soon. >>> >>> -- >>> Rui Paulo >>> >> >> That's splendid, thanks for fast reply. >> >> Is MFC to 8 feasible? > > Possibly, but it won't make it in time for 8.1. > That's understandable, I track STABLE anyway (since 8 became STABLE as a matter of fact). regards, - Jakub Lach -- View this message in context: http://old.nabble.com/wpa_supplicant-update--CTRL-EVENT-SCAN-RESULTS-tp28870665p28873587.html Sent from the freebsd-current mailing list archive at Nabble.com. From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 20:13:37 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 42EC71065672 for ; Sun, 13 Jun 2010 20:13:37 +0000 (UTC) (envelope-from kristof@sigsegv.be) Received: from juliette.telenet-ops.be (juliette.telenet-ops.be [195.130.137.74]) by mx1.freebsd.org (Postfix) with ESMTP id 5F0778FC08 for ; Sun, 13 Jun 2010 20:13:35 +0000 (UTC) Received: from triton.sigsegv.be ([213.119.97.224]) by juliette.telenet-ops.be with bizsmtp id VYDa1e00A4qUA0t06YDa2j; Sun, 13 Jun 2010 22:13:34 +0200 Received: from nereid (nereid.neptune.sigsegv.be [IPv6:2001:470:c8f4:0:200:ff:fe00:8]) by triton.sigsegv.be (Postfix) with SMTP id 2A8BF1D910; Sun, 13 Jun 2010 22:13:33 +0200 (CEST) Received: by nereid (sSMTP sendmail emulation); Sun, 13 Jun 2010 22:13:33 +0200 Date: Sun, 13 Jun 2010 22:13:31 +0200 From: Kristof Provost To: Norikatsu Shigemura Message-ID: <20100613201331.GA19653@nereid> References: <20100613233723.ed2c3a30.nork@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="HlL+5n6rz5pIUxbD" Content-Disposition: inline In-Reply-To: <20100613233723.ed2c3a30.nork@FreeBSD.org> X-PGP-Fingerprint: 6B6E 5EED 8ECF FAE7 1F61 7458 5046 7D0E 11B0 0EE8 User-Agent: Mutt/1.5.20 (2009-06-14) Cc: freebsd-arm@FreeBSD.org, freebsd-current@FreeBSD.org, yongari@FreeBSD.org Subject: Re: [OpenRD Ultimate] e1000phy(88E1149/88E1121) has a initialize issue X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 20:13:37 -0000 --HlL+5n6rz5pIUxbD Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On 2010-06-13 23:37:23 (+0900), Norikatsu Shigemura wrote: > Hi yongari! > > I have a OpenRD Ultimate, which has two GbE ports - if_mge(4). But > I couldn't use mge1 like following. So I tried to investigate. > > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > Jun 13 05:02:14 sidearms kernel: mge1: watchdog timeout > Jun 13 05:02:14 sidearms kernel: mge1: Timeout on link-up > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > I believe the mge(4) driver incorrectly configures the PHY address for the second interface. Can you give the attached patch a try? I'm not familiar with the PHY code so I won't comment on those changes. Regards, Kristof --HlL+5n6rz5pIUxbD Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="if_mge_openrd.patch" Index: sys/dev/mge/if_mge.c =================================================================== --- sys/dev/mge/if_mge.c (revision 208113) +++ sys/dev/mge/if_mge.c (working copy) @@ -606,7 +606,6 @@ mge_attach(device_t dev) { struct mge_softc *sc; - struct mii_softc *miisc; struct ifnet *ifp; uint8_t hwaddr[ETHER_ADDR_LEN]; int i, error ; @@ -690,9 +689,9 @@ } sc->mii = device_get_softc(sc->miibus); - /* Tell the MAC where to find the PHY so autoneg works */ - miisc = LIST_FIRST(&sc->mii->mii_phys); - MGE_WRITE(sc, MGE_REG_PHYDEV, miisc->mii_phy); + /* Tell the MAC where to find the PHY so autoneg works + * We assume a static mapping (see mge_miibus_readreg) */ + MGE_WRITE(sc, MGE_REG_PHYDEV, device_get_unit(dev) + MII_ADDR_BASE); /* Attach interrupt handlers */ for (i = 0; i < 2; ++i) { --HlL+5n6rz5pIUxbD-- From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 20:28:28 2010 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B05081065674 for ; Sun, 13 Jun 2010 20:28:28 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id F220E8FC13 for ; Sun, 13 Jun 2010 20:28:27 +0000 (UTC) Received: from mail-vw0-f54.google.com (mail-vw0-f54.google.com [209.85.212.54]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id CB968BF409 for ; Sun, 13 Jun 2010 22:28:25 +0200 (CEST) Received: by vws20 with SMTP id 20so3848501vws.13 for ; Sun, 13 Jun 2010 13:28:23 -0700 (PDT) MIME-Version: 1.0 Received: by 10.224.79.66 with SMTP id o2mr1601835qak.349.1276460903818; Sun, 13 Jun 2010 13:28:23 -0700 (PDT) Received: by 10.229.247.142 with HTTP; Sun, 13 Jun 2010 13:28:23 -0700 (PDT) Date: Sun, 13 Jun 2010 22:28:23 +0200 Message-ID: From: Alexander Best To: freebsd-current@FreeBSD.org Content-Type: text/plain; charset=ISO-8859-1 Cc: Subject: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 20:28:28 -0000 hi there. i'm experiencing two problems during buildworld. i'm not sure if these are the result of me doing weird stuff or a problem in the src structure: 1. i have the following in my make.conf: .if empty(.CURDIR:M/usr/src/*) && empty(.CURDIR:M/usr/obj/*) && exists(/usr/local/bin/gcc44) CC = gcc44 CXX = g++44 CPP = cpp44 .endif this should make sure that anywhere outside of /usr/src and /usr/obj gcc44 should be used instead of the base gcc. however during buidlworld i get: ===> libvers (installincludes)^M cd /usr/src/usr.bin/lex/lib; MAKEOBJDIRPREFIX=/usr/obj/lib32 _SHLIBDIRPREFIX=/usr/obj/usr/src/lib32 VERSION="FreeBSD 9.0-CURRENT amd64 900013" MACHINE=i386 MACHINE_ARCH=i386 MACHINE_CPU="i686 mmx sse sse2" INSTALL="sh /usr/src/tools/install.sh" PATH=/usr/obj/usr/src/tm /usr/obj/lib32/usr/src/usr.bin/lex/lib created for /usr/src/usr.bin/lex/lib^M cd /usr/src/lib/ncurses/ncurses; MAKEOBJDIRPREFIX=/usr/obj/lib32 /usr/obj/usr/src/make.amd64/make SSP_CFLAGS= DESTDIR= build-tools^M sh /usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/include/MKhashsize.sh /usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/include/Caps > hashsize.h^M AWK=awk sh /usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/include/MKncurses_def.sh /usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/include/ncurses_defs > ncurses_def.h^M sed curses.head -e "/@BROKEN_LINKER@/s%%0%" -e "/@HAVE_VSSCANF@/s%%1%" -e "/@NCURSES_CH_T@/s%%chtype%" -e "/@NCURSES_CONST@/s%%const%" -e "/@NCURSES_EXT_COLORS@/s%%0%" -e "/@NCURSES_EXT_FUNCS@/s cat curses.head > curses.h.new^M AWK=awk _POSIX2_VERSION=199209 sh /usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/include/MKkey_defs.sh /usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/include/Caps >> curses.h.new^M cat /usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/include/curses.tail >> curses.h.new^M mv -f curses.h.new curses.h^M sed MKterm.h.awk -e "/@BROKEN_LINKER@/s%%0%" -e "/@NCURSES_MAJOR@/s%%5%" -e "/@NCURSES_MINOR@/s%%7%" -e "/@NCURSES_CONST@/s%%const%" -e "/@NCURSES_TPARM_VARARGS@/s%%1%" -e "/@NCURSES_SBOOL@/ awk -f MKterm.h.awk /usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/include/Caps > term.h.new^M sh /usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/include/edit_cfg.sh /usr/src/lib/ncurses/ncurses/ncurses_cfg.h term.h.new^M ** edit: HAVE_TCGETATTR 1^M ** edit: HAVE_TERMIOS_H 1^M ** edit: HAVE_TERMIO_H 0^M ** edit: BROKEN_LINKER 0^M mv -f term.h.new term.h^M sed termcap.h -e "/@NCURSES_MAJOR@/s%%5%" -e "/@NCURSES_MINOR@/s%%7%" -e "/@NCURSES_CONST@/s%%const%" -e "/@NCURSES_OSPEED@/s%%short%"^M sed unctrl.h -e "/@NCURSES_MAJOR@/s%%5%" -e "/@NCURSES_MINOR@/s%%7%"^M cc -o make_hash -O2 -pipe -fno-strict-aliasing -funroll-loops -march=native -I. -I/usr/obj/lib32/usr/src/lib/ncurses/ncurses/../ncurses -I/usr/src/lib/ncurses/ncurses/../ncurses -I/usr/src/lib/ncurses/ncurses/../ncurses -I/usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/ awk -f /usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/ncurses/tinfo/MKnames.awk bigstrings=1 /usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/include/Caps > names.c^M cc -o make_keys -O2 -pipe -fno-strict-aliasing -funroll-loops -march=native -I. -I/usr/obj/lib32/usr/src/lib/ncurses/ncurses/../ncurses -I/usr/src/lib/ncurses/ncurses/../ncurses -I/usr/src/lib/ncurses/ncurses/../ncurses -I/usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/ cd /usr/src/lib/ncurses/ncursesw; MAKEOBJDIRPREFIX=/usr/obj/lib32 /usr/obj/usr/src/make.amd64/make SSP_CFLAGS= DESTDIR= build-tools^M sh /usr/src/lib/ncurses/ncursesw/../../../contrib/ncurses/include/MKhashsize.sh /usr/src/lib/ncurses/ncursesw/../../../contrib/ncurses/include/Caps > hashsize.h^M AWK=awk sh /usr/src/lib/ncurses/ncursesw/../../../contrib/ncurses/include/MKncurses_def.sh /usr/src/lib/ncurses/ncursesw/../../../contrib/ncurses/include/ncurses_defs > ncurses_def.h^M cc -o make_hash -O2 -pipe -fno-strict-aliasing -funroll-loops -march=native -D_XOPEN_SOURCE_EXTENDED -DENABLE_WIDEC -I. -I/usr/obj/lib32/usr/src/lib/ncurses/ncursesw/../ncursesw -I/usr/src/lib/ncurses/ncursesw/../ncursesw -I/usr/src/lib/ncurses/ncursesw/../ncurses -I/usr/src/ awk -f /usr/src/lib/ncurses/ncursesw/../../../contrib/ncurses/ncurses/tinfo/MKnames.awk bigstrings=1 /usr/src/lib/ncurses/ncursesw/../../../contrib/ncurses/include/Caps > names.c^M cc -o make_keys -O2 -pipe -fno-strict-aliasing -funroll-loops -march=native -D_XOPEN_SOURCE_EXTENDED -DENABLE_WIDEC -I. -I/usr/obj/lib32/usr/src/lib/ncurses/ncursesw/../ncursesw -I/usr/src/lib/ncurses/ncursesw/../ncursesw -I/usr/src/lib/ncurses/ncursesw/../ncurses -I/usr/src/ cd /usr/src/lib/libmagic; MAKEOBJDIRPREFIX=/usr/obj/lib32 /usr/obj/usr/src/make.amd64/make SSP_CFLAGS= DESTDIR= build-tools^M cc -DHAVE_CONFIG_H -DCOMPILE_ONLY -I/usr/src/lib/libmagic -I/usr/src/lib/libmagic/../../contrib/file -o mkmagic /usr/src/lib/libmagic/../../contrib/file/apprentice.c /usr/src/lib/libmagic/../../contrib/file/funcs.c /usr/src/lib/libmagic/../../contrib/file/magic.c /usr/src/li cd /usr/src; MAKEOBJDIRPREFIX=/usr/obj/lib32 _SHLIBDIRPREFIX=/usr/obj/usr/src/lib32 VERSION="FreeBSD 9.0-CURRENT amd64 900013" MACHINE=i386 MACHINE_ARCH=i386 MACHINE_CPU="i686 mmx sse sse2" INSTALL="sh /usr/src/tools/install.sh" PATH=/usr/obj/usr/src/tmp/legacy/usr/sb cd /usr/src; /usr/obj/usr/src/make.amd64/make -f Makefile.inc1 _prereq_libs; /usr/obj/usr/src/make.amd64/make -f Makefile.inc1 _startup_libs; /usr/obj/usr/src/make.amd64/make -f Makefile.inc1 _prebuild_libs; /usr/obj/usr/src/make.amd64/make -f Makefile.inc1 _generic_libs; ===> gnu/lib/libssp/libssp_nonshared (obj,depend,all,install)^M rm -f .depend^M CC='gcc44 -m32 -march=native -mfancy-math-387 -DCOMPAT_32BIT -isystem /usr/obj/usr/src/lib32/usr/include/ -L/usr/obj/usr/src/lib32/usr/lib32 -B/usr/obj/usr/src/lib32/usr/lib32' mkdep -f .depend -a -DHAVE_CONFIG_H -I/usr/src/gnu/lib/libssp/libssp_nonshared/.. -I/usr/src/ /usr/bin/mkdep: gcc44: not found^M mkdep: compile failed^M *** Error code 1^M ^M Stop in /usr/src/gnu/lib/libssp/libssp_nonshared.^M *** Error code 1^M ^M Stop in /usr/src.^M *** Error code 1^M ^M Stop in /usr/src.^M *** Error code 1^M ^M Stop in /usr/src.^M *** Error code 1^M ^M Stop in /usr/src.^M ^[[1m^[[7m%^[[27m^[[1m^[[m ^M ^[[1m^[[7m%^[[27m^[[1m^[[m Script done on Sun Jun 13 14:41:41 2010 2. if i set CC=cc (or clang) CXX=c++ (or clang) CPP=cpp (or clang) in src.conf buildworld fails with this error: ===> gnu/lib/csu (obj,depend,all,install)^M /usr/obj/usr/src/make.amd64/make -f /usr/src/gnu/lib/csu/../../usr.bin/cc/cc_tools/Makefile MFILE=/usr/src/gnu/lib/csu/../../usr.bin/cc/cc_tools/Makefile GCCDIR=/usr/src/gnu/lib/csu/../../../contrib/gcc tconfig.h^M TARGET_CPU_DEFAULT="" HEADERS="auto-host.h ansidecl.h" DEFINES="USED_FOR_TARGET" /bin/sh /usr/src/gnu/lib/csu/../../../contrib/gcc/mkconfig.sh tconfig.h^M /usr/obj/usr/src/make.amd64/make -f /usr/src/gnu/lib/csu/../../usr.bin/cc/cc_tools/Makefile MFILE=/usr/src/gnu/lib/csu/../../usr.bin/cc/cc_tools/Makefile GCCDIR=/usr/src/gnu/lib/csu/../../../contrib/gcc tm.h^M TARGET_CPU_DEFAULT="" HEADERS="options.h i386/i386.h i386/unix.h i386/att.h dbxelf.h elfos-undef.h elfos.h freebsd-native.h freebsd-spec.h freebsd.h i386/freebsd.h defaults.h" DEFINES="" /bin/sh /usr/src/gnu/lib/csu/../../../contrib/gcc/mkconfig.sh tm.h^M echo '#define EXTRA_MODES_FILE "i386/i386-modes.def"' >> tm.h^M /usr/obj/usr/src/make.amd64/make -f /usr/src/gnu/lib/csu/../../usr.bin/cc/cc_tools/Makefile MFILE=/usr/src/gnu/lib/csu/../../usr.bin/cc/cc_tools/Makefile GCCDIR=/usr/src/gnu/lib/csu/../../../contrib/gcc options.h^M LC_ALL=C awk -f /usr/src/gnu/lib/csu/../../../contrib/gcc/opt-gather.awk /usr/src/gnu/lib/csu/../../../contrib/gcc/c.opt /usr/src/gnu/lib/csu/../../../contrib/gcc/common.opt /usr/src/gnu/lib/csu/../../../contrib/gcc/config/i386/i386.opt > optionlist^M LC_ALL=C awk -f /usr/src/gnu/lib/csu/../../../contrib/gcc/opt-functions.awk -f /usr/src/gnu/lib/csu/../../../contrib/gcc/opth-gen.awk < optionlist > options.h^M rm -f .depend^M mkdep -f .depend -a -DCRT_BEGIN -DIN_GCC -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3 -I/usr/src/gnu/lib/csu/../../../contrib/gcclibs/include -I/usr/src/gnu/lib/csu/../../../contrib/gcc/config -I/usr/src/gnu/lib/csu/../../../contrib/gcc -I. -I/usr/src/gnu/lib/csu/../../ cc -O2 -pipe -fno-strict-aliasing -funroll-loops -DIN_GCC -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3 -finhibit-size-directive -fno-inline-functions -fno-exceptions -fno-zero-initialized-in-bss -fno-zero-initialized-in-bss -fno-toplevel-reorder -I/usr/src/gnu/lib/csu/. cc -O2 -pipe -fno-strict-aliasing -funroll-loops -DIN_GCC -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3 -finhibit-size-directive -fno-inline-functions -fno-exceptions -fno-zero-initialized-in-bss -fno-zero-initialized-in-bss -fno-toplevel-reorder -I/usr/src/gnu/lib/csu/. cc -O2 -pipe -fno-strict-aliasing -funroll-loops -DIN_GCC -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3 -finhibit-size-directive -fno-inline-functions -fno-exceptions -fno-zero-initialized-in-bss -fno-zero-initialized-in-bss -fno-toplevel-reorder -I/usr/src/gnu/lib/csu/. cc -O2 -pipe -fno-strict-aliasing -funroll-loops -DIN_GCC -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3 -finhibit-size-directive -fno-inline-functions -fno-exceptions -fno-zero-initialized-in-bss -fno-zero-initialized-in-bss -fno-toplevel-reorder -I/usr/src/gnu/lib/csu/. cc -O2 -pipe -fno-strict-aliasing -funroll-loops -DIN_GCC -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3 -finhibit-size-directive -fno-inline-functions -fno-exceptions -fno-zero-initialized-in-bss -fno-zero-initialized-in-bss -fno-toplevel-reorder -I/usr/src/gnu/lib/csu/. sh /usr/src/tools/install.sh -o root -g wheel -m 444 crtbegin.o /usr/obj/usr/src/lib32/usr/lib32/crtbegin.o^M sh /usr/src/tools/install.sh -o root -g wheel -m 444 crtend.o /usr/obj/usr/src/lib32/usr/lib32/crtend.o^M sh /usr/src/tools/install.sh -o root -g wheel -m 444 crtbeginT.o /usr/obj/usr/src/lib32/usr/lib32/crtbeginT.o^M sh /usr/src/tools/install.sh -o root -g wheel -m 444 crtbegin.So /usr/obj/usr/src/lib32/usr/lib32/crtbeginS.o^M sh /usr/src/tools/install.sh -o root -g wheel -m 444 crtend.So /usr/obj/usr/src/lib32/usr/lib32/crtendS.o^M ===> lib/csu/i386-elf (obj,depend,all,install)^M rm -f .depend^M mkdep -f .depend -a -I/usr/src/lib/csu/i386-elf/../common -I/usr/src/lib/csu/i386-elf/../../libc/include /usr/src/lib/csu/i386-elf/crti.S /usr/src/lib/csu/i386-elf/crtn.S^M cc -O2 -pipe -fno-strict-aliasing -funroll-loops -I/usr/src/lib/csu/i386-elf/../common -I/usr/src/lib/csu/i386-elf/../../libc/include -g -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-ari cc -O2 -pipe -fno-strict-aliasing -funroll-loops -I/usr/src/lib/csu/i386-elf/../common -I/usr/src/lib/csu/i386-elf/../../libc/include -g -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-ari cc -O2 -pipe -fno-strict-aliasing -funroll-loops -I/usr/src/lib/csu/i386-elf/../common -I/usr/src/lib/csu/i386-elf/../../libc/include -g -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-ari cc -O2 -pipe -fno-strict-aliasing -funroll-loops -I/usr/src/lib/csu/i386-elf/../common -I/usr/src/lib/csu/i386-elf/../../libc/include -g -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-ari /usr/src/lib/csu/i386-elf/crt1_s.S: Assembler messages:^M /usr/src/lib/csu/i386-elf/crt1_s.S:34: Error: suffix or operands invalid for `push'^M /usr/src/lib/csu/i386-elf/crt1_s.S:37: Error: `8(%ebp)' is not a valid 64 bit base/index expression^M /usr/src/lib/csu/i386-elf/crt1_s.S:38: Error: suffix or operands invalid for `push'^M /usr/src/lib/csu/i386-elf/crt1_s.S:39: Error: `4(%ebp)' is not a valid 64 bit base/index expression^M /usr/src/lib/csu/i386-elf/crt1_s.S:40: Error: suffix or operands invalid for `push'^M *** Error code 1^M ^M Stop in /usr/src/lib/csu/i386-elf.^M *** Error code 1^M ^M Stop in /usr/src.^M *** Error code 1^M ^M Stop in /usr/src.^M *** Error code 1^M ^M Stop in /usr/src.^M *** Error code 1^M ^M Stop in /usr/src.^M ^[[1m^[[7m%^[[27m^[[1m^[[m Script done on Sun Jun 13 22:20:33 2010 cheers. alex -- Alexander Best From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 20:40:55 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E55D8106566B for ; Sun, 13 Jun 2010 20:40:55 +0000 (UTC) (envelope-from yr.retarded@gmail.com) Received: from mail-yx0-f182.google.com (mail-yx0-f182.google.com [209.85.213.182]) by mx1.freebsd.org (Postfix) with ESMTP id 758188FC13 for ; Sun, 13 Jun 2010 20:40:55 +0000 (UTC) Received: by yxm34 with SMTP id 34so1404143yxm.13 for ; Sun, 13 Jun 2010 13:40:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:mime-version :content-type:subject:date:in-reply-to:cc:references:message-id :x-mailer; bh=Sk4uJrozxwpcZC8+hYC2ZGghLAwUhzBkoFgVEjIDheo=; b=W4DTXpsxPPOZE3ONZbLSx+1mOIGs6uS2SEts8hEZpD1cx8lBGLJz6niqEGjzCqwUgm RT4iCVAgz8gK9Ehfk6oKzIr7vm0LynOMyZK07SEd6MVV+meH9mhpuESYA3N4y5wIAzef dZprFiA5m1jGgTbAR0uv1+4ghENeGDczDeUnY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:mime-version:content-type:subject:date:in-reply-to:cc :references:message-id:x-mailer; b=swusdWIztC2dBTI2T+7vokYrdKSnDpZz49+ZwDjtfekykP4QiSiBDGuAIS1Y04wPTo e9RJ0XbQrXGIl5CA03c5awcaeuIZzOPMGQMOYJRE1MHhINq+Y88OUlS2ftOQ6bkuvjZc KHl+iDJCmGW/lATQ/yUkCisj6O3y2FKDUoqxI= Received: by 10.150.104.5 with SMTP id b5mr5802673ybc.411.1276461654619; Sun, 13 Jun 2010 13:40:54 -0700 (PDT) Received: from [192.168.8.188] ([24.206.120.250]) by mx.google.com with ESMTPS id p15sm27183622ybk.13.2010.06.13.13.40.51 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 13 Jun 2010 13:40:53 -0700 (PDT) From: Chris Ruiz Mime-Version: 1.0 (Apple Message framework v1078) Date: Sun, 13 Jun 2010 15:40:48 -0500 In-Reply-To: References: Message-Id: <1330B85F-4C1F-45FF-B058-793E31A76D81@gmail.com> X-Mailer: Apple Mail (2.1078) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: freebsd-current@FreeBSD.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 20:40:56 -0000 On Jun 13, 2010, at 3:28 PM, Alexander Best wrote: > hi there. i'm experiencing two problems during buildworld. i'm not > sure if these are the result of me doing weird stuff or a problem in > the src structure: >=20 > 1. i have the following in my make.conf: >=20 > .if empty(.CURDIR:M/usr/src/*) && empty(.CURDIR:M/usr/obj/*) && > exists(/usr/local/bin/gcc44) > CC =3D gcc44 > CXX =3D g++44 > CPP =3D cpp44 > .endif >=20 > this should make sure that anywhere outside of /usr/src and /usr/obj > gcc44 should be used instead of the base gcc. however during > buidlworld i get: I noticed the same thing on my system today. >=20 > 2. if i set >=20 > CC=3Dcc (or clang) > CXX=3Dc++ (or clang) > CPP=3Dcpp (or clang) >=20 > in src.conf >=20 > buildworld fails with this error: My buildworld breaks in a different place at the beginning of the build = process. My last successful build was r208970. =3D=3D=3D> lib/clang/libllvmsupport (obj,depend,all,install) /usr/obj/usr/src/tmp/usr/src/lib/clang/libllvmsupport created for = /usr/src/lib/clang/libllvmsupport rm -f .depend mkdep -f .depend -a -I/usr/obj/usr/src/tmp/legacy/usr/include = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/regcom= p.c = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/regerr= or.c = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/regexe= c.c = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/regfre= e.c = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/regstr= lcpy.c mkdep -f .depend -a -I/usr/obj/usr/src/tmp/legacy/usr/include = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/APFloa= t.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/APInt.= cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/APSInt= .cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Alloca= tor.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Comman= dLine.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Consta= ntRange.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Debug.= cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/DeltaA= lgorithm.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Dwarf.= cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/ErrorH= andling.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/FileUt= ilities.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Foldin= gSet.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Format= tedStream.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/GraphW= riter.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/IsInf.= cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/IsNAN.= cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Manage= dStatic.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Memory= Buffer.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Memory= Object.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Plugin= Loader.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Pretty= StackTrace.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Regex.= cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/SlowOp= erationInformer.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/SmallP= trSet.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/SmallV= ector.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Source= Mgr.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Statis= tic.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/String= Extras.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/String= Map.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/String= Pool.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/String= Ref.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/System= Utils.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Target= Registry.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Timer.= cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Triple= .cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Twine.= cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/circul= ar_raw_ostream.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/raw_os= _ostream.cpp = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/raw_os= tream.cpp=20 = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/APFloa= t.cpp:15:30: error: llvm/ADT/APFloat.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/APFloa= t.cpp:16:32: error: llvm/ADT/StringRef.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/APFloa= t.cpp:17:33: error: llvm/ADT/FoldingSet.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/APFloa= t.cpp:18:40: error: llvm/Support/ErrorHandling.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/APFloa= t.cpp:19:37: error: llvm/Support/MathExtras.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/APInt.= cpp:16:28: error: llvm/ADT/APInt.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/APInt.= cpp:17:32: error: llvm/ADT/StringRef.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/APInt.= cpp:18:33: error: llvm/ADT/FoldingSet.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/APInt.= cpp:19:34: error: llvm/ADT/SmallString.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/APInt.= cpp:20:32: error: llvm/Support/Debug.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/APInt.= cpp:21:40: error: llvm/Support/ErrorHandling.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/APInt.= cpp:22:37: error: llvm/Support/MathExtras.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/APInt.= cpp:23:38: error: llvm/Support/raw_ostream.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/APSInt= .cpp:15:29: error: llvm/ADT/APSInt.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/APSInt= .cpp:16:33: error: llvm/ADT/FoldingSet.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Alloca= tor.cpp:14:36: error: llvm/Support/Allocator.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Alloca= tor.cpp:15:35: error: llvm/System/DataTypes.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Alloca= tor.cpp:16:35: error: llvm/Support/Recycler.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Alloca= tor.cpp:17:38: error: llvm/Support/raw_ostream.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Alloca= tor.cpp:18:32: error: llvm/System/Memory.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Comman= dLine.cpp:19:38: error: llvm/Support/CommandLine.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Comman= dLine.cpp:20:32: error: llvm/Support/Debug.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Comman= dLine.cpp:21:40: error: llvm/Support/ErrorHandling.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Comman= dLine.cpp:22:39: error: llvm/Support/MemoryBuffer.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Comman= dLine.cpp:23:40: error: llvm/Support/ManagedStatic.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Comman= dLine.cpp:24:38: error: llvm/Support/raw_ostream.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Comman= dLine.cpp:25:40: error: llvm/Target/TargetRegistry.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Comman= dLine.cpp:26:30: error: llvm/System/Host.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Comman= dLine.cpp:27:30: error: llvm/System/Path.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Comman= dLine.cpp:28:32: error: llvm/ADT/OwningPtr.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Comman= dLine.cpp:29:34: error: llvm/ADT/SmallPtrSet.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Comman= dLine.cpp:30:34: error: llvm/ADT/SmallString.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Comman= dLine.cpp:31:32: error: llvm/ADT/StringMap.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Comman= dLine.cpp:32:28: error: llvm/ADT/Twine.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Comman= dLine.cpp:33:32: error: llvm/Config/config.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Consta= ntRange.cpp:24:40: error: llvm/Support/ConstantRange.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Consta= ntRange.cpp:25:32: error: llvm/Support/Debug.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Consta= ntRange.cpp:26:38: error: llvm/Support/raw_ostream.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Consta= ntRange.cpp:27:31: error: llvm/Instructions.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Debug.= cpp:26:38: error: llvm/Support/CommandLine.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Debug.= cpp:27:32: error: llvm/Support/Debug.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Debug.= cpp:28:47: error: llvm/Support/circular_raw_ostream.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Debug.= cpp:29:33: error: llvm/System/Signals.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/DeltaA= lgorithm.cpp:9:37: error: llvm/ADT/DeltaAlgorithm.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Dwarf.= cpp:14:32: error: llvm/Support/Dwarf.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/ErrorH= andling.cpp:15:28: error: llvm/ADT/Twine.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/ErrorH= andling.cpp:16:32: error: llvm/Support/Debug.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/ErrorH= andling.cpp:17:40: error: llvm/Support/ErrorHandling.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/ErrorH= andling.cpp:18:38: error: llvm/Support/raw_ostream.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/ErrorH= andling.cpp:19:33: error: llvm/System/Signals.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/ErrorH= andling.cpp:20:35: error: llvm/System/Threading.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/FileUt= ilities.cpp:15:40: error: llvm/Support/FileUtilities.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/FileUt= ilities.cpp:16:39: error: llvm/Support/MemoryBuffer.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/FileUt= ilities.cpp:17:38: error: llvm/Support/raw_ostream.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/FileUt= ilities.cpp:18:30: error: llvm/System/Path.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/FileUt= ilities.cpp:19:32: error: llvm/ADT/OwningPtr.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/FileUt= ilities.cpp:20:34: error: llvm/ADT/SmallString.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Foldin= gSet.cpp:17:33: error: llvm/ADT/FoldingSet.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Foldin= gSet.cpp:18:36: error: llvm/Support/Allocator.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Foldin= gSet.cpp:19:40: error: llvm/Support/ErrorHandling.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Foldin= gSet.cpp:20:37: error: llvm/Support/MathExtras.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Format= tedStream.cpp:14:32: error: llvm/Support/Debug.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Format= tedStream.cpp:15:42: error: llvm/Support/FormattedStream.h: No such file = or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/GraphW= riter.cpp:14:38: error: llvm/Support/GraphWriter.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/GraphW= riter.cpp:15:30: error: llvm/System/Path.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/GraphW= riter.cpp:16:33: error: llvm/System/Program.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/GraphW= riter.cpp:17:32: error: llvm/Config/config.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/IsInf.= cpp:14:32: error: llvm/Config/config.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/IsInf.= cpp:41:3: error: #error "Don't know how to get isinf()" = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/IsNAN.= cpp:14:32: error: llvm/Config/config.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/IsNAN.= cpp:27:3: error: #error "Don't know how to get isnan()" = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Manage= dStatic.cpp:14:40: error: llvm/Support/ManagedStatic.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Manage= dStatic.cpp:15:32: error: llvm/Config/config.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Manage= dStatic.cpp:16:32: error: llvm/System/Atomic.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Memory= Buffer.cpp:14:39: error: llvm/Support/MemoryBuffer.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Memory= Buffer.cpp:15:32: error: llvm/ADT/OwningPtr.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Memory= Buffer.cpp:16:34: error: llvm/ADT/SmallString.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Memory= Buffer.cpp:17:31: error: llvm/System/Errno.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Memory= Buffer.cpp:18:30: error: llvm/System/Path.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Memory= Buffer.cpp:19:33: error: llvm/System/Process.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Memory= Buffer.cpp:20:33: error: llvm/System/Program.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Memory= Object.cpp:10:39: error: llvm/Support/MemoryObject.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Plugin= Loader.cpp:15:40: error: llvm/Support/ManagedStatic.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Plugin= Loader.cpp:16:39: error: llvm/Support/PluginLoader.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Plugin= Loader.cpp:17:38: error: llvm/Support/raw_ostream.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Plugin= Loader.cpp:18:40: error: llvm/System/DynamicLibrary.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Plugin= Loader.cpp:19:31: error: llvm/System/Mutex.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Pretty= StackTrace.cpp:15:43: error: llvm/Support/PrettyStackTrace.h: No such = file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Pretty= StackTrace.cpp:16:38: error: llvm/Support/raw_ostream.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Pretty= StackTrace.cpp:17:33: error: llvm/System/Signals.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Pretty= StackTrace.cpp:18:37: error: llvm/System/ThreadLocal.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Pretty= StackTrace.cpp:19:34: error: llvm/ADT/SmallString.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Regex.= cpp:14:32: error: llvm/Support/Regex.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Regex.= cpp:15:40: error: llvm/Support/ErrorHandling.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Regex.= cpp:16:38: error: llvm/Support/raw_ostream.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Regex.= cpp:17:34: error: llvm/ADT/SmallVector.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/SlowOp= erationInformer.cpp:14:48: error: llvm/Support/SlowOperationInformer.h: = No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/SlowOp= erationInformer.cpp:15:38: error: llvm/Support/raw_ostream.h: No such = file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/SlowOp= erationInformer.cpp:16:31: error: llvm/System/Alarm.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/SmallP= trSet.cpp:15:34: error: llvm/ADT/SmallPtrSet.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/SmallP= trSet.cpp:16:37: error: llvm/Support/MathExtras.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/SmallV= ector.cpp:14:34: error: llvm/ADT/SmallVector.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Source= Mgr.cpp:16:36: error: llvm/Support/SourceMgr.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Source= Mgr.cpp:17:39: error: llvm/Support/MemoryBuffer.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Source= Mgr.cpp:18:38: error: llvm/Support/raw_ostream.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Statis= tic.cpp:24:32: error: llvm/ADT/Statistic.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Statis= tic.cpp:25:38: error: llvm/Support/CommandLine.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Statis= tic.cpp:26:32: error: llvm/Support/Debug.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Statis= tic.cpp:27:40: error: llvm/Support/ManagedStatic.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Statis= tic.cpp:28:38: error: llvm/Support/raw_ostream.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Statis= tic.cpp:29:31: error: llvm/System/Mutex.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Statis= tic.cpp:30:35: error: llvm/ADT/StringExtras.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/String= Extras.cpp:14:34: error: llvm/ADT/SmallVector.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/String= Extras.cpp:15:32: error: llvm/ADT/STLExtras.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/String= Extras.cpp:16:35: error: llvm/ADT/StringExtras.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/String= Map.cpp:14:32: error: llvm/ADT/StringMap.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/String= Map.cpp:15:35: error: llvm/ADT/StringExtras.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/String= Pool.cpp:14:37: error: llvm/Support/StringPool.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/String= Pool.cpp:15:32: error: llvm/ADT/StringRef.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/String= Ref.cpp:10:32: error: llvm/ADT/StringRef.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/String= Ref.cpp:11:28: error: llvm/ADT/APInt.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/System= Utils.cpp:15:38: error: llvm/Support/SystemUtils.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/System= Utils.cpp:16:33: error: llvm/System/Process.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/System= Utils.cpp:17:33: error: llvm/System/Program.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/System= Utils.cpp:18:38: error: llvm/Support/raw_ostream.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Target= Registry.cpp:10:40: error: llvm/Target/TargetRegistry.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Target= Registry.cpp:11:30: error: llvm/System/Host.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Timer.= cpp:14:32: error: llvm/Support/Timer.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Timer.= cpp:15:38: error: llvm/Support/CommandLine.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Timer.= cpp:16:32: error: llvm/Support/Debug.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Timer.= cpp:17:40: error: llvm/Support/ManagedStatic.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Timer.= cpp:18:38: error: llvm/Support/raw_ostream.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Timer.= cpp:19:33: error: llvm/Support/Format.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Timer.= cpp:20:31: error: llvm/System/Mutex.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Timer.= cpp:21:33: error: llvm/System/Process.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Timer.= cpp:22:32: error: llvm/ADT/OwningPtr.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Timer.= cpp:23:32: error: llvm/ADT/StringMap.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Triple= .cpp:10:29: error: llvm/ADT/Triple.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Triple= .cpp:12:34: error: llvm/ADT/SmallString.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Triple= .cpp:13:28: error: llvm/ADT/Twine.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Twine.= cpp:10:28: error: llvm/ADT/Twine.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Twine.= cpp:11:34: error: llvm/ADT/SmallString.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Twine.= cpp:12:32: error: llvm/Support/Debug.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/Twine.= cpp:13:38: error: llvm/Support/raw_ostream.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/circul= ar_raw_ostream.cpp:14:47: error: llvm/Support/circular_raw_ostream.h: No = such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/raw_os= _ostream.cpp:14:41: error: llvm/Support/raw_os_ostream.h: No such file = or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/raw_os= tream.cpp:14:38: error: llvm/Support/raw_ostream.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/raw_os= tream.cpp:15:33: error: llvm/Support/Format.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/raw_os= tream.cpp:16:33: error: llvm/System/Program.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/raw_os= tream.cpp:17:33: error: llvm/System/Process.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/raw_os= tream.cpp:18:34: error: llvm/ADT/SmallVector.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/raw_os= tream.cpp:19:32: error: llvm/Config/config.h: No such file or directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/raw_os= tream.cpp:20:35: error: llvm/Support/Compiler.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/raw_os= tream.cpp:21:40: error: llvm/Support/ErrorHandling.h: No such file or = directory = /usr/src/lib/clang/libllvmsupport/../../../contrib/llvm/lib/Support/raw_os= tream.cpp:22:32: error: llvm/ADT/STLExtras.h: No such file or directory mkdep: compile failed *** Error code 1 Stop in /usr/src/lib/clang/libllvmsupport. *** Error code 1 Thanks, Chris From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 21:24:16 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6E20E106564A for ; Sun, 13 Jun 2010 21:24:16 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id B09CD8FC13 for ; Sun, 13 Jun 2010 21:24:15 +0000 (UTC) Received: from mail-vw0-f54.google.com (mail-vw0-f54.google.com [209.85.212.54]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id 4D196BF405 for ; Sun, 13 Jun 2010 23:24:14 +0200 (CEST) Received: by vws20 with SMTP id 20so3910031vws.13 for ; Sun, 13 Jun 2010 14:24:12 -0700 (PDT) MIME-Version: 1.0 Received: by 10.224.115.27 with SMTP id g27mr1777809qaq.311.1276464251775; Sun, 13 Jun 2010 14:24:11 -0700 (PDT) Received: by 10.229.247.142 with HTTP; Sun, 13 Jun 2010 14:24:11 -0700 (PDT) In-Reply-To: References: Date: Sun, 13 Jun 2010 23:24:11 +0200 Message-ID: From: Alexander Best To: freebsd-current@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 21:24:16 -0000 On Sun, Jun 13, 2010 at 10:28 PM, Alexander Best wrote: > hi there. i'm experiencing two problems during buildworld. i'm not > sure if these are the result of me doing weird stuff or a problem in > the src structure: > > 1. i have the following in my make.conf: > > .if empty(.CURDIR:M/usr/src/*) && empty(.CURDIR:M/usr/obj/*) && > exists(/usr/local/bin/gcc44) > CC =3D gcc44 > CXX =3D g++44 > CPP =3D cpp44 > .endif > > this should make sure that anywhere outside of /usr/src and /usr/obj > gcc44 should be used instead of the base gcc. however during > buidlworld i get: > > =3D=3D=3D> libvers (installincludes)^M > cd /usr/src/usr.bin/lex/lib; MAKEOBJDIRPREFIX=3D/usr/obj/lib32 > _SHLIBDIRPREFIX=3D/usr/obj/usr/src/lib32 =A0VERSION=3D"FreeBSD 9.0-CURREN= T > amd64 900013" =A0MACHINE=3Di386 =A0MACHINE_ARCH=3Di386 =A0MACHINE_CPU=3D"= i686 mmx > sse sse2" =A0INSTALL=3D"sh /usr/src/tools/install.sh" > PATH=3D/usr/obj/usr/src/tm > /usr/obj/lib32/usr/src/usr.bin/lex/lib created for /usr/src/usr.bin/lex/l= ib^M > cd /usr/src/lib/ncurses/ncurses; =A0MAKEOBJDIRPREFIX=3D/usr/obj/lib32 > /usr/obj/usr/src/make.amd64/make SSP_CFLAGS=3D DESTDIR=3D =A0build-tools^= M > sh /usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/include/MKhashsi= ze.sh > /usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/include/Caps > > hashsize.h^M > AWK=3Dawk sh /usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/includ= e/MKncurses_def.sh > =A0/usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/include/ncurses_= defs >> ncurses_def.h^M > sed >curses.head =A0-e "/@BROKEN_LINKER@/s%%0%" =A0-e "/@HAVE_VSSCANF@/s%%1%" > -e "/@NCURSES_CH_T@/s%%chtype%" =A0-e "/@NCURSES_CONST@/s%%const%" =A0-e > "/@NCURSES_EXT_COLORS@/s%%0%" =A0-e "/@NCURSES_EXT_FUNCS@/s > cat curses.head > curses.h.new^M > AWK=3Dawk _POSIX2_VERSION=3D199209 sh > /usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/include/MKkey_defs.= sh > =A0/usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/include/Caps >> > curses.h.new^M > cat /usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/include/curses.= tail >>> curses.h.new^M > mv -f curses.h.new curses.h^M > sed >MKterm.h.awk =A0-e "/@BROKEN_LINKER@/s%%0%" =A0-e > "/@NCURSES_MAJOR@/s%%5%" =A0-e "/@NCURSES_MINOR@/s%%7%" =A0-e > "/@NCURSES_CONST@/s%%const%" =A0-e "/@NCURSES_TPARM_VARARGS@/s%%1%" =A0-e > "/@NCURSES_SBOOL@/ > awk -f MKterm.h.awk > /usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/include/Caps > > term.h.new^M > sh /usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/include/edit_cfg= .sh > /usr/src/lib/ncurses/ncurses/ncurses_cfg.h term.h.new^M > ** edit: HAVE_TCGETATTR 1^M > ** edit: HAVE_TERMIOS_H 1^M > ** edit: HAVE_TERMIO_H 0^M > ** edit: BROKEN_LINKER 0^M > mv -f term.h.new term.h^M > sed >termcap.h =A0-e "/@NCURSES_MAJOR@/s%%5%" =A0-e "/@NCURSES_MINOR@/s%%7%" > -e "/@NCURSES_CONST@/s%%const%" =A0-e "/@NCURSES_OSPEED@/s%%short%"^M > sed >unctrl.h =A0-e "/@NCURSES_MAJOR@/s%%5%" =A0-e "/@NCURSES_MINOR@/s%%7%"^M > cc -o make_hash -O2 -pipe -fno-strict-aliasing -funroll-loops > -march=3Dnative -I. > -I/usr/obj/lib32/usr/src/lib/ncurses/ncurses/../ncurses > -I/usr/src/lib/ncurses/ncurses/../ncurses > -I/usr/src/lib/ncurses/ncurses/../ncurses > -I/usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/ > awk -f /usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/ncurses/tinf= o/MKnames.awk > bigstrings=3D1 /usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/incl= ude/Caps >> names.c^M > cc -o make_keys -O2 -pipe -fno-strict-aliasing -funroll-loops > -march=3Dnative -I. > -I/usr/obj/lib32/usr/src/lib/ncurses/ncurses/../ncurses > -I/usr/src/lib/ncurses/ncurses/../ncurses > -I/usr/src/lib/ncurses/ncurses/../ncurses > -I/usr/src/lib/ncurses/ncurses/../../../contrib/ncurses/ > cd /usr/src/lib/ncurses/ncursesw; =A0MAKEOBJDIRPREFIX=3D/usr/obj/lib32 > /usr/obj/usr/src/make.amd64/make SSP_CFLAGS=3D DESTDIR=3D =A0build-tools^= M > sh /usr/src/lib/ncurses/ncursesw/../../../contrib/ncurses/include/MKhashs= ize.sh > /usr/src/lib/ncurses/ncursesw/../../../contrib/ncurses/include/Caps > > hashsize.h^M > AWK=3Dawk sh /usr/src/lib/ncurses/ncursesw/../../../contrib/ncurses/inclu= de/MKncurses_def.sh > =A0/usr/src/lib/ncurses/ncursesw/../../../contrib/ncurses/include/ncurses= _defs >> ncurses_def.h^M > cc -o make_hash -O2 -pipe -fno-strict-aliasing -funroll-loops > -march=3Dnative -D_XOPEN_SOURCE_EXTENDED -DENABLE_WIDEC -I. > -I/usr/obj/lib32/usr/src/lib/ncurses/ncursesw/../ncursesw > -I/usr/src/lib/ncurses/ncursesw/../ncursesw > -I/usr/src/lib/ncurses/ncursesw/../ncurses -I/usr/src/ > awk -f /usr/src/lib/ncurses/ncursesw/../../../contrib/ncurses/ncurses/tin= fo/MKnames.awk > bigstrings=3D1 /usr/src/lib/ncurses/ncursesw/../../../contrib/ncurses/inc= lude/Caps >> names.c^M > cc -o make_keys -O2 -pipe -fno-strict-aliasing -funroll-loops > -march=3Dnative -D_XOPEN_SOURCE_EXTENDED -DENABLE_WIDEC -I. > -I/usr/obj/lib32/usr/src/lib/ncurses/ncursesw/../ncursesw > -I/usr/src/lib/ncurses/ncursesw/../ncursesw > -I/usr/src/lib/ncurses/ncursesw/../ncurses -I/usr/src/ > cd /usr/src/lib/libmagic; =A0MAKEOBJDIRPREFIX=3D/usr/obj/lib32 > /usr/obj/usr/src/make.amd64/make SSP_CFLAGS=3D DESTDIR=3D =A0build-tools^= M > cc -DHAVE_CONFIG_H -DCOMPILE_ONLY =A0-I/usr/src/lib/libmagic > -I/usr/src/lib/libmagic/../../contrib/file -o mkmagic > /usr/src/lib/libmagic/../../contrib/file/apprentice.c > /usr/src/lib/libmagic/../../contrib/file/funcs.c > /usr/src/lib/libmagic/../../contrib/file/magic.c /usr/src/li > cd /usr/src; =A0MAKEOBJDIRPREFIX=3D/usr/obj/lib32 > _SHLIBDIRPREFIX=3D/usr/obj/usr/src/lib32 =A0VERSION=3D"FreeBSD 9.0-CURREN= T > amd64 900013" =A0MACHINE=3Di386 =A0MACHINE_ARCH=3Di386 =A0MACHINE_CPU=3D"= i686 mmx > sse sse2" =A0INSTALL=3D"sh /usr/src/tools/install.sh" > PATH=3D/usr/obj/usr/src/tmp/legacy/usr/sb > cd /usr/src; =A0/usr/obj/usr/src/make.amd64/make -f Makefile.inc1 > _prereq_libs; =A0/usr/obj/usr/src/make.amd64/make -f Makefile.inc1 > _startup_libs; =A0/usr/obj/usr/src/make.amd64/make -f Makefile.inc1 > _prebuild_libs; =A0/usr/obj/usr/src/make.amd64/make -f Makefile.inc1 > _generic_libs; > =3D=3D=3D> gnu/lib/libssp/libssp_nonshared (obj,depend,all,install)^M > rm -f .depend^M > CC=3D'gcc44 -m32 -march=3Dnative -mfancy-math-387 -DCOMPAT_32BIT =A0-isys= tem > /usr/obj/usr/src/lib32/usr/include/ > -L/usr/obj/usr/src/lib32/usr/lib32 > -B/usr/obj/usr/src/lib32/usr/lib32' mkdep -f .depend -a > -DHAVE_CONFIG_H -I/usr/src/gnu/lib/libssp/libssp_nonshared/.. > -I/usr/src/ > /usr/bin/mkdep: gcc44: not found^M > mkdep: compile failed^M > *** Error code 1^M > ^M > Stop in /usr/src/gnu/lib/libssp/libssp_nonshared.^M > *** Error code 1^M > ^M > Stop in /usr/src.^M > *** Error code 1^M > ^M > Stop in /usr/src.^M > *** Error code 1^M > ^M > Stop in /usr/src.^M > *** Error code 1^M > ^M > Stop in /usr/src.^M > ^[[1m^[[7m%^[[27m^[[1m^[[m > ^M > ^[[1m^[[7m%^[[27m^[[1m^[[m > > Script done on Sun Jun 13 14:41:41 2010 > > 2. if i set > > CC=3Dcc (or clang) > CXX=3Dc++ (or clang) > CPP=3Dcpp (or clang) with CC, CXX and CPP all set to clang the error output is huge. this is the start of it: clang -O2 -pipe -fno-strict-aliasing -funroll-loops -I/usr/src/usr.bin/clang/tblgen/../../../contrib/llvm/include -I/usr/src/usr.bin/clang/tblgen/../../../contrib/llvm/tools/clang/include -I/usr/src/usr.bin/clang/tblgen/../../../contrib/llvm/utils/TableGen -I. -I/usr/src/usr. clang: warning: argument unused during compilation: '-g'^M clang: warning: argument unused during compilation: '-g'^M ARMDecoderEmitter.o(.text+0x7d): In function `Filter::Filter(Filter const&)= ':^M /usr/include/c++/4.2/bits/stl_tree.h:1295: undefined reference to `std::__throw_bad_alloc()'^M ARMDecoderEmitter.o(.text+0x87): In function `Filter::Filter(Filter const&)= ':^M /usr/include/c++/4.2/bits/vector.tcc:147: undefined reference to `operator new(unsigned long)'^M ARMDecoderEmitter.o(.text+0x12b): In function `Filter::Filter(Filter const&= )':^M /usr/include/c++/4.2/bits/stl_tree.h:992: undefined reference to `std::terminate()'^M ARMDecoderEmitter.o(.text+0x13d): In function `Filter::Filter(Filter const&= )':^M /usr/include/c++/4.2/ext/new_allocator.h:97: undefined reference to `operator delete(void*)'^M ARMDecoderEmitter.o(.text+0x24d): In function `std::vector >::_M_insert_aux(__gnu_cxx::__normal_iterator > >, Filter const&)':^M /usr/include/c++/4.2/bits/vector.tcc:300: undefined reference to `std::terminate()'^M ARMDecoderEmitter.o(.text+0x265):/usr/include/c++/4.2/bits/vector.tcc:281: undefined reference to `operator delete(void*)'^M ARMDecoderEmitter.o(.text+0x4db): In function `Filter::~Filter()':^M /usr/include/c++/4.2/bits/stl_tree.h:605: undefined reference to `operator delete(void*)'^M ARMDecoderEmitter.o(.text+0x4ea):/usr/include/c++/4.2/bits/stl_tree.h:605: undefined reference to `operator delete(void*)'^M ARMDecoderEmitter.o(.text+0x4f3): In function `Filter::~Filter()':^M /usr/src/usr.bin/clang/tblgen/../../../contrib/llvm/utils/TableGen/ARMDecod= erEmitter.cpp:584: undefined reference to `operator delete(void*)'^M ARMDecoderEmitter.o(.text+0x4fc): In function `Filter::~Filter()':^M /usr/include/c++/4.2/bits/stl_tree.h:191: undefined reference to `std::_Rb_tree_increment(std::_Rb_tree_node_base*)'^M ARMDecoderEmitter.o(.text+0x554): In function `Filter::~Filter()':^M /usr/src/usr.bin/clang/tblgen/../../../contrib/llvm/utils/TableGen/ARMDecod= erEmitter.cpp:581: undefined reference to `operator delete(void*)'^M ARMDecoderEmitter.o(.text+0x5ef): In function `Filter::recurse()':^M /usr/src/usr.bin/clang/tblgen/../../../contrib/llvm/utils/TableGen/ARMDecod= erEmitter.cpp:610: undefined reference to `operator new(unsigned long)'^M ARMDecoderEmitter.o(.text+0x6e5):/usr/src/usr.bin/clang/tblgen/../../../con= trib/llvm/utils/TableGen/ARMDecoderEmitter.cpp:642: undefined reference to `operator new(unsigned long)'^M ARMDecoderEmitter.o(.text+0x72d): In function `Filter::recurse()':^M /usr/include/c++/4.2/bits/stl_tree.h:266: undefined reference to `std::_Rb_tree_increment(std::_Rb_tree_node_base const*)'^M ARMDecoderEmitter.o(.text+0x972): In function `Filter::emit(llvm::raw_ostream&, unsigned int&)':^M /usr/include/c++/4.2/bits/stl_tree.h:191: undefined reference to `std::_Rb_tree_increment(std::_Rb_tree_node_base*)'^M ARMDecoderEmitter.o(.text+0xcbf): In function `FilterChooser::emit(llvm::raw_ostream&, unsigned int&)':^M /usr/include/c++/4.2/bits/basic_string.h:2167: undefined reference to `std::string::compare(char const*) const'^M ARMDecoderEmitter.o(.text+0xcd1):/usr/include/c++/4.2/bits/basic_string.h:2= 167: undefined reference to `std::string::compare(char const*) const'^M ARMDecoderEmitter.o(.text+0xce3):/usr/include/c++/4.2/bits/basic_string.h:2= 167: undefined reference to `std::string::compare(char const*) const'^M ARMDecoderEmitter.o(.text+0xcf9):/usr/include/c++/4.2/bits/basic_string.h:2= 167: undefined reference to `std::string::compare(char const*) const'^M ARMDecoderEmitter.o(.text+0x1130):/usr/include/c++/4.2/bits/basic_string.h:= 2167: undefined reference to `std::string::compare(char const*) const'^M cheers. > > in src.conf > > buildworld fails with this error: > > =3D=3D=3D> gnu/lib/csu (obj,depend,all,install)^M > /usr/obj/usr/src/make.amd64/make -f > /usr/src/gnu/lib/csu/../../usr.bin/cc/cc_tools/Makefile > MFILE=3D/usr/src/gnu/lib/csu/../../usr.bin/cc/cc_tools/Makefile > GCCDIR=3D/usr/src/gnu/lib/csu/../../../contrib/gcc tconfig.h^M > TARGET_CPU_DEFAULT=3D"" =A0HEADERS=3D"auto-host.h ansidecl.h" > DEFINES=3D"USED_FOR_TARGET" =A0/bin/sh > /usr/src/gnu/lib/csu/../../../contrib/gcc/mkconfig.sh tconfig.h^M > /usr/obj/usr/src/make.amd64/make -f > /usr/src/gnu/lib/csu/../../usr.bin/cc/cc_tools/Makefile > MFILE=3D/usr/src/gnu/lib/csu/../../usr.bin/cc/cc_tools/Makefile > GCCDIR=3D/usr/src/gnu/lib/csu/../../../contrib/gcc tm.h^M > TARGET_CPU_DEFAULT=3D"" =A0HEADERS=3D"options.h i386/i386.h i386/unix.h > i386/att.h dbxelf.h elfos-undef.h elfos.h freebsd-native.h > freebsd-spec.h freebsd.h i386/freebsd.h defaults.h" =A0DEFINES=3D"" > /bin/sh /usr/src/gnu/lib/csu/../../../contrib/gcc/mkconfig.sh tm.h^M > echo '#define EXTRA_MODES_FILE "i386/i386-modes.def"' >> tm.h^M > /usr/obj/usr/src/make.amd64/make -f > /usr/src/gnu/lib/csu/../../usr.bin/cc/cc_tools/Makefile > MFILE=3D/usr/src/gnu/lib/csu/../../usr.bin/cc/cc_tools/Makefile > GCCDIR=3D/usr/src/gnu/lib/csu/../../../contrib/gcc options.h^M > LC_ALL=3DC awk -f > /usr/src/gnu/lib/csu/../../../contrib/gcc/opt-gather.awk > /usr/src/gnu/lib/csu/../../../contrib/gcc/c.opt > /usr/src/gnu/lib/csu/../../../contrib/gcc/common.opt > /usr/src/gnu/lib/csu/../../../contrib/gcc/config/i386/i386.opt > > optionlist^M > LC_ALL=3DC awk -f > /usr/src/gnu/lib/csu/../../../contrib/gcc/opt-functions.awk =A0-f > /usr/src/gnu/lib/csu/../../../contrib/gcc/opth-gen.awk =A0< optionlist > > options.h^M > rm -f .depend^M > mkdep -f .depend -a -DCRT_BEGIN =A0 -DIN_GCC -DHAVE_LD_EH_FRAME_HDR > -DDT_CONFIG -D__GLIBC__=3D3 > -I/usr/src/gnu/lib/csu/../../../contrib/gcclibs/include > -I/usr/src/gnu/lib/csu/../../../contrib/gcc/config > -I/usr/src/gnu/lib/csu/../../../contrib/gcc -I. > -I/usr/src/gnu/lib/csu/../../ > cc -O2 -pipe -fno-strict-aliasing -funroll-loops -DIN_GCC > -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3D3 > -finhibit-size-directive -fno-inline-functions =A0-fno-exceptions > -fno-zero-initialized-in-bss =A0-fno-zero-initialized-in-bss > -fno-toplevel-reorder -I/usr/src/gnu/lib/csu/. > cc -O2 -pipe -fno-strict-aliasing -funroll-loops -DIN_GCC > -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3D3 > -finhibit-size-directive -fno-inline-functions =A0-fno-exceptions > -fno-zero-initialized-in-bss =A0-fno-zero-initialized-in-bss > -fno-toplevel-reorder -I/usr/src/gnu/lib/csu/. > cc -O2 -pipe -fno-strict-aliasing -funroll-loops -DIN_GCC > -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3D3 > -finhibit-size-directive -fno-inline-functions =A0-fno-exceptions > -fno-zero-initialized-in-bss =A0-fno-zero-initialized-in-bss > -fno-toplevel-reorder -I/usr/src/gnu/lib/csu/. > cc -O2 -pipe -fno-strict-aliasing -funroll-loops -DIN_GCC > -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3D3 > -finhibit-size-directive -fno-inline-functions =A0-fno-exceptions > -fno-zero-initialized-in-bss =A0-fno-zero-initialized-in-bss > -fno-toplevel-reorder -I/usr/src/gnu/lib/csu/. > cc -O2 -pipe -fno-strict-aliasing -funroll-loops -DIN_GCC > -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3D3 > -finhibit-size-directive -fno-inline-functions =A0-fno-exceptions > -fno-zero-initialized-in-bss =A0-fno-zero-initialized-in-bss > -fno-toplevel-reorder -I/usr/src/gnu/lib/csu/. > sh /usr/src/tools/install.sh -o root -g wheel -m 444 =A0crtbegin.o > /usr/obj/usr/src/lib32/usr/lib32/crtbegin.o^M > sh /usr/src/tools/install.sh -o root -g wheel -m 444 =A0crtend.o > /usr/obj/usr/src/lib32/usr/lib32/crtend.o^M > sh /usr/src/tools/install.sh -o root -g wheel -m 444 =A0crtbeginT.o > /usr/obj/usr/src/lib32/usr/lib32/crtbeginT.o^M > sh /usr/src/tools/install.sh -o root -g wheel -m 444 =A0crtbegin.So > /usr/obj/usr/src/lib32/usr/lib32/crtbeginS.o^M > sh /usr/src/tools/install.sh -o root -g wheel -m 444 =A0crtend.So > /usr/obj/usr/src/lib32/usr/lib32/crtendS.o^M > =3D=3D=3D> lib/csu/i386-elf (obj,depend,all,install)^M > rm -f .depend^M > mkdep -f .depend -a =A0 =A0-I/usr/src/lib/csu/i386-elf/../common > -I/usr/src/lib/csu/i386-elf/../../libc/include > /usr/src/lib/csu/i386-elf/crti.S /usr/src/lib/csu/i386-elf/crtn.S^M > cc -O2 -pipe -fno-strict-aliasing -funroll-loops > -I/usr/src/lib/csu/i386-elf/../common > -I/usr/src/lib/csu/i386-elf/../../libc/include -g -std=3Dgnu99 > -Wsystem-headers -Werror -Wall -Wno-format-y2k -W > -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes > -Wpointer-ari > cc -O2 -pipe -fno-strict-aliasing -funroll-loops > -I/usr/src/lib/csu/i386-elf/../common > -I/usr/src/lib/csu/i386-elf/../../libc/include -g -std=3Dgnu99 > -Wsystem-headers -Werror -Wall -Wno-format-y2k -W > -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes > -Wpointer-ari > cc -O2 -pipe -fno-strict-aliasing -funroll-loops > -I/usr/src/lib/csu/i386-elf/../common > -I/usr/src/lib/csu/i386-elf/../../libc/include -g -std=3Dgnu99 > -Wsystem-headers -Werror -Wall -Wno-format-y2k -W > -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes > -Wpointer-ari > cc -O2 -pipe -fno-strict-aliasing -funroll-loops > -I/usr/src/lib/csu/i386-elf/../common > -I/usr/src/lib/csu/i386-elf/../../libc/include -g -std=3Dgnu99 > -Wsystem-headers -Werror -Wall -Wno-format-y2k -W > -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes > -Wpointer-ari > /usr/src/lib/csu/i386-elf/crt1_s.S: Assembler messages:^M > /usr/src/lib/csu/i386-elf/crt1_s.S:34: Error: suffix or operands > invalid for `push'^M > /usr/src/lib/csu/i386-elf/crt1_s.S:37: Error: `8(%ebp)' is not a valid > 64 bit base/index expression^M > /usr/src/lib/csu/i386-elf/crt1_s.S:38: Error: suffix or operands > invalid for `push'^M > /usr/src/lib/csu/i386-elf/crt1_s.S:39: Error: `4(%ebp)' is not a valid > 64 bit base/index expression^M > /usr/src/lib/csu/i386-elf/crt1_s.S:40: Error: suffix or operands > invalid for `push'^M > *** Error code 1^M > ^M > Stop in /usr/src/lib/csu/i386-elf.^M > *** Error code 1^M > ^M > Stop in /usr/src.^M > *** Error code 1^M > ^M > Stop in /usr/src.^M > *** Error code 1^M > ^M > Stop in /usr/src.^M > *** Error code 1^M > ^M > Stop in /usr/src.^M > ^[[1m^[[7m%^[[27m^[[1m^[[m > > Script done on Sun Jun 13 22:20:33 2010 > > cheers. > alex > > > > -- > Alexander Best > --=20 Alexander Best From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 21:35:29 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EDC7A106564A for ; Sun, 13 Jun 2010 21:35:28 +0000 (UTC) (envelope-from ticso@cicely7.cicely.de) Received: from raven.bwct.de (raven.bwct.de [85.159.14.73]) by mx1.freebsd.org (Postfix) with ESMTP id C4D2C8FC08 for ; Sun, 13 Jun 2010 21:35:27 +0000 (UTC) Received: from mail.cicely.de ([10.1.1.37]) by raven.bwct.de (8.13.4/8.13.4) with ESMTP id o5DLZObU017309 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 13 Jun 2010 23:35:24 +0200 (CEST) (envelope-from ticso@cicely7.cicely.de) Received: from cicely7.cicely.de (cicely7.cicely.de [10.1.1.9]) by mail.cicely.de (8.14.3/8.14.3) with ESMTP id o5DLZESZ071010 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 13 Jun 2010 23:35:14 +0200 (CEST) (envelope-from ticso@cicely7.cicely.de) Received: from cicely7.cicely.de (localhost [127.0.0.1]) by cicely7.cicely.de (8.14.2/8.14.2) with ESMTP id o5DLZEqD004190; Sun, 13 Jun 2010 23:35:14 +0200 (CEST) (envelope-from ticso@cicely7.cicely.de) Received: (from ticso@localhost) by cicely7.cicely.de (8.14.2/8.14.2/Submit) id o5DLZCqu004189; Sun, 13 Jun 2010 23:35:12 +0200 (CEST) (envelope-from ticso) Date: Sun, 13 Jun 2010 23:35:12 +0200 From: Bernd Walter To: Andrew Milton Message-ID: <20100613213512.GG87112@cicely7.cicely.de> References: <20100611162118.GR39829@acme.spoerlein.net> <867hm5tl6u.fsf@ds4.des.no> <20100612153526.GA3632@acme.spoerlein.net> <20100612163208.GS87112@cicely7.cicely.de> <864oh86tnl.fsf@ds4.des.no> <20100612225216.GT87112@cicely7.cicely.de> <86k4q33pk2.fsf@ds4.des.no> <20100613160035.GD87112@cicely7.cicely.de> <20100613162026.GQ40531@camelot.theinternet.com.au> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20100613162026.GQ40531@camelot.theinternet.com.au> X-Operating-System: FreeBSD cicely7.cicely.de 7.0-STABLE i386 User-Agent: Mutt/1.5.11 X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED=-1, BAYES_00=-1.9, T_RP_MATCHES_RCVD=-0.01 autolearn=unavailable version=3.3.0 X-Spam-Checker-Version: SpamAssassin 3.3.0 (2010-01-18) on spamd.cicely.de Cc: ticso@cicely.de, current@freebsd.org Subject: Re: Cleanup for cryptographic algorithms vs. compiler optimizations X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: ticso@cicely.de List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 21:35:29 -0000 On Mon, Jun 14, 2010 at 02:20:26AM +1000, Andrew Milton wrote: > +-------[ Bernd Walter ]---------------------- > | On Sun, Jun 13, 2010 at 05:44:29PM +0200, Dag-Erling Smørgrav wrote: > | > Bernd Walter writes: > | > > Amazing - this is one of the things which can get nasty if you try some > | > > kind of microtuning. > | > > | > Only if you break the rules. Bad code is always bad, even if it > | > sometimes works by accident. > | > | To expect that function calls are replaced with other functions isn't a > | very obvious rule. > > Don't turn on compiler optimisation then. You're explicitly telling > the compiler to make your code better/faster/smaller. Optimisation > flags always come with the caveat that your code may not work exactly > the same... This isn't helpfull at all. Yes - we can disable everything and have nothing after all including nothing unexpected. In Germany we say "Kind mit dem Bade auschütten". With other words you throw all the good things away just to catch a single bad point. Optimization isn't bad as such, but it is influencing more and more things, which could be considered save before. It is important to know which parts can be considered save in future and how it can be ensured. And don't tell me in the early/mid 90th anyone has ever expected compilers to optimize at the same level they do today. LTO was a very interesting new area because before that compilers never touched anything outside it's own scope. printf => puts isn't that amazing if you consider printf to be a puts consumer which is just shrink to nothing, but I understood Dags point that this was not the end of function exchange to expect. Volatile is also a very strong mechanism and often it is enough to just cast a variable volatile in a specific context as done in the macro of this thread - instead of just defining it volatile for every use as was suggested as well. Compilier optimization is even required in many cases to get decent performance or in small environments to get it small enough to fit into memory at all, but this doesn't mean it is what you want in every case. The wish to wipe out sensitive data in crypto code is very reasonable, but this doesn't mean disabling optimzation is the way to go. So far there isn't a save solution to use memset to wipe out a whole block of memory. Go back to the originating mail. Crypto code wasn't aware of this problem and this is a way more obviuous optimization than function exchange. And I do believe that the programmers were clever people. Alarming, isn't it? Maybe paranoid users might consider compiling their OS with -O0, but I don't think this is the right way. It is amazing how strong the influence of optimization is and how weak the programmers assumptions are. The thread is about how to handle optimization in corner cases and not to disable it. -- B.Walter http://www.bwct.de Modbus/TCP Ethernet I/O Baugruppen, ARM basierte FreeBSD Rechner uvm. From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 21:43:15 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 848471065677 for ; Sun, 13 Jun 2010 21:43:15 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 431BA8FC15 for ; Sun, 13 Jun 2010 21:43:15 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 43DDA1FFC33; Sun, 13 Jun 2010 21:43:14 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id 11C8284488; Sun, 13 Jun 2010 23:41:04 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: ticso@cicely.de References: <20100611162118.GR39829@acme.spoerlein.net> <867hm5tl6u.fsf@ds4.des.no> <20100612153526.GA3632@acme.spoerlein.net> <20100612163208.GS87112@cicely7.cicely.de> <864oh86tnl.fsf@ds4.des.no> <20100612225216.GT87112@cicely7.cicely.de> <86k4q33pk2.fsf@ds4.des.no> <20100613160035.GD87112@cicely7.cicely.de> <86fx0q52r0.fsf@ds4.des.no> <20100613162841.GE87112@cicely7.cicely.de> Date: Sun, 13 Jun 2010 23:41:03 +0200 In-Reply-To: <20100613162841.GE87112@cicely7.cicely.de> (Bernd Walter's message of "Sun, 13 Jun 2010 18:28:41 +0200") Message-ID: <86bpbe4nm8.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.95 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: current@freebsd.org Subject: Re: Cleanup for cryptographic algorithms vs. compiler optimizations X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 21:43:15 -0000 Bernd Walter writes: > Dag-Erling Sm=C3=B8rgrav writes: > > The only way you can tell that gcc did it is if you break the rules, > > such as by defining your own version of printf() or puts(). > Our loader stages do this for good reasons. And in microcontroller > programming (surely out of FreeBSD scope) it is done very regulary. Those are freestanding environments, where printf() and puts() don't exist as far as the C standard is concerned. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 21:46:01 2010 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ED3E31065676 for ; Sun, 13 Jun 2010 21:46:01 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: from mx0.hoeg.nl (mx0.hoeg.nl [IPv6:2001:4dd0:ff41::b23f:aa]) by mx1.freebsd.org (Postfix) with ESMTP id ABEF48FC08 for ; Sun, 13 Jun 2010 21:46:01 +0000 (UTC) Received: by mx0.hoeg.nl (Postfix, from userid 1000) id 8CCF52A290C1; Sun, 13 Jun 2010 23:46:00 +0200 (CEST) Date: Sun, 13 Jun 2010 23:46:00 +0200 From: Ed Schouten To: Alexander Best Message-ID: <20100613214600.GH1797@hoeg.nl> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="dMyqICaxQaaUjrCL" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Cc: freebsd-current@FreeBSD.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 21:46:02 -0000 --dMyqICaxQaaUjrCL Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Alexander, * Alexander Best wrote: > .if empty(.CURDIR:M/usr/src/*) && empty(.CURDIR:M/usr/obj/*) && > exists(/usr/local/bin/gcc44) > CC =3D gcc44 > CXX =3D g++44 > CPP =3D cpp44 > .endif Try /usr/local/bin/gcc44. The FreeBSD build infrastructure overrides PATH to prevent accidental use of local tools. > 2. if i set >=20 > CC=3Dcc (or clang) > CXX=3Dc++ (or clang) > CPP=3Dcpp (or clang) >=20 > in src.conf >=20 > buildworld fails with this error: I can't say what's going on here, but keep in mind that you shouldn't set CXX to clang, but clang++. --=20 Ed Schouten WWW: http://80386.nl/ --dMyqICaxQaaUjrCL Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAkwVUZgACgkQ52SDGA2eCwWL4ACfVTPzUcWvTP792ZKjz+Xxx6ks zPkAn2//6mzMDJj/NfSd3vtrX1WmGoVA =wn8Q -----END PGP SIGNATURE----- --dMyqICaxQaaUjrCL-- From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 21:56:17 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 459DA106566B for ; Sun, 13 Jun 2010 21:56:17 +0000 (UTC) (envelope-from patfbsd@davenulle.org) Received: from smtp.lamaiziere.net (net.lamaiziere.net [91.121.44.19]) by mx1.freebsd.org (Postfix) with ESMTP id F387F8FC0A for ; Sun, 13 Jun 2010 21:56:16 +0000 (UTC) Received: from baby-jane.lamaiziere.net (unknown [192.168.1.10]) by smtp.lamaiziere.net (Postfix) with ESMTP id C6AC063307B; Sun, 13 Jun 2010 23:56:15 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by baby-jane.lamaiziere.net (Postfix) with ESMTP id 13D352CECDE; Sun, 13 Jun 2010 23:57:01 +0200 (CEST) Date: Sun, 13 Jun 2010 23:57:00 +0200 From: Patrick Lamaiziere To: freebsd-current@freebsd.org Message-ID: <20100613235700.66050a93@davenulle.org> In-Reply-To: <20100613213512.GG87112@cicely7.cicely.de> References: <20100611162118.GR39829@acme.spoerlein.net> <867hm5tl6u.fsf@ds4.des.no> <20100612153526.GA3632@acme.spoerlein.net> <20100612163208.GS87112@cicely7.cicely.de> <864oh86tnl.fsf@ds4.des.no> <20100612225216.GT87112@cicely7.cicely.de> <86k4q33pk2.fsf@ds4.des.no> <20100613160035.GD87112@cicely7.cicely.de> <20100613162026.GQ40531@camelot.theinternet.com.au> <20100613213512.GG87112@cicely7.cicely.de> X-Mailer: Claws Mail 3.7.5 (GTK+ 2.18.7; i386-portbld-freebsd8.0) Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit Cc: ticso@cicely.de Subject: Re: Cleanup for cryptographic algorithms vs. compiler optimizations X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 21:56:17 -0000 Le Sun, 13 Jun 2010 23:35:12 +0200, Bernd Walter a écrit : > Go back to the originating mail. > Crypto code wasn't aware of this problem and this is a way more > obviuous optimization than function exchange. > And I do believe that the programmers were clever people. > Alarming, isn't it? The removal of dead store by gcc is recent. There was a discussion about this problem on the linux crypto mailing list, see: http://www.mail-archive.com/linux-crypto@vger.kernel.org/msg04229.html If i remember well, they have introduced a secure_memset() function or something like that, but I do not find this piece of code any more. Regards. From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 22:05:51 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D26D4106566C for ; Sun, 13 Jun 2010 22:05:51 +0000 (UTC) (envelope-from ticso@cicely7.cicely.de) Received: from raven.bwct.de (raven.bwct.de [85.159.14.73]) by mx1.freebsd.org (Postfix) with ESMTP id 3AA6D8FC1B for ; Sun, 13 Jun 2010 22:05:50 +0000 (UTC) Received: from mail.cicely.de ([10.1.1.37]) by raven.bwct.de (8.13.4/8.13.4) with ESMTP id o5DM5lut023504 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 14 Jun 2010 00:05:47 +0200 (CEST) (envelope-from ticso@cicely7.cicely.de) Received: from cicely7.cicely.de (cicely7.cicely.de [10.1.1.9]) by mail.cicely.de (8.14.3/8.14.3) with ESMTP id o5DM5icj075021 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 14 Jun 2010 00:05:44 +0200 (CEST) (envelope-from ticso@cicely7.cicely.de) Received: from cicely7.cicely.de (localhost [127.0.0.1]) by cicely7.cicely.de (8.14.2/8.14.2) with ESMTP id o5DM5ids004331; Mon, 14 Jun 2010 00:05:44 +0200 (CEST) (envelope-from ticso@cicely7.cicely.de) Received: (from ticso@localhost) by cicely7.cicely.de (8.14.2/8.14.2/Submit) id o5DM5iSh004330; Mon, 14 Jun 2010 00:05:44 +0200 (CEST) (envelope-from ticso) Date: Mon, 14 Jun 2010 00:05:44 +0200 From: Bernd Walter To: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= Message-ID: <20100613220543.GH87112@cicely7.cicely.de> References: <867hm5tl6u.fsf@ds4.des.no> <20100612153526.GA3632@acme.spoerlein.net> <20100612163208.GS87112@cicely7.cicely.de> <864oh86tnl.fsf@ds4.des.no> <20100612225216.GT87112@cicely7.cicely.de> <86k4q33pk2.fsf@ds4.des.no> <20100613160035.GD87112@cicely7.cicely.de> <86fx0q52r0.fsf@ds4.des.no> <20100613162841.GE87112@cicely7.cicely.de> <86bpbe4nm8.fsf@ds4.des.no> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <86bpbe4nm8.fsf@ds4.des.no> X-Operating-System: FreeBSD cicely7.cicely.de 7.0-STABLE i386 User-Agent: Mutt/1.5.11 X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED=-1, BAYES_00=-1.9, T_RP_MATCHES_RCVD=-0.01 autolearn=ham version=3.3.0 X-Spam-Checker-Version: SpamAssassin 3.3.0 (2010-01-18) on spamd.cicely.de Cc: ticso@cicely.de, current@freebsd.org Subject: Re: Cleanup for cryptographic algorithms vs. compiler optimizations X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: ticso@cicely.de List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 22:05:51 -0000 On Sun, Jun 13, 2010 at 11:41:03PM +0200, Dag-Erling Smørgrav wrote: > Bernd Walter writes: > > Dag-Erling Smørgrav writes: > > > The only way you can tell that gcc did it is if you break the rules, > > > such as by defining your own version of printf() or puts(). > > Our loader stages do this for good reasons. And in microcontroller > > programming (surely out of FreeBSD scope) it is done very regulary. > > Those are freestanding environments, where printf() and puts() don't > exist as far as the C standard is concerned. Most controller environments have some kind of libc. We even have devel/avr-libc and devel/msp430-libc in ports. Anyway - printf=>puts isn't scarying as such, it is more that this might happen in other cases as well. -- B.Walter http://www.bwct.de Modbus/TCP Ethernet I/O Baugruppen, ARM basierte FreeBSD Rechner uvm. From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 22:58:16 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D9713106566C for ; Sun, 13 Jun 2010 22:58:16 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id 96C178FC08 for ; Sun, 13 Jun 2010 22:58:16 +0000 (UTC) Received: from mail-vw0-f54.google.com (mail-vw0-f54.google.com [209.85.212.54]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id 9AE2BBF405 for ; Mon, 14 Jun 2010 00:58:14 +0200 (CEST) Received: by vws20 with SMTP id 20so4014109vws.13 for ; Sun, 13 Jun 2010 15:58:12 -0700 (PDT) MIME-Version: 1.0 Received: by 10.224.1.142 with SMTP id 14mr1710544qaf.35.1276469892467; Sun, 13 Jun 2010 15:58:12 -0700 (PDT) Received: by 10.229.247.142 with HTTP; Sun, 13 Jun 2010 15:58:12 -0700 (PDT) In-Reply-To: <20100613214600.GH1797@hoeg.nl> References: <20100613214600.GH1797@hoeg.nl> Date: Mon, 14 Jun 2010 00:58:12 +0200 Message-ID: From: Alexander Best To: Ed Schouten Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 22:58:16 -0000 On Sun, Jun 13, 2010 at 11:46 PM, Ed Schouten wrote: > Alexander, > > * Alexander Best wrote: >> .if empty(.CURDIR:M/usr/src/*) && empty(.CURDIR:M/usr/obj/*) && >> exists(/usr/local/bin/gcc44) >> CC =3D gcc44 >> CXX =3D g++44 >> CPP =3D cpp44 >> .endif > > Try /usr/local/bin/gcc44. The FreeBSD build infrastructure overrides > PATH to prevent accidental use of local tools. hmmm...but i thought during buildworld either empty(.CURDIR:M/usr/src/*) or empty(.CURDIR:M/usr/obj/*) should be false. so CC/CXX/CPP should never actually be set during buildworld or buildkernel. cheers. alex > >> 2. if i set >> >> CC=3Dcc (or clang) >> CXX=3Dc++ (or clang) >> CPP=3Dcpp (or clang) >> >> in src.conf >> >> buildworld fails with this error: > > I can't say what's going on here, but keep in mind that you shouldn't > set CXX to clang, but clang++. thanks for the hint. i'll try and see if that works. > > -- > =A0Ed Schouten > =A0WWW: http://80386.nl/ > --=20 Alexander Best From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 23:02:31 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 41CE3106567B for ; Sun, 13 Jun 2010 23:02:31 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id BB7098FC1D for ; Sun, 13 Jun 2010 23:02:30 +0000 (UTC) Received: (qmail 24917 invoked by uid 399); 13 Jun 2010 23:02:29 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 13 Jun 2010 23:02:29 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4C156384.40105@FreeBSD.org> Date: Sun, 13 Jun 2010 16:02:28 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100330 Thunderbird/3.0.4 MIME-Version: 1.0 To: Alexander Best References: <20100613214600.GH1797@hoeg.nl> In-Reply-To: X-Enigmail-Version: 1.0.1 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Ed Schouten , freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 23:02:31 -0000 On 06/13/10 15:58, Alexander Best wrote: > > hmmm...but i thought during buildworld either > > empty(.CURDIR:M/usr/src/*) or > empty(.CURDIR:M/usr/obj/*) should be false. so CC/CXX/CPP should never > actually be set during buildworld or buildkernel. That depends, are /usr/src and /usr/obj literally directories in the /usr/ filesystem? -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/ From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 23:21:23 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F11A1065670; Sun, 13 Jun 2010 23:21:23 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id D30D68FC15; Sun, 13 Jun 2010 23:21:22 +0000 (UTC) Received: from mail-gw0-f54.google.com (mail-gw0-f54.google.com [74.125.83.54]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id A548BBF404; Mon, 14 Jun 2010 01:21:21 +0200 (CEST) Received: by gwj20 with SMTP id 20so2636333gwj.13 for ; Sun, 13 Jun 2010 16:21:20 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.235.204 with SMTP id kh12mr1945522qcb.191.1276471280060; Sun, 13 Jun 2010 16:21:20 -0700 (PDT) Received: by 10.229.247.142 with HTTP; Sun, 13 Jun 2010 16:21:20 -0700 (PDT) In-Reply-To: <4C156384.40105@FreeBSD.org> References: <20100613214600.GH1797@hoeg.nl> <4C156384.40105@FreeBSD.org> Date: Mon, 14 Jun 2010 01:21:20 +0200 Message-ID: From: Alexander Best To: Doug Barton Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Ed Schouten , freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 23:21:23 -0000 On Mon, Jun 14, 2010 at 1:02 AM, Doug Barton wrote: > On 06/13/10 15:58, Alexander Best wrote: >> >> hmmm...but i thought during buildworld either >> >> empty(.CURDIR:M/usr/src/*) or >> empty(.CURDIR:M/usr/obj/*) should be false. so CC/CXX/CPP should never >> actually be set during buildworld or buildkernel. > > That depends, are /usr/src and /usr/obj literally directories in the /usr= / > filesystem? `mount -p && stat -x /usr/src /usr/obj`: /dev/ufs/rootfs / ufs noatime 1 1 devfs /dev devfs rw 0 0 procfs /proc procfs rw 0 0 linprocfs /usr/compat/linux/proc linprocfs rw 0 0 linsysfs /usr/compat/linux/sys linsysfs rw 0 0 devfs /usr/compat/linux/dev devfs rw 0 0 linprocfs /usr/local/gentoo-stage3/proc linprocfs rw 0 0 linsysfs /usr/local/gentoo-stage3/sys linsysfs rw 0 0 devfs /usr/local/gentoo-stage3/dev devfs rw 0 0 tmpfs /tmp tmpfs rw 0 0 /dev/cd0 /media/dvd cd9660 ro,nosuid 0 0 File: "/usr/src" Size: 1024 FileType: Directory Mode: (0775/drwxrwxr-x) Uid: ( 0/ root) Gid: ( 0/ whe= el) Device: 0,93 Inode: 6854420 Links: 23 Access: Tue Jun 8 03:06:08 2010 Modify: Sun Jun 13 23:02:23 2010 Change: Sun Jun 13 23:02:23 2010 File: "/usr/obj" Size: 512 FileType: Directory Mode: (0755/drwxr-xr-x) Uid: ( 0/ root) Gid: ( 0/ whe= el) Device: 0,93 Inode: 6830264 Links: 3 Access: Thu Jun 10 01:32:19 2010 Modify: Sun Jun 13 23:08:27 2010 Change: Sun Jun 13 23:08:27 2010 > > > -- > > =A0 =A0 =A0 =A0... and that's just a little bit of history repeating. > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0-- Propellerheads > > =A0 =A0 =A0 =A0Improve the effectiveness of your Internet presence with > =A0 =A0 =A0 =A0a domain name makeover! =A0 =A0http://SupersetSolutions.co= m/ > > --=20 Alexander Best From owner-freebsd-current@FreeBSD.ORG Sun Jun 13 23:28:59 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B49161065674 for ; Sun, 13 Jun 2010 23:28:59 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id 390558FC13 for ; Sun, 13 Jun 2010 23:28:58 +0000 (UTC) Received: (qmail 23609 invoked by uid 399); 13 Jun 2010 23:28:58 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 13 Jun 2010 23:28:58 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4C1569B9.9060804@FreeBSD.org> Date: Sun, 13 Jun 2010 16:28:57 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100330 Thunderbird/3.0.4 MIME-Version: 1.0 To: Alexander Best References: <20100613214600.GH1797@hoeg.nl> <4C156384.40105@FreeBSD.org> In-Reply-To: X-Enigmail-Version: 1.0.1 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Ed Schouten , freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 23:28:59 -0000 On 06/13/10 16:21, Alexander Best wrote: > `mount -p&& stat -x /usr/src /usr/obj`: wow, completely unhelpful. So let me try again. If the /usr/src and /usr/obj are not literal directories in /usr then the tests you posted won't work. Given what you've posted so far I strongly suspect that there is something in your environment that is more complicated than it needs to be, which is why you're running into the problems that you are. So to debug it I would suggest that you move make.conf out of the way, then try again without one. If that works, then you can gradually add things back until you find the culprit. hth, Doug -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/ From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 00:11:37 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4FB881065677; Mon, 14 Jun 2010 00:11:37 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id D1CD88FC12; Mon, 14 Jun 2010 00:11:36 +0000 (UTC) Received: from mail-qy0-f182.google.com (mail-qy0-f182.google.com [209.85.216.182]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id A60C8BF405; Mon, 14 Jun 2010 02:11:35 +0200 (CEST) Received: by qyk11 with SMTP id 11so363473qyk.13 for ; Sun, 13 Jun 2010 17:11:34 -0700 (PDT) MIME-Version: 1.0 Received: by 10.224.63.77 with SMTP id a13mr1838223qai.267.1276474293854; Sun, 13 Jun 2010 17:11:33 -0700 (PDT) Received: by 10.229.247.142 with HTTP; Sun, 13 Jun 2010 17:11:33 -0700 (PDT) In-Reply-To: <4C1569B9.9060804@FreeBSD.org> References: <20100613214600.GH1797@hoeg.nl> <4C156384.40105@FreeBSD.org> <4C1569B9.9060804@FreeBSD.org> Date: Mon, 14 Jun 2010 02:11:33 +0200 Message-ID: From: Alexander Best To: Doug Barton Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Ed Schouten , freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 00:11:37 -0000 On Mon, Jun 14, 2010 at 1:28 AM, Doug Barton wrote: > On 06/13/10 16:21, Alexander Best wrote: >> >> `mount -p&& =A0stat -x /usr/src /usr/obj`: > > wow, completely unhelpful. So let me try again. If the /usr/src and /usr/= obj > are not literal directories in /usr then the tests you posted won't work. > Given what you've posted so far I strongly suspect that there is somethin= g > in your environment that is more complicated than it needs to be, which i= s > why you're running into the problems that you are. oh sorry for that. if i comment out all the gcc44 stuff in my make.conf and don't set CC/CXX/CPP in src.conf everything works fine. any suggestions what i should put into my make.conf so that gcc44 only gets picked when the current directory is not /usr/src/* or /usr/obj/*? as you pointed out empty(.CURDIR:M/usr/src/*) and empty(.CURDIR:M/usr/obj/*) aren't doing what i want. actually i just modified this .if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44) CC=3Dgcc44 CXX=3Dg++44 CPP=3Dcpp44 .endif which was suggested over @ http://www.freebsd.org/doc/en_US.ISO8859-1/articles/custom-gcc/configuring-= ports-gcc.html cheers. > > So to debug it I would suggest that you move make.conf out of the way, th= en > try again without one. If that works, then you can gradually add things b= ack > until you find the culprit. > > > hth, > > Doug > > -- > > =A0 =A0 =A0 =A0... and that's just a little bit of history repeating. > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0-- Propellerheads > > =A0 =A0 =A0 =A0Improve the effectiveness of your Internet presence with > =A0 =A0 =A0 =A0a domain name makeover! =A0 =A0http://SupersetSolutions.co= m/ > > --=20 Alexander Best From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 00:54:58 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D337106566B for ; Mon, 14 Jun 2010 00:54:58 +0000 (UTC) (envelope-from peterjeremy@acm.org) Received: from mail35.syd.optusnet.com.au (mail35.syd.optusnet.com.au [211.29.133.51]) by mx1.freebsd.org (Postfix) with ESMTP id B6F7F8FC0C for ; Mon, 14 Jun 2010 00:54:57 +0000 (UTC) Received: from server.vk2pj.dyndns.org (c211-30-160-13.mirnd2.nsw.optusnet.com.au [211.30.160.13] (may be forged)) by mail35.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id o5E0slUS001471 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 14 Jun 2010 10:54:49 +1000 X-Bogosity: Ham, spamicity=0.000000 Received: from server.vk2pj.dyndns.org (localhost.vk2pj.dyndns.org [127.0.0.1]) by server.vk2pj.dyndns.org (8.14.4/8.14.4) with ESMTP id o5E0sjOZ074900; Mon, 14 Jun 2010 10:54:45 +1000 (EST) (envelope-from peter@server.vk2pj.dyndns.org) Received: (from peter@localhost) by server.vk2pj.dyndns.org (8.14.4/8.14.4/Submit) id o5E0sj63074896; Mon, 14 Jun 2010 10:54:45 +1000 (EST) (envelope-from peter) Date: Mon, 14 Jun 2010 10:54:44 +1000 From: Peter Jeremy To: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= Message-ID: <20100614005444.GA57650@server.vk2pj.dyndns.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="HlL+5n6rz5pIUxbD" Content-Disposition: inline X-PGP-Key: http://members.optusnet.com.au/peterjeremy/pubkey.asc User-Agent: Mutt/1.5.20 (2009-06-14) Cc: current@freebsd.org Subject: Protecting sensitive data [was Re: Cleanup for cryptographic algorithms vs. compiler optimizations] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 00:54:58 -0000 --HlL+5n6rz5pIUxbD Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2010-Jun-13 10:07:15 +0200, Dag-Erling Sm=F8rgrav wrote: >You always overwrite passphrases, keys etc. as soon as you're done with >them so they don't end up in a crash dump or on a swap disk or >something. Which brings up an associated issue: By default, mlock(2) can only be used by root processes. It would be really handy if non-privileged processes could lock small amounts of VM so they can securely handle passwords, passphrases, keys, etc. MAC offers the option of allowing non-root processes access to mlock() but doesn't provide any restrictions on the amount of memory they can lock. --=20 Peter Jeremy --HlL+5n6rz5pIUxbD Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAkwVfdQACgkQ/opHv/APuIc6aACfQQy/Ezb2KMT1H/Lz78DwlADk 3ysAn2jh3RBEgsRay4ld8m69v7CCGdCt =eIWx -----END PGP SIGNATURE----- --HlL+5n6rz5pIUxbD-- From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 01:38:03 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 42D0A1065675 for ; Mon, 14 Jun 2010 01:38:03 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id BC9A68FC0A for ; Mon, 14 Jun 2010 01:38:02 +0000 (UTC) Received: (qmail 11422 invoked by uid 399); 14 Jun 2010 01:38:01 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 14 Jun 2010 01:38:01 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4C1587F8.40002@FreeBSD.org> Date: Sun, 13 Jun 2010 18:38:00 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100330 Thunderbird/3.0.4 MIME-Version: 1.0 To: John Baldwin References: <20100530025541.GA19805@FreeBSD.org> <201006011126.02396.jhb@freebsd.org> In-Reply-To: <201006011126.02396.jhb@freebsd.org> X-Enigmail-Version: 1.0.1 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-current@freebsd.org, Christian Zander Subject: Re: nvidia-driver 195.22 use horribly broken on amd64 between r206173 and X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 01:38:03 -0000 On 06/01/10 08:26, John Baldwin wrote: > > I've asked the driver author if the calls to vm_page_wire() and > vm_page_unwire() can simply be removed but have not heard back yet. Is there any news on this? I have updated to the latest current so I'm running the nv driver now, but I'd like to get the nvidia driver running again. Doug -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/ From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 01:43:10 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BBF91106567D for ; Mon, 14 Jun 2010 01:43:10 +0000 (UTC) (envelope-from cpghost@cordula.ws) Received: from ey-out-2122.google.com (ey-out-2122.google.com [74.125.78.25]) by mx1.freebsd.org (Postfix) with ESMTP id 533648FC13 for ; Mon, 14 Jun 2010 01:43:09 +0000 (UTC) Received: by ey-out-2122.google.com with SMTP id 22so568279eye.3 for ; Sun, 13 Jun 2010 18:43:09 -0700 (PDT) MIME-Version: 1.0 Received: by 10.213.4.207 with SMTP id 15mr1616535ebs.72.1276479788880; Sun, 13 Jun 2010 18:43:08 -0700 (PDT) Received: by 10.213.12.199 with HTTP; Sun, 13 Jun 2010 18:43:08 -0700 (PDT) X-Originating-IP: [93.203.56.11] In-Reply-To: <20100613213512.GG87112@cicely7.cicely.de> References: <20100611162118.GR39829@acme.spoerlein.net> <867hm5tl6u.fsf@ds4.des.no> <20100612153526.GA3632@acme.spoerlein.net> <20100612163208.GS87112@cicely7.cicely.de> <864oh86tnl.fsf@ds4.des.no> <20100612225216.GT87112@cicely7.cicely.de> <86k4q33pk2.fsf@ds4.des.no> <20100613160035.GD87112@cicely7.cicely.de> <20100613162026.GQ40531@camelot.theinternet.com.au> <20100613213512.GG87112@cicely7.cicely.de> Date: Mon, 14 Jun 2010 03:43:08 +0200 Message-ID: From: "C. P. Ghost" To: ticso@cicely.de Content-Type: text/plain; charset=ISO-8859-1 Cc: FreeBSD Current Subject: Re: Cleanup for cryptographic algorithms vs. compiler optimizations X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 01:43:10 -0000 On Sun, Jun 13, 2010 at 11:35 PM, Bernd Walter wrote: > Crypto code wasn't aware of this problem and this is a way more > obviuous optimization than function exchange. > And I do believe that the programmers were clever people. > Alarming, isn't it? > Maybe paranoid users might consider compiling their OS with -O0, but > I don't think this is the right way. I think that most crypto code isn't compiled with strong optimizations anyway, even when the rest of the OS or program is (or can be). After all, we do have separate compilation units... as long as you don't enable LTO, of course. Turning off strong optimizations for crypto code may seem paradoxical, but since most performance-critical routines often contain hand-optimized assembly anyway, and compiler-optimizations may be counter-productive here, the point is rather moot, usually. > It is amazing how strong the influence of optimization is and how weak > the programmers assumptions are. Indeed. That's a classic trap that trips a lot of crypto programmers in particular, and even seasoned C programmers occasionally. -cpghost. -- Cordula's Web. http://www.cordula.ws/ From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 02:00:55 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DBD7E106564A for ; Mon, 14 Jun 2010 02:00:55 +0000 (UTC) (envelope-from cpghost@cordula.ws) Received: from ey-out-2122.google.com (ey-out-2122.google.com [74.125.78.25]) by mx1.freebsd.org (Postfix) with ESMTP id 717998FC19 for ; Mon, 14 Jun 2010 02:00:55 +0000 (UTC) Received: by ey-out-2122.google.com with SMTP id 25so472774eya.9 for ; Sun, 13 Jun 2010 19:00:54 -0700 (PDT) MIME-Version: 1.0 Received: by 10.213.4.207 with SMTP id 15mr1620052ebs.72.1276480853034; Sun, 13 Jun 2010 19:00:53 -0700 (PDT) Received: by 10.213.12.199 with HTTP; Sun, 13 Jun 2010 19:00:52 -0700 (PDT) X-Originating-IP: [93.203.40.162] In-Reply-To: <20100614005444.GA57650@server.vk2pj.dyndns.org> References: <20100614005444.GA57650@server.vk2pj.dyndns.org> Date: Mon, 14 Jun 2010 04:00:52 +0200 Message-ID: From: "C. P. Ghost" To: Peter Jeremy Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: =?ISO-8859-1?Q?Dag=2DErling_Sm=F8rgrav?= , current@freebsd.org Subject: Re: Protecting sensitive data [was Re: Cleanup for cryptographic algorithms vs. compiler optimizations] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 02:00:55 -0000 2010/6/14 Peter Jeremy : > On 2010-Jun-13 10:07:15 +0200, Dag-Erling Sm=F8rgrav wrote: >>You always overwrite passphrases, keys etc. as soon as you're done with >>them so they don't end up in a crash dump or on a swap disk or >>something. > > Which brings up an associated issue: By default, mlock(2) can only be > used by root processes. =A0It would be really handy if non-privileged > processes could lock small amounts of VM so they can securely handle > passwords, passphrases, keys, etc. =A0MAC offers the option of allowing > non-root processes access to mlock() but doesn't provide any > restrictions on the amount of memory they can lock. Interesting! >From an admin point of view, this behavior could them be enabled or disabled via sysctl(8), and this sysctl variable could define what "small" means exactly (#nr of pages per process maybe?) Another sysctl variable should probably define how many pages can be locked in general by all non-privileged processes, to prevent malicious programs like fork bombs to mlock the whole memory. > Peter Jeremy -cpghost. --=20 Cordula's Web. http://www.cordula.ws/ From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 02:09:34 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ED5D2106566B; Mon, 14 Jun 2010 02:09:33 +0000 (UTC) (envelope-from alan.l.cox@gmail.com) Received: from mail-vw0-f54.google.com (mail-vw0-f54.google.com [209.85.212.54]) by mx1.freebsd.org (Postfix) with ESMTP id 6F97D8FC08; Mon, 14 Jun 2010 02:09:33 +0000 (UTC) Received: by vws20 with SMTP id 20so4230380vws.13 for ; Sun, 13 Jun 2010 19:09:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:reply-to :in-reply-to:references:date:message-id:subject:from:to:cc :content-type; bh=KtA3aM2ABxDM7YB2CxyNlg8M6PT5ZEzwSUEkaOtbqVM=; b=Lm6bt6cY70MNUmcnpMOZm0fek1i7FgbCmDOHXNDnFLNFMBcjB5Xlwvh/HCRmuEnpmB oacCr3cGBwmh1uJCVMKDUr1nONjnmJUL7MsVMIyT4SyCYyFMWMLhcQ44HpO7E9ZuaTeW 2qyFMDxl6jMY23RyOukwS62wO8FIDrLlKVEuc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:reply-to:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; b=wBPx3fICexC3Kv7Xfw1iacM8/DUc773FmNk1ja/MI+hTlm/+dUzqZ+2XhgCQtCjQjW PuGZa5yjNTdmdyKrAAb6DldJlo6GVoH0sR6vYMrhNCkND0a8tDvvCzV5hzBSczbuTLFC tQiKOl3yBx0MZlZPNmT5hiNoiVz1FBTo2/CYA= MIME-Version: 1.0 Received: by 10.224.73.27 with SMTP id o27mr1749596qaj.177.1276481372435; Sun, 13 Jun 2010 19:09:32 -0700 (PDT) Received: by 10.229.212.205 with HTTP; Sun, 13 Jun 2010 19:09:32 -0700 (PDT) In-Reply-To: <4C1587F8.40002@FreeBSD.org> References: <20100530025541.GA19805@FreeBSD.org> <201006011126.02396.jhb@freebsd.org> <4C1587F8.40002@FreeBSD.org> Date: Sun, 13 Jun 2010 21:09:32 -0500 Message-ID: From: Alan Cox To: Doug Barton Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: freebsd-current@freebsd.org, Christian Zander Subject: Re: nvidia-driver 195.22 use horribly broken on amd64 between r206173 and X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: alc@freebsd.org List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 02:09:34 -0000 On Sun, Jun 13, 2010 at 8:38 PM, Doug Barton wrote: > On 06/01/10 08:26, John Baldwin wrote: > >> >> I've asked the driver author if the calls to vm_page_wire() and >> vm_page_unwire() can simply be removed but have not heard back yet. >> > > Is there any news on this? I have updated to the latest current so I'm > running the nv driver now, but I'd like to get the nvidia driver running > again. > > Yes, the unnecessary (and now problematic) wiring and unwiring calls will be removed in a future release of the driver. Alan From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 02:58:55 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C3879106564A for ; Mon, 14 Jun 2010 02:58:55 +0000 (UTC) (envelope-from kientzle@freebsd.org) Received: from monday.kientzle.com (kientzle.com [66.166.149.50]) by mx1.freebsd.org (Postfix) with ESMTP id 62AAC8FC0C for ; Mon, 14 Jun 2010 02:58:55 +0000 (UTC) Received: (from root@localhost) by monday.kientzle.com (8.14.3/8.14.3) id o5E2xB9P029816; Mon, 14 Jun 2010 02:59:11 GMT (envelope-from kientzle@freebsd.org) Received: from horton.x.kientzle.com (fw2.kientzle.com [10.123.1.2]) by kientzle.com with SMTP id 3hvpuvk2p8d36nvap7sac9ci5n; Mon, 14 Jun 2010 02:59:10 +0000 (UTC) (envelope-from kientzle@freebsd.org) Message-ID: <4C159AEB.4030505@freebsd.org> Date: Sun, 13 Jun 2010 19:58:51 -0700 From: Tim Kientzle User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.8.1.23) Gecko/20100314 SeaMonkey/1.1.18 MIME-Version: 1.0 To: Boris Samorodov References: <83802150@bb.ipt.ru> In-Reply-To: <83802150@bb.ipt.ru> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-current@freebsd.org Subject: Re: [bsdtar] strange compression with ^T command X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 02:58:55 -0000 Thanks for the report! This was caused by an overflow in the compression calculation when the "in" bytes was larger than the "out" bytes. I just committed a fix as r209152. Tim Boris Samorodov wrote: > Hi! > > ----- > % uname -a > FreeBSD host.ipt.ru 9.0-CURRENT FreeBSD 9.0-CURRENT #4 r208799: Fri Jun 4 13:58:47 MSD 2010 bsam@host.ipt.ru:/storage/obj/storage/src/sys/HOST i386 > > % make extract > ===> Vulnerability check disabled, database not found > ===> License check disabled, port has not defined LICENSE > ===> Extracting for eric5-5.0.0 > => No checksum file (/m/home/bsam/shared/FreeBSD/exp/eric5/devel/eric5/distinfo). > load: 6.85 cmd: bsdtar 68052 [runnable] 131.55r 0.03u 0.30s 0% 2044k > In: 17512980 bytes, compression 1290122025%; Out: 1502 files, 17509012 bytes > Current: eric5-5.0.0-RC1/eric/icons/default/drawEraser.png (1172 bytes) > load: 6.96 cmd: gzip 68051 [pipdwt] 150.90r 0.16u 0.00s 0% 1052k > In: 24466168 bytes, compression -1782936608%; Out: 1821 files, 24460918 bytes > Current: eric5-5.0.0-RC1/eric/E5Gui/E5SingleApplication.py (4726 bytes) > % > ----- > > One can get the file to experiment: > ----- > % fetch http://heanet.dl.sourceforge.net/project/eric-ide/eric5/stable/5.0.0-RC1/eric5-5.0.0-RC1.tar.gz > ----- > > Extracted files seems to be OK. > From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 03:23:10 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 54AF2106566C for ; Mon, 14 Jun 2010 03:23:10 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id CAA698FC08 for ; Mon, 14 Jun 2010 03:23:09 +0000 (UTC) Received: (qmail 11136 invoked by uid 399); 14 Jun 2010 03:23:08 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 14 Jun 2010 03:23:08 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4C15A09B.8080501@FreeBSD.org> Date: Sun, 13 Jun 2010 20:23:07 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100330 Thunderbird/3.0.4 MIME-Version: 1.0 To: alc@freebsd.org References: <20100530025541.GA19805@FreeBSD.org> <201006011126.02396.jhb@freebsd.org> <4C1587F8.40002@FreeBSD.org> In-Reply-To: X-Enigmail-Version: 1.0.1 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Alan Cox , Christian Zander , freebsd-current@freebsd.org Subject: Re: nvidia-driver 195.22 use horribly broken on amd64 between r206173 and X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 03:23:10 -0000 On 06/13/10 19:09, Alan Cox wrote: > On Sun, Jun 13, 2010 at 8:38 PM, Doug Barton wrote: > >> On 06/01/10 08:26, John Baldwin wrote: >> >>> >>> I've asked the driver author if the calls to vm_page_wire() and >>> vm_page_unwire() can simply be removed but have not heard back yet. >>> >> >> Is there any news on this? I have updated to the latest current so I'm >> running the nv driver now, but I'd like to get the nvidia driver running >> again. >> >> > Yes, the unnecessary (and now problematic) wiring and unwiring calls will be > removed in a future release of the driver. Excellent! Any ETA? Or are there patches against an existing version of the driver? Thanks, Doug -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/ From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 04:46:11 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3BA21065670; Mon, 14 Jun 2010 04:46:11 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id 581ED8FC0A; Mon, 14 Jun 2010 04:46:11 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5E4kA0U024782; Mon, 14 Jun 2010 00:46:10 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5E4kALD024777; Mon, 14 Jun 2010 04:46:10 GMT (envelope-from tinderbox@freebsd.org) Date: Mon, 14 Jun 2010 04:46:10 GMT Message-Id: <201006140446.o5E4kALD024777@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on ia64/ia64 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 04:46:11 -0000 TB --- 2010-06-14 03:23:02 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-14 03:23:02 - starting HEAD tinderbox run for ia64/ia64 TB --- 2010-06-14 03:23:02 - cleaning the object tree TB --- 2010-06-14 03:23:11 - cvsupping the source tree TB --- 2010-06-14 03:23:11 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/ia64/ia64/supfile TB --- 2010-06-14 03:23:54 - building world TB --- 2010-06-14 03:23:54 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-14 03:23:54 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-14 03:23:54 - TARGET=ia64 TB --- 2010-06-14 03:23:54 - TARGET_ARCH=ia64 TB --- 2010-06-14 03:23:54 - TZ=UTC TB --- 2010-06-14 03:23:54 - __MAKE_CONF=/dev/null TB --- 2010-06-14 03:23:54 - cd /src TB --- 2010-06-14 03:23:54 - /usr/bin/make -B buildworld >>> World build started on Mon Jun 14 03:23:55 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything [...] cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/command.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/config.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/devices.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/dhcp.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/disks.c cc1: warnings being treated as errors /src/usr.sbin/sysinstall/disks.c: In function 'diskPartitionWrite': /src/usr.sbin/sysinstall/disks.c:877: warning: unused variable 'boot1' *** Error code 1 Stop in /src/usr.sbin/sysinstall. *** Error code 1 Stop in /src/usr.sbin. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-14 04:46:10 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-14 04:46:10 - ERROR: failed to build world TB --- 2010-06-14 04:46:10 - 3844.49 user 638.02 system 4988.16 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-ia64-ia64.full From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 04:58:07 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 486481065674; Mon, 14 Jun 2010 04:58:07 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: from mx0.hoeg.nl (mx0.hoeg.nl [IPv6:2001:4dd0:ff41::b23f:aa]) by mx1.freebsd.org (Postfix) with ESMTP id 032FA8FC0A; Mon, 14 Jun 2010 04:58:07 +0000 (UTC) Received: by mx0.hoeg.nl (Postfix, from userid 1000) id 46ED42A290C1; Mon, 14 Jun 2010 06:58:06 +0200 (CEST) Date: Mon, 14 Jun 2010 06:58:06 +0200 From: Ed Schouten To: Alexander Best Message-ID: <20100614045806.GI1797@hoeg.nl> References: <20100613214600.GH1797@hoeg.nl> <4C156384.40105@FreeBSD.org> <4C1569B9.9060804@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="nEsDIrWrg+hrB7l1" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Cc: Doug Barton , freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 04:58:07 -0000 --nEsDIrWrg+hrB7l1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Alexander Best wrote: > CC=3Dgcc44 > CXX=3Dg++44 > CPP=3Dcpp44 As I mentioned before, "gcc44" and "/usr/local/bin/gcc44" are spelled differently. --=20 Ed Schouten WWW: http://80386.nl/ --nEsDIrWrg+hrB7l1 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAkwVtt4ACgkQ52SDGA2eCwWdTQCfQV1VvjsC4moSBwzDdlrROeP0 KMUAmwaJJU0t/psqGT7LoPJddDysiWHe =D7Mh -----END PGP SIGNATURE----- --nEsDIrWrg+hrB7l1-- From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 06:26:11 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 48A931065672; Mon, 14 Jun 2010 06:26:11 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id DD4DE8FC17; Mon, 14 Jun 2010 06:26:10 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5E6QAwv099827; Mon, 14 Jun 2010 02:26:10 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5E6QAJN099826; Mon, 14 Jun 2010 06:26:10 GMT (envelope-from tinderbox@freebsd.org) Date: Mon, 14 Jun 2010 06:26:10 GMT Message-Id: <201006140626.o5E6QAJN099826@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on sparc64/sparc64 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 06:26:11 -0000 TB --- 2010-06-14 05:21:54 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-14 05:21:54 - starting HEAD tinderbox run for sparc64/sparc64 TB --- 2010-06-14 05:21:54 - cleaning the object tree TB --- 2010-06-14 05:22:03 - cvsupping the source tree TB --- 2010-06-14 05:22:03 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/sparc64/sparc64/supfile TB --- 2010-06-14 05:25:04 - building world TB --- 2010-06-14 05:25:04 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-14 05:25:04 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-14 05:25:04 - TARGET=sparc64 TB --- 2010-06-14 05:25:04 - TARGET_ARCH=sparc64 TB --- 2010-06-14 05:25:04 - TZ=UTC TB --- 2010-06-14 05:25:04 - __MAKE_CONF=/dev/null TB --- 2010-06-14 05:25:04 - cd /src TB --- 2010-06-14 05:25:04 - /usr/bin/make -B buildworld >>> World build started on Mon Jun 14 05:25:05 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything [...] cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/index.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/install.c cc1: warnings being treated as errors /src/usr.sbin/sysinstall/install.c: In function 'installStandard': /src/usr.sbin/sysinstall/install.c:632: warning: unused variable 'devs' /src/usr.sbin/sysinstall/install.c:631: warning: unused variable 'tries' /src/usr.sbin/sysinstall/install.c: In function 'installFixupBase': /src/usr.sbin/sysinstall/install.c:877: warning: unused variable 'fp' *** Error code 1 Stop in /src/usr.sbin/sysinstall. *** Error code 1 Stop in /src/usr.sbin. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-14 06:26:10 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-14 06:26:10 - ERROR: failed to build world TB --- 2010-06-14 06:26:10 - 2737.76 user 595.17 system 3855.72 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-sparc64-sparc64.full From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 06:34:56 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A268106564A; Mon, 14 Jun 2010 06:34:56 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id B41178FC0C; Mon, 14 Jun 2010 06:34:55 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5E6Ytjv037091; Mon, 14 Jun 2010 02:34:55 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5E6Ytx8037090; Mon, 14 Jun 2010 06:34:55 GMT (envelope-from tinderbox@freebsd.org) Date: Mon, 14 Jun 2010 06:34:55 GMT Message-Id: <201006140634.o5E6Ytx8037090@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on powerpc/powerpc X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 06:34:56 -0000 TB --- 2010-06-14 04:54:51 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-14 04:54:51 - starting HEAD tinderbox run for powerpc/powerpc TB --- 2010-06-14 04:54:51 - cleaning the object tree TB --- 2010-06-14 04:55:01 - cvsupping the source tree TB --- 2010-06-14 04:55:01 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/powerpc/powerpc/supfile TB --- 2010-06-14 04:55:52 - building world TB --- 2010-06-14 04:55:52 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-14 04:55:52 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-14 04:55:52 - TARGET=powerpc TB --- 2010-06-14 04:55:52 - TARGET_ARCH=powerpc TB --- 2010-06-14 04:55:52 - TZ=UTC TB --- 2010-06-14 04:55:52 - __MAKE_CONF=/dev/null TB --- 2010-06-14 04:55:52 - cd /src TB --- 2010-06-14 04:55:52 - /usr/bin/make -B buildworld >>> World build started on Mon Jun 14 04:55:52 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything [...] cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/index.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/install.c cc1: warnings being treated as errors /src/usr.sbin/sysinstall/install.c: In function 'installStandard': /src/usr.sbin/sysinstall/install.c:632: warning: unused variable 'devs' /src/usr.sbin/sysinstall/install.c:631: warning: unused variable 'tries' /src/usr.sbin/sysinstall/install.c: In function 'installFixupBase': /src/usr.sbin/sysinstall/install.c:877: warning: unused variable 'fp' *** Error code 1 Stop in /src/usr.sbin/sysinstall. *** Error code 1 Stop in /src/usr.sbin. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-14 06:34:55 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-14 06:34:55 - ERROR: failed to build world TB --- 2010-06-14 06:34:55 - 4822.26 user 759.63 system 6003.26 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-powerpc-powerpc.full From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 06:40:45 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B45981065672; Mon, 14 Jun 2010 06:40:45 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id 5AEA68FC0C; Mon, 14 Jun 2010 06:40:45 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5E6eis2050183; Mon, 14 Jun 2010 02:40:44 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5E6ei6W050182; Mon, 14 Jun 2010 06:40:44 GMT (envelope-from tinderbox@freebsd.org) Date: Mon, 14 Jun 2010 06:40:44 GMT Message-Id: <201006140640.o5E6ei6W050182@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on sparc64/sun4v X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 06:40:45 -0000 TB --- 2010-06-14 05:41:14 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-14 05:41:14 - starting HEAD tinderbox run for sparc64/sun4v TB --- 2010-06-14 05:41:14 - cleaning the object tree TB --- 2010-06-14 05:41:23 - cvsupping the source tree TB --- 2010-06-14 05:41:23 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/sparc64/sun4v/supfile TB --- 2010-06-14 05:42:04 - building world TB --- 2010-06-14 05:42:04 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-14 05:42:04 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-14 05:42:04 - TARGET=sun4v TB --- 2010-06-14 05:42:04 - TARGET_ARCH=sparc64 TB --- 2010-06-14 05:42:04 - TZ=UTC TB --- 2010-06-14 05:42:04 - __MAKE_CONF=/dev/null TB --- 2010-06-14 05:42:04 - cd /src TB --- 2010-06-14 05:42:04 - /usr/bin/make -B buildworld >>> World build started on Mon Jun 14 05:42:05 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything [...] cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/index.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/install.c cc1: warnings being treated as errors /src/usr.sbin/sysinstall/install.c: In function 'installStandard': /src/usr.sbin/sysinstall/install.c:632: warning: unused variable 'devs' /src/usr.sbin/sysinstall/install.c:631: warning: unused variable 'tries' /src/usr.sbin/sysinstall/install.c: In function 'installFixupBase': /src/usr.sbin/sysinstall/install.c:877: warning: unused variable 'fp' *** Error code 1 Stop in /src/usr.sbin/sysinstall. *** Error code 1 Stop in /src/usr.sbin. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-14 06:40:44 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-14 06:40:44 - ERROR: failed to build world TB --- 2010-06-14 06:40:44 - 2729.35 user 574.16 system 3569.53 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-sparc64-sun4v.full From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 07:44:35 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F529106566B for ; Mon, 14 Jun 2010 07:44:35 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id F16D38FC13 for ; Mon, 14 Jun 2010 07:44:34 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 24B551FFC34; Mon, 14 Jun 2010 07:44:33 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id EF24384465; Mon, 14 Jun 2010 09:42:22 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: ticso@cicely.de References: <867hm5tl6u.fsf@ds4.des.no> <20100612153526.GA3632@acme.spoerlein.net> <20100612163208.GS87112@cicely7.cicely.de> <864oh86tnl.fsf@ds4.des.no> <20100612225216.GT87112@cicely7.cicely.de> <86k4q33pk2.fsf@ds4.des.no> <20100613160035.GD87112@cicely7.cicely.de> <86fx0q52r0.fsf@ds4.des.no> <20100613162841.GE87112@cicely7.cicely.de> <86bpbe4nm8.fsf@ds4.des.no> <20100613220543.GH87112@cicely7.cicely.de> Date: Mon, 14 Jun 2010 09:42:22 +0200 In-Reply-To: <20100613220543.GH87112@cicely7.cicely.de> (Bernd Walter's message of "Mon, 14 Jun 2010 00:05:44 +0200") Message-ID: <86y6eigiw1.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.95 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: current@freebsd.org Subject: Re: Cleanup for cryptographic algorithms vs. compiler optimizations X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 07:44:35 -0000 Bernd Walter writes: > Dag-Erling Sm=C3=B8rgrav writes: > > Those are freestanding environments, where printf() and puts() don't > > exist as far as the C standard is concerned. > Most controller environments have some kind of libc. They are still freestanding environments. Can we agree not to discuss this any further until you've read chapters 1 through 5 of the C standard? > Anyway - printf=3D>puts isn't scarying as such, it is more that this > might happen in other cases as well. Yes, it might, and if you run into trouble because of it, it means you've broken the rules somewhere. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 10:01:22 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9A65C1065677; Mon, 14 Jun 2010 10:01:22 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id 25A778FC1B; Mon, 14 Jun 2010 10:01:21 +0000 (UTC) Received: from mail-vw0-f54.google.com (mail-vw0-f54.google.com [209.85.212.54]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id F178DBF41C; Mon, 14 Jun 2010 12:01:19 +0200 (CEST) Received: by vws20 with SMTP id 20so4783274vws.13 for ; Mon, 14 Jun 2010 03:01:18 -0700 (PDT) MIME-Version: 1.0 Received: by 10.224.52.155 with SMTP id i27mr2024725qag.225.1276509678271; Mon, 14 Jun 2010 03:01:18 -0700 (PDT) Received: by 10.229.247.142 with HTTP; Mon, 14 Jun 2010 03:01:18 -0700 (PDT) In-Reply-To: <20100614045806.GI1797@hoeg.nl> References: <20100613214600.GH1797@hoeg.nl> <4C156384.40105@FreeBSD.org> <4C1569B9.9060804@FreeBSD.org> <20100614045806.GI1797@hoeg.nl> Date: Mon, 14 Jun 2010 12:01:18 +0200 Message-ID: From: Alexander Best To: Ed Schouten Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Doug Barton , freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 10:01:22 -0000 On Mon, Jun 14, 2010 at 6:58 AM, Ed Schouten wrote: > * Alexander Best wrote: >> CC=3Dgcc44 >> CXX=3Dg++44 >> CPP=3Dcpp44 > > As I mentioned before, "gcc44" and "/usr/local/bin/gcc44" are spelled > differently. yes, but the point is: i don't want gcc44 to be used at all during buildworld/buildkernel. so even if buildworld/buildkernel are chaging $PATH it shouldn't cause any problems because both targets should never use gcc44. i changed the values of CC/CXX/CPP like you suggested however because somewhere else (apart from /usr/src) $PATH might get changed somehow. what i'm now trying to do in order to having everything being built with gcc44 expect buildworld and buildkernel is this (in make.conf): .if !target(buildworld) && !target(buildkernel) && exists(/usr/local/bin/gc= c44) CC =3D /usr/local/bin/gcc44 CXX =3D /usr/local/bin/g++44 CPP =3D /usr/local/bin/cpp44 .endif i'm just running buildworld to see if it works. cheers. alex btw: making 'buildworld' with clang also failed when CXX was set to 'clang++' (CCC/CPP remained being set to 'clang'). here's the output: clang -O2 -pipe -fno-strict-aliasing -funroll-loops -march=3Dnative -DTERMIOS -DANSI_SOURCE -I/usr/src/secure/lib/libcrypto/../../../crypto/openssl -I/usr/src/secure/lib/libcrypto/../../../crypto/openssl/crypto -I/usr/obj/usr/src/secure/lib/libcrypto -DOPENSSL_THREADS -DDSO_DLF clang: warning: argument unused during compilation: '-funroll-loops'^M clang -O2 -pipe -fno-strict-aliasing -funroll-loops -march=3Dnative -DTERMIOS -DANSI_SOURCE -I/usr/src/secure/lib/libcrypto/../../../crypto/openssl -I/usr/src/secure/lib/libcrypto/../../../crypto/openssl/crypto -I/usr/obj/usr/src/secure/lib/libcrypto -DOPENSSL_THREADS -DDSO_DLF clang: warning: argument unused during compilation: '-funroll-loops'^M ^[[1m/usr/src/secure/lib/libcrypto/../../../crypto/openssl/crypto/rc5/rc5_s= key.c:122:11: ^[[0m^[[0;1;31merror: ^[[0m^[[1munsupported inline asm: input with type 'unsigned long' matching output with type 'unsigned int'^M ^[[0m A=3DS[ii]=3DROTATE_l32(k,3);^M ^[[0;1;32m ^~~~~~~~~~~~~~~^M ^[[0m/usr/src/secure/lib/libcrypto/../../../crypto/openssl/crypto/rc5/rc5_s= key.c:122:22: note: instantiated from:^M A=3DS[ii]=3DROTATE_l32(k,3);^M ^[[0;1;32m ^^M ^[[0m^[[1m/usr/src/secure/lib/libcrypto/../../../crypto/openssl/crypto/rc5/= rc5_skey.c:125:11: ^[[0m^[[0;1;31merror: ^[[0m^[[1munsupported inline asm: input with type 'unsigned long' matching output with type 'unsigned int'^M ^[[0m B=3DL[jj]=3DROTATE_l32(k,m);^M ^[[0;1;32m ^~~~~~~~~~~~~~~^M ^[[0m/usr/src/secure/lib/libcrypto/../../../crypto/openssl/crypto/rc5/rc5_s= key.c:125:22: note: instantiated from:^M B=3DL[jj]=3DROTATE_l32(k,m);^M ^[[0;1;32m ^^M ^[[0m2 errors generated.^M *** Error code 1^M ^M Stop in /usr/src/secure/lib/libcrypto.^M *** Error code 1^M ^M Stop in /usr/src.^M *** Error code 1^M ^M Stop in /usr/src.^M *** Error code 1^M ^M Stop in /usr/src.^M *** Error code 1^M ^M Stop in /usr/src.^M > > -- > =A0Ed Schouten > =A0WWW: http://80386.nl/ > --=20 Alexander Best From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 10:08:54 2010 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 981E4106566C for ; Mon, 14 Jun 2010 10:08:54 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from vlakno.cz (lev.vlakno.cz [77.93.215.190]) by mx1.freebsd.org (Postfix) with ESMTP id 5311B8FC19 for ; Mon, 14 Jun 2010 10:08:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id CE1869CB065; Mon, 14 Jun 2010 12:05:02 +0200 (CEST) X-Virus-Scanned: amavisd-new at vlakno.cz Received: from vlakno.cz ([127.0.0.1]) by localhost (lev.vlakno.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4KRsrUSUPZqM; Mon, 14 Jun 2010 12:05:01 +0200 (CEST) Received: from vlk.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id E473F9CB099; Mon, 14 Jun 2010 12:05:00 +0200 (CEST) Received: (from rdivacky@localhost) by vlk.vlakno.cz (8.14.3/8.14.3/Submit) id o5EA50xN035313; Mon, 14 Jun 2010 12:05:00 +0200 (CEST) (envelope-from rdivacky) Date: Mon, 14 Jun 2010 12:05:00 +0200 From: Roman Divacky To: Alexander Best Message-ID: <20100614100500.GA35142@freebsd.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.3i Cc: freebsd-current@FreeBSD.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 10:08:54 -0000 On Sun, Jun 13, 2010 at 10:28:23PM +0200, Alexander Best wrote: > hi there. i'm experiencing two problems during buildworld. i'm not > sure if these are the result of me doing weird stuff or a problem in > the src structure: > > 1. i have the following in my make.conf: > > .if empty(.CURDIR:M/usr/src/*) && empty(.CURDIR:M/usr/obj/*) && > exists(/usr/local/bin/gcc44) > CC = gcc44 > CXX = g++44 > CPP = cpp44 > .endif you may want to reverse the condition, ie. .if !empty(.CURDIR:M/usr/ports/*) From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 10:11:56 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 919521065676; Mon, 14 Jun 2010 10:11:56 +0000 (UTC) (envelope-from uqs@spoerlein.net) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2001:470:9a47::1]) by mx1.freebsd.org (Postfix) with ESMTP id 2171C8FC12; Mon, 14 Jun 2010 10:11:55 +0000 (UTC) Received: from acme.spoerlein.net (localhost.spoerlein.net [IPv6:::1]) by acme.spoerlein.net (8.14.4/8.14.4) with ESMTP id o5EABsdB056867 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 14 Jun 2010 12:11:55 +0200 (CEST) (envelope-from uqs@spoerlein.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=spoerlein.net; s=dkim200908; t=1276510315; bh=EjtaUmxAhoo6lHrvVgQFJVTXO8+F1Xa6RuawDlOpIA4=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:In-Reply-To; b=PKnVGU6qf3rcsc8dqRZWxSFSOh/n1jENtCF0kCc1eDU9SlNyWB5DWCC2sb5vviS+r PFV+NrkJL6WAO4zuJvTbURMtdkRKGOuDWKRp+TU6NGeBCT7OaBESacWlt2koRrhvxF eR9kTtBBFhf4zw8V91WHFgHsblPX/4gEe4HdGIN8= Received: (from uqs@localhost) by acme.spoerlein.net (8.14.4/8.14.4/Submit) id o5EABsBg056863; Mon, 14 Jun 2010 12:11:54 +0200 (CEST) (envelope-from uqs@spoerlein.net) Date: Mon, 14 Jun 2010 12:11:54 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Rui Paulo Message-ID: <20100614101154.GC3632@acme.spoerlein.net> Mail-Followup-To: Rui Paulo , Jakub Lach , freebsd-current@freebsd.org References: <28870665.post@talk.nabble.com> <2BD1167C-E2B3-49FA-89D0-7B1DA487BB71@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2BD1167C-E2B3-49FA-89D0-7B1DA487BB71@FreeBSD.org> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: freebsd-current@freebsd.org, Jakub Lach Subject: Re: wpa_supplicant update? CTRL-EVENT-SCAN-RESULTS X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 10:11:56 -0000 On Sun, 13.06.2010 at 12:03:05 -0700, Rui Paulo wrote: > On 13 Jun 2010, at 04:23, Jakub Lach wrote: > > > > > Hello. > > > > Is update of wpa_supplicant planned? > > > > Current version in STABLE as well as CURRENT > > (v0.6.8) is suffering from CTRL-EVENT-SCAN-RESULTS > > log spam. > > > > If it's the same problem, looks like it's fixed in v0.6.10 > > > > http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=539915 > > I'll likely work on this soon. Great news, btw, are you aware of WPA problems with the iwi(4) driver? I had no problems and good performance early this year, but since March or so, the driver gets stuck regularly. For example I can no longer boot up with if_iwi loaded and the WPA bits in rc.conf, as the immediate startup of wpa_supplicant will somehow wedge things (I have a couple of traces for this): ifconfig wlan0 down will get stuck, killing wpa_supplicant is no longer possible, etc. What works for me (please don't laugh): - boot up without if_iwi loaded - disable wlan radio using hotkey - load if_iwi, devd will automatically start wpa_supplicant - wpa_supplicant will eventually (1-2 min) associate with my ath(4) based AP - turn on radio per hotkey - check ifconfig wlan0 to see if everything is alright - ifconfig lagg0 laggport wlan0 for wired/wireless roaming. Here's a trace of when 'ifconfig wlan0 down' was stuck, too bad the trace for wpa_supplicant doesn't show up in the textdump Tracing command ifconfig pid 1894 tid 100121 td 0xc4d76c30 sched_switch(c4d76c30,0,104,191,3593fa53,...) at sched_switch+0x2fc mi_switch(104,0,c092b242,1eb,5c,...) at mi_switch+0x200 sleepq_switch(c4d76c30,0,c092b242,260,0,...) at sleepq_switch+0x15f sleepq_wait(c41862d8,5c,c091c518,0,0,...) at sleepq_wait+0x63 _sleep(c41862d8,c3f02494,5c,c091c518,0,...) at _sleep+0x365 taskqueue_drain(c3f02480,c41862d8,48d,c0935b10,fb51cab8,...) at taskqueue_drain+0xf5 ieee80211_vap_detach(c4186000,fb51cae4,0,fb51cacc,c06bac77,...) at ieee80211_vap_detach+0x78 iwi_vap_delete(c4186000,fb51cae4,c0694457,c413f000,c413f000,...) at iwi_vap_delete+0x12 wlan_clone_destroy(c413f000,c413f000,c413f000,c413f000,fb51cb10,...) at wlan_clone_destroy+0x17 ifc_simple_destroy(c099c260,c413f000,c09362cc,105,c099c290,...) at ifc_simple_destroy+0x27 if_clone_destroyif(c099c260,c413f000,c09362cc,e0,c42225c0,...) at if_clone_destroyif+0x12e if_clone_destroy(c42225c0,19c,c0954c7d,c091ead3,3,...) at if_clone_destroy+0xa2 ifioctl(c3c4f670,80206979,c42225c0,c4d76c30,c4415100,...) at ifioctl+0x476 soo_ioctl(c44433b8,80206979,c42225c0,c44b2700,c4d76c30,...) at soo_ioctl+0x40f kern_ioctl(c4d76c30,3,80206979,c42225c0,6230b0,...) at kern_ioctl+0x1fd ioctl(c4d76c30,fb51ccf8,c09615aa,c09492c0,c4d6d2a8,...) at ioctl+0x134 syscall(fb51cd38) at syscall+0x220 Xint0x80_syscall() at Xint0x80_syscall+0x20 --- syscall (54, FreeBSD ELF32, ioctl), eip = 0x281cbb13, esp = 0xbfbfe44c, ebp = 0xbfbfe468 --- Uli From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 10:44:49 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B758A106576C; Mon, 14 Jun 2010 10:44:49 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id 456908FC21; Mon, 14 Jun 2010 10:44:49 +0000 (UTC) Received: from mail-vw0-f54.google.com (mail-vw0-f54.google.com [209.85.212.54]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id DA451BF40D; Mon, 14 Jun 2010 12:44:47 +0200 (CEST) Received: by vws20 with SMTP id 20so4834698vws.13 for ; Mon, 14 Jun 2010 03:44:46 -0700 (PDT) MIME-Version: 1.0 Received: by 10.224.59.30 with SMTP id j30mr1998306qah.143.1276512286320; Mon, 14 Jun 2010 03:44:46 -0700 (PDT) Received: by 10.229.247.142 with HTTP; Mon, 14 Jun 2010 03:44:46 -0700 (PDT) In-Reply-To: <20100614100500.GA35142@freebsd.org> References: <20100614100500.GA35142@freebsd.org> Date: Mon, 14 Jun 2010 12:44:46 +0200 Message-ID: From: Alexander Best To: Roman Divacky Content-Type: text/plain; charset=ISO-8859-1 Cc: freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 10:44:49 -0000 On Mon, Jun 14, 2010 at 12:05 PM, Roman Divacky wrote: > On Sun, Jun 13, 2010 at 10:28:23PM +0200, Alexander Best wrote: >> hi there. i'm experiencing two problems during buildworld. i'm not >> sure if these are the result of me doing weird stuff or a problem in >> the src structure: >> >> 1. i have the following in my make.conf: >> >> .if empty(.CURDIR:M/usr/src/*) && empty(.CURDIR:M/usr/obj/*) && >> exists(/usr/local/bin/gcc44) >> CC = gcc44 >> CXX = g++44 >> CPP = cpp44 >> .endif > > you may want to reverse the condition, ie. > > .if !empty(.CURDIR:M/usr/ports/*) yeah i had something like that in my make.conf beforehand. the problem was however that this would only use gcc44 when 'make' was run in the ports directory. however i want make to ALWAYS use gcc44 apart from /usr/src. I think this solution works quite well now: .if !target(buildworld) && !target(buildkernel) && exists(/usr/local/bin/gcc44) CC = /usr/local/bin/gcc44 CXX = /usr/local/bin/g++44 CPP = /usr/local/bin/cpp44 .endif so here're the results: 1. (buildworld without CC/CXX/CPP set in src.conf) => suceeds. 2. (buildworld with CC=gcc CXX=g++ CPP=cpp in src.conf) mkdep -f .depend -a -I/usr/src/lib/csu/i386-elf/../common -I/usr/src/lib/csu/i386-elf/../../libc/include /usr/src/lib/csu/i386-elf/crti.S /usr/src/lib/csu/i386-elf/crtn.S^M cc -O2 -pipe -fno-strict-aliasing -funroll-loops -I/usr/src/lib/csu/i386-elf/../common -I/usr/src/lib/csu/i386-elf/../../libc/include -g -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-ari cc -O2 -pipe -fno-strict-aliasing -funroll-loops -I/usr/src/lib/csu/i386-elf/../common -I/usr/src/lib/csu/i386-elf/../../libc/include -g -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-ari cc -O2 -pipe -fno-strict-aliasing -funroll-loops -I/usr/src/lib/csu/i386-elf/../common -I/usr/src/lib/csu/i386-elf/../../libc/include -g -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-ari cc -O2 -pipe -fno-strict-aliasing -funroll-loops -I/usr/src/lib/csu/i386-elf/../common -I/usr/src/lib/csu/i386-elf/../../libc/include -g -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-ari /usr/src/lib/csu/i386-elf/crt1_s.S: Assembler messages:^M /usr/src/lib/csu/i386-elf/crt1_s.S:34: Error: suffix or operands invalid for `push'^M /usr/src/lib/csu/i386-elf/crt1_s.S:37: Error: `8(%ebp)' is not a valid 64 bit base/index expression^M /usr/src/lib/csu/i386-elf/crt1_s.S:38: Error: suffix or operands invalid for `push'^M /usr/src/lib/csu/i386-elf/crt1_s.S:39: Error: `4(%ebp)' is not a valid 64 bit base/index expression^M /usr/src/lib/csu/i386-elf/crt1_s.S:40: Error: suffix or operands invalid for `push'^M *** Error code 1^M ^M Stop in /usr/src/lib/csu/i386-elf.^M *** Error code 1^M ^M Stop in /usr/src.^M *** Error code 1^M ^M Stop in /usr/src.^M *** Error code 1^M ^M Stop in /usr/src.^M *** Error code 1^M ^M Stop in /usr/src.^M ^[[1m^[[7m%^[[27m^[[1m^[[m 3. (buildworld with CC=clang CXX=clang++ CPP=clang in src.conf) clang: warning: argument unused during compilation: '-funroll-loops'^M clang -O2 -pipe -fno-strict-aliasing -funroll-loops -march=native -DTERMIOS -DANSI_SOURCE -I/usr/src/secure/lib/libcrypto/../../../crypto/openssl -I/usr/src/secure/lib/libcrypto/../../../crypto/openssl/crypto -I/usr/obj/usr/src/secure/lib/libcrypto -DOPENSSL_THREADS -DDSO_DLF clang: warning: argument unused during compilation: '-funroll-loops'^M ^[[1m/usr/src/secure/lib/libcrypto/../../../crypto/openssl/crypto/rc5/rc5_skey.c:122:11: ^[[0m^[[0;1;31merror: ^[[0m^[[1munsupported inline asm: input with type 'unsigned long' matching output with type 'unsigned int'^M ^[[0m A=S[ii]=ROTATE_l32(k,3);^M ^[[0;1;32m ^~~~~~~~~~~~~~~^M ^[[0m/usr/src/secure/lib/libcrypto/../../../crypto/openssl/crypto/rc5/rc5_skey.c:122:22: note: instantiated from:^M A=S[ii]=ROTATE_l32(k,3);^M ^[[0;1;32m ^^M ^[[0m^[[1m/usr/src/secure/lib/libcrypto/../../../crypto/openssl/crypto/rc5/rc5_skey.c:125:11: ^[[0m^[[0;1;31merror: ^[[0m^[[1munsupported inline asm: input with type 'unsigned long' matching output with type 'unsigned int'^M ^[[0m B=L[jj]=ROTATE_l32(k,m);^M ^[[0;1;32m ^~~~~~~~~~~~~~~^M ^[[0m/usr/src/secure/lib/libcrypto/../../../crypto/openssl/crypto/rc5/rc5_skey.c:125:22: note: instantiated from:^M B=L[jj]=ROTATE_l32(k,m);^M ^[[0;1;32m ^^M ^[[0m2 errors generated.^M *** Error code 1^M ^M Stop in /usr/src/secure/lib/libcrypto.^M *** Error code 1^M ^M Stop in /usr/src.^M *** Error code 1^M ^M Stop in /usr/src.^M *** Error code 1^M ^M Stop in /usr/src.^M *** Error code 1^M ^M Stop in /usr/src.^M cheers. alex > -- Alexander Best From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 11:49:17 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3ABB3106566B for ; Mon, 14 Jun 2010 11:49:17 +0000 (UTC) (envelope-from rpaulo@freebsd.org) Received: from karen.lavabit.com (karen.lavabit.com [72.249.41.33]) by mx1.freebsd.org (Postfix) with ESMTP id 7FDCD8FC08 for ; Mon, 14 Jun 2010 11:49:16 +0000 (UTC) Received: from e.earth.lavabit.com (e.earth.lavabit.com [192.168.111.14]) by karen.lavabit.com (Postfix) with ESMTP id 21EBB18F3AD; Mon, 14 Jun 2010 06:49:11 -0500 (CDT) Received: from 10.0.128.34 (75.16.26.133) by lavabit.com with ESMTP id DG5X0EB2G6R7; Mon, 14 Jun 2010 06:49:11 -0500 References: <28870665.post@talk.nabble.com> <2BD1167C-E2B3-49FA-89D0-7B1DA487BB71@FreeBSD.org> <20100614101154.GC3632@acme.spoerlein.net> In-Reply-To: <20100614101154.GC3632@acme.spoerlein.net> Mime-Version: 1.0 (Apple Message framework v1078) Content-Type: text/plain; charset=iso-8859-1 Message-Id: Content-Transfer-Encoding: quoted-printable From: Rui Paulo Date: Mon, 14 Jun 2010 04:49:09 -0700 To: =?iso-8859-1?Q?Ulrich_Sp=F6rlein?= X-Mailer: Apple Mail (2.1078) Cc: freebsd-current@freebsd.org, Jakub Lach Subject: Re: wpa_supplicant update? CTRL-EVENT-SCAN-RESULTS X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 11:49:17 -0000 On 14 Jun 2010, at 03:11, Ulrich Sp=F6rlein wrote: > On Sun, 13.06.2010 at 12:03:05 -0700, Rui Paulo wrote: >> On 13 Jun 2010, at 04:23, Jakub Lach wrote: >>=20 >>>=20 >>> Hello. >>>=20 >>> Is update of wpa_supplicant planned?=20 >>>=20 >>> Current version in STABLE as well as CURRENT =20 >>> (v0.6.8) is suffering from CTRL-EVENT-SCAN-RESULTS >>> log spam. >>>=20 >>> If it's the same problem, looks like it's fixed in v0.6.10 >>>=20 >>> http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D539915 >>=20 >> I'll likely work on this soon. >=20 > Great news, >=20 > btw, are you aware of WPA problems with the iwi(4) driver? I had no > problems and good performance early this year, but since March or so, > the driver gets stuck regularly. For example I can no longer boot up > with if_iwi loaded and the WPA bits in rc.conf, as the immediate = startup > of wpa_supplicant will somehow wedge things (I have a couple of traces > for this): ifconfig wlan0 down will get stuck, killing wpa_supplicant = is > no longer possible, etc. >=20 > What works for me (please don't laugh): > - boot up without if_iwi loaded > - disable wlan radio using hotkey > - load if_iwi, devd will automatically start wpa_supplicant > - wpa_supplicant will eventually (1-2 min) associate with my ath(4) > based AP > - turn on radio per hotkey > - check ifconfig wlan0 to see if everything is alright > - ifconfig lagg0 laggport wlan0 for wired/wireless roaming. >=20 > Here's a trace of when 'ifconfig wlan0 down' was stuck, too bad the > trace for wpa_supplicant doesn't show up in the textdump >=20 > Tracing command ifconfig pid 1894 tid 100121 td 0xc4d76c30 > sched_switch(c4d76c30,0,104,191,3593fa53,...) at sched_switch+0x2fc > mi_switch(104,0,c092b242,1eb,5c,...) at mi_switch+0x200 > sleepq_switch(c4d76c30,0,c092b242,260,0,...) at sleepq_switch+0x15f > sleepq_wait(c41862d8,5c,c091c518,0,0,...) at sleepq_wait+0x63 > _sleep(c41862d8,c3f02494,5c,c091c518,0,...) at _sleep+0x365 > taskqueue_drain(c3f02480,c41862d8,48d,c0935b10,fb51cab8,...) at = taskqueue_drain+0xf5 > ieee80211_vap_detach(c4186000,fb51cae4,0,fb51cacc,c06bac77,...) at = ieee80211_vap_detach+0x78 > iwi_vap_delete(c4186000,fb51cae4,c0694457,c413f000,c413f000,...) at = iwi_vap_delete+0x12 > wlan_clone_destroy(c413f000,c413f000,c413f000,c413f000,fb51cb10,...) = at wlan_clone_destroy+0x17 > ifc_simple_destroy(c099c260,c413f000,c09362cc,105,c099c290,...) at = ifc_simple_destroy+0x27 > if_clone_destroyif(c099c260,c413f000,c09362cc,e0,c42225c0,...) at = if_clone_destroyif+0x12e > if_clone_destroy(c42225c0,19c,c0954c7d,c091ead3,3,...) at = if_clone_destroy+0xa2 > ifioctl(c3c4f670,80206979,c42225c0,c4d76c30,c4415100,...) at = ifioctl+0x476 > soo_ioctl(c44433b8,80206979,c42225c0,c44b2700,c4d76c30,...) at = soo_ioctl+0x40f > kern_ioctl(c4d76c30,3,80206979,c42225c0,6230b0,...) at = kern_ioctl+0x1fd > ioctl(c4d76c30,fb51ccf8,c09615aa,c09492c0,c4d6d2a8,...) at ioctl+0x134 > syscall(fb51cd38) at syscall+0x220 > Xint0x80_syscall() at Xint0x80_syscall+0x20 > --- syscall (54, FreeBSD ELF32, ioctl), eip =3D 0x281cbb13, esp =3D = 0xbfbfe44c, ebp =3D 0xbfbfe468 --- Please update your sources. I think this was fixed a while ago. -- Rui Paulo From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 13:41:22 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8805B1065677 for ; Mon, 14 Jun 2010 13:41:22 +0000 (UTC) (envelope-from rmgls@free.fr) Received: from smtpfb1-g21.free.fr (smtpfb1-g21.free.fr [212.27.42.9]) by mx1.freebsd.org (Postfix) with ESMTP id 4AFDA8FC1C for ; Mon, 14 Jun 2010 13:41:20 +0000 (UTC) Received: from smtp3-g21.free.fr (smtp3-g21.free.fr [212.27.42.3]) by smtpfb1-g21.free.fr (Postfix) with ESMTP id 28A9077CD78 for ; Mon, 14 Jun 2010 15:25:20 +0200 (CEST) Received: from free.fr (evr27-1-88-172-40-194.fbx.proxad.net [88.172.40.194]) by smtp3-g21.free.fr (Postfix) with ESMTP id 144A8818079 for ; Mon, 14 Jun 2010 15:25:14 +0200 (CEST) From: Raoul To: freebsd-current@freebsd.org Date: Mon, 14 Jun 2010 15:25:14 +0200 Sender: rmgls@free.fr Message-Id: <20100614132515.144A8818079@smtp3-g21.free.fr> Subject: Dell bluetooth wireless card X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 13:41:22 -0000 Hello all, Please, can you tell me what to do to make my bluetooth card detected on current. It is a Dell Wireless 370 Bluetooth Mini-card, running on a Dell E6400 laptop. OS: FBSD current r208665. Thanks in advance. Raoul rmgls@free.fr From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 13:48:29 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 788AE1065678; Mon, 14 Jun 2010 13:48:29 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 4ADBD8FC1D; Mon, 14 Jun 2010 13:48:29 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id F355146C17; Mon, 14 Jun 2010 09:48:28 -0400 (EDT) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 8FEA58A050; Mon, 14 Jun 2010 09:48:27 -0400 (EDT) From: John Baldwin To: freebsd-current@freebsd.org Date: Mon, 14 Jun 2010 08:48:55 -0400 User-Agent: KMail/1.12.1 (FreeBSD/7.3-CBSD-20100217; KDE/4.3.1; amd64; ; ) References: <4C15A09B.8080501@FreeBSD.org> In-Reply-To: <4C15A09B.8080501@FreeBSD.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201006140848.55979.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Mon, 14 Jun 2010 09:48:27 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.5 required=4.2 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: alc@freebsd.org, Alan Cox , Doug Barton , Christian Zander Subject: Re: nvidia-driver 195.22 use horribly broken on amd64 between r206173 and X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 13:48:29 -0000 On Sunday 13 June 2010 11:23:07 pm Doug Barton wrote: > On 06/13/10 19:09, Alan Cox wrote: > > On Sun, Jun 13, 2010 at 8:38 PM, Doug Barton wrote: > > > >> On 06/01/10 08:26, John Baldwin wrote: > >> > >>> > >>> I've asked the driver author if the calls to vm_page_wire() and > >>> vm_page_unwire() can simply be removed but have not heard back yet. > >>> > >> > >> Is there any news on this? I have updated to the latest current so I'm > >> running the nv driver now, but I'd like to get the nvidia driver running > >> again. > >> > >> > > Yes, the unnecessary (and now problematic) wiring and unwiring calls will be > > removed in a future release of the driver. > > Excellent! Any ETA? Or are there patches against an existing version of > the driver? I would just remove the calls to vm_page_wire() and vm_page_unwire() along with the immediately adjacent calls to vm_page_{un,}lock_queues(). -- John Baldwin From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 14:18:11 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3FFA81065673 for ; Mon, 14 Jun 2010 14:18:11 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-fx0-f54.google.com (mail-fx0-f54.google.com [209.85.161.54]) by mx1.freebsd.org (Postfix) with ESMTP id BA0A88FC17 for ; Mon, 14 Jun 2010 14:18:10 +0000 (UTC) Received: by fxm7 with SMTP id 7so3036666fxm.13 for ; Mon, 14 Jun 2010 07:18:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:references :date:in-reply-to:message-id:user-agent:mime-version:content-type; bh=Tz9vr6P0sF7bjFdu/MkTWNoBIDq3dTgl/UILy7sJOak=; b=GxJ/qlbTC6skR0RtiOBz1JDE2CZHIA159oPzMnKDNOJ6qPYzoWy1M/Voh2fcywFazp IpY4o+i7wMJ4s5NGDdpMO3oEralD6xfiQEdnNymFujzf2nFeJ2MReF64SUYtBz/fxKa0 JYVVqxFkli5OM7v2xQrSoQVJA70zkjuXHJhWc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; b=bAwfpufWv449iVmbLIMX+IGGXjxJPegOqFwJ9K8maGR/Mpf7v4KSiMOALrMNf0Xior TCQLWtHf6ufJnosCybtXGCH+ltXp5uUVN27XNNmOTx1gPflJP2XLXur5vgqXLnpMXh9u 0Fhp4DdJT2WWdzwmQcQdXsD/dx+IfckiZNFto= Received: by 10.223.20.218 with SMTP id g26mr5539487fab.18.1276525088599; Mon, 14 Jun 2010 07:18:08 -0700 (PDT) Received: from localhost (spftor1.privacyfoundation.de [87.118.104.203]) by mx.google.com with ESMTPS id y2sm7264990faj.39.2010.06.14.07.17.59 (version=SSLv3 cipher=RC4-MD5); Mon, 14 Jun 2010 07:18:05 -0700 (PDT) From: Anonymous To: Alexander Best References: <20100614100500.GA35142@freebsd.org> Date: Mon, 14 Jun 2010 18:17:06 +0400 In-Reply-To: (Alexander Best's message of "Mon, 14 Jun 2010 12:44:46 +0200") Message-ID: <86y6ehsnq5.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 14:18:11 -0000 Alexander Best writes: > On Mon, Jun 14, 2010 at 12:05 PM, Roman Divacky wrote: >> On Sun, Jun 13, 2010 at 10:28:23PM +0200, Alexander Best wrote: >>> hi there. i'm experiencing two problems during buildworld. i'm not >>> sure if these are the result of me doing weird stuff or a problem in >>> the src structure: >>> >>> 1. i have the following in my make.conf: >>> >>> .if empty(.CURDIR:M/usr/src/*) && empty(.CURDIR:M/usr/obj/*) && >>> exists(/usr/local/bin/gcc44) >>> CC = gcc44 >>> CXX = g++44 >>> CPP = cpp44 >>> .endif >> >> you may want to reverse the condition, ie. >> >> .if !empty(.CURDIR:M/usr/ports/*) > > yeah i had something like that in my make.conf beforehand. the problem > was however that this would only use gcc44 when 'make' was run in the > ports directory. however i want make to ALWAYS use gcc44 apart from > /usr/src. It may be easier to make gcc44 symlinks for cc/c++/gcc/g++ in e.g. HOME/.bin and add it to PATH before /usr/bin[1]. make buildworld overrides its own PATH and shouldn't be affected but pretty much anything else will use gcc44, not only make(1) targets. You can create basegcc/baseg++ symlinks then for things that don't compile by gcc44 but in case of portmaster you'd have to teach it respect user-defined PATH in order for CC=basegcc in make.conf to work. [1] *after* ccache if you have it installed, e.g. PATH=$LOCALBASE/libexec/ccache:$HOME/.bin:...:/usr/bin:... From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 14:22:41 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 396911065675; Mon, 14 Jun 2010 14:22:41 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id 0683D8FC1D; Mon, 14 Jun 2010 14:22:40 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5EEMesl005899; Mon, 14 Jun 2010 10:22:40 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5EEMeCX005890; Mon, 14 Jun 2010 14:22:40 GMT (envelope-from tinderbox@freebsd.org) Date: Mon, 14 Jun 2010 14:22:40 GMT Message-Id: <201006141422.o5EEMeCX005890@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on arm/arm X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 14:22:41 -0000 TB --- 2010-06-14 13:50:00 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-14 13:50:00 - starting HEAD tinderbox run for arm/arm TB --- 2010-06-14 13:50:00 - cleaning the object tree TB --- 2010-06-14 13:50:16 - cvsupping the source tree TB --- 2010-06-14 13:50:16 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/arm/arm/supfile TB --- 2010-06-14 13:54:57 - building world TB --- 2010-06-14 13:54:57 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-14 13:54:57 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-14 13:54:57 - TARGET=arm TB --- 2010-06-14 13:54:57 - TARGET_ARCH=arm TB --- 2010-06-14 13:54:57 - TZ=UTC TB --- 2010-06-14 13:54:57 - __MAKE_CONF=/dev/null TB --- 2010-06-14 13:54:57 - cd /src TB --- 2010-06-14 13:54:57 - /usr/bin/make -B buildworld >>> World build started on Mon Jun 14 13:54:58 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies [...] mkdep -f .depend -a -I/src/sys/boot/uboot/lib/../../../../lib/libstand/ -I/src/sys/boot/uboot/lib/../../../../sys/contrib/libfdt/ -I/src/sys/boot/uboot/lib/../../common -I/src/sys/boot/uboot/lib/../../.. -I. /src/sys/boot/uboot/lib/devicename.c /src/sys/boot/uboot/lib/elf_freebsd.c /src/sys/boot/uboot/lib/console.c /src/sys/boot/uboot/lib/copy.c /src/sys/boot/uboot/lib/disk.c /src/sys/boot/uboot/lib/module.c /src/sys/boot/uboot/lib/net.c /src/sys/boot/uboot/lib/reboot.c /src/sys/boot/uboot/lib/time.c /src/sys/boot/uboot/lib/glue.c ===> sys/boot/arm (depend) ===> sys/boot/arm/uboot (depend) sh /src/sys/boot/arm/uboot/../../common/newvers.sh /src/sys/boot/arm/uboot/version "U-Boot loader" arm rm -f .depend mkdep -f .depend -a -DLOADER_DISK_SUPPORT -DLOADER_UFS_SUPPORT -DLOADER_NET_SUPPORT -DLOADER_NFS_SUPPORT -DBOOT_FORTH -I/src/sys/boot/arm/uboot/../../ficl -I/src/sys/boot/arm/uboot/../../ficl/arm -I/src/sys/boot/arm/uboot/../../common -I. -I/src/sys/boot/arm/uboot/../../uboot/common -I/src/sys/boot/arm/uboot/../../uboot/lib -I/obj/arm/src/sys/boot/arm/uboot/../../uboot/lib -I/src/sys/boot/arm/uboot/../../../../lib/libstand/ /src/sys/boot/arm/uboot/start.S /src/sys/boot/arm/uboot/conf.c vers.c /src/sys/boot/arm/uboot/../../common/boot.c /src/sys/boot/arm/uboot/../../common/commands.c /src/sys/boot/arm/uboot/../../common/console.c /src/sys/boot/arm/uboot/../../common/devopen.c /src/sys/boot/arm/uboot/../../common/interp.c /src/sys/boot/arm/uboot/../../common/interp_backslash.c /src/sys/boot/arm/uboot/../../common/interp_parse.c /src/sys/boot/arm/uboot/../../common/ls.c /src/sys/boot/arm/uboot/../../common/misc.c /src/sys/boot/arm/uboot/../../common/module.c /src/sys/boot/ar! m/uboot/../../common/panic.c /src/sys/boot/arm/uboot/../../common/load_elf32.c /src/sys/boot/arm/uboot/../../common/reloc_elf32.c /src/sys/boot/arm/uboot/../../common/dev_net.c /src/sys/boot/arm/uboot/../../common/interp_forth.c /src/sys/boot/arm/uboot/../../uboot/common/main.c /src/sys/boot/arm/uboot/../../uboot/common/metadata.c /src/sys/boot/arm/uboot/../../uboot/common/metadata.c:40:30: error: machine/bootinfo.h: No such file or directory mkdep: compile failed *** Error code 1 Stop in /src/sys/boot/arm/uboot. *** Error code 1 Stop in /src/sys/boot/arm. *** Error code 1 Stop in /src/sys/boot. *** Error code 1 Stop in /src/sys. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-14 14:22:40 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-14 14:22:40 - ERROR: failed to build world TB --- 2010-06-14 14:22:40 - 1248.82 user 343.84 system 1959.61 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-arm-arm.full From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 15:04:45 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CED7D1065675; Mon, 14 Jun 2010 15:04:45 +0000 (UTC) (envelope-from chzander@nvidia.com) Received: from hqemgate03.nvidia.com (hqemgate03.nvidia.com [216.228.121.140]) by mx1.freebsd.org (Postfix) with ESMTP id AFD688FC16; Mon, 14 Jun 2010 15:04:44 +0000 (UTC) Received: from hqnvupgp02.nvidia.com (Not Verified[172.17.98.15]) by hqemgate03.nvidia.com id ; Mon, 14 Jun 2010 07:47:10 -0700 Received: from hqemfe02.nvidia.com ([172.17.108.22]) by hqnvupgp02.nvidia.com (PGP Universal service); Mon, 14 Jun 2010 07:44:43 -0700 X-PGP-Universal: processed; by hqnvupgp02.nvidia.com on Mon, 14 Jun 2010 07:44:43 -0700 Received: from nvidia.com ([172.17.108.22]) by hqemfe02.nvidia.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 14 Jun 2010 07:44:42 -0700 Date: Mon, 14 Jun 2010 07:44:34 -0700 From: Christian Zander To: John Baldwin Message-ID: <20100614144434.GA28855@wolf.nvidia.com> References: <4C15A09B.8080501@FreeBSD.org> <201006140848.55979.jhb@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201006140848.55979.jhb@freebsd.org> User-Agent: Mutt/1.4.2.3i X-NVConfidentiality: public X-OriginalArrivalTime: 14 Jun 2010 14:44:42.0918 (UTC) FILETIME=[200F7C60:01CB0BD0] X-Mailman-Approved-At: Mon, 14 Jun 2010 15:19:08 +0000 Cc: "alc@freebsd.org" , Alan Cox , "freebsd-current@freebsd.org" , Christian Zander , Doug Barton Subject: Re: nvidia-driver 195.22 use horribly broken on amd64 between r206173 and X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Christian Zander List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 15:04:45 -0000 On Mon, Jun 14, 2010 at 05:48:55AM -0700, John Baldwin wrote: (...) > > >>> > > >>> I've asked the driver author if the calls to vm_page_wire() and > > >>> vm_page_unwire() can simply be removed but have not heard back yet. > > >>> > > >> > > >> Is there any news on this? I have updated to the latest current so I'm > > >> running the nv driver now, but I'd like to get the nvidia driver running > > >> again. > > >> > > >> > > > Yes, the unnecessary (and now problematic) wiring and unwiring calls will be > > > removed in a future release of the driver. > > > > Excellent! Any ETA? Or are there patches against an existing version of > > the driver? > > I would just remove the calls to vm_page_wire() and vm_page_unwire() along > with the immediately adjacent calls to vm_page_{un,}lock_queues(). > That's all I did. The next 256.xx build will pick these changes up. -- christian zander ch?zander@nvidia.com From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 15:24:31 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7363B1065781 for ; Mon, 14 Jun 2010 15:24:31 +0000 (UTC) (envelope-from ganbold@gmail.com) Received: from mail-px0-f182.google.com (mail-px0-f182.google.com [209.85.212.182]) by mx1.freebsd.org (Postfix) with ESMTP id 358EA8FC16 for ; Mon, 14 Jun 2010 15:24:30 +0000 (UTC) Received: by pxi7 with SMTP id 7so3441447pxi.13 for ; Mon, 14 Jun 2010 08:24:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; bh=WzQTPfrVutpOlT2esyc6z/0EvTk36UFtF985BUWgFpY=; b=qifF3cxXanmrP0O0wKHRhlMWdv6luvmBt2l0VpLAaKkSpDeG7ltGEgC1rJqa7H2LHG FPss0wbaLXXwdM0ltDhiyyNrsdvF6+cGo/Q+pdMM93cMNzNFC2i5/GSEcR5NFSmg0Oju qsYJ0PbGscKNDqDje3t741HIft5ehZ/peiu5Y= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=XZdVw3ygQZTiaPZ8Q3jk4NQwHUHaHcL9dw4Uvja0FZfWBI6KpO6op7qrpv72/kvhk5 5aqLr8GChLxSIoJs6H6si+Mv7LOD0u83DhHcf3R9BGDalsklQRTU+BJw65AemMKdFuq6 zytxWAXuZqrjL1KL7vctcc/Cw5Etx5xLsyJg8= Received: by 10.143.26.41 with SMTP id d41mr4134465wfj.316.1276529070484; Mon, 14 Jun 2010 08:24:30 -0700 (PDT) Received: from beastie.micom.mng.net ([202.179.21.128]) by mx.google.com with ESMTPS id r20sm56125641wam.17.2010.06.14.08.24.22 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 14 Jun 2010 08:24:26 -0700 (PDT) Message-ID: <4C16499A.3050808@gmail.com> Date: Mon, 14 Jun 2010 23:24:10 +0800 From: Ganbold User-Agent: Thunderbird 2.0.0.23 (X11/20091011) MIME-Version: 1.0 To: PseudoCylon References: <16641.96608.qm@web51806.mail.re2.yahoo.com> <4BA22B8D.9030700@micom.mng.net> <375331.74876.qm@web51804.mail.re2.yahoo.com> <4BA38B26.6050208@micom.mng.net> <989377.89740.qm@web51802.mail.re2.yahoo.com> <4BAE01AC.7000509@gmail.com> <623907.37074.qm@web51803.mail.re2.yahoo.com> <4BB3575D.4040506@gmail.com> <87836.79143.qm@web51804.mail.re2.yahoo.com> <4BBB372C.1060302@gmail.com> <665283.95271.qm@web51802.mail.re2.yahoo.com> <4BBDEC8F.9050803@gmail.com> <490521.32714.qm@web51804.mail.re2.yahoo.com> <4BD307DE.5080507@gmail.com> <332448.8676.qm@web51801.mail.re2.yahoo.com> <4BD3F2D4.8000007@gmail.com> <702632.81988.qm@web51803.mail.re2.yahoo.com> <4BDEE393.4080206@gmail.com> <660085.11669.qm@web51802.mail.re2.yahoo.com> <4BFD4806.8070001@gmail.com> <618770.37649.qm@web51807.mail.re2.yahoo.com> <4C0FAEA2.7010204@gmail.com> <94007.38072.qm@web51807.mail.re2.yahoo.com> <4C11188A.1040002@gmail.com> <447555.80295.qm@web51803.mail.re2.yahoo.com> In-Reply-To: <447555.80295.qm@web51803.mail.re2.yahoo.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Ganbold Tsagaankhuu , freebsd-current@freebsd.org Subject: Re: CALL for TEST [HOSTAP] run(4) ralink usb wireless X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 15:24:31 -0000 AK-san, PseudoCylon wrote: > ----- Original Message ---- > >> From: Ganbold >> To: PseudoCylon >> Cc: freebsd-current@freebsd.org; Ganbold Tsagaankhuu >> Sent: Thu, June 10, 2010 10:53:30 AM >> Subject: Re: CALL for TEST [HOSTAP] run(4) ralink usb wireless >> >> It seems like it is running without any problem so far, no more adsl >> modem problem. >> I can see arp packets in wlan0 interface as well as in macbook. >> I will continue testing and let you know if there comes any problem. >> >> thanks again, >> >> Ganbold >> > > Hello, > > Glad to hear. It was an encryption problem. A client was dropping packets.. > > Please let me know if you find another bug. (Hope there won't be) > Well, looks like I was too fast :( It seems like client is not receiving any arp packets when rspro doesn't first initiate ping (maybe arp request) to client. If I first ping to client from rspro, later on arp packets can be seen on client. When I ping from rspro to client, response is very different: # arp -a ? (192.168.1.43) at 8e:fd:59:d6:3a:50 on bridge0 permanent [bridge] ? (192.168.1.42) at 00:22:cf:03:e0:30 on wlan0 permanent [ethernet] ? (192.168.1.41) at 00:15:6d:c1:c7:77 on arge0 permanent [ethernet] ? (192.168.1.1) at 00:30:54:62:3d:24 on arge0 expires in 1200 seconds [ethernet] ? (192.168.1.7) at 00:1c:25:9d:36:1d on arge0 expires in 824 seconds [ethernet] # ping 192.168.1.50 PING 192.168.1.50 (192.168.1.50): 56 data bytes 64 bytes from 192.168.1.50: icmp_seq=0 ttl=64 time=2.694 ms 64 bytes from 192.168.1.50: icmp_seq=1 ttl=64 time=302.177 ms 64 bytes from 192.168.1.50: icmp_seq=2 ttl=64 time=1.041 ms 64 bytes from 192.168.1.50: icmp_seq=4 ttl=64 time=5234.417 ms 64 bytes from 192.168.1.50: icmp_seq=5 ttl=64 time=4225.060 ms 64 bytes from 192.168.1.50: icmp_seq=6 ttl=64 time=3214.908 ms 64 bytes from 192.168.1.50: icmp_seq=7 ttl=64 time=2207.241 ms 64 bytes from 192.168.1.50: icmp_seq=8 ttl=64 time=1197.061 ms 64 bytes from 192.168.1.50: icmp_seq=9 ttl=64 time=186.833 ms ^C --- 192.168.1.50 ping statistics --- 11 packets transmitted, 9 packets received, 18.2% packet loss round-trip min/avg/max/stddev = 1.041/1841.270/5234.417/1870.962 ms # arp -a ? (192.168.1.43) at 8e:fd:59:d6:3a:50 on bridge0 permanent [bridge] ? (192.168.1.42) at 00:22:cf:03:e0:30 on wlan0 permanent [ethernet] ? (192.168.1.41) at 00:15:6d:c1:c7:77 on arge0 permanent [ethernet] ? (192.168.1.1) at 00:30:54:62:3d:24 on arge0 expires in 1183 seconds [ethernet] ? (192.168.1.7) at 00:1c:25:9d:36:1d on arge0 expires in 805 seconds [ethernet] ? (192.168.1.50) at 00:26:bb:17:f6:61 on arge0 expires in 1186 seconds [ethernet] # ping 192.168.1.50 PING 192.168.1.50 (192.168.1.50): 56 data bytes 64 bytes from 192.168.1.50: icmp_seq=2 ttl=64 time=1590.035 ms 64 bytes from 192.168.1.50: icmp_seq=3 ttl=64 time=580.201 ms 64 bytes from 192.168.1.50: icmp_seq=4 ttl=64 time=528.019 ms ^C --- 192.168.1.50 ping statistics --- 5 packets transmitted, 3 packets received, 40.0% packet loss round-trip min/avg/max/stddev = 528.019/899.418/1590.035/488.804 ms Any idea? thanks, Ganbold > Thank you for testing > > AK > > > > > -- Computer programmers never die, they just get lost in the processing. From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 17:19:18 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 59A5D1065672 for ; Mon, 14 Jun 2010 17:19:18 +0000 (UTC) (envelope-from brucec@muon.cran.org.uk) Received: from muon.cran.org.uk (muon.cran.org.uk [204.109.60.94]) by mx1.freebsd.org (Postfix) with ESMTP id CEDE58FC1A for ; Mon, 14 Jun 2010 17:19:17 +0000 (UTC) Received: by muon.cran.org.uk (Postfix, from userid 1002) id 513855D17; Mon, 14 Jun 2010 17:00:00 +0000 (UTC) Date: Mon, 14 Jun 2010 17:00:00 +0000 From: Bruce Cran To: freebsd-current@freebsd.org Message-ID: <20100614170000.GA41366@muon.cran.org.uk> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="ew6BAiZeqk4r7MaW" Content-Disposition: inline User-Agent: Mutt/1.4.2.3i Cc: bzeeb+freebsd+lor@zabbadoz.net Subject: ZFS LORs: syncer vs. zfs and devfs vs. zfs X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 17:19:18 -0000 --ew6BAiZeqk4r7MaW Content-Type: text/plain; charset=us-ascii Content-Disposition: inline I got the attached ZFS LORs when building ports on a new install of 9.0-CURRENT-20100610-JPSNAP. I know there have been some ZFS checkins in the last few days so I don't know if they've already been fixed? -- Bruce --ew6BAiZeqk4r7MaW Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename=lor lock order reversal: 1st 0xffffff000a846458 zfs (zfs) @ /usr/src/sys/kern/vfs_mount.c:1201 2nd 0xffffff000a846638 devfs (devfs) @ /usr/src/sys/ufs/ffs/ffs_vfsops.c:1250 KDB: stack backtrace: db_trace_self_wrapper() at db_trace_self_wrapper+0x2a _witness_debugger() at _witness_debugger+0x2e witness_checkorder() at witness_checkorder+0x81e __lockmgr_args() at __lockmgr_args+0xd11 vop_stdlock() at vop_stdlock+0x39 VOP_LOCK1_APV() at VOP_LOCK1_APV+0x9b _vn_lock() at _vn_lock+0x47 ffs_flushfiles() at ffs_flushfiles+0xb5 ffs_unmount() at ffs_unmount+0x70 dounmount() at dounmount+0x2e6 unmount() at unmount+0x27e syscallenter() at syscallenter+0xf0 syscall() at syscall+0x4c Xfast_syscall() at Xfast_syscall+0xe1 --- syscall (22, FreeBSD ELF64, unmount), rip = 0x8006a23ec, rsp = 0x7fffffffe3c8, rbp = 0x800c09bb0 --- lock order reversal: 1st 0xffffff000a857bd8 syncer (syncer) @ /usr/src/sys/kern/vfs_subr.c:1713 2nd 0xffffff0127b389f8 zfs (zfs) @ /usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c:152 KDB: stack backtrace: db_trace_self_wrapper() at db_trace_self_wrapper+0x2a _witness_debugger() at _witness_debugger+0x2e witness_checkorder() at witness_checkorder+0x81e __lockmgr_args() at __lockmgr_args+0xd11 vop_stdlock() at vop_stdlock+0x39 VOP_LOCK1_APV() at VOP_LOCK1_APV+0x9b _vn_lock() at _vn_lock+0x47 zfs_znode_cache_constructor() at zfs_znode_cache_constructor+0x57 zfs_znode_alloc() at zfs_znode_alloc+0x39 zfs_zget() at zfs_zget+0x2a7 zfs_get_data() at zfs_get_data+0x4d zil_commit() at zil_commit+0x532 zfs_sync() at zfs_sync+0xa6 sync_fsync() at sync_fsync+0x13a sync_vnode() at sync_vnode+0x157 sched_sync() at sched_sync+0x1d1 fork_exit() at fork_exit+0x12a fork_trampoline() at fork_trampoline+0xe --- trap 0, rip = 0, rsp = 0xffffff8323b0ad30, rbp = 0 --- --ew6BAiZeqk4r7MaW-- From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 17:38:19 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 05B571065688 for ; Mon, 14 Jun 2010 17:38:19 +0000 (UTC) (envelope-from tijl@coosemans.org) Received: from mailrelay010.isp.belgacom.be (mailrelay010.isp.belgacom.be [195.238.6.177]) by mx1.freebsd.org (Postfix) with ESMTP id 8D75D8FC18 for ; Mon, 14 Jun 2010 17:38:18 +0000 (UTC) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av0EAOYEFkxbsdE3/2dsb2JhbACDHZtlcrAQkGmBJoMFbwQ Received: from 55.209-177-91.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([91.177.209.55]) by relay.skynet.be with ESMTP; 14 Jun 2010 19:38:16 +0200 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.4/8.14.4) with ESMTP id o5EHcFDM015866 for ; Mon, 14 Jun 2010 19:38:15 +0200 (CEST) (envelope-from tijl@coosemans.org) From: Tijl Coosemans To: freebsd-current@freebsd.org Date: Mon, 14 Jun 2010 19:38:15 +0200 User-Agent: KMail/1.13.3 (FreeBSD/8.1-PRERELEASE; KDE/4.4.4; i386; ; ) References: <20100611162118.GR39829@acme.spoerlein.net> <201006112304.10952.tijl@coosemans.org> <86y6els1bm.fsf@ds4.des.no> In-Reply-To: <86y6els1bm.fsf@ds4.des.no> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <201006141938.15200.tijl@coosemans.org> Subject: Re: Cleanup for cryptographic algorithms vs. compiler optimizations X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 17:38:19 -0000 On Friday 11 June 2010 23:31:57 Dag-Erling Sm=C3=B8rgrav wrote: > Tijl Coosemans writes: >> Dag-Erling Sm=C3=B8rgrav writes: >>> #define FORCE_ASSIGN(type, var, value) \ >>> *(volatile type *)&(var) =3D (value) >> memset can be optimised away as well. The only way is to declare >> those variables volatile. >=20 > Assigning through a volatile pointer, as in FORCE_ASSIGN(), also > works, even if the variable itself is not volatile. Just thought of problem with this macro when var is a pointer. Then volatile applies to the referenced memory and not the variable. So you should move the volatile keyword, like so: #define FORCE_ASSIGN(type, var, value) \ *(type volatile *)&(var) =3D (value) And if you can use GNU extensions this can be simplified to: #define FORCE_ASSIGN(var, value) \ *(typeof(var) volatile *)&(var) =3D (value) From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 17:43:23 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 14FBB10656CA; Mon, 14 Jun 2010 17:43:23 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id C1B088FC1A; Mon, 14 Jun 2010 17:43:22 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5EHhL97064907; Mon, 14 Jun 2010 13:43:21 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5EHhLw2064855; Mon, 14 Jun 2010 17:43:21 GMT (envelope-from tinderbox@freebsd.org) Date: Mon, 14 Jun 2010 17:43:21 GMT Message-Id: <201006141743.o5EHhLw2064855@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on sparc64/sparc64 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 17:43:23 -0000 TB --- 2010-06-14 16:41:38 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-14 16:41:38 - starting HEAD tinderbox run for sparc64/sparc64 TB --- 2010-06-14 16:41:38 - cleaning the object tree TB --- 2010-06-14 16:41:47 - cvsupping the source tree TB --- 2010-06-14 16:41:47 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/sparc64/sparc64/supfile TB --- 2010-06-14 16:42:44 - building world TB --- 2010-06-14 16:42:44 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-14 16:42:44 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-14 16:42:44 - TARGET=sparc64 TB --- 2010-06-14 16:42:44 - TARGET_ARCH=sparc64 TB --- 2010-06-14 16:42:44 - TZ=UTC TB --- 2010-06-14 16:42:44 - __MAKE_CONF=/dev/null TB --- 2010-06-14 16:42:44 - cd /src TB --- 2010-06-14 16:42:44 - /usr/bin/make -B buildworld >>> World build started on Mon Jun 14 16:42:45 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything [...] cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/config.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/devices.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/dhcp.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/disks.c cc1: warnings being treated as errors /src/usr.sbin/sysinstall/disks.c: In function 'diskPartitionWrite': /src/usr.sbin/sysinstall/disks.c:893: warning: implicit declaration of function 'bootalloc' /src/usr.sbin/sysinstall/disks.c:893: warning: assignment makes pointer from integer without a cast *** Error code 1 Stop in /src/usr.sbin/sysinstall. *** Error code 1 Stop in /src/usr.sbin. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-14 17:43:21 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-14 17:43:21 - ERROR: failed to build world TB --- 2010-06-14 17:43:21 - 2732.12 user 587.49 system 3703.34 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-sparc64-sparc64.full From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 17:43:33 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A652C10656C0; Mon, 14 Jun 2010 17:43:33 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id 491338FC08; Mon, 14 Jun 2010 17:43:33 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5EHhWbG066249; Mon, 14 Jun 2010 13:43:32 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5EHhVUd066248; Mon, 14 Jun 2010 17:43:31 GMT (envelope-from tinderbox@freebsd.org) Date: Mon, 14 Jun 2010 17:43:31 GMT Message-Id: <201006141743.o5EHhVUd066248@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on powerpc/powerpc X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 17:43:33 -0000 TB --- 2010-06-14 16:34:51 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-14 16:34:51 - starting HEAD tinderbox run for powerpc/powerpc TB --- 2010-06-14 16:34:51 - cleaning the object tree TB --- 2010-06-14 16:35:02 - cvsupping the source tree TB --- 2010-06-14 16:35:02 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/powerpc/powerpc/supfile TB --- 2010-06-14 16:40:21 - building world TB --- 2010-06-14 16:40:21 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-14 16:40:21 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-14 16:40:21 - TARGET=powerpc TB --- 2010-06-14 16:40:21 - TARGET_ARCH=powerpc TB --- 2010-06-14 16:40:21 - TZ=UTC TB --- 2010-06-14 16:40:21 - __MAKE_CONF=/dev/null TB --- 2010-06-14 16:40:21 - cd /src TB --- 2010-06-14 16:40:21 - /usr/bin/make -B buildworld >>> World build started on Mon Jun 14 16:40:21 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies [...] echo watchdogd: /obj/powerpc/src/tmp/usr/lib/libc.a /obj/powerpc/src/tmp/usr/lib/libm.a /obj/powerpc/src/tmp/usr/lib/libutil.a >> .depend ===> usr.sbin/wlandebug (depend) rm -f .depend mkdep -f .depend -a /src/usr.sbin/wlandebug/wlandebug.c echo wlandebug: /obj/powerpc/src/tmp/usr/lib/libc.a >> .depend ===> usr.sbin/wpa (depend) ===> usr.sbin/wpa/wpa_supplicant (depend) make: don't know how to make l2_packet_freebsd.c. Stop *** Error code 2 Stop in /src/usr.sbin/wpa. *** Error code 1 Stop in /src/usr.sbin. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-14 17:43:31 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-14 17:43:31 - ERROR: failed to build world TB --- 2010-06-14 17:43:31 - 3023.17 user 531.48 system 4119.47 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-powerpc-powerpc.full From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 18:13:07 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9281106564A; Mon, 14 Jun 2010 18:13:07 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id 622C38FC0A; Mon, 14 Jun 2010 18:13:07 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5EID6kd035612; Mon, 14 Jun 2010 14:13:06 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5EID6iI035611; Mon, 14 Jun 2010 18:13:06 GMT (envelope-from tinderbox@freebsd.org) Date: Mon, 14 Jun 2010 18:13:06 GMT Message-Id: <201006141813.o5EID6iI035611@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on sparc64/sun4v X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 18:13:07 -0000 TB --- 2010-06-14 17:15:01 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-14 17:15:01 - starting HEAD tinderbox run for sparc64/sun4v TB --- 2010-06-14 17:15:01 - cleaning the object tree TB --- 2010-06-14 17:15:10 - cvsupping the source tree TB --- 2010-06-14 17:15:10 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/sparc64/sun4v/supfile TB --- 2010-06-14 17:15:51 - building world TB --- 2010-06-14 17:15:51 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-14 17:15:51 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-14 17:15:51 - TARGET=sun4v TB --- 2010-06-14 17:15:51 - TARGET_ARCH=sparc64 TB --- 2010-06-14 17:15:51 - TZ=UTC TB --- 2010-06-14 17:15:51 - __MAKE_CONF=/dev/null TB --- 2010-06-14 17:15:51 - cd /src TB --- 2010-06-14 17:15:51 - /usr/bin/make -B buildworld >>> World build started on Mon Jun 14 17:15:51 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything [...] cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/config.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/devices.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/dhcp.c cc -O2 -pipe -DUSE_GZIP=1 -fno-strict-aliasing -I/src/usr.sbin/sysinstall/../../gnu/lib/libdialog -I. -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /src/usr.sbin/sysinstall/disks.c cc1: warnings being treated as errors /src/usr.sbin/sysinstall/disks.c: In function 'diskPartitionWrite': /src/usr.sbin/sysinstall/disks.c:893: warning: implicit declaration of function 'bootalloc' /src/usr.sbin/sysinstall/disks.c:893: warning: assignment makes pointer from integer without a cast *** Error code 1 Stop in /src/usr.sbin/sysinstall. *** Error code 1 Stop in /src/usr.sbin. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-14 18:13:06 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-14 18:13:06 - ERROR: failed to build world TB --- 2010-06-14 18:13:06 - 2760.70 user 553.52 system 3484.88 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-sparc64-sun4v.full From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 18:48:25 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4244F1065672 for ; Mon, 14 Jun 2010 18:48:25 +0000 (UTC) (envelope-from tlott@ebel-syste.ms) Received: from spirit.gamesnet.de (spirit.gamesnet.de [87.230.101.86]) by mx1.freebsd.org (Postfix) with ESMTP id F0BD78FC16 for ; Mon, 14 Jun 2010 18:48:24 +0000 (UTC) Received: from spirit.gamesnet.de (localhost [127.0.0.1]) by spirit.gamesnet.de (Postfix) with ESMTP id C8FAE29B032 for ; Mon, 14 Jun 2010 20:31:57 +0200 (CEST) X-Virus-Scanned: amavisd-new at mail.gamesnet.de Received: from spirit.gamesnet.de ([127.0.0.1]) by spirit.gamesnet.de (spirit.gamesnet.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Af3o8borC0Kt for ; Mon, 14 Jun 2010 20:31:53 +0200 (CEST) Received: from sub.han.vpn.gamesnet.de (sub.han.vpn.gamesnet.de [192.168.1.101]) by spirit.gamesnet.de (Postfix) with ESMTPSA id 941B629B00B for ; Mon, 14 Jun 2010 20:31:53 +0200 (CEST) Date: Mon, 14 Jun 2010 20:31:52 +0200 From: Tobias Lott To: freebsd-current@freebsd.org Message-ID: <20100614203152.5518f72c@sub.han.vpn.gamesnet.de> In-Reply-To: <20100614132515.144A8818079@smtp3-g21.free.fr> References: <20100614132515.144A8818079@smtp3-g21.free.fr> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; amd64-portbld-freebsd8.1) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: Dell bluetooth wireless card X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 18:48:25 -0000 On Mon, 14 Jun 2010 15:25:14 +0200 Raoul wrote: > > > Hello all, > > Please, can you tell me what to do to make my bluetooth > card detected on current. > > It is a Dell Wireless 370 Bluetooth Mini-card, running on a Dell > E6400 laptop. OS: FBSD current r208665. > Thanks in advance. > > Raoul > rmgls@free.fr > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to > "freebsd-current-unsubscribe@freebsd.org" kldload ng_ubt Which is actually panic-ing my Inspiron 9200 From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 18:50:44 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9102C1065672 for ; Mon, 14 Jun 2010 18:50:44 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id 2B6538FC23 for ; Mon, 14 Jun 2010 18:50:43 +0000 (UTC) Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id o5EIoWdi062931 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 14 Jun 2010 21:50:32 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4) with ESMTP id o5EIoWrq096737; Mon, 14 Jun 2010 21:50:32 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4/Submit) id o5EIoW9o096736; Mon, 14 Jun 2010 21:50:32 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 14 Jun 2010 21:50:32 +0300 From: Kostik Belousov To: Bruce Cran Message-ID: <20100614185031.GJ13238@deviant.kiev.zoral.com.ua> References: <20100614170000.GA41366@muon.cran.org.uk> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="CZb08McUREi1kVi+" Content-Disposition: inline In-Reply-To: <20100614170000.GA41366@muon.cran.org.uk> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.2 at skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-2.3 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_50, DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: bzeeb+freebsd+lor@zabbadoz.net, freebsd-current@freebsd.org Subject: Re: ZFS LORs: syncer vs. zfs and devfs vs. zfs X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 18:50:44 -0000 --CZb08McUREi1kVi+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jun 14, 2010 at 05:00:00PM +0000, Bruce Cran wrote: > I got the attached ZFS LORs when building ports on a new install of=20 > 9.0-CURRENT-20100610-JPSNAP. I know there have been some ZFS checkins in = the=20 > last few days so I don't know if they've already been fixed? The LORs are not specific to ZFS, are caused by VFS layer, and I my recollection is that they are false positives. >=20 > --=20 > Bruce >=20 >=20 > lock order reversal: > 1st 0xffffff000a846458 zfs (zfs) @ /usr/src/sys/kern/vfs_mount.c:1201 > 2nd 0xffffff000a846638 devfs (devfs) @ /usr/src/sys/ufs/ffs/ffs_vfsops.c= :1250 > KDB: stack backtrace: > db_trace_self_wrapper() at db_trace_self_wrapper+0x2a > _witness_debugger() at _witness_debugger+0x2e > witness_checkorder() at witness_checkorder+0x81e > __lockmgr_args() at __lockmgr_args+0xd11 > vop_stdlock() at vop_stdlock+0x39 > VOP_LOCK1_APV() at VOP_LOCK1_APV+0x9b > _vn_lock() at _vn_lock+0x47 > ffs_flushfiles() at ffs_flushfiles+0xb5 > ffs_unmount() at ffs_unmount+0x70 > dounmount() at dounmount+0x2e6 > unmount() at unmount+0x27e > syscallenter() at syscallenter+0xf0 > syscall() at syscall+0x4c > Xfast_syscall() at Xfast_syscall+0xe1 > --- syscall (22, FreeBSD ELF64, unmount), rip =3D 0x8006a23ec, rsp =3D 0x= 7fffffffe3c8, rbp =3D 0x800c09bb0 --- >=20 > lock order reversal: > 1st 0xffffff000a857bd8 syncer (syncer) @ /usr/src/sys/kern/vfs_subr.c:17= 13 > 2nd 0xffffff0127b389f8 zfs (zfs) @ /usr/src/sys/modules/zfs/../../cddl/c= ontrib/opensolaris/uts/common/fs/zfs/zfs_znode.c:152 > KDB: stack backtrace: > db_trace_self_wrapper() at db_trace_self_wrapper+0x2a > _witness_debugger() at _witness_debugger+0x2e > witness_checkorder() at witness_checkorder+0x81e > __lockmgr_args() at __lockmgr_args+0xd11 > vop_stdlock() at vop_stdlock+0x39 > VOP_LOCK1_APV() at VOP_LOCK1_APV+0x9b > _vn_lock() at _vn_lock+0x47 > zfs_znode_cache_constructor() at zfs_znode_cache_constructor+0x57 > zfs_znode_alloc() at zfs_znode_alloc+0x39 > zfs_zget() at zfs_zget+0x2a7 > zfs_get_data() at zfs_get_data+0x4d > zil_commit() at zil_commit+0x532 > zfs_sync() at zfs_sync+0xa6 > sync_fsync() at sync_fsync+0x13a > sync_vnode() at sync_vnode+0x157 > sched_sync() at sched_sync+0x1d1 > fork_exit() at fork_exit+0x12a > fork_trampoline() at fork_trampoline+0xe > --- trap 0, rip =3D 0, rsp =3D 0xffffff8323b0ad30, rbp =3D 0 --- > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" --CZb08McUREi1kVi+ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (FreeBSD) iEYEARECAAYFAkwWefcACgkQC3+MBN1Mb4gmdACfbC6zUrRpylMFeBpTpjWeI+ev q6MAnjXf0rJ3HOyR9HSkjQVkNoseNwFJ =cioG -----END PGP SIGNATURE----- --CZb08McUREi1kVi+-- From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 20:02:08 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 14E911065678 for ; Mon, 14 Jun 2010 20:02:08 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id 9345F8FC08 for ; Mon, 14 Jun 2010 20:02:07 +0000 (UTC) Received: from mail-yw0-f182.google.com (mail-yw0-f182.google.com [209.85.211.182]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id A6CB5BF404 for ; Mon, 14 Jun 2010 22:02:05 +0200 (CEST) Received: by ywh12 with SMTP id 12so3065803ywh.14 for ; Mon, 14 Jun 2010 13:02:04 -0700 (PDT) MIME-Version: 1.0 Received: by 10.224.72.32 with SMTP id k32mr2521926qaj.167.1276545723971; Mon, 14 Jun 2010 13:02:03 -0700 (PDT) Received: by 10.229.247.142 with HTTP; Mon, 14 Jun 2010 13:02:03 -0700 (PDT) In-Reply-To: <86y6ehsnq5.fsf@gmail.com> References: <20100614100500.GA35142@freebsd.org> <86y6ehsnq5.fsf@gmail.com> Date: Mon, 14 Jun 2010 22:02:03 +0200 Message-ID: From: Alexander Best To: Anonymous Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 20:02:08 -0000 On Mon, Jun 14, 2010 at 4:17 PM, Anonymous wrote: > Alexander Best writes: > >> On Mon, Jun 14, 2010 at 12:05 PM, Roman Divacky w= rote: >>> On Sun, Jun 13, 2010 at 10:28:23PM +0200, Alexander Best wrote: >>>> hi there. i'm experiencing two problems during buildworld. i'm not >>>> sure if these are the result of me doing weird stuff or a problem in >>>> the src structure: >>>> >>>> 1. i have the following in my make.conf: >>>> >>>> .if empty(.CURDIR:M/usr/src/*) && empty(.CURDIR:M/usr/obj/*) && >>>> exists(/usr/local/bin/gcc44) >>>> CC =3D gcc44 >>>> CXX =3D g++44 >>>> CPP =3D cpp44 >>>> .endif >>> >>> you may want to reverse the condition, ie. >>> >>> .if !empty(.CURDIR:M/usr/ports/*) >> >> yeah i had something like that in my make.conf beforehand. the problem >> was however that this would only use gcc44 when 'make' was run in the >> ports directory. however i want make to ALWAYS use gcc44 apart from >> /usr/src. > > It may be easier to make gcc44 symlinks for cc/c++/gcc/g++ in > e.g. HOME/.bin and add it to PATH before /usr/bin[1]. make buildworld > overrides its own PATH and shouldn't be affected but pretty much > anything else will use gcc44, not only make(1) targets. > > You can create basegcc/baseg++ symlinks then for things that don't > compile by gcc44 but in case of portmaster you'd have to teach it > respect user-defined PATH in order for CC=3Dbasegcc in make.conf to work. > > [1] *after* ccache if you have it installed, e.g. > =A0 =A0PATH=3D$LOCALBASE/libexec/ccache:$HOME/.bin:...:/usr/bin:... thanks for hint. right now my main problem is that i'm not able to sucessfull do 'buildworld' with CC/CXX/CPP set in src.conf. this should be reproducable quite easy by either adding: CC=3Dgcc CXX=3Dg++ CPP=3Dcpp to src.conf or CC=3Dclang CXX=3Dclang++ CPP=3Dclang i posted the error output beforehand. this problems has nothing to do with anything in make.conf since i commented out every gcc44 stuff and even CFLAGS and so forth. for me the only way to successfully do 'buildworld' is to make sure CC/CXX/CPP aren't set in src.conf or as envars. cheers. alex > --=20 Alexander Best From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 20:25:42 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60848106564A for ; Mon, 14 Jun 2010 20:25:42 +0000 (UTC) (envelope-from root@free.fr) Received: from smtp3-g21.free.fr (smtp3-g21.free.fr [212.27.42.3]) by mx1.freebsd.org (Postfix) with ESMTP id 2462E8FC12 for ; Mon, 14 Jun 2010 20:25:40 +0000 (UTC) Received: from free.fr (evr27-1-88-172-40-194.fbx.proxad.net [88.172.40.194]) by smtp3-g21.free.fr (Postfix) with ESMTP id 9E6C5818080 for ; Mon, 14 Jun 2010 22:25:36 +0200 (CEST) To: freebsd-current@freebsd.org From: Raoul Date: Mon, 14 Jun 2010 22:25:36 +0200 Sender: root@free.fr Message-Id: <20100614202536.9E6C5818080@smtp3-g21.free.fr> Subject: Re: Dell bluetooth wireless card X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 20:25:42 -0000 On Mon, 14 Jun 2010 20:31:52 +0200 Tobias Lott wrote: > On Mon, 14 Jun 2010 15:25:14 +0200 > Raoul wrote: >> >> >> Hello all, >> >> Please, can you tell me what to do to make my bluetooth >> card detected on current. >> >> It is a Dell Wireless 370 Bluetooth Mini-card, running on a Dell >> E6400 laptop. OS: FBSD current r208665. >> Thanks in advance. >> >> Raoul >> rmgls@free.fr > kldload ng_ubt > Which is actually panic-ing my Inspiron 9200 alas, it is already loaded! and /etc/rc.bluetooth start ubt0 gives: ngctl: send msg: No such file or directory the card is not detected at all (no mention in dmesg). best regards Raoul rmgls@free.fr From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 21:03:47 2010 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A1E531065679 for ; Mon, 14 Jun 2010 21:03:47 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 656438FC1B for ; Mon, 14 Jun 2010 21:03:47 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id F3F0E1FFC34; Mon, 14 Jun 2010 21:03:45 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id C16328444A; Mon, 14 Jun 2010 23:01:35 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Alexander Best References: Date: Mon, 14 Jun 2010 23:01:35 +0200 In-Reply-To: (Alexander Best's message of "Sun, 13 Jun 2010 22:28:23 +0200") Message-ID: <86mxuxgwgg.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.95 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@FreeBSD.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 21:03:47 -0000 Alexander Best writes: > .if empty(.CURDIR:M/usr/src/*) && empty(.CURDIR:M/usr/obj/*) && > exists(/usr/local/bin/gcc44) > CC =3D gcc44 > CXX =3D g++44 > CPP =3D cpp44 > .endif What happens when .CURDIR =3D /usr/src? DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 21:22:41 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C2E11065672; Mon, 14 Jun 2010 21:22:41 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: from mail-yw0-f182.google.com (mail-yw0-f182.google.com [209.85.211.182]) by mx1.freebsd.org (Postfix) with ESMTP id BBCDD8FC14; Mon, 14 Jun 2010 21:22:40 +0000 (UTC) Received: by ywh12 with SMTP id 12so3144623ywh.14 for ; Mon, 14 Jun 2010 14:22:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=AEumJpM6dKr1SwJL0MFsqZ80FD9ks0eVfOs95Sgm22Y=; b=lwAoDnIv1c+eU8ZzFOMJ2jP+rVJzsNBa/f430k8uLbG/wkzXQmTjZL/xN5jViruIHv pcXywOzQY+UwXQGSCvwC1vtIZNwGsbKyD4c0gRLEw0NMzZkR7VTrzL+wco6tyaWRm0ry wUJ6PCZRjypaBdsN5zdtnMkXanjiS76lYWN0U= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=wWmtR0w9S3La6Ne8v/3zjz3J28kjA5orFJH7cOupebaabSq062Bwoio66MpD99vIBL viSrbSyLtgagrxMuAXrCmKqFMQTiebJh1aSXr6GtF4O0fHoLgK1HvDna8LR+dOinSPTM FlVmqb60SDg8Nen893cvJD0WNyS86Q84Vlzjg= MIME-Version: 1.0 Received: by 10.224.57.198 with SMTP id d6mr2539084qah.331.1276550552238; Mon, 14 Jun 2010 14:22:32 -0700 (PDT) Received: by 10.229.80.75 with HTTP; Mon, 14 Jun 2010 14:22:32 -0700 (PDT) In-Reply-To: <201006101346.59824.jhb@freebsd.org> References: <201006101346.59824.jhb@freebsd.org> Date: Mon, 14 Jun 2010 14:22:32 -0700 Message-ID: From: Garrett Cooper To: John Baldwin Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: current@freebsd.org Subject: Re: RFC: etcupdate tool in base? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 21:22:41 -0000 On Thu, Jun 10, 2010 at 10:46 AM, John Baldwin wrote: > I've had several folks ask me recently about importing etcupdate > (http://www.FreeBSD.org/~jhb/etcupdate) into the base system as an altern= ate > tool for updating /etc during upgrades. =A0Do folks have any strong objec= tions > to doing so? =A0More details about how it works and an HTML version of th= e > manpage can be found at the URL above. Finally got around to looking at this. Some comments: 1. Script doesn't check to see whether or not it has write access (and doesn't catch some errors): $ etcupdate mkdir: /var/db/etcupdate: Permission denied /usr/sbin/etcupdate: cannot create /var/db/etcupdate/log: No such file or directory Eventually it stops though, so maybe it's not really a big issue... 2. Some messages are a bit misleading: $ etcupdate /usr/sbin/etcupdate: cannot create /var/db/etcupdate/log: Permission denied $ ls -l /var/db/etcupdate/log -rw-r--r-- 1 root wheel 0 Jun 14 14:06 /var/db/etcupdate/log $ whoami garrcoop 3. Workflow comments. i. Ok... I know I'm doing a downgrade, but what now? $ sudo etcupdate No previous tree to compare against, a sane comparison is not possible. ii. Did a bit more reading, and I think that `etcupdate build' is what I want... but it wasn't happy when I did that: $ sudo etcupdate build Missing required tarball. usage: etcupdate [-nBF] [-d workdir] [-r | -s source | -t tarball] [-A patt= erns] [-D destdir] [-I patterns] [-L logfile] [-M options] etcupdate build [-B] [-d workdir] [-s source] [-L logfile] [-M optio= ns] etcupdate diff [-d workdir] [-D destdir] [-I patterns] [-L logfile] etcupdate extract [-B] [-d workdir] [-s source | -t tarball] [-L log= file] [-M options] etcupdate resolve [-d workdir] [-D destdir] [-L logfile] etcupdate status [-d workdir] So uh... ok? Manpage and usage were a bit confusing (but not too bad). After I fixed my arguments, here's what I came up with: $ sudo etcupdate build -s /data/scratch/src/stable/8/ /root/etcupdate-stable8.tbz $ sudo etcupdate extract -t /root/etcupdate-stable8.tbz $ Wait -- what happened...? What's going on isn't overly apparent from running extract. It's nice having clean utilities, but I'm not used to the etcupdate workflow, so having some verbosity would be helpful :D. Thanks, -Garrett From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 21:22:47 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 881B41065672 for ; Mon, 14 Jun 2010 21:22:47 +0000 (UTC) (envelope-from pawel.worach@gmail.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id 1723C8FC19 for ; Mon, 14 Jun 2010 21:22:46 +0000 (UTC) Received: by wyb34 with SMTP id 34so706653wyb.13 for ; Mon, 14 Jun 2010 14:22:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:content-type :content-transfer-encoding:subject:date:message-id:to:mime-version :x-mailer; bh=IDdfNiAIRXbMvPA2bVdKxO5JkR6aq5GQL+NkjBd/Zno=; b=gyDwFxmghdoycNJcW40M8uSNZOP87zTnQP2mmp3OEsOmjE3+EsOSms6Ls8fiec/YS9 W/AjBvjCaw5FxtpmEYkXp/3sdTbUV6cszaaKQJOWjqMvW5Of9X39BcDMuSGahy/dziq/ GNRS5ljn3O3LR76BeieMjeKKaVF7pCpFUS+R8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:content-type:content-transfer-encoding:subject:date:message-id :to:mime-version:x-mailer; b=hSh7+q8wdfC2fcjFgGb5SG8JvconV4xuIJLX6wNdAkl7SA9AtAuAKHqlDs8JJAYZdd wUrD5jXN6eCFVEjcvx0kCyxYy1o7XE5Tl44lOr0zQxy5WEpH0hZokH6Qg2THwXlEyyDF R/Y6b01dqdQFl8KVAhDM04KNTR7bzw/7VEH9w= Received: by 10.227.69.213 with SMTP id a21mr6216866wbj.220.1276550564908; Mon, 14 Jun 2010 14:22:44 -0700 (PDT) Received: from [172.16.0.199] (c80-216-186-179.bredband.comhem.se [80.216.186.179]) by mx.google.com with ESMTPS id t15sm39862806wbc.11.2010.06.14.14.22.44 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 14 Jun 2010 14:22:44 -0700 (PDT) From: Pawel Worach Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Date: Mon, 14 Jun 2010 23:22:42 +0200 Message-Id: To: current@freebsd.org Mime-Version: 1.0 (Apple Message framework v1078) X-Mailer: Apple Mail (2.1078) Cc: Subject: [patch] Misc warnings found by clang. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 21:22:47 -0000 Here is a patch that fixes a couple of "warning: format string is not a = string literal" and a couple of unused/never read variable "len" = warnings in lib/libugidfw. http://pes.vlakno.cz/~pwo/clang-warn-fix-head.diff Regards --=20 Pawel From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 21:59:13 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A39A1065715 for ; Mon, 14 Jun 2010 21:59:13 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: from mail-gy0-f182.google.com (mail-gy0-f182.google.com [209.85.160.182]) by mx1.freebsd.org (Postfix) with ESMTP id 00D408FC18 for ; Mon, 14 Jun 2010 21:59:12 +0000 (UTC) Received: by gyh20 with SMTP id 20so3617597gyh.13 for ; Mon, 14 Jun 2010 14:59:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=sa1gHrzASjoBETQxD69+wOZK1BDuFqPnjo305zCxwkI=; b=TtZKwXw+eMhC+DEhKHfT0JisF3qHpwCPiLsLXleKDIscfxUNnqg/IWZHR2zP4Uqd9F ZZpyvmpau/IzZa64Y2hAUMZKvr0L7pSJHtW2Dunb4O+UHbwFGTcZaBTDVG7iIatcHQB0 Hfy2UZrDSjBZq5ng2/7HsDrqPQZA+fLoEZU3U= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=vRk1oc3uc6+pA7JiPViBoz+IPSrWS4XPn5DZFnXXqqYhNX2bZxSxOu17Sl20BJ0Wca bCzYw3m85a52IBzxmrZwHSIQOK3o5592e7SQrenlFhDLMAcGHDGgGmgMxGxRw00ctebM jr3ghrqfrHBLFwyCIZ9TC7DflMHyBr2we8A4Y= MIME-Version: 1.0 Received: by 10.229.223.130 with SMTP id ik2mr2775131qcb.107.1276552750693; Mon, 14 Jun 2010 14:59:10 -0700 (PDT) Received: by 10.229.80.75 with HTTP; Mon, 14 Jun 2010 14:59:10 -0700 (PDT) In-Reply-To: References: Date: Mon, 14 Jun 2010 14:59:10 -0700 Message-ID: From: Garrett Cooper To: Xin LI Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: FreeBSD Current Subject: Re: Multiple stability issues with r208557, r208809 on amd64 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 21:59:13 -0000 On Tue, Jun 8, 2010 at 5:37 PM, Garrett Cooper wrote: > On Tue, Jun 8, 2010 at 4:59 PM, Xin LI wrote: >> Do you mean between the two revisions or something? =A0I committed >> r208557 which doesn't seem likely to cause any runtime issue; 208809 >> is isp(4) change which is not part of your kernel... >> >> [delphij@delta] /usr/src> svn log -r 208557 >> ------------------------------------------------------------------------ >> r208557 | delphij | 2010-05-25 15:19:51 -0700 (Tue, 25 May 2010) | 4 lin= es >> >> Grammar nits. >> >> Submitted by: =A0 b. f. >> >> ------------------------------------------------------------------------ >> [delphij@delta] /usr/src> svn diff -c 208557 >> Index: release/doc/en_US.ISO8859-1/relnotes/article.sgml >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> --- release/doc/en_US.ISO8859-1/relnotes/article.sgml =A0 (revision 2085= 56) >> +++ release/doc/en_US.ISO8859-1/relnotes/article.sgml =A0 (revision 2085= 57) >> @@ -327,7 +327,7 @@ >> =A0 =A0 =A0 based on libarchive, have replaced the = GNU >> =A0 =A0 =A0 Binutils versions of these utilities. >> >> - =A0 =A0BSD-licensed version of &man.bc.1; and &man.dc.1; has >> + =A0 =A0BSD-licensed versions of &man.bc.1; and &man.dc.1; have >> =A0 =A0 =A0 replaced their GNU counterparts. >> >> =A0 =A0 &man.chflags.1; now supports a >> flag for >> @@ -378,7 +378,7 @@ >> =A0 =A0 =A0 disable the use of TCP options. >> >> =A0 =A0 &man.nc.1;'s switch has been deprecate= d. >> - =A0 =A0 =A0It will be removed in future release. >> + =A0 =A0 =A0It will be removed in a future release. >> >> =A0 =A0 The &man.ping6.8; utility now returns 2 >> =A0 =A0 =A0 when the packet transmission was successful but no responses > > Hi Xin! > > Well, I hope that that wouldn't cause my machine to tank (otherwise it > likes to be a grammar nazi too much :P)... > > What I was trying to identify is a general trend in terms of > evaluation of different versions of CURRENT; somewhere after the code > revision that I noted (r206173), the code appears to be regressing > more and more to the point where CURRENT has become completely > unusable to me in a development scenario, other than just a throwaway > NFS rootfs, s.t. recent code changes need to be thoroughly inspected > and the regression / multiple regressions needs to be root caused > before 9.0-RELEASE, otherwise this will definitely gate multiple > people from upgrading to newer versions of FreeBSD. This probably is > somewhat related to the locking changes, and the fact that several > drivers might have been broken before, but because there were > safeguards around certain sections of code, or because it was > operating at a slow enough rate, the system itself appeared sane and > happy from the outside. But that's probably just useless conjecture > anyhow... > > I realize that CURRENT is supposed to be relatively in flux and it's > primarily for development and evaluation, but I thought that the whole > point of having development branches was to avoid the scenario where > the software itself was completely unusable on dev boxes so that > several folks could work in parallel with [relatively] minor conflicts > between each others' changes. Part of the reason why I've avoided > passing along pkg_install patches -- I want to make sure that I do my > job in testing things to a large degree so I don't break other > peoples' machines unnecessarily (and I'm sure that the bulk majority > of developers on the project feel the same as well). Long story short, I downgraded to 8-STABLE (r209169), and the issue appears to be occurring with ipfw whenever I push through a non-trivial (but not large) number of packets on my bce(4) enabled interface. I'll bring this up with the net@ folks. If this keeps up, I might have to downgrade further down 8-STABLE until I figure out the root cause :(... Thanks, -Garrett From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 22:08:16 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7217D106566B for ; Mon, 14 Jun 2010 22:08:16 +0000 (UTC) (envelope-from max@love2party.net) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.186]) by mx1.freebsd.org (Postfix) with ESMTP id 05FED8FC19 for ; Mon, 14 Jun 2010 22:08:15 +0000 (UTC) Received: from vampire.homelinux.org (dslb-088-066-005-069.pools.arcor-ip.net [88.66.5.69]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0LaYbD-1P6w770nnD-00luOO; Tue, 15 Jun 2010 00:08:14 +0200 Received: (qmail 84161 invoked from network); 14 Jun 2010 22:08:13 -0000 Received: from f8x64.laiers.local (192.168.4.188) by router.laiers.local with SMTP; 14 Jun 2010 22:08:13 -0000 From: Max Laier Organization: FreeBSD To: freebsd-current@freebsd.org Date: Tue, 15 Jun 2010 00:08:14 +0200 User-Agent: KMail/1.13.3 (FreeBSD/8.0-RELEASE-p2; KDE/4.4.3; amd64; ; ) References: In-Reply-To: MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201006150008.14124.max@love2party.net> X-Provags-ID: V01U2FsdGVkX18SRmvoCrfg2wdRa8jWx5jEfnEpPYedWn1vbU0 DoVbfAYiUQwhXmAYu9/JkVNZypqOaOeuDYlcjZDHHlrgym/h2s kppaRG99l4nx6akgJWB0A== Cc: Subject: Re: [patch] Misc warnings found by clang. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 22:08:16 -0000 On Monday 14 June 2010 23:22:42 Pawel Worach wrote: > Here is a patch that fixes a couple of "warning: format string is not a > string literal" and a couple of unused/never read variable "len" warnings > in lib/libugidfw. I'm not sure about the intention behind the len assignements in libugidfw - might be just a leftover - but if the idea is to teach a model that "we generally care about the return value of snprintf()", a void cast might be the more protable solution. > http://pes.vlakno.cz/~pwo/clang-warn-fix-head.diff Regards, Max From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 22:24:58 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90AE11065674 for ; Mon, 14 Jun 2010 22:24:58 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id 4EAB58FC20 for ; Mon, 14 Jun 2010 22:24:57 +0000 (UTC) Received: from mail-yw0-f182.google.com (mail-yw0-f182.google.com [209.85.211.182]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id 566CBBF406 for ; Tue, 15 Jun 2010 00:24:56 +0200 (CEST) Received: by ywh12 with SMTP id 12so3192620ywh.14 for ; Mon, 14 Jun 2010 15:24:53 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.246.135 with SMTP id ly7mr2755655qcb.269.1276554293839; Mon, 14 Jun 2010 15:24:53 -0700 (PDT) Received: by 10.229.247.142 with HTTP; Mon, 14 Jun 2010 15:24:53 -0700 (PDT) In-Reply-To: <86mxuxgwgg.fsf@ds4.des.no> References: <86mxuxgwgg.fsf@ds4.des.no> Date: Tue, 15 Jun 2010 00:24:53 +0200 Message-ID: From: Alexander Best To: =?ISO-8859-1?Q?Dag=2DErling_Sm=F8rgrav?= Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 22:24:58 -0000 2010/6/14 Dag-Erling Sm=F8rgrav : > Alexander Best writes: >> .if empty(.CURDIR:M/usr/src/*) && empty(.CURDIR:M/usr/obj/*) && >> exists(/usr/local/bin/gcc44) >> CC =3D gcc44 >> CXX =3D g++44 >> CPP =3D cpp44 >> .endif > > What happens when .CURDIR =3D /usr/src? i'm now using .if !target(buildworld) && !target(buildkernel) && exists(/usr/local/bin/gc= c44) CC =3D /usr/local/bin/gcc44 CXX =3D /usr/local/bin/g++44 CPP =3D /usr/local/bin/cpp44 .endif which works quite well. right now i'm trying to solve a different issue which i outlined in my previous posts. would be nice if somebody could try building world with the settings i have in src.conf (see earlier post). cheers. alex > > DES > -- > Dag-Erling Sm=F8rgrav - des@des.no > --=20 Alexander Best From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 00:13:48 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 009B41065677 for ; Tue, 15 Jun 2010 00:13:48 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from server.mypc.hu (server.mypc.hu [87.229.73.95]) by mx1.freebsd.org (Postfix) with ESMTP id AA61E8FC1C for ; Tue, 15 Jun 2010 00:13:47 +0000 (UTC) Received: from server.mypc.hu (localhost [127.0.0.1]) by server.mypc.hu (Postfix) with ESMTP id 6469F14DBB31; Tue, 15 Jun 2010 02:13:46 +0200 (CEST) X-Virus-Scanned: amavisd-new at server.mypc.hu Received: from server.mypc.hu ([127.0.0.1]) by server.mypc.hu (server.mypc.hu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id L2OMla-WlAF8; Tue, 15 Jun 2010 02:13:44 +0200 (CEST) Received: from [192.168.1.105] (catv-80-99-92-167.catv.broadband.hu [80.99.92.167]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by server.mypc.hu (Postfix) with ESMTPSA id 289A814DBB0E; Tue, 15 Jun 2010 02:13:44 +0200 (CEST) Message-ID: <4C16C5B5.1070308@FreeBSD.org> Date: Tue, 15 Jun 2010 02:13:41 +0200 From: Gabor Kovesdan User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.2; es-ES; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: FreeBSD Current Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Edwin Groothuis , Xin LI , i18n@FreeBSD.org Subject: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 00:13:48 -0000 Hello Folks, during the last summer, Google generously founded my Summer of Code project, which was providing a BSD-licensed iconv implementation for FreeBSD. I'm proud to announce that the work has been completed and a patch is available to add it to the base system. The results of this work are: - The Citrus implementation has been ported from NetBSD. - Some utilities have been added. There is a conversion table generator, which can compare conversion tables to reference data generated by GNU libiconv. This helps ensuring conversion compatibility. - UTF-16 surrogate support and some endianness issues have been fixed. - The rather chaotic Makefiles to build metadata have been refactored and cleaned up, now it is easy to read and it is also easier to add support for new encodings. - A bunch of new encodings and encoding aliases have been added. - Support for 1->2, 1->3 and 1->4 mappings, which is needed for transliterating with flying accents as GNU does, like "u. - Lots of warnings have been fixed, the major part of the code is now WARNS=6 clean. - New section 1 and section 5 manual pages have been added. - Some GNU-specific calls have been implemented: iconvlist(), iconvctl(), iconv_canonicalize(), iconv_open_into() - Support for GNU's //IGNORE suffix has been added. - The "-" argument for stdin is now recognized in iconv(1) as per POSIX. - The Big5 conversion module has been fixed. - The iconv.h header files is supposed to be compatible with the GNU version, i.e. sources should build with base iconv.h and GNU libiconv. I've just did a very quick test and it seems ports can safely link to GNU libiconv, there's no conflict. - Various cleanups and style(9) fixes. - A bachelor thesis written in Hungarian language: http://www.kovesdan.org/files/bsc_iconv.pdf The rather big patch (42,5M) is available here: http://www.kovesdan.org/patches/iconv_base_integrate.diff Any comments, suggestions or bugreports are very welcome. -- Gabor Kovesdan FreeBSD Volunteer EMAIL:gabor@FreeBSD.org .:|:.gabor@kovesdan.org WEB:http://people.FreeBSD.org/~gabor .:|:.http://kovesdan.org From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 00:25:09 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B00191065676 for ; Tue, 15 Jun 2010 00:25:09 +0000 (UTC) (envelope-from jamesbrandongooch@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 5956B8FC0C for ; Tue, 15 Jun 2010 00:25:09 +0000 (UTC) Received: by iwn7 with SMTP id 7so5733365iwn.13 for ; Mon, 14 Jun 2010 17:25:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type; bh=L+naH46Ea+hQdBw9taDGmU/Sxcv/VbtMj4u/rkLjSi8=; b=YDx397BPe6lwZDpqJWcybhIwwTJO/rVfj5p0p1w52tPkEuIwcu7F9JfBSRDH08i6Nu +2+h90pFotAhBjbMupQzyRT2XmAVyIW38hPgRrGM6X6XHl9fkodhD5eyo+oQEgzW8xwK I5CKMmY0gVVHvjTdKZh/ydR4otmdkyBSlkEJI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=LLOy2Dld04oUVs1F0RaVWtSR9JUJSJdqiZu8Vt7uLD6mhv2CZHSjOtqWk8Q9MHm3H7 OhWKBDtOV04norRyJFxCta+6BArIxudZeeI8xjwAgRdeG7aOFT62Qf4eIMRBGlcsPH+w LcK6h9Qu4Qnlyfj7PXilL3mErKPfw04XR5ZQU= MIME-Version: 1.0 Received: by 10.231.69.71 with SMTP id y7mr6278984ibi.136.1276561508541; Mon, 14 Jun 2010 17:25:08 -0700 (PDT) Received: by 10.231.182.196 with HTTP; Mon, 14 Jun 2010 17:25:08 -0700 (PDT) In-Reply-To: <4C16C5B5.1070308@FreeBSD.org> References: <4C16C5B5.1070308@FreeBSD.org> Date: Mon, 14 Jun 2010 19:25:08 -0500 Message-ID: From: Brandon Gooch To: Gabor Kovesdan Content-Type: text/plain; charset=ISO-8859-1 Cc: Edwin Groothuis , FreeBSD Current , Xin LI , i18n@freebsd.org Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 00:25:09 -0000 On Mon, Jun 14, 2010 at 7:13 PM, Gabor Kovesdan wrote: > Hello Folks, > > during the last summer, Google generously founded my Summer of Code project, > which was providing a BSD-licensed iconv implementation for FreeBSD. I'm > proud to announce that the work has been completed and a patch is available > to add it to the base system. > > The results of this work are: > - The Citrus implementation has been ported from NetBSD. > - Some utilities have been added. There is a conversion table generator, > which can compare conversion tables to reference data generated by GNU > libiconv. This helps ensuring conversion compatibility. > - UTF-16 surrogate support and some endianness issues have been fixed. > - The rather chaotic Makefiles to build metadata have been refactored and > cleaned up, now it is easy to read and it is also easier to add support for > new encodings. > - A bunch of new encodings and encoding aliases have been added. > - Support for 1->2, 1->3 and 1->4 mappings, which is needed for > transliterating with flying accents as GNU does, like "u. > - Lots of warnings have been fixed, the major part of the code is now > WARNS=6 clean. > - New section 1 and section 5 manual pages have been added. > - Some GNU-specific calls have been implemented: iconvlist(), iconvctl(), > iconv_canonicalize(), iconv_open_into() > - Support for GNU's //IGNORE suffix has been added. > - The "-" argument for stdin is now recognized in iconv(1) as per POSIX. > - The Big5 conversion module has been fixed. > - The iconv.h header files is supposed to be compatible with the GNU > version, i.e. sources should build with base iconv.h and GNU libiconv. I've > just did a very quick test and it seems ports can safely link to GNU > libiconv, there's no conflict. > - Various cleanups and style(9) fixes. > - A bachelor thesis written in Hungarian language: > http://www.kovesdan.org/files/bsc_iconv.pdf > > The rather big patch (42,5M) is available here: > http://www.kovesdan.org/patches/iconv_base_integrate.diff Over 40 Megabytes?! WOW. Thank you for this incredible amount of work, I know the FreeBSD community will benefit greatly from it. I think this effort deserves some hardcore testing, so now to the FreeBSD community -- I know it will get the attention it deserves :) -Brandon From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 02:14:42 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4D1D1065672 for ; Tue, 15 Jun 2010 02:14:41 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id 7CEB88FC08 for ; Tue, 15 Jun 2010 02:14:41 +0000 (UTC) Received: (qmail 22685 invoked by uid 399); 15 Jun 2010 02:14:40 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 15 Jun 2010 02:14:40 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4C16E20E.9070309@FreeBSD.org> Date: Mon, 14 Jun 2010 19:14:38 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100330 Thunderbird/3.0.4 MIME-Version: 1.0 To: Rene Ladan References: <4C15A09B.8080501@FreeBSD.org> <201006140848.55979.jhb@freebsd.org> <4C169F5B.7040409@gmail.com> In-Reply-To: <4C169F5B.7040409@gmail.com> X-Enigmail-Version: 1.0.1 OpenPGP: id=1A1ABC84 Content-Type: multipart/mixed; boundary="------------030401070901060403000204" Cc: danfe@FreeBSD.org, Christian Zander , alc@freebsd.org, Alan Cox , freebsd-current@freebsd.org Subject: Re: nvidia-driver 195.22 use horribly broken on amd64 between r206173 and X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 02:14:42 -0000 This is a multi-part message in MIME format. --------------030401070901060403000204 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 06/14/10 14:30, Rene Ladan wrote: > On 14-06-2010 14:48, John Baldwin wrote: >> On Sunday 13 June 2010 11:23:07 pm Doug Barton wrote: >>> On 06/13/10 19:09, Alan Cox wrote: >>>> On Sun, Jun 13, 2010 at 8:38 PM, Doug Barton wrote: >>>> >>>>> On 06/01/10 08:26, John Baldwin wrote: >>>>> >>>>>> >>>>>> I've asked the driver author if the calls to vm_page_wire() and >>>>>> vm_page_unwire() can simply be removed but have not heard back yet. >>>>>> >>>>> >>>>> Is there any news on this? I have updated to the latest current so I'm >>>>> running the nv driver now, but I'd like to get the nvidia driver running >>>>> again. >>>>> >>>>> >>>> Yes, the unnecessary (and now problematic) wiring and unwiring calls will >> be >>>> removed in a future release of the driver. >>> >>> Excellent! Any ETA? Or are there patches against an existing version of >>> the driver? >> >> I would just remove the calls to vm_page_wire() and vm_page_unwire() along >> with the immediately adjacent calls to vm_page_{un,}lock_queues(). >> > Just to confirm, like the attached patch? > > This is with a GeForce GT 240M, current/amd64 r209035, nvidia-driver > 195.36.15 > > I haven't runtime-tested it yet... This worked great, thanks! I'm re-attaching the patch for Alexey's benefit, just in case. Details, I'm running today's -current (r209174) and I've had it up for 4.5 hours already, which is 3 hours longer than I was able to run with anything > 195.22 for months. I've done full "normal" use which includes lots of terminals, tbird, firefox, flash, etc. Thanks again, Doug -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/ --------------030401070901060403000204 Content-Type: text/plain; name="patch-jhb-current" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-jhb-current" --- src/nvidia_subr.c.orig 2010-03-12 17:48:52.000000000 +0100 +++ src/nvidia_subr.c 2010-06-14 23:25:28.000000000 +0200 @@ -1301,9 +1301,6 @@ for (i = 0; i < count; i++) { pte_array[i] = at->pte_array[i].physical_address; - vm_page_lock_queues(); - vm_page_wire(PHYS_TO_VM_PAGE(pte_array[i])); - vm_page_unlock_queues(); sglist_append_phys(at->sg_list, pte_array[i], PAGE_SIZE); } @@ -1365,9 +1362,6 @@ os_flush_cpu_cache(); for (i = 0; i < count; i++) { - vm_page_lock_queues(); - vm_page_unwire(PHYS_TO_VM_PAGE(at->pte_array[i].physical_address), 0); - vm_page_unlock_queues(); kmem_free(kernel_map, at->pte_array[i].virtual_address, PAGE_SIZE); malloc_type_freed(M_NVIDIA, PAGE_SIZE); --------------030401070901060403000204-- From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 02:31:36 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AB37F106566C for ; Tue, 15 Jun 2010 02:31:36 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-gy0-f182.google.com (mail-gy0-f182.google.com [209.85.160.182]) by mx1.freebsd.org (Postfix) with ESMTP id 64B738FC0A for ; Tue, 15 Jun 2010 02:31:36 +0000 (UTC) Received: by gyh20 with SMTP id 20so3760317gyh.13 for ; Mon, 14 Jun 2010 19:31:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:references :date:in-reply-to:message-id:user-agent:mime-version:content-type; bh=8FHV699+HO7BXDM4/9L494yg65gQnHE4f5nqd24Ziwo=; b=f5BpIOePsO/nE19IcATbTte4hv4XPHpQtV/sGEtiVqwoFyg8Z6sJo2LwUROp8zspL0 gUUUXJrK3UjCcQiWE5QCxbAIZM0HJ/US1oieBjQUsjnrROLWYpQ7QAD+0FBM2rajwW2S KMjbwaBHsqBU0rj6Q/NykI9ZfQENLn3UtCAHc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; b=fninMIASxbmNEFsW4UqnvCXIaxLa5hSc/QJefXQRZHDFIxvdzHZHAOXJKJOu7csVYx FCKUohdxYf6fJg+W5mCGPRNfS2gQjwdYuoI/XTc/AjHQyaOr4kBcwnmiqEuUKybkDlCB iPq3suK6cAAXkfs7f3FunQRyXLAN1Jrt3P58k= Received: by 10.100.245.4 with SMTP id s4mr5404502anh.224.1276569095506; Mon, 14 Jun 2010 19:31:35 -0700 (PDT) Received: from localhost ([222.107.34.53]) by mx.google.com with ESMTPS id e4sm26923733anb.15.2010.06.14.19.31.31 (version=SSLv3 cipher=RC4-MD5); Mon, 14 Jun 2010 19:31:34 -0700 (PDT) From: Anonymous To: Gabor Kovesdan References: <4C16C5B5.1070308@FreeBSD.org> Date: Tue, 15 Jun 2010 06:28:18 +0400 In-Reply-To: <4C16C5B5.1070308@FreeBSD.org> (Gabor Kovesdan's message of "Tue, 15 Jun 2010 02:13:41 +0200") Message-ID: <86wru1f2rh.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: FreeBSD Current Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 02:31:36 -0000 Gabor Kovesdan writes: [...] > The rather big patch (42,5M) is available here: > http://www.kovesdan.org/patches/iconv_base_integrate.diff Why not compress it with gzip(1) or xz(1)? > > Any comments, suggestions or bugreports are very welcome. From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 21:30:09 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1B1A1065672; Mon, 14 Jun 2010 21:30:09 +0000 (UTC) (envelope-from r.c.ladan@gmail.com) Received: from mail-ww0-f54.google.com (mail-ww0-f54.google.com [74.125.82.54]) by mx1.freebsd.org (Postfix) with ESMTP id CE4158FC0A; Mon, 14 Jun 2010 21:30:08 +0000 (UTC) Received: by wwa36 with SMTP id 36so198215wwa.13 for ; Mon, 14 Jun 2010 14:30:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :x-enigmail-version:content-type; bh=Ogn2vTgnt4EfB3P/fRnRFKOgCS2P9qpHTJcWvz/y9Y0=; b=Z3DxhbFG9VkC9ycbwQFDl7qE2gIUQlaxdDt8/C+chAIkWUg0aCIg2Opwoe20asbHRp IO2Hxk03VY3FBi+cBPm/Izri3BWBPiDyoIjQt4wOyhcJTdWV2qKkl13DSgbRLQHgNpb0 kvFBCTaU0n8oAv+GtjEilITTXy/Fr8hdJVJ1g= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:content-type; b=YfierNKHnGc95zETo9eRnCxEce2jGpH07bgF7kC2gkTFDFWG8uFCR2nyoP/L3GPX4O R2ivO4uY4eYcZhkusc31YPb3tAwSf915DEh1cqOwVDfNBZMCBzQSHNrhYKg4bgNS8wmp O75OnNwAsQxccrg9h7AvxXoEDZJBgS3104dA8= Received: by 10.227.146.3 with SMTP id f3mr6205496wbv.211.1276551007510; Mon, 14 Jun 2010 14:30:07 -0700 (PDT) Received: from acer.rene-ladan.nl (ip4da3ae31.direct-adsl.nl [77.163.174.49]) by mx.google.com with ESMTPS id n31sm11419526wba.9.2010.06.14.14.30.04 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 14 Jun 2010 14:30:05 -0700 (PDT) Message-ID: <4C169F5B.7040409@gmail.com> Date: Mon, 14 Jun 2010 23:30:03 +0200 From: Rene Ladan User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; nl-NL; rv:1.9.1.9) Gecko/20100612 Thunderbird/3.0.4 MIME-Version: 1.0 To: John Baldwin References: <4C15A09B.8080501@FreeBSD.org> <201006140848.55979.jhb@freebsd.org> In-Reply-To: <201006140848.55979.jhb@freebsd.org> X-Enigmail-Version: 1.0 Content-Type: multipart/mixed; boundary="------------080607050105060508060303" X-Mailman-Approved-At: Tue, 15 Jun 2010 02:35:02 +0000 Cc: alc@freebsd.org, Alan Cox , freebsd-current@freebsd.org, Christian Zander , Doug Barton Subject: Re: nvidia-driver 195.22 use horribly broken on amd64 between r206173 and X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 21:30:10 -0000 This is a multi-part message in MIME format. --------------080607050105060508060303 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit On 14-06-2010 14:48, John Baldwin wrote: > On Sunday 13 June 2010 11:23:07 pm Doug Barton wrote: >> On 06/13/10 19:09, Alan Cox wrote: >>> On Sun, Jun 13, 2010 at 8:38 PM, Doug Barton wrote: >>> >>>> On 06/01/10 08:26, John Baldwin wrote: >>>> >>>>> >>>>> I've asked the driver author if the calls to vm_page_wire() and >>>>> vm_page_unwire() can simply be removed but have not heard back yet. >>>>> >>>> >>>> Is there any news on this? I have updated to the latest current so I'm >>>> running the nv driver now, but I'd like to get the nvidia driver running >>>> again. >>>> >>>> >>> Yes, the unnecessary (and now problematic) wiring and unwiring calls will > be >>> removed in a future release of the driver. >> >> Excellent! Any ETA? Or are there patches against an existing version of >> the driver? > > I would just remove the calls to vm_page_wire() and vm_page_unwire() along > with the immediately adjacent calls to vm_page_{un,}lock_queues(). > Just to confirm, like the attached patch? This is with a GeForce GT 240M, current/amd64 r209035, nvidia-driver 195.36.15 I haven't runtime-tested it yet... Rene -- http://www.rene-ladan.nl/ GPG fingerprint = E738 5471 D185 7013 0EE0 4FC8 3C1D 6F83 12E1 84F6 (subkeys.pgp.net) --------------080607050105060508060303 Content-Type: text/plain; name="patch-jhb-current" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-jhb-current" --- src/nvidia_subr.c.orig 2010-03-12 17:48:52.000000000 +0100 +++ src/nvidia_subr.c 2010-06-14 23:25:28.000000000 +0200 @@ -1301,9 +1301,6 @@ for (i = 0; i < count; i++) { pte_array[i] = at->pte_array[i].physical_address; - vm_page_lock_queues(); - vm_page_wire(PHYS_TO_VM_PAGE(pte_array[i])); - vm_page_unlock_queues(); sglist_append_phys(at->sg_list, pte_array[i], PAGE_SIZE); } @@ -1365,9 +1362,6 @@ os_flush_cpu_cache(); for (i = 0; i < count; i++) { - vm_page_lock_queues(); - vm_page_unwire(PHYS_TO_VM_PAGE(at->pte_array[i].physical_address), 0); - vm_page_unlock_queues(); kmem_free(kernel_map, at->pte_array[i].virtual_address, PAGE_SIZE); malloc_type_freed(M_NVIDIA, PAGE_SIZE); --------------080607050105060508060303-- From owner-freebsd-current@FreeBSD.ORG Mon Jun 14 21:31:32 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 234561065678; Mon, 14 Jun 2010 21:31:32 +0000 (UTC) (envelope-from chzander@nvidia.com) Received: from hqemgate04.nvidia.com (hqemgate04.nvidia.com [216.228.121.35]) by mx1.freebsd.org (Postfix) with ESMTP id F36808FC1B; Mon, 14 Jun 2010 21:31:31 +0000 (UTC) Received: from hqnvupgp04.nvidia.com (Not Verified[172.20.161.48]) by hqemgate04.nvidia.com id ; Mon, 14 Jun 2010 14:29:02 -0700 Received: from hqemfe03.nvidia.com ([172.17.108.22]) by hqnvupgp04.nvidia.com (PGP Universal service); Mon, 14 Jun 2010 14:31:31 -0700 X-PGP-Universal: processed; by hqnvupgp04.nvidia.com on Mon, 14 Jun 2010 14:31:31 -0700 Received: from nvidia.com ([172.17.108.22]) by hqemfe03.nvidia.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 14 Jun 2010 14:31:30 -0700 Date: Mon, 14 Jun 2010 14:31:22 -0700 From: Christian Zander To: Rene Ladan Message-ID: <20100614213122.GS28855@wolf.nvidia.com> References: <4C15A09B.8080501@FreeBSD.org> <201006140848.55979.jhb@freebsd.org> <4C169F5B.7040409@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4C169F5B.7040409@gmail.com> User-Agent: Mutt/1.4.2.3i X-NVConfidentiality: public X-OriginalArrivalTime: 14 Jun 2010 21:31:30.0898 (UTC) FILETIME=[F459AB20:01CB0C08] X-Mailman-Approved-At: Tue, 15 Jun 2010 02:35:15 +0000 Cc: Christian Zander , Doug Barton , "alc@freebsd.org" , Alan Cox , "freebsd-current@freebsd.org" Subject: Re: nvidia-driver 195.22 use horribly broken on amd64 between r206173 and X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Christian Zander List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 21:31:32 -0000 On Mon, Jun 14, 2010 at 02:30:03PM -0700, Rene Ladan wrote: (...) > >>>>> I've asked the driver author if the calls to vm_page_wire() and > >>>>> vm_page_unwire() can simply be removed but have not heard back yet. > >>>>> > >>>> > >>>> Is there any news on this? I have updated to the latest current so I'm > >>>> running the nv driver now, but I'd like to get the nvidia driver running > >>>> again. > >>>> > >>>> > >>> Yes, the unnecessary (and now problematic) wiring and unwiring calls will > > be > >>> removed in a future release of the driver. > >> > >> Excellent! Any ETA? Or are there patches against an existing version of > >> the driver? > > > > I would just remove the calls to vm_page_wire() and vm_page_unwire() along > > with the immediately adjacent calls to vm_page_{un,}lock_queues(). > > > Just to confirm, like the attached patch? > Yes. > This is with a GeForce GT 240M, current/amd64 r209035, nvidia-driver > 195.36.15 > > I haven't runtime-tested it yet... > > Rene > -- > http://www.rene-ladan.nl/ > > GPG fingerprint = E738 5471 D185 7013 0EE0 4FC8 3C1D 6F83 12E1 84F6 > (subkeys.pgp.net) Content-Description: patch-jhb-current > --- src/nvidia_subr.c.orig 2010-03-12 17:48:52.000000000 +0100 > +++ src/nvidia_subr.c 2010-06-14 23:25:28.000000000 +0200 > @@ -1301,9 +1301,6 @@ > > for (i = 0; i < count; i++) { > pte_array[i] = at->pte_array[i].physical_address; > - vm_page_lock_queues(); > - vm_page_wire(PHYS_TO_VM_PAGE(pte_array[i])); > - vm_page_unlock_queues(); > sglist_append_phys(at->sg_list, pte_array[i], PAGE_SIZE); > } > > @@ -1365,9 +1362,6 @@ > os_flush_cpu_cache(); > > for (i = 0; i < count; i++) { > - vm_page_lock_queues(); > - vm_page_unwire(PHYS_TO_VM_PAGE(at->pte_array[i].physical_address), 0); > - vm_page_unlock_queues(); > kmem_free(kernel_map, > at->pte_array[i].virtual_address, PAGE_SIZE); > malloc_type_freed(M_NVIDIA, PAGE_SIZE); -- christian zander ch?zander@nvidia.com From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 03:24:04 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 965C31065673; Tue, 15 Jun 2010 03:24:04 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: from mail-vw0-f54.google.com (mail-vw0-f54.google.com [209.85.212.54]) by mx1.freebsd.org (Postfix) with ESMTP id 109808FC0C; Tue, 15 Jun 2010 03:24:03 +0000 (UTC) Received: by vws20 with SMTP id 20so6067780vws.13 for ; Mon, 14 Jun 2010 20:24:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=W4/D5dPpjf8zzG9cKhxlK40eRM0prz+NbOzJuShiAOQ=; b=Xw+fpD0o5r+jndqQaeORMKxgsKXUYNZjPb3mtPXzUQQIr2NhjsjnPKWBnZgkpW4Qvo nLVbdefB1OzUVOoTyvwt4kNn8mZLhPUNHCC6Y/vHUmv23E4wlEOyw2qGnR5geLHtV1f3 PdLw3LMOGT6D/l+iypourd4sB5JUON6l8mw84= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=oLcNqUrvA7M99j1KYfSYMJHmH7q6+Um1c+ErADlMuffgCyf7RXrOmT10v7aomf9naU 25UCBKoB6H01wKArLx2bINTW8a5Jb0ysUayB6tLO+Wkf5Fu/EeAEIz5IPcJuE+ZOjsGD D8SX7xRWtOJr7zc61T3pO4YOLe9MUfujp8D8o= MIME-Version: 1.0 Received: by 10.224.21.200 with SMTP id k8mr2811770qab.210.1276572242941; Mon, 14 Jun 2010 20:24:02 -0700 (PDT) Received: by 10.229.80.75 with HTTP; Mon, 14 Jun 2010 20:24:02 -0700 (PDT) In-Reply-To: <20100614213122.GS28855@wolf.nvidia.com> References: <4C15A09B.8080501@FreeBSD.org> <201006140848.55979.jhb@freebsd.org> <4C169F5B.7040409@gmail.com> <20100614213122.GS28855@wolf.nvidia.com> Date: Mon, 14 Jun 2010 20:24:02 -0700 Message-ID: From: Garrett Cooper To: Christian Zander Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Christian Zander , Doug Barton , Rene Ladan , "alc@freebsd.org" , Alan Cox , "freebsd-current@freebsd.org" Subject: Re: nvidia-driver 195.22 use horribly broken on amd64 between r206173 and X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 03:24:04 -0000 On Mon, Jun 14, 2010 at 2:31 PM, Christian Zander wrot= e: > On Mon, Jun 14, 2010 at 02:30:03PM -0700, Rene Ladan wrote: > (...) >> >>>>> I've asked the driver author if the calls to vm_page_wire() and >> >>>>> vm_page_unwire() can simply be removed but have not heard back yet= . >> >>>>> >> >>>> >> >>>> Is there any news on this? I have updated to the latest current so = I'm >> >>>> running the nv driver now, but I'd like to get the nvidia driver ru= nning >> >>>> again. >> >>>> >> >>>> >> >>> Yes, the unnecessary (and now problematic) wiring and unwiring calls= will >> > be >> >>> removed in a future release of the driver. >> >> >> >> Excellent! Any ETA? Or are there patches against an existing version = of >> >> the driver? >> > >> > I would just remove the calls to vm_page_wire() and vm_page_unwire() a= long >> > with the immediately adjacent calls to vm_page_{un,}lock_queues(). >> > >> Just to confirm, like the attached patch? >> > > Yes. > > >> This is with a GeForce GT 240M, current/amd64 r209035, nvidia-driver >> 195.36.15 >> >> I haven't runtime-tested it yet... >> >> Rene >> -- >> http://www.rene-ladan.nl/ >> >> GPG fingerprint =3D E738 5471 D185 7013 0EE0 =A04FC8 3C1D 6F83 12E1 84F6 >> (subkeys.pgp.net) > > Content-Description: patch-jhb-current >> --- src/nvidia_subr.c.orig =A0 =A02010-03-12 17:48:52.000000000 +0100 >> +++ src/nvidia_subr.c 2010-06-14 23:25:28.000000000 +0200 >> @@ -1301,9 +1301,6 @@ >> >> =A0 =A0 =A0for (i =3D 0; i < count; i++) { >> =A0 =A0 =A0 =A0 =A0pte_array[i] =3D at->pte_array[i].physical_address; >> - =A0 =A0 =A0 =A0vm_page_lock_queues(); >> - =A0 =A0 =A0 =A0vm_page_wire(PHYS_TO_VM_PAGE(pte_array[i])); >> - =A0 =A0 =A0 =A0vm_page_unlock_queues(); >> =A0 =A0 =A0 =A0 =A0sglist_append_phys(at->sg_list, pte_array[i], PAGE_SI= ZE); >> =A0 =A0 =A0} >> >> @@ -1365,9 +1362,6 @@ >> =A0 =A0 =A0 =A0 =A0os_flush_cpu_cache(); >> >> =A0 =A0 =A0for (i =3D 0; i < count; i++) { >> - =A0 =A0 =A0 =A0vm_page_lock_queues(); >> - =A0 =A0 =A0 =A0vm_page_unwire(PHYS_TO_VM_PAGE(at->pte_array[i].physica= l_address), 0); >> - =A0 =A0 =A0 =A0vm_page_unlock_queues(); >> =A0 =A0 =A0 =A0 =A0kmem_free(kernel_map, >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0at->pte_array[i].virtual_address, PAG= E_SIZE); >> =A0 =A0 =A0 =A0 =A0malloc_type_freed(M_NVIDIA, PAGE_SIZE); I'll give it a quick shot on my desktop to see how things go. FWIW, nvidia-driver-195.36.15 has been a rock solid release as well, with or without the patch. Cheers, -Garrett From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 04:43:50 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D20911065670 for ; Tue, 15 Jun 2010 04:43:50 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id 6E5648FC1E for ; Tue, 15 Jun 2010 04:43:50 +0000 (UTC) Received: (qmail 27903 invoked by uid 399); 15 Jun 2010 04:43:49 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 15 Jun 2010 04:43:49 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4C170503.30707@FreeBSD.org> Date: Mon, 14 Jun 2010 21:43:47 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100330 Thunderbird/3.0.4 MIME-Version: 1.0 To: Rene Ladan References: <4C15A09B.8080501@FreeBSD.org> <201006140848.55979.jhb@freebsd.org> <4C169F5B.7040409@gmail.com> <4C16E20E.9070309@FreeBSD.org> In-Reply-To: <4C16E20E.9070309@FreeBSD.org> X-Enigmail-Version: 1.0.1 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: alc@freebsd.org, Alan Cox , danfe@FreeBSD.org, Christian Zander , freebsd-current@freebsd.org Subject: Re: nvidia-driver 195.22 use horribly broken on amd64 between r206173 and X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 04:43:50 -0000 On 06/14/10 19:14, Doug Barton wrote: > Details, I'm running today's -current (r209174) and I've had it up for > 4.5 hours already, which is 3 hours longer than I was able to run with > anything > 195.22 for months. I've done full "normal" use which includes > lots of terminals, tbird, firefox, flash, etc. I may have spoke too soon. About 90 minutes after sending this message, and after 1 hour+ of watching a flash video (a CISSP training course) I got a lockup which required me to power off my laptop. After fsck'ing I got back to my desktop, opened firefox, opened my flash video again, and it locked up almost instantly. This time I got a core though. I'm not sure if this is related to the nvidia driver or not, but there 'tis: Unread portion of the kernel message buffer: panic: mi_switch: switch in a critical section cpuid = 1 panic: bufwrite: buffer is not busy??? cpuid = 1 Uptime: 11m11s #0 doadump () at pcpu.h:231 231 pcpu.h: No such file or directory. in pcpu.h (kgdb) #0 doadump () at pcpu.h:231 #1 0xc05f697f in boot (howto=260) at /usr/local/src/sys/kern/kern_shutdown.c:416 #2 0xc05f6c62 in panic (fmt=Variable "fmt" is not available. ) at /usr/local/src/sys/kern/kern_shutdown.c:590 #3 0xc07f881e in ffs_bufwrite (bp=0xd8d687f8) at /usr/local/src/sys/ufs/ffs/ffs_vfsops.c:1858 #4 0xc066bfa8 in vfs_bio_awrite (bp=0xd8d687f8) at buf.h:386 #5 0xc067592b in vop_stdfsync (ap=0xd8f59c6c) at /usr/local/src/sys/kern/vfs_default.c:650 #6 0xc0588a5c in devfs_fsync (ap=0xd8f59c6c) at /usr/local/src/sys/fs/devfs/devfs_vnops.c:566 #7 0xc088ec95 in VOP_FSYNC_APV (vop=0xc0947080, a=0xd8f59c6c) at vnode_if.c:1267 #8 0xc0686928 in sync_vnode (slp=0xc4f50bf8, bo=0xd8f59cd8, td=0xc5964780) at vnode_if.h:549 #9 0xc0686c73 in sched_sync () at /usr/local/src/sys/kern/vfs_subr.c:1819 #10 0xc05cd378 in fork_exit (callout=0xc0686a00 , arg=0x0, frame=0xd8f59d28) at /usr/local/src/sys/kern/kern_fork.c:843 #11 0xc08568d0 in fork_trampoline () at /usr/local/src/sys/i386/i386/exception.s:270 (kgdb) Full file is core.txt.2 in my freefall home directory. Doug -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/ From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 08:37:14 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B9211065673 for ; Tue, 15 Jun 2010 08:37:14 +0000 (UTC) (envelope-from dimitry@andric.com) Received: from tensor.andric.com (cl-327.ede-01.nl.sixxs.net [IPv6:2001:7b8:2ff:146::2]) by mx1.freebsd.org (Postfix) with ESMTP id 5FAA08FC0A for ; Tue, 15 Jun 2010 08:37:13 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7:0:6017:7948:af20:f043] (unknown [IPv6:2001:7b8:3a7:0:6017:7948:af20:f043]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 3EDF25C43; Tue, 15 Jun 2010 10:37:12 +0200 (CEST) Message-ID: <4C173BC1.7020808@andric.com> Date: Tue, 15 Jun 2010 10:37:21 +0200 From: Dimitry Andric User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US; rv:1.9.2.4) Gecko/20100612 Lanikai/3.1.1pre MIME-Version: 1.0 To: Max Laier References: <201006150008.14124.max@love2party.net> In-Reply-To: <201006150008.14124.max@love2party.net> Content-Type: multipart/mixed; boundary="------------070809050808050201010205" Cc: freebsd-current@freebsd.org Subject: Re: [patch] Misc warnings found by clang. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 08:37:14 -0000 This is a multi-part message in MIME format. --------------070809050808050201010205 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit On 2010-06-15 00:08, Max Laier wrote: > I'm not sure about the intention behind the len assignements in libugidfw - > might be just a leftover - but if the idea is to teach a model that "we > generally care about the return value of snprintf()", a void cast might be the > more protable solution. These specific snprintf() calls all occur just before returning an error, so checking the return value is quite useless (unless one wanted to output some sort of overflow warning right there). Moreover, all calls to snprintf() in lib/libugidfw/ugidfw.c that do check the return value are incorrect in two ways: - The return value is stored in a size_t, while snprintf() returns an int. Thus all the checks "ret < 0" become bogus. - The idiom used everywhere is: len = snprintf(cur, left, ...); if (len < 0 || len > left) goto truncated; which is wrong; the second check should be "len >= left" instead. Please review the attached patch which fixes those problems too. --------------070809050808050201010205 Content-Type: text/plain; name="warnfix-ugidfw.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="warnfix-ugidfw.diff" Index: lib/libugidfw/ugidfw.c =================================================================== --- lib/libugidfw/ugidfw.c (revision 209192) +++ lib/libugidfw/ugidfw.c (working copy) @@ -63,22 +63,22 @@ struct passwd *pwd; struct statfs *mntbuf; char *cur, type[sizeof(rule->mbr_object.mbo_type) * CHAR_BIT + 1]; - size_t left, len; - int anymode, unknownmode, truncated, numfs, i, notdone; + size_t left; + int len, anymode, unknownmode, truncated, numfs, i, notdone; cur = buf; left = buflen; truncated = 0; len = snprintf(cur, left, "subject "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; if (rule->mbr_subject.mbs_flags) { if (rule->mbr_subject.mbs_neg == MBS_ALL_FLAGS) { len = snprintf(cur, left, "not "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; @@ -89,7 +89,7 @@ if (!notdone && (rule->mbr_subject.mbs_neg & MBO_UID_DEFINED)) { len = snprintf(cur, left, "! "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; @@ -99,14 +99,14 @@ if (pwd != NULL) { len = snprintf(cur, left, "uid %s", pwd->pw_name); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } else { len = snprintf(cur, left, "uid %u", rule->mbr_subject.mbs_uid_min); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; @@ -117,21 +117,21 @@ if (pwd != NULL) { len = snprintf(cur, left, ":%s ", pwd->pw_name); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } else { len = snprintf(cur, left, ":%u ", rule->mbr_subject.mbs_uid_max); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } } else { len = snprintf(cur, left, " "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; @@ -139,7 +139,7 @@ } if (!notdone && (rule->mbr_subject.mbs_neg & MBO_GID_DEFINED)) { len = snprintf(cur, left, "! "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; @@ -149,14 +149,14 @@ if (grp != NULL) { len = snprintf(cur, left, "gid %s", grp->gr_name); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } else { len = snprintf(cur, left, "gid %u", rule->mbr_subject.mbs_gid_min); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; @@ -167,21 +167,21 @@ if (grp != NULL) { len = snprintf(cur, left, ":%s ", grp->gr_name); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } else { len = snprintf(cur, left, ":%u ", rule->mbr_subject.mbs_gid_max); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } } else { len = snprintf(cur, left, " "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; @@ -189,7 +189,7 @@ } if (!notdone && (rule->mbr_subject.mbs_neg & MBS_PRISON_DEFINED)) { len = snprintf(cur, left, "! "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; @@ -197,7 +197,7 @@ if (rule->mbr_subject.mbs_flags & MBS_PRISON_DEFINED) { len = snprintf(cur, left, "jailid %d ", rule->mbr_subject.mbs_prison); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; @@ -205,14 +205,14 @@ } len = snprintf(cur, left, "object "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; if (rule->mbr_object.mbo_flags) { if (rule->mbr_object.mbo_neg == MBO_ALL_FLAGS) { len = snprintf(cur, left, "not "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; @@ -223,7 +223,7 @@ if (!notdone && (rule->mbr_object.mbo_neg & MBO_UID_DEFINED)) { len = snprintf(cur, left, "! "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; @@ -233,14 +233,14 @@ if (pwd != NULL) { len = snprintf(cur, left, "uid %s", pwd->pw_name); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } else { len = snprintf(cur, left, "uid %u", rule->mbr_object.mbo_uid_min); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; @@ -251,21 +251,21 @@ if (pwd != NULL) { len = snprintf(cur, left, ":%s ", pwd->pw_name); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } else { len = snprintf(cur, left, ":%u ", rule->mbr_object.mbo_uid_max); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } } else { len = snprintf(cur, left, " "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; @@ -273,7 +273,7 @@ } if (!notdone && (rule->mbr_object.mbo_neg & MBO_GID_DEFINED)) { len = snprintf(cur, left, "! "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; @@ -283,14 +283,14 @@ if (grp != NULL) { len = snprintf(cur, left, "gid %s", grp->gr_name); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } else { len = snprintf(cur, left, "gid %u", rule->mbr_object.mbo_gid_min); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; @@ -301,21 +301,21 @@ if (grp != NULL) { len = snprintf(cur, left, ":%s ", grp->gr_name); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } else { len = snprintf(cur, left, ":%u ", rule->mbr_object.mbo_gid_max); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } } else { len = snprintf(cur, left, " "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; @@ -323,7 +323,7 @@ } if (!notdone && (rule->mbr_object.mbo_neg & MBO_FSID_DEFINED)) { len = snprintf(cur, left, "! "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; @@ -337,70 +337,70 @@ break; len = snprintf(cur, left, "filesys %s ", i == numfs ? "???" : mntbuf[i].f_mntonname); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } if (!notdone && (rule->mbr_object.mbo_neg & MBO_SUID)) { len = snprintf(cur, left, "! "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } if (rule->mbr_object.mbo_flags & MBO_SUID) { len = snprintf(cur, left, "suid "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } if (!notdone && (rule->mbr_object.mbo_neg & MBO_SGID)) { len = snprintf(cur, left, "! "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } if (rule->mbr_object.mbo_flags & MBO_SGID) { len = snprintf(cur, left, "sgid "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } if (!notdone && (rule->mbr_object.mbo_neg & MBO_UID_SUBJECT)) { len = snprintf(cur, left, "! "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } if (rule->mbr_object.mbo_flags & MBO_UID_SUBJECT) { len = snprintf(cur, left, "uid_of_subject "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } if (!notdone && (rule->mbr_object.mbo_neg & MBO_GID_SUBJECT)) { len = snprintf(cur, left, "! "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } if (rule->mbr_object.mbo_flags & MBO_GID_SUBJECT) { len = snprintf(cur, left, "gid_of_subject "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; } if (!notdone && (rule->mbr_object.mbo_neg & MBO_TYPE_DEFINED)) { len = snprintf(cur, left, "! "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; @@ -427,7 +427,7 @@ } type[i++] = '\0'; len = snprintf(cur, left, "type %s ", type); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; @@ -435,7 +435,7 @@ } len = snprintf(cur, left, "mode "); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; cur += len; @@ -445,7 +445,7 @@ if (rule->mbr_mode & MBI_ADMIN) { len = snprintf(cur, left, "a"); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; @@ -453,7 +453,7 @@ } if (rule->mbr_mode & MBI_READ) { len = snprintf(cur, left, "r"); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; @@ -461,7 +461,7 @@ } if (rule->mbr_mode & MBI_STAT) { len = snprintf(cur, left, "s"); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; @@ -469,7 +469,7 @@ } if (rule->mbr_mode & MBI_WRITE) { len = snprintf(cur, left, "w"); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; @@ -477,7 +477,7 @@ } if (rule->mbr_mode & MBI_EXEC) { len = snprintf(cur, left, "x"); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; @@ -485,7 +485,7 @@ } if (!anymode) { len = snprintf(cur, left, "n"); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; @@ -493,7 +493,7 @@ } if (unknownmode) { len = snprintf(cur, left, "?"); - if (len < 0 || len > left) + if (len < 0 || len >= left) goto truncated; left -= len; @@ -513,7 +513,6 @@ uid_t uid1, uid2; char *spec1, *spec2, *endp; unsigned long value; - size_t len; spec2 = spec; spec1 = strsep(&spec2, ":"); @@ -524,8 +523,7 @@ else { value = strtoul(spec1, &endp, 10); if (*endp != '\0') { - len = snprintf(errstr, buflen, - "invalid uid: '%s'", spec1); + snprintf(errstr, buflen, "invalid uid: '%s'", spec1); return (-1); } uid1 = value; @@ -542,8 +540,7 @@ else { value = strtoul(spec2, &endp, 10); if (*endp != '\0') { - len = snprintf(errstr, buflen, - "invalid uid: '%s'", spec2); + snprintf(errstr, buflen, "invalid uid: '%s'", spec2); return (-1); } uid2 = value; @@ -562,7 +559,6 @@ gid_t gid1, gid2; char *spec1, *spec2, *endp; unsigned long value; - size_t len; spec2 = spec; spec1 = strsep(&spec2, ":"); @@ -573,8 +569,7 @@ else { value = strtoul(spec1, &endp, 10); if (*endp != '\0') { - len = snprintf(errstr, buflen, - "invalid gid: '%s'", spec1); + snprintf(errstr, buflen, "invalid gid: '%s'", spec1); return (-1); } gid1 = value; @@ -591,8 +586,7 @@ else { value = strtoul(spec2, &endp, 10); if (*endp != '\0') { - len = snprintf(errstr, buflen, - "invalid gid: '%s'", spec2); + snprintf(errstr, buflen, "invalid gid: '%s'", spec2); return (-1); } gid2 = value; @@ -614,7 +608,6 @@ uid_t uid_min, uid_max; gid_t gid_min, gid_max; int jid; - size_t len; long value; current = 0; @@ -631,11 +624,11 @@ while (current < argc) { if (strcmp(argv[current], "uid") == 0) { if (current + 2 > argc) { - len = snprintf(errstr, buflen, "uid short"); + snprintf(errstr, buflen, "uid short"); return (-1); } if (flags & MBS_UID_DEFINED) { - len = snprintf(errstr, buflen, "one uid only"); + snprintf(errstr, buflen, "one uid only"); return (-1); } if (bsde_parse_uidrange(argv[current+1], @@ -649,11 +642,11 @@ current += 2; } else if (strcmp(argv[current], "gid") == 0) { if (current + 2 > argc) { - len = snprintf(errstr, buflen, "gid short"); + snprintf(errstr, buflen, "gid short"); return (-1); } if (flags & MBS_GID_DEFINED) { - len = snprintf(errstr, buflen, "one gid only"); + snprintf(errstr, buflen, "one gid only"); return (-1); } if (bsde_parse_gidrange(argv[current+1], @@ -667,17 +660,17 @@ current += 2; } else if (strcmp(argv[current], "jailid") == 0) { if (current + 2 > argc) { - len = snprintf(errstr, buflen, "prison short"); + snprintf(errstr, buflen, "prison short"); return (-1); } if (flags & MBS_PRISON_DEFINED) { - len = snprintf(errstr, buflen, "one jail only"); + snprintf(errstr, buflen, "one jail only"); return (-1); } value = strtol(argv[current+1], &endp, 10); if (*endp != '\0') { - len = snprintf(errstr, buflen, - "invalid jid: '%s'", argv[current+1]); + snprintf(errstr, buflen, "invalid jid: '%s'", + argv[current+1]); return (-1); } jid = value; @@ -689,14 +682,13 @@ current += 2; } else if (strcmp(argv[current], "!") == 0) { if (nextnot) { - len = snprintf(errstr, buflen, - "double negative"); + snprintf(errstr, buflen, "double negative"); return (-1); } nextnot = 1; current += 1; } else { - len = snprintf(errstr, buflen, "'%s' not expected", + snprintf(errstr, buflen, "'%s' not expected", argv[current]); return (-1); } @@ -724,7 +716,6 @@ int bsde_parse_type(char *spec, int *type, size_t buflen, char *errstr) { - size_t len; int i; *type = 0; @@ -756,7 +747,7 @@ *type |= MBO_ALL_TYPE; break; default: - len = snprintf(errstr, buflen, "Unknown type code: %c", + snprintf(errstr, buflen, "Unknown type code: %c", spec[i]); return (-1); } @@ -768,12 +759,11 @@ int bsde_parse_fsid(char *spec, struct fsid *fsid, size_t buflen, char *errstr) { - size_t len; struct statfs buf; if (statfs(spec, &buf) < 0) { - len = snprintf(errstr, buflen, "Unable to get id for %s: %s", - spec, strerror(errno)); + snprintf(errstr, buflen, "Unable to get id for %s: %s", spec, + strerror(errno)); return (-1); } @@ -792,7 +782,6 @@ gid_t gid_min, gid_max; int type; struct fsid fsid; - size_t len; current = 0; flags = 0; @@ -808,11 +797,11 @@ while (current < argc) { if (strcmp(argv[current], "uid") == 0) { if (current + 2 > argc) { - len = snprintf(errstr, buflen, "uid short"); + snprintf(errstr, buflen, "uid short"); return (-1); } if (flags & MBO_UID_DEFINED) { - len = snprintf(errstr, buflen, "one uid only"); + snprintf(errstr, buflen, "one uid only"); return (-1); } if (bsde_parse_uidrange(argv[current+1], @@ -826,11 +815,11 @@ current += 2; } else if (strcmp(argv[current], "gid") == 0) { if (current + 2 > argc) { - len = snprintf(errstr, buflen, "gid short"); + snprintf(errstr, buflen, "gid short"); return (-1); } if (flags & MBO_GID_DEFINED) { - len = snprintf(errstr, buflen, "one gid only"); + snprintf(errstr, buflen, "one gid only"); return (-1); } if (bsde_parse_gidrange(argv[current+1], @@ -844,11 +833,11 @@ current += 2; } else if (strcmp(argv[current], "filesys") == 0) { if (current + 2 > argc) { - len = snprintf(errstr, buflen, "filesys short"); + snprintf(errstr, buflen, "filesys short"); return (-1); } if (flags & MBO_FSID_DEFINED) { - len = snprintf(errstr, buflen, "one fsid only"); + snprintf(errstr, buflen, "one fsid only"); return (-1); } if (bsde_parse_fsid(argv[current+1], &fsid, @@ -890,11 +879,11 @@ current += 1; } else if (strcmp(argv[current], "type") == 0) { if (current + 2 > argc) { - len = snprintf(errstr, buflen, "type short"); + snprintf(errstr, buflen, "type short"); return (-1); } if (flags & MBO_TYPE_DEFINED) { - len = snprintf(errstr, buflen, "one type only"); + snprintf(errstr, buflen, "one type only"); return (-1); } if (bsde_parse_type(argv[current+1], &type, @@ -908,14 +897,13 @@ current += 2; } else if (strcmp(argv[current], "!") == 0) { if (nextnot) { - len = snprintf(errstr, buflen, - "double negative'"); + snprintf(errstr, buflen, "double negative'"); return (-1); } nextnot = 1; current += 1; } else { - len = snprintf(errstr, buflen, "'%s' not expected", + snprintf(errstr, buflen, "'%s' not expected", argv[current]); return (-1); } @@ -946,16 +934,15 @@ bsde_parse_mode(int argc, char *argv[], mode_t *mode, size_t buflen, char *errstr) { - size_t len; int i; if (argc == 0) { - len = snprintf(errstr, buflen, "mode expects mode value"); + snprintf(errstr, buflen, "mode expects mode value"); return (-1); } if (argc != 1) { - len = snprintf(errstr, buflen, "'%s' unexpected", argv[1]); + snprintf(errstr, buflen, "'%s' unexpected", argv[1]); return (-1); } @@ -981,7 +968,7 @@ /* ignore */ break; default: - len = snprintf(errstr, buflen, "Unknown mode letter: %c", + snprintf(errstr, buflen, "Unknown mode letter: %c", argv[0][i]); return (-1); } @@ -998,17 +985,16 @@ int object, object_elements, object_elements_length; int mode, mode_elements, mode_elements_length; int error, i; - size_t len; bzero(rule, sizeof(*rule)); if (argc < 1) { - len = snprintf(errstr, buflen, "Rule must begin with subject"); + snprintf(errstr, buflen, "Rule must begin with subject"); return (-1); } if (strcmp(argv[0], "subject") != 0) { - len = snprintf(errstr, buflen, "Rule must begin with subject"); + snprintf(errstr, buflen, "Rule must begin with subject"); return (-1); } subject = 0; @@ -1022,7 +1008,7 @@ object = i; if (object == -1) { - len = snprintf(errstr, buflen, "Rule must contain an object"); + snprintf(errstr, buflen, "Rule must contain an object"); return (-1); } @@ -1033,7 +1019,7 @@ mode = i; if (mode == -1) { - len = snprintf(errstr, buflen, "Rule must contain mode"); + snprintf(errstr, buflen, "Rule must contain mode"); return (-1); } @@ -1112,12 +1098,12 @@ len = sizeof(version); error = sysctlbyname(MIB ".rule_version", &version, &len, NULL, 0); if (error) { - len = snprintf(errstr, buflen, "version check failed: %s", + snprintf(errstr, buflen, "version check failed: %s", strerror(errno)); return (-1); } if (version != MB_VERSION) { - len = snprintf(errstr, buflen, "module v%d != library v%d", + snprintf(errstr, buflen, "module v%d != library v%d", version, MB_VERSION); return (-1); } @@ -1134,12 +1120,11 @@ len = sizeof(rule_count); error = sysctlbyname(MIB ".rule_count", &rule_count, &len, NULL, 0); if (error) { - len = snprintf(errstr, buflen, strerror(errno)); + snprintf(errstr, buflen, "%s", strerror(errno)); return (-1); } if (len != sizeof(rule_count)) { - len = snprintf(errstr, buflen, "Data error in %s.rule_count", - MIB); + snprintf(errstr, buflen, "Data error in %s.rule_count", MIB); return (-1); } @@ -1156,12 +1141,11 @@ len = sizeof(rule_slots); error = sysctlbyname(MIB ".rule_slots", &rule_slots, &len, NULL, 0); if (error) { - len = snprintf(errstr, buflen, strerror(errno)); + snprintf(errstr, buflen, "%s", strerror(errno)); return (-1); } if (len != sizeof(rule_slots)) { - len = snprintf(errstr, buflen, "Data error in %s.rule_slots", - MIB); + snprintf(errstr, buflen, "Data error in %s.rule_slots", MIB); return (-1); } @@ -1187,7 +1171,7 @@ len = 10; error = bsde_get_mib(MIB ".rules", name, &len); if (error) { - len = snprintf(errstr, errlen, "%s: %s", MIB ".rules", + snprintf(errstr, errlen, "%s: %s", MIB ".rules", strerror(errno)); return (-1); } @@ -1199,11 +1183,11 @@ if (error == -1 && errno == ENOENT) return (-2); if (error) { - len = snprintf(errstr, errlen, "%s.%d: %s", MIB ".rules", - rulenum, strerror(errno)); + snprintf(errstr, errlen, "%s.%d: %s", MIB ".rules", rulenum, + strerror(errno)); return (-1); } else if (size != sizeof(*rule)) { - len = snprintf(errstr, errlen, "Data error in %s.%d: %s", + snprintf(errstr, errlen, "Data error in %s.%d: %s", MIB ".rules", rulenum, strerror(errno)); return (-1); } @@ -1225,7 +1209,7 @@ len = 10; error = bsde_get_mib(MIB ".rules", name, &len); if (error) { - len = snprintf(errstr, buflen, "%s: %s", MIB ".rules", + snprintf(errstr, buflen, "%s: %s", MIB ".rules", strerror(errno)); return (-1); } @@ -1236,7 +1220,7 @@ size = sizeof(rule); error = sysctl(name, len, NULL, NULL, &rule, 0); if (error) { - len = snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules", + snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules", rulenum, strerror(errno)); return (-1); } @@ -1258,7 +1242,7 @@ len = 10; error = bsde_get_mib(MIB ".rules", name, &len); if (error) { - len = snprintf(errstr, buflen, "%s: %s", MIB ".rules", + snprintf(errstr, buflen, "%s: %s", MIB ".rules", strerror(errno)); return (-1); } @@ -1269,7 +1253,7 @@ size = sizeof(*rule); error = sysctl(name, len, NULL, NULL, rule, size); if (error) { - len = snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules", + snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules", rulenum, strerror(errno)); return (-1); } @@ -1292,14 +1276,14 @@ len = 10; error = bsde_get_mib(MIB ".rules", name, &len); if (error) { - len = snprintf(errstr, buflen, "%s: %s", MIB ".rules", + snprintf(errstr, buflen, "%s: %s", MIB ".rules", strerror(errno)); return (-1); } rule_slots = bsde_get_rule_slots(BUFSIZ, charstr); if (rule_slots == -1) { - len = snprintf(errstr, buflen, "unable to get rule slots: %s", + snprintf(errstr, buflen, "unable to get rule slots: %s", strerror(errno)); return (-1); } @@ -1310,8 +1294,8 @@ size = sizeof(*rule); error = sysctl(name, len, NULL, NULL, rule, size); if (error) { - len = snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules", - rule_slots, strerror(errno)); + snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules", rule_slots, + strerror(errno)); return (-1); } --------------070809050808050201010205-- From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 09:46:40 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B707106564A for ; Tue, 15 Jun 2010 09:46:40 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 3D95F8FC0C for ; Tue, 15 Jun 2010 09:46:40 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 363F01FFC33; Tue, 15 Jun 2010 09:46:39 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id ECF7A844DE; Tue, 15 Jun 2010 11:44:28 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Alexander Best References: <86mxuxgwgg.fsf@ds4.des.no> Date: Tue, 15 Jun 2010 11:44:28 +0200 In-Reply-To: (Alexander Best's message of "Tue, 15 Jun 2010 00:24:53 +0200") Message-ID: <86d3vspr43.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.95 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 09:46:40 -0000 Alexander Best writes: > Dag-Erling Sm=C3=B8rgrav writes: > > Alexander Best writes: > > > .if empty(.CURDIR:M/usr/src/*) && empty(.CURDIR:M/usr/obj/*) && > > > exists(/usr/local/bin/gcc44) > > > CC =3D gcc44 > > > CXX =3D g++44 > > > CPP =3D cpp44 > > > .endif > > What happens when .CURDIR =3D /usr/src? > i'm now using [...] I was trying to show you why what you had didn't work... DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 10:21:38 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 868FB1065678 for ; Tue, 15 Jun 2010 10:21:38 +0000 (UTC) (envelope-from moonlightakkiy@yahoo.ca) Received: from web51804.mail.re2.yahoo.com (web51804.mail.re2.yahoo.com [206.190.38.235]) by mx1.freebsd.org (Postfix) with SMTP id 2E6FC8FC1E for ; Tue, 15 Jun 2010 10:21:37 +0000 (UTC) Received: (qmail 48517 invoked by uid 60001); 15 Jun 2010 10:21:37 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.ca; s=s1024; t=1276597297; bh=U2gI3YpMej1vjs3+JYOtd9OrdxqME9zT/ywcMfoFGXQ=; h=Message-ID:X-YMail-OSG:Received:X-Mailer:References:Date:From:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type; b=aIrU3I4DDvfjq4ad6ZmzWi84KjEcgBbSt0ExTBVb41XQiCtha2iKhC9DKOF/3RG6atjMlUoFbK10FApWTDmwI3/Ti3CyulnIxa3Rsp81L/gamdamKymGVZZFahvgn2rZX6N2EEnv+HO3c60nvTcTpCqKveNJyqGASIJWF1FTuLo= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.ca; h=Message-ID:X-YMail-OSG:Received:X-Mailer:References:Date:From:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type; b=lTqN4D5XnQwqJtng3HbApuVkyyrQ1m87mfiHbCJn61ajdGOaszKG2ClsOlPcRncpex2t703iX9vPdBfRIf4PG4+OzfU69QV+T4XvZenmBAUnYyUSjPbVvwBHNqvkO4W/g/9dFOmTK9fkVqlKJEB9QkCiU4QX1NOajUILuD2Z7VA=; Message-ID: <337427.44900.qm@web51804.mail.re2.yahoo.com> X-YMail-OSG: nwo86A8VM1kUH.9yiVoaOk0V_aXwXMv5LRNws3_.QbluY5X kY0AmKoD1WZaTzffT9iRXDo_gM_nW2n9gFyU1LZ9sVYdORLzAtrQO1iPNd5N CxuKhmJAEOOFIZPqACRKl2p4N8Qc4Fo5KvVzcjkaVWCMlaXXpK3L3QmksUNf xvDiNoesr2EwdTJLx4FmA8YA3mkEjX9PYORaI8boQEJ86knZ_iIeAah1KMVl uETv8dJrhxvj1pk3tvQmvFdozdNx6JqkJwl5VTY.lBkHQAr4hxd0AtLqTI0Z RJTRSaRQSMJ6fqY6Y4EJes02CwJ_GXKkTxRiTwFMSvyCXn1h_hKMkgPbPYmd uJWB8stjND9paO3Yk3w-- Received: from [173.183.132.20] by web51804.mail.re2.yahoo.com via HTTP; Tue, 15 Jun 2010 03:21:37 PDT X-Mailer: YahooMailRC/397.8 YahooMailWebService/0.8.104.274457 References: <16641.96608.qm@web51806.mail.re2.yahoo.com> <4BA22B8D.9030700@micom.mng.net> <375331.74876.qm@web51804.mail.re2.yahoo.com> <4BA38B26.6050208@micom.mng.net> <989377.89740.qm@web51802.mail.re2.yahoo.com> <4BAE01AC.7000509@gmail.com> <623907.37074.qm@web51803.mail.re2.yahoo.com> <4BB3575D.4040506@gmail.com> <87836.79143.qm@web51804.mail.re2.yahoo.com> <4BBB372C.1060302@gmail.com> <665283.95271.qm@web51802.mail.re2.yahoo.com> <4BBDEC8F.9050803@gmail.com> <490521.32714.qm@web51804.mail.re2.yahoo.com> <4BD307DE.5080507@gmail.com> <332448.8676.qm@web51801.mail.re2.yahoo.com> <4BD3F2D4.8000007@gmail.com> <702632.81988.qm@web51803.mail.re2.yahoo.com> <4BDEE393.4080206@gmail.com> <660085.11669.qm@web51802.mail.re2.yahoo.com> <4BFD4806.8070001@gmail.com> <618770.37649.qm@web51807.mail.re2.yahoo.com> <4C0FAEA2.7010204@gmail.com> <94007.38072.qm@web51807.mail.re2.yahoo.com> <4C11188A.1040002@gmail.com> <447555.80295.qm@web51803.mail.re2.yahoo.com> <4C16499A.3050808@gmail.com> Date: Tue, 15 Jun 2010 03:21:37 -0700 (PDT) From: PseudoCylon To: Ganbold In-Reply-To: <4C16499A.3050808@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Ganbold Tsagaankhuu , freebsd-current@freebsd.org Subject: Re: CALL for TEST [HOSTAP] run(4) ralink usb wireless X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 10:21:38 -0000 >>> From: Ganbold >>> To: PseudoCylon >>> Cc: freebsd-current@freebsd.org; Ganbold Tsagaankhuu >>> Sent: Thu, June 10, 2010 10:53:30 AM >>> Subject: Re: CALL for TEST [HOSTAP] run(4) ralink usb wireless >>> >>> It seems like it is running without any problem so far, no more adsl >>> modem problem. >>> I can see arp packets in wlan0 interface as well as in macbook. >>> I will continue testing and let you know if there comes any problem. >>> >>> thanks again, >>> >>> Ganbold >>> >> >> Hello, >> >> Glad to hear. It was an encryption problem. A client was dropping packets.. >> >> Please let me know if you find another bug. (Hope there won't be) >> > >Well, looks like I was too fast :( > >It seems like client is not receiving any arp packets when rspro doesn't >first initiate ping (maybe arp request) to client. >If I first ping to client from rspro, later on arp packets can be seen >on client. >When I ping from rspro to client, response is very different: > ># arp -a >? (192.168.1.43) at 8e:fd:59:d6:3a:50 on bridge0 permanent [bridge] >? (192.168.1.42) at 00:22:cf:03:e0:30 on wlan0 permanent [ethernet] >? (192.168.1.41) at 00:15:6d:c1:c7:77 on arge0 permanent [ethernet] >? (192.168.1.1) at 00:30:54:62:3d:24 on arge0 expires in 1200 seconds >[ethernet] >? (192.168.1.7) at 00:1c:25:9d:36:1d on arge0 expires in 824 seconds >[ethernet] ># ping 192.168.1.50 >PING 192.168.1.50 (192.168.1.50): 56 data bytes >64 bytes from 192.168.1.50: icmp_seq=0 ttl=64 time=2.694 ms >64 bytes from 192.168.1.50: icmp_seq=1 ttl=64 time=302.177 ms >64 bytes from 192.168.1.50: icmp_seq=2 ttl=64 time=1.041 ms >64 bytes from 192.168.1.50: icmp_seq=4 ttl=64 time=5234.417 ms >64 bytes from 192.168.1.50: icmp_seq=5 ttl=64 time=4225.060 ms >64 bytes from 192.168.1.50: icmp_seq=6 ttl=64 time=3214.908 ms >64 bytes from 192.168.1.50: icmp_seq=7 ttl=64 time=2207.241 ms >64 bytes from 192.168.1.50: icmp_seq=8 ttl=64 time=1197.061 ms >64 bytes from 192.168.1.50: icmp_seq=9 ttl=64 time=186.833 ms >^C >--- 192.168.1.50 ping statistics --- >11 packets transmitted, 9 packets received, 18.2% packet loss >round-trip min/avg/max/stddev = 1.041/1841.270/5234.417/1870.962 ms ># arp -a >? (192.168.1.43) at 8e:fd:59:d6:3a:50 on bridge0 permanent [bridge] >? (192.168.1.42) at 00:22:cf:03:e0:30 on wlan0 permanent [ethernet] >? (192.168.1.41) at 00:15:6d:c1:c7:77 on arge0 permanent [ethernet] >? (192.168.1.1) at 00:30:54:62:3d:24 on arge0 expires in 1183 seconds >[ethernet] >? (192.168.1.7) at 00:1c:25:9d:36:1d on arge0 expires in 805 seconds >[ethernet] >? (192.168.1.50) at 00:26:bb:17:f6:61 on arge0 expires in 1186 seconds >[ethernet] ># ping 192.168.1.50 >PING 192.168.1.50 (192.168.1.50): 56 data bytes >64 bytes from 192.168.1.50: icmp_seq=2 ttl=64 time=1590.035 ms >64 bytes from 192.168.1.50: icmp_seq=3 ttl=64 time=580.201 ms >64 bytes from 192.168.1.50: icmp_seq=4 ttl=64 time=528.019 ms >^C >--- 192.168.1.50 ping statistics --- >5 packets transmitted, 3 packets received, 40.0% packet loss >round-trip min/avg/max/stddev = 528.019/899.418/1590.035/488.804 ms > Well, the patch is working (sort of). Old driver wouldn't let you ping anywhere. Replies are taking awfully long. One of them took 5 sec. This could be a different issue. Can you try a few thing? (Unfortunately, everything is working on my side.) * Before ping from rspro, does ping from macbook to 192.168.1.42 (wlan0) work? * If you give IP address to only bridge0, does it make any difference? * Does it make any difference if use rspro without 192.168.1.7 (if possible)? wlandebug doesn't work on macbook, does it? Can you show me your hostapd.conf (minus password, of course). I'll try with the same config. And, if you ping from macbook, would it take that long? AK >Any idea? > >thanks, > >Ganbold From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 10:33:58 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C24BF1065688; Tue, 15 Jun 2010 10:33:58 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 45EFF8FC21; Tue, 15 Jun 2010 10:33:56 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 97FA41FFC33; Tue, 15 Jun 2010 10:33:55 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id 6CD3F84490; Tue, 15 Jun 2010 12:31:45 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Garrett Cooper References: <201006101346.59824.jhb@freebsd.org> Date: Tue, 15 Jun 2010 12:31:45 +0200 In-Reply-To: (Garrett Cooper's message of "Mon, 14 Jun 2010 14:22:32 -0700") Message-ID: <864oh4poxa.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.95 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: current@freebsd.org Subject: Re: RFC: etcupdate tool in base? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 10:33:58 -0000 Garrett Cooper writes: > 1. Script doesn't check to see whether or not it has write access (and > doesn't catch some errors): IMHO, any shell script which is intended to be used more than twice should start with "set -e". DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 11:11:35 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9AFB5106566C for ; Tue, 15 Jun 2010 11:11:35 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id 57A998FC0A for ; Tue, 15 Jun 2010 11:11:34 +0000 (UTC) Received: from mail-yw0-f182.google.com (mail-yw0-f182.google.com [209.85.211.182]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id 74EDABF411 for ; Tue, 15 Jun 2010 13:11:33 +0200 (CEST) Received: by ywh12 with SMTP id 12so3474700ywh.14 for ; Tue, 15 Jun 2010 04:11:32 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.181.1 with SMTP id bw1mr2878989qcb.221.1276600291933; Tue, 15 Jun 2010 04:11:31 -0700 (PDT) Received: by 10.229.247.142 with HTTP; Tue, 15 Jun 2010 04:11:31 -0700 (PDT) In-Reply-To: <86d3vspr43.fsf@ds4.des.no> References: <86mxuxgwgg.fsf@ds4.des.no> <86d3vspr43.fsf@ds4.des.no> Date: Tue, 15 Jun 2010 13:11:31 +0200 Message-ID: From: Alexander Best To: =?ISO-8859-1?Q?Dag=2DErling_Sm=F8rgrav?= Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 11:11:35 -0000 2010/6/15 Dag-Erling Sm=F8rgrav : > Alexander Best writes: >> Dag-Erling Sm=F8rgrav writes: >> > Alexander Best writes: >> > > .if empty(.CURDIR:M/usr/src/*) && empty(.CURDIR:M/usr/obj/*) && >> > > exists(/usr/local/bin/gcc44) >> > > CC =3D gcc44 >> > > CXX =3D g++44 >> > > CPP =3D cpp44 >> > > .endif >> > What happens when .CURDIR =3D /usr/src? >> i'm now using [...] > > I was trying to show you why what you had didn't work... sorry. i didn't mean to affend you. doug barton already pointed out that what i had in my make.conf beforehand won't work unless /usr/src and /usr/obj are literal directories in /usr [1]. here's the error ouput i got with .if empty(.CURDIR:M/usr/src/*) && empty(.CURDIR:M/usr/obj/*) && exists(/usr/local/bin/gcc44) CC =3D gcc44 CXX =3D g++44 CPP =3D cpp44 .endif in my make.conf: [2] [1] http://www.mail-archive.com/freebsd-current@freebsd.org/msg122986.html [2] http://www.mail-archive.com/freebsd-current@freebsd.org/msg122975.html cheers. alex > > DES > -- > Dag-Erling Sm=F8rgrav - des@des.no > --=20 Alexander Best From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 14:02:30 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C15A91065679 for ; Tue, 15 Jun 2010 14:02:30 +0000 (UTC) (envelope-from ganbold@gmail.com) Received: from mail-pv0-f182.google.com (mail-pv0-f182.google.com [74.125.83.182]) by mx1.freebsd.org (Postfix) with ESMTP id 7FFFA8FC27 for ; Tue, 15 Jun 2010 14:02:30 +0000 (UTC) Received: by pvg2 with SMTP id 2so190411pvg.13 for ; Tue, 15 Jun 2010 07:02:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; bh=RFylST/QJfgVbsTz8sWasA84qasPAW7XMfVAhryvCYw=; b=vNYG+GI0c0/ZoD6itLGJhv1I9Ig5eq7R2VmU/wej8D2vHKBf8vovrpejanh7CNys/D v/qIq6ORpFm94VnqcEZX62CPjbgpsA5k9Ap7NYtKIlcDzPNpvVsTsFq+h97aSLt6+xCY Mc2XqSLCqmrIx/Ucs46Ka2tkYgixK64x4KaeA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=Y0B3St5iNgHMAxDqDnQNRBf5BLIp65Hz1SVWYbZtXnb80GaLpGG2Y5e+N0j25feEd4 r7qdqaU1n1q8CedIdlK654uCyCm3YQkLLb94VGJkEcXkwOfR90aN0C4YO7qbWTBfj3qO aO+taVcvY0g0soQZPv6LhDgnAaY0sC9xjRKfo= Received: by 10.115.135.32 with SMTP id m32mr5786314wan.47.1276610549527; Tue, 15 Jun 2010 07:02:29 -0700 (PDT) Received: from beastie.micom.mng.net ([202.179.21.128]) by mx.google.com with ESMTPS id c22sm2952149wam.18.2010.06.15.07.02.14 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 15 Jun 2010 07:02:28 -0700 (PDT) Message-ID: <4C1787DA.2070308@gmail.com> Date: Tue, 15 Jun 2010 22:02:02 +0800 From: Ganbold User-Agent: Thunderbird 2.0.0.23 (X11/20091011) MIME-Version: 1.0 To: PseudoCylon References: <16641.96608.qm@web51806.mail.re2.yahoo.com> <4BA38B26.6050208@micom.mng.net> <989377.89740.qm@web51802.mail.re2.yahoo.com> <4BAE01AC.7000509@gmail.com> <623907.37074.qm@web51803.mail.re2.yahoo.com> <4BB3575D.4040506@gmail.com> <87836.79143.qm@web51804.mail.re2.yahoo.com> <4BBB372C.1060302@gmail.com> <665283.95271.qm@web51802.mail.re2.yahoo.com> <4BBDEC8F.9050803@gmail.com> <490521.32714.qm@web51804.mail.re2.yahoo.com> <4BD307DE.5080507@gmail.com> <332448.8676.qm@web51801.mail.re2.yahoo.com> <4BD3F2D4.8000007@gmail.com> <702632.81988.qm@web51803.mail.re2.yahoo.com> <4BDEE393.4080206@gmail.com> <660085.11669.qm@web51802.mail.re2.yahoo.com> <4BFD4806.8070001@gmail.com> <618770.37649.qm@web51807.mail.re2.yahoo.com> <4C0FAEA2.7010204@gmail.com> <94007.38072.qm@web51807.mail.re2.yahoo.com> <4C11188A.1040002@gmail.com> <447555.80295.qm@web51803.mail.re2.yahoo.com> <4C16499A.3050808@gmail.com> <337427.44900.qm@web51804.mail.re2.yahoo.com> In-Reply-To: <337427.44900.qm@web51804.mail.re2.yahoo.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Ganbold Tsagaankhuu , freebsd-current@freebsd.org Subject: Re: CALL for TEST [HOSTAP] run(4) ralink usb wireless X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 14:02:30 -0000 AK-san, PseudoCylon wrote: >>>> From: Ganbold >>>> To: PseudoCylon >>>> Cc: freebsd-current@freebsd.org; Ganbold Tsagaankhuu >>>> Sent: Thu, June 10, 2010 10:53:30 AM >>>> Subject: Re: CALL for TEST [HOSTAP] run(4) ralink usb wireless >>>> >>>> It seems like it is running without any problem so far, no more adsl >>>> modem problem. >>>> I can see arp packets in wlan0 interface as well as in macbook. >>>> I will continue testing and let you know if there comes any problem. >>>> >>>> thanks again, >>>> >>>> Ganbold >>>> >>>> >>> Hello, >>> >>> Glad to hear. It was an encryption problem. A client was dropping packets.. >>> >>> Please let me know if you find another bug. (Hope there won't be) >>> >>> >> Well, looks like I was too fast :( >> >> It seems like client is not receiving any arp packets when rspro doesn't >> first initiate ping (maybe arp request) to client. >> If I first ping to client from rspro, later on arp packets can be seen >> on client. >> When I ping from rspro to client, response is very different: >> >> # arp -a >> ? (192.168.1.43) at 8e:fd:59:d6:3a:50 on bridge0 permanent [bridge] >> ? (192.168.1.42) at 00:22:cf:03:e0:30 on wlan0 permanent [ethernet] >> ? (192.168.1.41) at 00:15:6d:c1:c7:77 on arge0 permanent [ethernet] >> ? (192.168.1.1) at 00:30:54:62:3d:24 on arge0 expires in 1200 seconds >> [ethernet] >> ? (192.168.1.7) at 00:1c:25:9d:36:1d on arge0 expires in 824 seconds >> [ethernet] >> # ping 192.168.1.50 >> PING 192.168.1.50 (192.168.1.50): 56 data bytes >> 64 bytes from 192.168.1.50: icmp_seq=0 ttl=64 time=2.694 ms >> 64 bytes from 192.168.1.50: icmp_seq=1 ttl=64 time=302.177 ms >> 64 bytes from 192.168.1.50: icmp_seq=2 ttl=64 time=1.041 ms >> 64 bytes from 192.168.1.50: icmp_seq=4 ttl=64 time=5234.417 ms >> 64 bytes from 192.168.1.50: icmp_seq=5 ttl=64 time=4225.060 ms >> 64 bytes from 192.168.1.50: icmp_seq=6 ttl=64 time=3214.908 ms >> 64 bytes from 192.168.1.50: icmp_seq=7 ttl=64 time=2207.241 ms >> 64 bytes from 192.168.1.50: icmp_seq=8 ttl=64 time=1197.061 ms >> 64 bytes from 192.168.1.50: icmp_seq=9 ttl=64 time=186.833 ms >> ^C >> --- 192.168.1.50 ping statistics --- >> 11 packets transmitted, 9 packets received, 18.2% packet loss >> round-trip min/avg/max/stddev = 1.041/1841.270/5234.417/1870.962 ms >> # arp -a >> ? (192.168.1.43) at 8e:fd:59:d6:3a:50 on bridge0 permanent [bridge] >> ? (192.168.1.42) at 00:22:cf:03:e0:30 on wlan0 permanent [ethernet] >> ? (192.168.1.41) at 00:15:6d:c1:c7:77 on arge0 permanent [ethernet] >> ? (192.168.1.1) at 00:30:54:62:3d:24 on arge0 expires in 1183 seconds >> [ethernet] >> ? (192.168.1.7) at 00:1c:25:9d:36:1d on arge0 expires in 805 seconds >> [ethernet] >> ? (192.168.1.50) at 00:26:bb:17:f6:61 on arge0 expires in 1186 seconds >> [ethernet] >> # ping 192.168.1.50 >> PING 192.168.1.50 (192.168.1.50): 56 data bytes >> 64 bytes from 192.168.1.50: icmp_seq=2 ttl=64 time=1590.035 ms >> 64 bytes from 192.168.1.50: icmp_seq=3 ttl=64 time=580.201 ms >> 64 bytes from 192.168.1.50: icmp_seq=4 ttl=64 time=528.019 ms >> ^C >> --- 192.168.1.50 ping statistics --- >> 5 packets transmitted, 3 packets received, 40.0% packet loss >> round-trip min/avg/max/stddev = 528.019/899.418/1590.035/488.804 ms >> >> > > Well, the patch is working (sort of). Old driver wouldn't let you ping anywhere. > > Replies are taking awfully long. One of them took 5 sec. This could be a different issue. > > Can you try a few thing? (Unfortunately, everything is working on my side.) > * Before ping from rspro, does ping from macbook to 192.168.1.42 (wlan0) work? > No. I will check again and let you know. > * If you give IP address to only bridge0, does it make any difference? > I will let you know after testing. > * Does it make any difference if use rspro without 192.168.1.7 (if possible)? > 192.168.1.7 is just my freebsd laptop. > wlandebug doesn't work on macbook, does it? > I don't know yet how to debug wlan in macbook, will look for it. > Can you show me your hostapd.conf (minus password, of course). I'll try with the same config. > Ok, here it is: interface=wlan0 debug=1 logger_syslog=-1 logger_syslog_level=1 ctrl_interface=/var/run/hostapd ctrl_interface_group=wheel ssid=bsd wpa=3 wpa_passphrase=test wpa_key_mgmt=WPA-PSK wpa_pairwise=CCMP TKIP > And, if you ping from macbook, would it take that long? > After ping from rspro, from Macbook it doesn't take long, usually around 3-4ms. Ganbold > > AK > > >> Any idea? >> >> thanks, >> >> Ganbold >> > > > > > -- Experience is a good teacher, but she sends in terrific bills. -- Minna Antrim, "Naked Truth and Veiled Allusions" From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 14:07:22 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B2AD8106567F for ; Tue, 15 Jun 2010 14:07:22 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 6F5448FC15 for ; Tue, 15 Jun 2010 14:07:22 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 071F146C0B; Tue, 15 Jun 2010 10:07:22 -0400 (EDT) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id DEC718A04E; Tue, 15 Jun 2010 10:07:20 -0400 (EDT) From: John Baldwin To: Garrett Cooper Date: Tue, 15 Jun 2010 09:49:47 -0400 User-Agent: KMail/1.12.1 (FreeBSD/7.3-CBSD-20100217; KDE/4.3.1; amd64; ; ) References: <201006101346.59824.jhb@freebsd.org> In-Reply-To: MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201006150949.47185.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Tue, 15 Jun 2010 10:07:20 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.5 required=4.2 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: current@freebsd.org Subject: Re: RFC: etcupdate tool in base? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 14:07:22 -0000 On Monday 14 June 2010 5:22:32 pm Garrett Cooper wrote: > On Thu, Jun 10, 2010 at 10:46 AM, John Baldwin wrote: > > I've had several folks ask me recently about importing etcupdate > > (http://www.FreeBSD.org/~jhb/etcupdate) into the base system as an alternate > > tool for updating /etc during upgrades. Do folks have any strong objections > > to doing so? More details about how it works and an HTML version of the > > manpage can be found at the URL above. > > Finally got around to looking at this. > > Some comments: > > 1. Script doesn't check to see whether or not it has write access (and > doesn't catch some errors): > > $ etcupdate > mkdir: /var/db/etcupdate: Permission denied > /usr/sbin/etcupdate: cannot create /var/db/etcupdate/log: No such file > or directory > > Eventually it stops though, so maybe it's not really a big issue... It does actually check, but it does so after it opens the log file. :-/ > 2. Some messages are a bit misleading: > > $ etcupdate > /usr/sbin/etcupdate: cannot create /var/db/etcupdate/log: Permission denied > $ ls -l /var/db/etcupdate/log > -rw-r--r-- 1 root wheel 0 Jun 14 14:06 /var/db/etcupdate/log > $ whoami > garrcoop That is the shell complaining due to this: exec 3>$LOGFILE Arguably the shell is emitting the correct message since it is attempting to recreate the file. > 3. Workflow comments. > > i. Ok... I know I'm doing a downgrade, but what now? > > $ sudo etcupdate > No previous tree to compare against, a sane comparison is not possible. > > ii. Did a bit more reading, and I think that `etcupdate build' is what > I want... but it wasn't happy when I did that: Did you read this part of the manpage: EXAMPLES If the source tree matches the currently installed world, then the fol- lowing can be used to bootstrap etcupdate so that it can be used for future upgrades: etcupdate extract To merge changes after an upgrade via the buildworld and installworld process: etcupdate To resolve any conflicts generated during a merge: etcupdate resolve Also, the README file at http://www.FreeBSD.org/~jhb/etcupdate/ may be useful. > $ sudo etcupdate build > Missing required tarball. > > usage: etcupdate [-nBF] [-d workdir] [-r | -s source | -t tarball] [-A patterns] > [-D destdir] [-I patterns] [-L logfile] [-M options] > etcupdate build [-B] [-d workdir] [-s source] [-L logfile] [-M options] > > etcupdate diff [-d workdir] [-D destdir] [-I patterns] [-L logfile] > etcupdate extract [-B] [-d workdir] [-s source | -t tarball] [-L logfile] > [-M options] > etcupdate resolve [-d workdir] [-D destdir] [-L logfile] > etcupdate status [-d workdir] > > So uh... ok? Manpage and usage were a bit confusing (but not too bad). > After I fixed my arguments, here's what I came up with: > > $ sudo etcupdate build -s /data/scratch/src/stable/8/ > /root/etcupdate-stable8.tbz > $ sudo etcupdate extract -t /root/etcupdate-stable8.tbz > $ You could just do 'etcupdate extract -s /data/scratch/src/stable/8' in this case. :) However, when you do an extract, you are doing a one-time bootstrap. This step needs to be pointed at a source tree that matches what you already have installed. You can do an 'etcupdate diff' after the extract to see what local differences you have and make sure those look sane. Once you have done this, then you can use etcupdate for future upgrades by just running 'etcupdate'. -- John Baldwin From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 15:03:08 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F374C106566C; Tue, 15 Jun 2010 15:03:07 +0000 (UTC) (envelope-from lars@e.0x20.net) Received: from mail.0x20.net (mail.0x20.net [217.69.67.217]) by mx1.freebsd.org (Postfix) with ESMTP id AA28A8FC14; Tue, 15 Jun 2010 15:03:07 +0000 (UTC) Received: by mail.0x20.net (Postfix, from userid 1002) id 362633A581; Tue, 15 Jun 2010 17:03:06 +0200 (CEST) Date: Tue, 15 Jun 2010 17:03:06 +0200 From: Lars Engels To: Rui Paulo Message-ID: <20100615150305.GA43178@e.0x20.net> Mail-Followup-To: Lars Engels , Rui Paulo , bf1783@gmail.com, Doug Barton , freebsd-current@freebsd.org References: <4C00832A.4030102@FreeBSD.org> <958F0C5A-3CE8-41E2-9C6B-AC1C3C1863C7@FreeBSD.org> <20100530174838.GC41305@e.0x20.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="PNTmBPCT7hxwcZjr" Content-Disposition: inline In-Reply-To: <20100530174838.GC41305@e.0x20.net> X-Editor: VIM - Vi IMproved 7.2 X-Operation-System: FreeBSD 5.5-RELEASE-p19 User-Agent: Mutt/1.5.20 (2009-06-14) Cc: bf1783@gmail.com, Doug Barton , freebsd-current@freebsd.org Subject: Re: wpa_supplicant (Was: Re: wpi not working on today's current (r208626)) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 15:03:08 -0000 --PNTmBPCT7hxwcZjr Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, May 30, 2010 at 07:48:38PM +0200, Lars Engels wrote: > On Sat, May 29, 2010 at 11:20:18AM +0100, Rui Paulo wrote: > >=20 > > On 29 May 2010, at 05:39, b. f. wrote: > >=20 > > > On 5/28/10, Doug Barton wrote: > > >> On 5/28/2010 4:50 PM, b. f. wrote: > > >>>=20 > > >>> I can't see any problems when using WPA2 with AES on r208606 i386 w= ith > > >>> uath(4). I'm updating this machine to r208630 tonight, and if I > > >>> encounter problems with the later revision, I'll let you know. > > >>=20 > > >> Ok, thanks. > > >>=20 > > >>> Are > > >>> you saying that you experienced problems when trying to use a r2071= 34 > > >>> base with a r208626 kernel? If that's the case, I would recommend > > >>> updating the base to the same revision as the kernel, and then > > >>> retesting. > > >>=20 > > >> Yes, that's what I'm doing I actually tried running the newly built > > >> wpa_supplicant but that didn't work. I'm kind of hesitant to do the = full > > >> upgrade since I'm having kernel problems with the nvidia driver, but= if > > >> I'm sure wpa_supplicant will work then I suppose I can bite the bull= et. > > >>=20 > > >=20 > > > It appears that something is wrong. My wireless stick no longer > > > associates with the network with r208630. I'll do some tinkering. > >=20 > > That's odd. The only way for that to happen would be caused bug in the > > taskqueue stuff that zml committed, I think, but that's a long shot. >=20 > Correction: Wireless actually works if you set the channel manually and > start wpa_supplicant afterwards. So wpa_supplicant no longer seems to be > able to change the channel itself. The issue is still present in r209168. --PNTmBPCT7hxwcZjr Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEARECAAYFAkwXlikACgkQKc512sD3afiybQCdHFnLHlGNX4wlEudu3hlCMfyF DeoAn3/lYzeUy+TBLu2bYpjhlI3QAYwG =FDd/ -----END PGP SIGNATURE----- --PNTmBPCT7hxwcZjr-- From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 16:00:56 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8BE13106566C; Tue, 15 Jun 2010 16:00:56 +0000 (UTC) (envelope-from rpaulo@freebsd.org) Received: from karen.lavabit.com (karen.lavabit.com [72.249.41.33]) by mx1.freebsd.org (Postfix) with ESMTP id CEE568FC1D; Tue, 15 Jun 2010 16:00:55 +0000 (UTC) Received: from e.earth.lavabit.com (e.earth.lavabit.com [192.168.111.14]) by karen.lavabit.com (Postfix) with ESMTP id 7DE1F11B9F3; Tue, 15 Jun 2010 11:00:53 -0500 (CDT) Received: from 10.0.128.34 (75.16.26.133) by lavabit.com with ESMTP id 469UHLP887B5; Tue, 15 Jun 2010 11:00:53 -0500 References: <4C00832A.4030102@FreeBSD.org> <958F0C5A-3CE8-41E2-9C6B-AC1C3C1863C7@FreeBSD.org> <20100530174838.GC41305@e.0x20.net> <20100615150305.GA43178@e.0x20.net> In-Reply-To: <20100615150305.GA43178@e.0x20.net> Mime-Version: 1.0 (Apple Message framework v1078) Content-Type: text/plain; charset=us-ascii Message-Id: Content-Transfer-Encoding: quoted-printable From: Rui Paulo Date: Tue, 15 Jun 2010 09:00:51 -0700 To: Lars Engels X-Mailer: Apple Mail (2.1078) Cc: bf1783@gmail.com, Doug Barton , freebsd-current@freebsd.org Subject: Re: wpa_supplicant (Was: Re: wpi not working on today's current (r208626)) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 16:00:56 -0000 On 15 Jun 2010, at 08:03, Lars Engels wrote: > On Sun, May 30, 2010 at 07:48:38PM +0200, Lars Engels wrote: >> On Sat, May 29, 2010 at 11:20:18AM +0100, Rui Paulo wrote: >>>=20 >>> On 29 May 2010, at 05:39, b. f. wrote: >>>=20 >>>> On 5/28/10, Doug Barton wrote: >>>>> On 5/28/2010 4:50 PM, b. f. wrote: >>>>>>=20 >>>>>> I can't see any problems when using WPA2 with AES on r208606 i386 = with >>>>>> uath(4). I'm updating this machine to r208630 tonight, and if I >>>>>> encounter problems with the later revision, I'll let you know. >>>>>=20 >>>>> Ok, thanks. >>>>>=20 >>>>>> Are >>>>>> you saying that you experienced problems when trying to use a = r207134 >>>>>> base with a r208626 kernel? If that's the case, I would = recommend >>>>>> updating the base to the same revision as the kernel, and then >>>>>> retesting. >>>>>=20 >>>>> Yes, that's what I'm doing I actually tried running the newly = built >>>>> wpa_supplicant but that didn't work. I'm kind of hesitant to do = the full >>>>> upgrade since I'm having kernel problems with the nvidia driver, = but if >>>>> I'm sure wpa_supplicant will work then I suppose I can bite the = bullet. >>>>>=20 >>>>=20 >>>> It appears that something is wrong. My wireless stick no longer >>>> associates with the network with r208630. I'll do some tinkering. >>>=20 >>> That's odd. The only way for that to happen would be caused bug in = the >>> taskqueue stuff that zml committed, I think, but that's a long shot. >>=20 >> Correction: Wireless actually works if you set the channel manually = and >> start wpa_supplicant afterwards. So wpa_supplicant no longer seems to = be >> able to change the channel itself. >=20 >=20 > The issue is still present in r209168. Which driver? I works fine with my ath. -- Rui Paulo From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 16:17:41 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B7C61065673; Tue, 15 Jun 2010 16:17:41 +0000 (UTC) (envelope-from lars@e.0x20.net) Received: from mail.0x20.net (mail.0x20.net [217.69.67.217]) by mx1.freebsd.org (Postfix) with ESMTP id 43A3D8FC13; Tue, 15 Jun 2010 16:17:41 +0000 (UTC) Received: by mail.0x20.net (Postfix, from userid 1002) id 107BF3A581; Tue, 15 Jun 2010 18:17:40 +0200 (CEST) Date: Tue, 15 Jun 2010 18:17:40 +0200 From: Lars Engels To: Rui Paulo Message-ID: <20100615161739.GB43178@e.0x20.net> Mail-Followup-To: Lars Engels , Rui Paulo , bf1783@gmail.com, Doug Barton , freebsd-current@freebsd.org References: <4C00832A.4030102@FreeBSD.org> <958F0C5A-3CE8-41E2-9C6B-AC1C3C1863C7@FreeBSD.org> <20100530174838.GC41305@e.0x20.net> <20100615150305.GA43178@e.0x20.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="kORqDWCi7qDJ0mEj" Content-Disposition: inline In-Reply-To: X-Editor: VIM - Vi IMproved 7.2 X-Operation-System: FreeBSD 5.5-RELEASE-p19 User-Agent: Mutt/1.5.20 (2009-06-14) Cc: bf1783@gmail.com, Doug Barton , freebsd-current@freebsd.org Subject: Re: wpa_supplicant (Was: Re: wpi not working on today's current (r208626)) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 16:17:41 -0000 --kORqDWCi7qDJ0mEj Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jun 15, 2010 at 09:00:51AM -0700, Rui Paulo wrote: >=20 > On 15 Jun 2010, at 08:03, Lars Engels wrote: > >=20 > > The issue is still present in r209168. >=20 > Which driver? I works fine with my ath. >=20 ath0: mem 0xd4000000-0xd400ffff irq 16 at device 0.0 on= pci2 ath0: [ITHREAD] ath0: AR2425 mac 14.2 RF5424 phy 7.0 --kORqDWCi7qDJ0mEj Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEARECAAYFAkwXp6MACgkQKc512sD3afgFnACfYVyAHUcRyjJ3JvvDaCEV89u7 P8AAoMdJO+K207H3128MsYAlhGT4AHkK =rDCN -----END PGP SIGNATURE----- --kORqDWCi7qDJ0mEj-- From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 16:25:25 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9490D1065680; Tue, 15 Jun 2010 16:25:25 +0000 (UTC) (envelope-from rpaulo@freebsd.org) Received: from karen.lavabit.com (karen.lavabit.com [72.249.41.33]) by mx1.freebsd.org (Postfix) with ESMTP id 2EB218FC17; Tue, 15 Jun 2010 16:25:24 +0000 (UTC) Received: from e.earth.lavabit.com (e.earth.lavabit.com [192.168.111.14]) by karen.lavabit.com (Postfix) with ESMTP id 7B9481CF181; Tue, 15 Jun 2010 11:25:23 -0500 (CDT) Received: from 10.0.128.34 (75.16.26.133) by lavabit.com with ESMTP id WMHWPPJ7QP1G; Tue, 15 Jun 2010 11:25:23 -0500 References: <4C00832A.4030102@FreeBSD.org> <958F0C5A-3CE8-41E2-9C6B-AC1C3C1863C7@FreeBSD.org> <20100530174838.GC41305@e.0x20.net> <20100615150305.GA43178@e.0x20.net> <20100615161739.GB43178@e.0x20.net> In-Reply-To: <20100615161739.GB43178@e.0x20.net> Mime-Version: 1.0 (Apple Message framework v1078) Content-Type: text/plain; charset=us-ascii Message-Id: <452BA399-BC66-422A-96D2-9A665214CF61@FreeBSD.org> Content-Transfer-Encoding: quoted-printable From: Rui Paulo Date: Tue, 15 Jun 2010 09:25:22 -0700 To: Lars Engels X-Mailer: Apple Mail (2.1078) Cc: bf1783@gmail.com, Doug Barton , freebsd-current@freebsd.org Subject: Re: wpa_supplicant (Was: Re: wpi not working on today's current (r208626)) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 16:25:25 -0000 On 15 Jun 2010, at 09:17, Lars Engels wrote: > On Tue, Jun 15, 2010 at 09:00:51AM -0700, Rui Paulo wrote: >>=20 >> On 15 Jun 2010, at 08:03, Lars Engels wrote: >>>=20 >>> The issue is still present in r209168. >>=20 >> Which driver? I works fine with my ath. >>=20 >=20 > ath0: mem 0xd4000000-0xd400ffff irq 16 at device = 0.0 on pci2 > ath0: [ITHREAD] > ath0: AR2425 mac 14.2 RF5424 phy 7.0 Can you identify the revision that broke it? -- Rui Paulo From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 16:32:35 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23B621065677; Tue, 15 Jun 2010 16:32:35 +0000 (UTC) (envelope-from lars@e.0x20.net) Received: from mail.0x20.net (mail.0x20.net [217.69.67.217]) by mx1.freebsd.org (Postfix) with ESMTP id CFA7E8FC0A; Tue, 15 Jun 2010 16:32:34 +0000 (UTC) Received: by mail.0x20.net (Postfix, from userid 1002) id C250E3A581; Tue, 15 Jun 2010 18:32:33 +0200 (CEST) Date: Tue, 15 Jun 2010 18:32:33 +0200 From: Lars Engels To: Rui Paulo Message-ID: <20100615163233.GC43178@e.0x20.net> Mail-Followup-To: Lars Engels , Rui Paulo , bf1783@gmail.com, Doug Barton , freebsd-current@freebsd.org References: <4C00832A.4030102@FreeBSD.org> <958F0C5A-3CE8-41E2-9C6B-AC1C3C1863C7@FreeBSD.org> <20100530174838.GC41305@e.0x20.net> <20100615150305.GA43178@e.0x20.net> <20100615161739.GB43178@e.0x20.net> <452BA399-BC66-422A-96D2-9A665214CF61@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ctP54qlpMx3WjD+/" Content-Disposition: inline In-Reply-To: <452BA399-BC66-422A-96D2-9A665214CF61@FreeBSD.org> X-Editor: VIM - Vi IMproved 7.2 X-Operation-System: FreeBSD 5.5-RELEASE-p19 User-Agent: Mutt/1.5.20 (2009-06-14) Cc: bf1783@gmail.com, Doug Barton , freebsd-current@freebsd.org Subject: Re: wpa_supplicant (Was: Re: wpi not working on today's current (r208626)) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 16:32:35 -0000 --ctP54qlpMx3WjD+/ Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jun 15, 2010 at 09:25:22AM -0700, Rui Paulo wrote: >=20 > On 15 Jun 2010, at 09:17, Lars Engels wrote: >=20 > > On Tue, Jun 15, 2010 at 09:00:51AM -0700, Rui Paulo wrote: > >>=20 > >> On 15 Jun 2010, at 08:03, Lars Engels wrote: > >>>=20 > >>> The issue is still present in r209168. > >>=20 > >> Which driver? I works fine with my ath. > >>=20 > >=20 > > ath0: mem 0xd4000000-0xd400ffff irq 16 at device 0.= 0 on pci2 > > ath0: [ITHREAD] > > ath0: AR2425 mac 14.2 RF5424 phy 7.0 >=20 > Can you identify the revision that broke it? Unfortunately not the exact revision. Doug wrote that it stopped working at r208626 and before it also worked for me.=20 --ctP54qlpMx3WjD+/ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEARECAAYFAkwXqyEACgkQKc512sD3afijxACgmWErZzqaaWOblqJ4JByJ+YKZ JFQAnRZxlPmjU+OJw5xvvkjXdY0wNAOB =MZ8K -----END PGP SIGNATURE----- --ctP54qlpMx3WjD+/-- From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 16:49:03 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6881B1065672 for ; Tue, 15 Jun 2010 16:49:03 +0000 (UTC) (envelope-from jiashiun@gmail.com) Received: from mail-vw0-f54.google.com (mail-vw0-f54.google.com [209.85.212.54]) by mx1.freebsd.org (Postfix) with ESMTP id 191918FC1A for ; Tue, 15 Jun 2010 16:49:02 +0000 (UTC) Received: by vws20 with SMTP id 20so7072180vws.13 for ; Tue, 15 Jun 2010 09:49:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:received:in-reply-to :references:from:date:message-id:subject:to:cc:content-type; bh=I6yg+qosM5OfXMISu8va1L1T5WSIG+Cc4Vr5STAUllk=; b=AHiLp7yzfiBznAwJoVC3PwEs1mCwUZicl61FkpPVorrdzeP15eLrP01blN7+c0tujB foPDtpMmRXrQeYePoc6FeAxeUPn07wFl7cUxsVdBOJvuqWXDhwXNZfqiNijBX06PwVbt IBqEd9gFjajkCLD2jeJ4RAIjh+2jgo8796C98= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; b=TKJ3ikAdN/PKyaT4OYUdJQzKXxNoxAKqkRfQ3cgz3iP3zUolnYxMSaCvQljT5tUfnC 5MWIpfDo3WwxY3OcVssJ1Kl7zEljxQkKWKt96AyA/GlsVFgSUFr2Td78FNMHI9H+Ynra ITG4eVY4Zyd6wGM7dMSVXG4//3lsTry4IFuxU= Received: by 10.224.96.97 with SMTP id g33mr3533864qan.372.1276620540317; Tue, 15 Jun 2010 09:49:00 -0700 (PDT) MIME-Version: 1.0 Received: by 10.220.189.77 with HTTP; Tue, 15 Jun 2010 09:48:40 -0700 (PDT) In-Reply-To: <4C12A4A5.1040701@freemail.hu> References: <4C12A4A5.1040701@freemail.hu> From: Jia-Shiun Li Date: Wed, 16 Jun 2010 00:48:40 +0800 Message-ID: To: oizs Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: freebsd-current@freebsd.org Subject: Re: Marvell 88SX7042 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 16:49:03 -0000 On Sat, Jun 12, 2010 at 5:03 AM, oizs wrote: > Hello, > > I got myself a board made for google by arima and had some issues with it > booting freebsd on it, but with some help of the list i was able to make it > boot. > Now i have two problems, whenever i try to reboot i get kernel trap 12, and > the more irritating problem, is that i can't make disks on the marvell > controller show up. According to 'man ata' the 88sx7042 is supported, but > even if i compile the kernel to support mvs, or try to load it with > loader.conf it won't load the driver. If i load debian up im able to > read/write them, so its probably not a hw issue. I would welcome any ideas > since im starting to run out of them. > > pciconf -lv > > hptrr0@pci0:2:0:0: class=0x010000 card=0x11ab11ab chip=0x704211ab > rev=0x02 hdr=0x00 > Your 88sx7042 is claimed by hptrr, driver for highpoint rocketraid adapters. You may want to build a custom kernel by removing the line device hptrr -js. From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 17:01:55 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21D7D106566C; Tue, 15 Jun 2010 17:01:55 +0000 (UTC) (envelope-from gleb.kurtsou@gmail.com) Received: from mail-bw0-f54.google.com (mail-bw0-f54.google.com [209.85.214.54]) by mx1.freebsd.org (Postfix) with ESMTP id 3D2538FC18; Tue, 15 Jun 2010 17:01:53 +0000 (UTC) Received: by bwz8 with SMTP id 8so257651bwz.13 for ; Tue, 15 Jun 2010 10:01:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=CDUii5vuCia8DK1TewIs2tp/HTzoattqdc/br6m2OJs=; b=pxhh2aWJ9+0y+JQycuydDdnwBufv1Um2agCfJFBuGG2VWA04Etv1dV1glmh7Ai03aS C98SSVY3DVrYVqLpwHzMdPOz0SxxPctgGihvX4756+/vecf5h8f3tjh2ngBBnM5DtkeT tkPZq1B51fqSPbGq0bFQa1Jwf8YEBwIDt/d4E= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=Bv+pyAOrfaXfizucfPnYTM/orKhFn4o7Vo77YMo7fORWjw/jZyQgsHpgMx0cRtCsZh 80f0BCaO3zpKLATMfw82bj7OlxnEWoha9FUOWgzQRPeXvVxdLUGV+7nRB62lUSZINEKL Cqmmpwb92YiWdaZTfhL8Pw61zQTnPmimS9G8I= Received: by 10.204.47.25 with SMTP id l25mr5637974bkf.46.1276621312316; Tue, 15 Jun 2010 10:01:52 -0700 (PDT) Received: from localhost ([212.98.186.134]) by mx.google.com with ESMTPS id f13sm25202151bka.23.2010.06.15.10.01.50 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 15 Jun 2010 10:01:51 -0700 (PDT) Date: Tue, 15 Jun 2010 20:01:58 +0300 From: Gleb Kurtsou To: Gabor Kovesdan Message-ID: <20100615170158.GA2131@tops> References: <4C16C5B5.1070308@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <4C16C5B5.1070308@FreeBSD.org> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: Edwin Groothuis , FreeBSD Current , Xin LI , i18n@FreeBSD.org Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 17:01:55 -0000 On (15/06/2010 02:13), Gabor Kovesdan wrote: > Hello Folks, > > during the last summer, Google generously founded my Summer of Code > project, which was providing a BSD-licensed iconv implementation for > FreeBSD. I'm proud to announce that the work has been completed and a > patch is available to add it to the base system. > > The results of this work are: > - The Citrus implementation has been ported from NetBSD. > - Some utilities have been added. There is a conversion table generator, > which can compare conversion tables to reference data generated by GNU > libiconv. This helps ensuring conversion compatibility. > - UTF-16 surrogate support and some endianness issues have been fixed. > - The rather chaotic Makefiles to build metadata have been refactored > and cleaned up, now it is easy to read and it is also easier to add > support for new encodings. > - A bunch of new encodings and encoding aliases have been added. > - Support for 1->2, 1->3 and 1->4 mappings, which is needed for > transliterating with flying accents as GNU does, like "u. > - Lots of warnings have been fixed, the major part of the code is now > WARNS=6 clean. > - New section 1 and section 5 manual pages have been added. > - Some GNU-specific calls have been implemented: iconvlist(), > iconvctl(), iconv_canonicalize(), iconv_open_into() > - Support for GNU's //IGNORE suffix has been added. > - The "-" argument for stdin is now recognized in iconv(1) as per POSIX. > - The Big5 conversion module has been fixed. > - The iconv.h header files is supposed to be compatible with the GNU > version, i.e. sources should build with base iconv.h and GNU libiconv. > I've just did a very quick test and it seems ports can safely link to > GNU libiconv, there's no conflict. > - Various cleanups and style(9) fixes. > - A bachelor thesis written in Hungarian language: > http://www.kovesdan.org/files/bsc_iconv.pdf > > The rather big patch (42,5M) is available here: > http://www.kovesdan.org/patches/iconv_base_integrate.diff > > Any comments, suggestions or bugreports are very welcome. Awesome! Thanks for working on it. Are there any plans to resurrect/finish multibyte collation support GSoC'2008 project: http://wiki.freebsd.org/KonradJankowski/Collation And are you aware of any plans on adding utf8-aware regex? I think NetBSD has already imported one: http://blog.netbsd.org/tnf/entry/efficient_wide_character_regular_expressions Thanks, Gleb. > -- > Gabor Kovesdan > FreeBSD Volunteer > > EMAIL:gabor@FreeBSD.org .:|:.gabor@kovesdan.org > WEB:http://people.FreeBSD.org/~gabor .:|:.http://kovesdan.org > > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 17:02:49 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6128A106564A for ; Tue, 15 Jun 2010 17:02:49 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id EEDBF8FC1D for ; Tue, 15 Jun 2010 17:02:47 +0000 (UTC) Received: (qmail 2442 invoked by uid 399); 15 Jun 2010 17:02:46 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 15 Jun 2010 17:02:46 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4C17B234.6080607@FreeBSD.org> Date: Tue, 15 Jun 2010 10:02:44 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100330 Thunderbird/3.0.4 MIME-Version: 1.0 To: Lars Engels , Rui Paulo , bf1783@gmail.com, freebsd-current@freebsd.org References: <4C00832A.4030102@FreeBSD.org> <958F0C5A-3CE8-41E2-9C6B-AC1C3C1863C7@FreeBSD.org> <20100530174838.GC41305@e.0x20.net> <20100615150305.GA43178@e.0x20.net> <20100615161739.GB43178@e.0x20.net> <452BA399-BC66-422A-96D2-9A665214CF61@FreeBSD.org> <20100615163233.GC43178@e.0x20.net> In-Reply-To: <20100615163233.GC43178@e.0x20.net> X-Enigmail-Version: 1.0.1 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Subject: Re: wpa_supplicant (Was: Re: wpi not working on today's current (r208626)) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 17:02:49 -0000 On 06/15/10 09:32, Lars Engels wrote: > On Tue, Jun 15, 2010 at 09:25:22AM -0700, Rui Paulo wrote: >> >> On 15 Jun 2010, at 09:17, Lars Engels wrote: >> >>> On Tue, Jun 15, 2010 at 09:00:51AM -0700, Rui Paulo wrote: >>>> >>>> On 15 Jun 2010, at 08:03, Lars Engels wrote: >>>>> >>>>> The issue is still present in r209168. >>>> >>>> Which driver? I works fine with my ath. >>>> >>> >>> ath0: mem 0xd4000000-0xd400ffff irq 16 at device 0.0 on pci2 >>> ath0: [ITHREAD] >>> ath0: AR2425 mac 14.2 RF5424 phy 7.0 >> >> Can you identify the revision that broke it? > > Unfortunately not the exact revision. Doug wrote that it stopped working > at r208626 and before it also worked for me. The problem I had was related to other things, not wpa_supplicant directly. I upgraded my -current a few days ago and it's working fine for me, both before and after Rui's latest update (using the wpi driver). hth, Doug -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/ From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 17:07:11 2010 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AB601106566B for ; Tue, 15 Jun 2010 17:07:11 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id 59D7F8FC1A for ; Tue, 15 Jun 2010 17:07:10 +0000 (UTC) Received: from mail-qy0-f182.google.com (mail-qy0-f182.google.com [209.85.216.182]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id 2C70BBF405; Tue, 15 Jun 2010 19:07:08 +0200 (CEST) Received: by qyk11 with SMTP id 11so934795qyk.13 for ; Tue, 15 Jun 2010 10:07:06 -0700 (PDT) MIME-Version: 1.0 Received: by 10.224.98.8 with SMTP id o8mr3301932qan.368.1276621626578; Tue, 15 Jun 2010 10:07:06 -0700 (PDT) Received: by 10.229.247.142 with HTTP; Tue, 15 Jun 2010 10:07:06 -0700 (PDT) Date: Tue, 15 Jun 2010 19:07:06 +0200 Message-ID: From: Alexander Best To: Gabor Kovesdan Content-Type: text/plain; charset=ISO-8859-1 Cc: freebsd-current@FreeBSD.org Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 17:07:11 -0000 getting this error when doing 'buildworld': cc -O2 -pipe -fno-strict-aliasing -funroll-loops -march=native -I/usr/src/lib/libc/include -I/usr/src/lib/libc/../../include -I/usr/src/lib/libc/amd64 -DNLS -D__DBINTERFACE_PRIVATE -I/usr/src/lib/libc/../../contrib/gdtoa -I/usr/obj/usr/src/lib/libc -I/usr/src/lib/libc/resolv -D_ACL_PRIVATE -DPOSIX_MISTAKE -I/usr/src/lib/libc/../../contrib/tzcode/stdtime -I/usr/src/lib/libc/stdtime -I/usr/src/lib/libc/locale -DBROKEN_DES -DPORTMAP -DDES_BUILTIN -I/usr/src/lib/libc/rpc -DSYMBOL_VERSIONING -g -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/lib/libc/iconv/citrus_none.c cc1: warnings being treated as errors /usr/src/lib/libc/iconv/citrus_none.c: In function '_citrus_NONE_stdenc_cstomb': /usr/src/lib/libc/iconv/citrus_none.c:114: warning: unused variable 'ret' *** Error code 1 Stop in /usr/src/lib/libc. *** Error code 1 Stop in /usr/src. *** Error code 1 Stop in /usr/src. *** Error code 1 Stop in /usr/src. *** Error code 1 Stop in /usr/src. -- Alexander Best From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 17:11:04 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01D47106566B; Tue, 15 Jun 2010 17:11:04 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from server.mypc.hu (server.mypc.hu [87.229.73.95]) by mx1.freebsd.org (Postfix) with ESMTP id AD7658FC08; Tue, 15 Jun 2010 17:10:56 +0000 (UTC) Received: from server.mypc.hu (localhost [127.0.0.1]) by server.mypc.hu (Postfix) with ESMTP id D929214DBB5C; Tue, 15 Jun 2010 19:10:54 +0200 (CEST) X-Virus-Scanned: amavisd-new at server.mypc.hu Received: from server.mypc.hu ([127.0.0.1]) by server.mypc.hu (server.mypc.hu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 66O6HdmzmIHP; Tue, 15 Jun 2010 19:10:52 +0200 (CEST) Received: from [192.168.1.105] (catv-80-99-92-167.catv.broadband.hu [80.99.92.167]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by server.mypc.hu (Postfix) with ESMTPSA id A17B814DB9B6; Tue, 15 Jun 2010 19:10:52 +0200 (CEST) Message-ID: <4C17B419.6020507@FreeBSD.org> Date: Tue, 15 Jun 2010 19:10:49 +0200 From: Gabor Kovesdan User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.2; es-ES; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: Gleb Kurtsou References: <4C16C5B5.1070308@FreeBSD.org> <20100615170158.GA2131@tops> In-Reply-To: <20100615170158.GA2131@tops> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: FreeBSD Current , i18n@FreeBSD.org Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 17:11:04 -0000 > Are there any plans to resurrect/finish multibyte collation support > GSoC'2008 project: > http://wiki.freebsd.org/KonradJankowski/Collation > Yes, my queue is just so long that I haven't got there yet. I'm in SoC 2010 again with a different project and there's still BSD grep from SoC 2008. I'm also fixing the last nits of that. And there are also personal things, like a one-year internship in Portugal, which is going to start in September. But I hope once I'll find time or this. > And are you aware of any plans on adding utf8-aware regex? I think > NetBSD has already imported one: > http://blog.netbsd.org/tnf/entry/efficient_wide_character_regular_expressions > Yes, again but same issues. :) Besides, we need/should add a more relaxed regex support to TRE before we can adopt it. GNU regex allows things like [a|], which is not standard, so we should support them to maintain compatibility. This will be important for ports. This is also the reason why BSD grep is linked to GNU regex instead of libc-regex. -- Gabor Kovesdan FreeBSD Volunteer EMAIL: gabor@FreeBSD.org .:|:. gabor@kovesdan.org WEB: http://people.FreeBSD.org/~gabor .:|:. http://kovesdan.org From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 17:12:20 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 81B631065677 for ; Tue, 15 Jun 2010 17:12:20 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id 0476D8FC0C for ; Tue, 15 Jun 2010 17:12:19 +0000 (UTC) Received: (qmail 21426 invoked by uid 399); 15 Jun 2010 17:12:19 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 15 Jun 2010 17:12:19 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4C17B472.1020305@FreeBSD.org> Date: Tue, 15 Jun 2010 10:12:18 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100330 Thunderbird/3.0.4 MIME-Version: 1.0 To: Alexander Best References: <86mxuxgwgg.fsf@ds4.des.no> <86d3vspr43.fsf@ds4.des.no> In-Reply-To: X-Enigmail-Version: 1.0.1 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit Cc: =?ISO-8859-1?Q?Dag-Erling_Sm=F8rgrav?= , freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 17:12:20 -0000 On 06/15/10 04:11, Alexander Best wrote: > 2010/6/15 Dag-Erling Smørgrav: >> Alexander Best writes: >>> Dag-Erling Smørgrav writes: >>>> Alexander Best writes: >>>>> .if empty(.CURDIR:M/usr/src/*)&& empty(.CURDIR:M/usr/obj/*)&& >>>>> exists(/usr/local/bin/gcc44) >>>>> CC = gcc44 >>>>> CXX = g++44 >>>>> CPP = cpp44 >>>>> .endif >>>> What happens when .CURDIR = /usr/src? >>> i'm now using [...] >> >> I was trying to show you why what you had didn't work... > > sorry. i didn't mean to affend you. doug barton already pointed out > that what i had in my make.conf beforehand won't work unless /usr/src > and /usr/obj are literal directories in /usr [1]. You're really working hard to make this more complicated than it needs to be. Try this: cd /usr/src make -V .CURDIR Then tell us what it says. Doug -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/ From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 17:24:33 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC30B106566B; Tue, 15 Jun 2010 17:24:33 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id 59CB18FC14; Tue, 15 Jun 2010 17:24:33 +0000 (UTC) Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com [209.85.161.182]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id 183BABF40C; Tue, 15 Jun 2010 19:24:31 +0200 (CEST) Received: by gxk27 with SMTP id 27so1299005gxk.13 for ; Tue, 15 Jun 2010 10:24:29 -0700 (PDT) MIME-Version: 1.0 Received: by 10.224.27.221 with SMTP id j29mr3447256qac.132.1276622668957; Tue, 15 Jun 2010 10:24:28 -0700 (PDT) Received: by 10.229.247.142 with HTTP; Tue, 15 Jun 2010 10:24:28 -0700 (PDT) In-Reply-To: <4C17B472.1020305@FreeBSD.org> References: <86mxuxgwgg.fsf@ds4.des.no> <86d3vspr43.fsf@ds4.des.no> <4C17B472.1020305@FreeBSD.org> Date: Tue, 15 Jun 2010 19:24:28 +0200 Message-ID: From: Alexander Best To: Doug Barton Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: =?ISO-8859-1?Q?Dag=2DErling_Sm=F8rgrav?= , freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 17:24:33 -0000 On Tue, Jun 15, 2010 at 7:12 PM, Doug Barton wrote: > On 06/15/10 04:11, Alexander Best wrote: >> >> 2010/6/15 Dag-Erling Sm=F8rgrav: >>> >>> Alexander Best =A0writes: >>>> >>>> Dag-Erling Sm=F8rgrav =A0writes: >>>>> >>>>> Alexander Best =A0writes: >>>>>> >>>>>> .if empty(.CURDIR:M/usr/src/*)&& =A0empty(.CURDIR:M/usr/obj/*)&& >>>>>> exists(/usr/local/bin/gcc44) >>>>>> CC =3D gcc44 >>>>>> CXX =3D g++44 >>>>>> CPP =3D cpp44 >>>>>> .endif >>>>> >>>>> What happens when .CURDIR =3D /usr/src? >>>> >>>> i'm now using [...] >>> >>> I was trying to show you why what you had didn't work... >> >> sorry. i didn't mean to affend you. doug barton already pointed out >> that what i had in my make.conf beforehand won't work unless /usr/src >> and /usr/obj are literal directories in /usr [1]. > > You're really working hard to make this more complicated than it needs to > be. Try this: > > cd /usr/src > make -V .CURDIR > > Then tell us what it says. *lol* sorry. i'm quite busy with other stuff atm so i'm not that good at reading mails very thoroughly right now. ;9 `make -V .CURDIR` in /usr/src returns "/usr/src" cheers. alex > > > Doug > > -- > > =A0 =A0 =A0 =A0... and that's just a little bit of history repeating. > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0-- Propellerheads > > =A0 =A0 =A0 =A0Improve the effectiveness of your Internet presence with > =A0 =A0 =A0 =A0a domain name makeover! =A0 =A0http://SupersetSolutions.co= m/ > > --=20 Alexander Best From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 17:30:28 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1D4F31065670 for ; Tue, 15 Jun 2010 17:30:28 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id 951C78FC14 for ; Tue, 15 Jun 2010 17:30:27 +0000 (UTC) Received: (qmail 23494 invoked by uid 399); 15 Jun 2010 17:30:26 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 15 Jun 2010 17:30:26 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4C17B8B1.6070205@FreeBSD.org> Date: Tue, 15 Jun 2010 10:30:25 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100330 Thunderbird/3.0.4 MIME-Version: 1.0 To: Alexander Best References: <86mxuxgwgg.fsf@ds4.des.no> <86d3vspr43.fsf@ds4.des.no> <4C17B472.1020305@FreeBSD.org> In-Reply-To: X-Enigmail-Version: 1.0.1 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 17:30:28 -0000 On 06/15/10 10:24, Alexander Best wrote: > `make -V .CURDIR` in /usr/src returns "/usr/src" Thanks. Now: cd /usr/obj/usr/src make -V .CURDIR Doug -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/ From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 17:38:11 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5981E1065672; Tue, 15 Jun 2010 17:38:11 +0000 (UTC) (envelope-from lars@e.0x20.net) Received: from mail.0x20.net (mail.0x20.net [217.69.67.217]) by mx1.freebsd.org (Postfix) with ESMTP id 11CA58FC1C; Tue, 15 Jun 2010 17:38:10 +0000 (UTC) Received: by mail.0x20.net (Postfix, from userid 1002) id 190163A61E; Tue, 15 Jun 2010 19:38:10 +0200 (CEST) Date: Tue, 15 Jun 2010 19:38:10 +0200 From: Lars Engels To: Doug Barton Message-ID: <20100615173809.GD43178@e.0x20.net> Mail-Followup-To: Lars Engels , Doug Barton , Rui Paulo , bf1783@gmail.com, freebsd-current@freebsd.org References: <4C00832A.4030102@FreeBSD.org> <958F0C5A-3CE8-41E2-9C6B-AC1C3C1863C7@FreeBSD.org> <20100530174838.GC41305@e.0x20.net> <20100615150305.GA43178@e.0x20.net> <20100615161739.GB43178@e.0x20.net> <452BA399-BC66-422A-96D2-9A665214CF61@FreeBSD.org> <20100615163233.GC43178@e.0x20.net> <4C17B234.6080607@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="8w3uRX/HFJGApMzv" Content-Disposition: inline In-Reply-To: <4C17B234.6080607@FreeBSD.org> X-Editor: VIM - Vi IMproved 7.2 X-Operation-System: FreeBSD 5.5-RELEASE-p19 User-Agent: Mutt/1.5.20 (2009-06-14) Cc: bf1783@gmail.com, freebsd-current@freebsd.org, Rui Paulo Subject: Re: wpa_supplicant (Was: Re: wpi not working on today's current (r208626)) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 17:38:11 -0000 --8w3uRX/HFJGApMzv Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jun 15, 2010 at 10:02:44AM -0700, Doug Barton wrote: > On 06/15/10 09:32, Lars Engels wrote: > > On Tue, Jun 15, 2010 at 09:25:22AM -0700, Rui Paulo wrote: > >> > >> On 15 Jun 2010, at 09:17, Lars Engels wrote: > >> > >>> On Tue, Jun 15, 2010 at 09:00:51AM -0700, Rui Paulo wrote: > >>>> > >>>> On 15 Jun 2010, at 08:03, Lars Engels wrote: > >>>>> > >>>>> The issue is still present in r209168. > >>>> > >>>> Which driver? I works fine with my ath. > >>>> > >>> > >>> ath0: mem 0xd4000000-0xd400ffff irq 16 at device = 0.0 on pci2 > >>> ath0: [ITHREAD] > >>> ath0: AR2425 mac 14.2 RF5424 phy 7.0 > >> > >> Can you identify the revision that broke it? > > > > Unfortunately not the exact revision. Doug wrote that it stopped working > > at r208626 and before it also worked for me. >=20 > The problem I had was related to other things, not wpa_supplicant=20 > directly. I upgraded my -current a few days ago and it's working fine=20 > for me, both before and after Rui's latest update (using the wpi driver). Good to hear that it's working for you. In my case, it was PEBKAC. To quote Firefox: "Well, this is embarrassing." When I upgraded my machine I also removed all installed Ports and cleaned up my rc.conf. Somehow I changed ifconfig_wlan0 to fconfig_wlan0. After inserting the missing 'i' I have a working wireless connection again. Now please forget what you've just read and only remember that my problem is fixed. ;-) --8w3uRX/HFJGApMzv Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEARECAAYFAkwXuoEACgkQKc512sD3afhuKgCgltE+i3deZv84aK8rNuHetv79 b3sAni7/rJ3pKg9qEi5UIAt+BObL5DfA =dvPC -----END PGP SIGNATURE----- --8w3uRX/HFJGApMzv-- From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 17:42:21 2010 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5AA4E10656E3 for ; Tue, 15 Jun 2010 17:42:21 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from server.mypc.hu (server.mypc.hu [87.229.73.95]) by mx1.freebsd.org (Postfix) with ESMTP id 133C08FC16 for ; Tue, 15 Jun 2010 17:42:20 +0000 (UTC) Received: from server.mypc.hu (localhost [127.0.0.1]) by server.mypc.hu (Postfix) with ESMTP id 273C414DBB57; Tue, 15 Jun 2010 19:42:20 +0200 (CEST) X-Virus-Scanned: amavisd-new at server.mypc.hu Received: from server.mypc.hu ([127.0.0.1]) by server.mypc.hu (server.mypc.hu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id pu9vw7ooxl6A; Tue, 15 Jun 2010 19:42:17 +0200 (CEST) Received: from [192.168.1.105] (catv-80-99-92-167.catv.broadband.hu [80.99.92.167]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by server.mypc.hu (Postfix) with ESMTPSA id E2B7014DBB37; Tue, 15 Jun 2010 19:42:16 +0200 (CEST) Message-ID: <4C17BB76.6020702@FreeBSD.org> Date: Tue, 15 Jun 2010 19:42:14 +0200 From: Gabor Kovesdan User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.2; es-ES; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: Alexander Best References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-current@FreeBSD.org Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 17:42:21 -0000 > /usr/src/lib/libc/iconv/citrus_none.c: In function '_citrus_NONE_stdenc_cstomb': > /usr/src/lib/libc/iconv/citrus_none.c:114: warning: unused variable 'ret' > *** Error code 1 > I'm sorry, this one slipped in. Today I've checked the sources with clang and fixed some minor warnings, including this one. The new patch is here: http://www.kovesdan.org/patches/iconv_base_integrate2.diff And a gzipped version: http://www.kovesdan.org/patches/iconv_base_integrate2.diff.gz -- Gabor Kovesdan FreeBSD Volunteer EMAIL: gabor@FreeBSD.org .:|:. gabor@kovesdan.org WEB: http://people.FreeBSD.org/~gabor .:|:. http://kovesdan.org From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 17:54:08 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A8311065678 for ; Tue, 15 Jun 2010 17:54:08 +0000 (UTC) (envelope-from oizs@freemail.hu) Received: from fep15.mx.upcmail.net (fep15.mx.upcmail.net [62.179.121.35]) by mx1.freebsd.org (Postfix) with ESMTP id E46268FC17 for ; Tue, 15 Jun 2010 17:54:07 +0000 (UTC) Received: from edge03.upcmail.net ([192.168.13.238]) by viefep15-int.chello.at (InterMail vM.8.01.02.02 201-2260-120-106-20100312) with ESMTP id <20100615175406.CWBF21071.viefep15-int.chello.at@edge03.upcmail.net> for ; Tue, 15 Jun 2010 19:54:06 +0200 Received: from [192.168.0.6] ([213.222.167.104]) by edge03.upcmail.net with edge id WHu51e00g2FUr7103Hu66j; Tue, 15 Jun 2010 19:54:06 +0200 X-SourceIP: 213.222.167.104 Message-ID: <4C17BE33.5020203@freemail.hu> Date: Tue, 15 Jun 2010 19:53:55 +0200 From: oizs User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: freebsd-current@freebsd.org References: <4C12A4A5.1040701@freemail.hu> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Cloudmark-Analysis: v=1.1 cv=O+FWVpunvrlG1gSnSO6WiIQ7o0MJ4laHqrEcUJ8XjIg= c=1 sm=0 a=2caWB_DcjroA:10 a=IkcTkHD0fZMA:10 a=6I5d2MoRAAAA:8 a=ovceeCZKRoosABj5cJoA:9 a=x93JhQNeUdw85SPvSIwA:7 a=dfgcZwEbjvuDMB7UNkRGWHPtv6MA:4 a=QEXdDO2ut3YA:10 a=SV7veod9ZcQA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Subject: Re: Marvell 88SX7042 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 17:54:08 -0000 Thanks i managed to fix that, but sadly its still unusable. I tried to create a raidz on 4 1.5tb disks with moderate success, Im able to create the raid, but when im trying to copy files onto the raid i get immense amount of errors. Is this zfs related or the driver/controller is doing some hinky stuff? -zsozso mvsch1: Timeout on slot 0 mvsch1: iec 02000000 sstat 00000123 serr 00000000 edma_s 00000040 dma_c 16000700 dma_s 00000008 rs 00000001 status c0 mvsch0: Timeout on slot 0 mvsch0: iec 00000000 sstat 00000123 serr 00000000 edma_s 00000040 dma_c 16000700 dma_s 00000008 rs 00000001 status c0 mvsch3: Timeout on slot 0 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7ffffffe mvsch3: Timeout on slot 1 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7ffffffc mvsch3: Timeout on slot 2 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7ffffff8 mvsch3: Timeout on slot 3 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7ffffff0 mvsch3: Timeout on slot 4 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7fffffe0 mvsch3: Timeout on slot 5 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7fffffc0 mvsch3: Timeout on slot 6 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7fffff80 mvsch3: Timeout on slot 7 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7fffff00 mvsch3: Timeout on slot 8 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7ffffe00 mvsch3: Timeout on slot 9 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7ffffc00 mvsch3: Timeout on slot 10 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7ffff800 mvsch3: Timeout on slot 11 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7ffff000 mvsch3: Timeout on slot 12 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7fffe000 mvsch3: Timeout on slot 13 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7fffc000 mvsch3: Timeout on slot 14 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7fff8000 mvsch3: Timeout on slot 15 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7fff0000 mvsch3: Timeout on slot 16 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7ffe0000 mvsch3: Timeout on slot 17 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7ffc0000 mvsch3: Timeout on slot 18 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7ff80000 mvsch3: Timeout on slot 19 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7ff00000 mvsch3: Timeout on slot 20 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7fe00000 mvsch3: Timeout on slot 21 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7fc00000 mvsch3: Timeout on slot 22 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7f800000 mvsch3: Timeout on slot 23 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7f000000 mvsch3: Timeout on slot 24 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7e000000 mvsch3: Timeout on slot 25 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 7c000000 mvsch3: Timeout on slot 26 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 78000000 mvsch3: Timeout on slot 27 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 70000000 mvsch3: Timeout on slot 28 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 60000000 mvsch3: Timeout on slot 29 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: ... waiting for slots 40000000 mvsch3: Timeout on slot 30 mvsch3: iec 00000000 sstat 00000123 serr 00000000 edma_s 0000001d dma_c 00000000 dma_s 00000008 rs 7fffffff status c0 mvsch3: Error while READ LOG EXT mvsch3: Error while READ LOG EXT mvsch3: Error while READ LOG EXT On 2010.06.15. 18:48, Jia-Shiun Li wrote: > On Sat, Jun 12, 2010 at 5:03 AM, oizs wrote: > > >> Hello, >> >> I got myself a board made for google by arima and had some issues with it >> booting freebsd on it, but with some help of the list i was able to make it >> boot. >> Now i have two problems, whenever i try to reboot i get kernel trap 12, and >> the more irritating problem, is that i can't make disks on the marvell >> controller show up. According to 'man ata' the 88sx7042 is supported, but >> even if i compile the kernel to support mvs, or try to load it with >> loader.conf it won't load the driver. If i load debian up im able to >> read/write them, so its probably not a hw issue. I would welcome any ideas >> since im starting to run out of them. >> >> pciconf -lv >> >> hptrr0@pci0:2:0:0: class=0x010000 card=0x11ab11ab chip=0x704211ab >> rev=0x02 hdr=0x00 >> >> > Your 88sx7042 is claimed by hptrr, driver for highpoint rocketraid adapters. > You may want to build a custom kernel by removing the line > device hptrr > > -js. > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" > > > From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 17:56:37 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3BCC106566B; Tue, 15 Jun 2010 17:56:37 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id 710E48FC14; Tue, 15 Jun 2010 17:56:37 +0000 (UTC) Received: from mail-qy0-f182.google.com (mail-qy0-f182.google.com [209.85.216.182]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id 32B52BF410; Tue, 15 Jun 2010 19:56:36 +0200 (CEST) Received: by qyk11 with SMTP id 11so955508qyk.13 for ; Tue, 15 Jun 2010 10:56:34 -0700 (PDT) MIME-Version: 1.0 Received: by 10.224.87.149 with SMTP id w21mr3485341qal.18.1276624594314; Tue, 15 Jun 2010 10:56:34 -0700 (PDT) Received: by 10.229.247.142 with HTTP; Tue, 15 Jun 2010 10:56:34 -0700 (PDT) In-Reply-To: <4C17BB76.6020702@FreeBSD.org> References: <4C17BB76.6020702@FreeBSD.org> Date: Tue, 15 Jun 2010 19:56:34 +0200 Message-ID: From: Alexander Best To: Gabor Kovesdan Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 17:56:37 -0000 On Tue, Jun 15, 2010 at 7:42 PM, Gabor Kovesdan wrote: > >> /usr/src/lib/libc/iconv/citrus_none.c: In function >> '_citrus_NONE_stdenc_cstomb': >> /usr/src/lib/libc/iconv/citrus_none.c:114: warning: unused variable 'ret= ' >> *** Error code 1 >> > > I'm sorry, this one slipped in. Today I've checked the sources with clang > and fixed some minor warnings, including this one. The new patch is here: > http://www.kovesdan.org/patches/iconv_base_integrate2.diff > > And a gzipped version: > http://www.kovesdan.org/patches/iconv_base_integrate2.diff.gz thanks. i'll revert the previous patch and apply this new one. cheers. alex > > -- > Gabor Kovesdan > FreeBSD Volunteer > > EMAIL: gabor@FreeBSD.org .:|:. gabor@kovesdan.org > WEB: =A0 http://people.FreeBSD.org/~gabor .:|:. http://kovesdan.org > > --=20 Alexander Best From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 18:03:32 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E0415106567D; Tue, 15 Jun 2010 18:03:32 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id 99A498FC13; Tue, 15 Jun 2010 18:03:32 +0000 (UTC) Received: from mail-gw0-f54.google.com (mail-gw0-f54.google.com [74.125.83.54]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id B0533BF403; Tue, 15 Jun 2010 20:03:28 +0200 (CEST) Received: by gwj20 with SMTP id 20so4407650gwj.13 for ; Tue, 15 Jun 2010 11:03:27 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.225.19 with SMTP id iq19mr3368550qcb.188.1276624520831; Tue, 15 Jun 2010 10:55:20 -0700 (PDT) Received: by 10.229.247.142 with HTTP; Tue, 15 Jun 2010 10:55:20 -0700 (PDT) In-Reply-To: <4C17B8B1.6070205@FreeBSD.org> References: <86mxuxgwgg.fsf@ds4.des.no> <86d3vspr43.fsf@ds4.des.no> <4C17B472.1020305@FreeBSD.org> <4C17B8B1.6070205@FreeBSD.org> Date: Tue, 15 Jun 2010 19:55:20 +0200 Message-ID: From: Alexander Best To: Doug Barton Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 18:03:33 -0000 On Tue, Jun 15, 2010 at 7:30 PM, Doug Barton wrote: > On 06/15/10 10:24, Alexander Best wrote: >> >> `make -V .CURDIR` in /usr/src returns "/usr/src" > > Thanks. Now: > > cd /usr/obj/usr/src > make -V .CURDIR "/usr/obj/usr/src" > > > Doug > > -- > > =A0 =A0 =A0 =A0... and that's just a little bit of history repeating. > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0-- Propellerheads > > =A0 =A0 =A0 =A0Improve the effectiveness of your Internet presence with > =A0 =A0 =A0 =A0a domain name makeover! =A0 =A0http://SupersetSolutions.co= m/ > > --=20 Alexander Best From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 18:10:07 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3B13106566C; Tue, 15 Jun 2010 18:10:07 +0000 (UTC) (envelope-from pyunyh@gmail.com) Received: from mail-px0-f182.google.com (mail-px0-f182.google.com [209.85.212.182]) by mx1.freebsd.org (Postfix) with ESMTP id 597118FC0C; Tue, 15 Jun 2010 18:10:07 +0000 (UTC) Received: by pxi7 with SMTP id 7so4219195pxi.13 for ; Tue, 15 Jun 2010 11:10:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:from:date:to:cc :subject:message-id:reply-to:references:mime-version:content-type :content-disposition:in-reply-to:user-agent; bh=+IB/TdvdbVWT61Cxw87yUS8uf5qfZRyOhvAlJWdLIss=; b=SXsFO6mnDbngYyuUSAuXM1nG/WnD9bx3VjClmQcx9Ij3RptZzdTeLiig/2BzmrUi18 xpIXEsKW1kqaqpI6fdHWnufSdaKwMfXm+urDtWAmsGErfy1r85+oIQHYXZ/5TktbWD74 rEUx8jOyF9kIip/RGf/sb+7ofhIIXztfwnuqw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:date:to:cc:subject:message-id:reply-to:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=dU0k+yndL9r56BmzBjY7P0Xp3U9mI69DoMRMvw4igcq/wD7d4oCSDhUx744ZZghQkK rdacNHWDU5usHQqP5uVmX1Dvx8CHiCuHjbwT3rvDzqlNsQwAEmSCRHIv9vM8amm2magC 8UdmHLJSeYyikkmwQV4re4+k1RtSlutfrl9iU= Received: by 10.141.1.1 with SMTP id d1mr6029412rvi.89.1276625406584; Tue, 15 Jun 2010 11:10:06 -0700 (PDT) Received: from pyunyh@gmail.com ([174.35.1.224]) by mx.google.com with ESMTPS id q10sm6041213rvp.20.2010.06.15.11.10.04 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 15 Jun 2010 11:10:05 -0700 (PDT) Received: by pyunyh@gmail.com (sSMTP sendmail emulation); Tue, 15 Jun 2010 11:09:23 -0700 From: Pyun YongHyeon Date: Tue, 15 Jun 2010 11:09:23 -0700 To: Norikatsu Shigemura Message-ID: <20100615180923.GH4257@michelle.cdnetworks.com> References: <20100613233723.ed2c3a30.nork@FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100613233723.ed2c3a30.nork@FreeBSD.org> User-Agent: Mutt/1.4.2.3i Cc: Kristof Provost , freebsd-arm@freebsd.org, freebsd-current@freebsd.org, yongari@freebsd.org Subject: Re: [OpenRD Ultimate] e1000phy(88E1149/88E1121) has a initialize issue X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: pyunyh@gmail.com List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 18:10:07 -0000 On Sun, Jun 13, 2010 at 11:37:23PM +0900, Norikatsu Shigemura wrote: > Hi yongari! > > I have a OpenRD Ultimate, which has two GbE ports - if_mge(4). But > I couldn't use mge1 like following. So I tried to investigate. > > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > Jun 13 05:02:14 sidearms kernel: mge1: watchdog timeout > Jun 13 05:02:14 sidearms kernel: mge1: Timeout on link-up ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ This part looks like a bug in mge(4). Driver does not know how long it would take to get a valid link. Waiting for valid link in driver initialization does not work(e.g Starting controller without UTP cable may always fail on mge(4)). I think mge(4) should implement correct link state change handling. > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > > I found a initialize issue in e1000phy.c. > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > --- sys/dev/mii/e1000phy.c.orig 2010-05-01 10:17:15.282196000 +0900 > +++ sys/dev/mii/e1000phy.c 2010-06-13 16:19:46.616650536 +0900 > @@ -278,6 +278,7 @@ > case MII_MODEL_MARVELL_E1118: > break; > case MII_MODEL_MARVELL_E1116: > + case MII_MODEL_MARVELL_E1149: > page = PHY_READ(sc, E1000_EADR); > /* Select page 3, LED control register. */ > PHY_WRITE(sc, E1000_EADR, 3); > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > > I confirmed OK on my environment, OpenRD Ultimate has a 88E1121(I > saw it, physically): Once it was there but I removed it due to some other issues seen on Yukon Ultra. That part will program LED access so I guess it wouldn't affect normal network activity. > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > Jun 13 15:20:01 sidearms kernel: miibus0: miibus_probe: ma.mii_id1 = 0x141, ma.mii_id2 = 0xcb3 > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > And I confirmed that MII chipset ID is same as 88E1249. > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > mge0 > Marvell OBIO Memory: > 4043776000-4043784191 > Marvell OBIO IRQ: > 11 > 12 > 13 > 14 > 46 > miibus0 > e1000phy0 pnpinfo oui=0x5043 model=0xb rev=0x3 at phyno=0 > mge1 > Marvell OBIO Memory: > 4043792384-4043800575 > Marvell OBIO IRQ: > 15 > 16 > 17 > 18 > 47 > miibus1 > e1000phy1 pnpinfo oui=0x5043 model=0xb rev=0x3 at phyno=1 > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > > > BTW, I knew same issue on OpenRD Client, it has a 88E1116R, maybe. > Sorry, I don't already have it. I couldn't confirm. > So accordingly my memo: > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > miibus0: ma.mii_id1 = 0x141, ma.mii_id2 = 0xe40 > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > I found many initialize issues on 88E1116R by not existing on > e1000phy.c. Maybe 88E1116 = 88E1116R like following: > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > switch (esc->mii_model) { > case MII_MODEL_MARVELL_E1111: > case MII_MODEL_MARVELL_E1112: > case MII_MODEL_MARVELL_E1116: > + case MII_MODEL_MARVELL_E1116R: > case MII_MODEL_MARVELL_E1118: > case MII_MODEL_MARVELL_E1149: > case MII_MODEL_MARVELL_PHYG65G: > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > But there are many points, I don't know that this modify is right. > 88E1116R might be RGMII variant of 88E1116. Because I don't have controller that has 88E1116R I didn't treat it as 88E1116. With that change could you use straight cable without help of MDI/MDI-X converter? From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 18:27:51 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6763E1065797 for ; Tue, 15 Jun 2010 18:27:51 +0000 (UTC) (envelope-from bsam@ipt.ru) Received: from services.ipt.ru (services.ipt.ru [194.62.233.110]) by mx1.freebsd.org (Postfix) with ESMTP id 1F9E28FC12 for ; Tue, 15 Jun 2010 18:27:50 +0000 (UTC) Received: from [94.233.200.206] (helo=izar) by services.ipt.ru with esmtpa (Exim 4.54 (FreeBSD)) id 1OOarV-000KdF-7L; Tue, 15 Jun 2010 22:27:49 +0400 From: Boris Samorodov To: Tim Kientzle References: <83802150@bb.ipt.ru> <4C159AEB.4030505@freebsd.org> Date: Tue, 15 Jun 2010 22:27:44 +0400 In-Reply-To: <4C159AEB.4030505@freebsd.org> (Tim Kientzle's message of "Sun, 13 Jun 2010 19:58:51 -0700") Message-ID: <64082847@ipt.ru> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: freebsd-current@freebsd.org Subject: Re: [bsdtar] strange compression with ^T command X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 18:27:51 -0000 On Sun, 13 Jun 2010 19:58:51 -0700 Tim Kientzle wrote: > Thanks for the report! This was caused by an > overflow in the compression calculation when the "in" > bytes was larger than the "out" bytes. > I just committed a fix as r209152. Yep, it works. Thanks for the quick fix! > Tim > Boris Samorodov wrote: > > Hi! > > > > ----- > > % uname -a > > FreeBSD host.ipt.ru 9.0-CURRENT FreeBSD 9.0-CURRENT #4 r208799: Fri Jun 4 13:58:47 MSD 2010 bsam@host.ipt.ru:/storage/obj/storage/src/sys/HOST i386 > > > > % make extract > > ===> Vulnerability check disabled, database not found > > ===> License check disabled, port has not defined LICENSE > > ===> Extracting for eric5-5.0.0 > > => No checksum file (/m/home/bsam/shared/FreeBSD/exp/eric5/devel/eric5/distinfo). > > load: 6.85 cmd: bsdtar 68052 [runnable] 131.55r 0.03u 0.30s 0% 2044k > > In: 17512980 bytes, compression 1290122025%; Out: 1502 files, 17509012 bytes > > Current: eric5-5.0.0-RC1/eric/icons/default/drawEraser.png (1172 bytes) > > load: 6.96 cmd: gzip 68051 [pipdwt] 150.90r 0.16u 0.00s 0% 1052k > > In: 24466168 bytes, compression -1782936608%; Out: 1821 files, 24460918 bytes > > Current: eric5-5.0.0-RC1/eric/E5Gui/E5SingleApplication.py (4726 bytes) > > % > > ----- > > > > One can get the file to experiment: > > ----- > > % fetch http://heanet.dl.sourceforge.net/project/eric-ide/eric5/stable/5.0.0-RC1/eric5-5.0.0-RC1.tar.gz > > ----- > > > > Extracted files seems to be OK. -- WBR, Boris Samorodov (bsam) Research Engineer, http://www.ipt.ru Telephone & Internet SP FreeBSD Committer, http://www.FreeBSD.org The Power To Serve From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 18:32:07 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AB77A1065674; Tue, 15 Jun 2010 18:32:07 +0000 (UTC) (envelope-from r.c.ladan@gmail.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id A5B888FC1B; Tue, 15 Jun 2010 18:32:06 +0000 (UTC) Received: by wyb34 with SMTP id 34so1698740wyb.13 for ; Tue, 15 Jun 2010 11:32:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :organization:user-agent:mime-version:to:cc:subject:references :in-reply-to:x-enigmail-version:content-type :content-transfer-encoding; bh=CVLqg0z0CHHzkpfUJ6qpmLEb+0PQ+2G1qmFDI/oL5E0=; b=BDB10as36ArFQbx/EeoniWla3PuN0emHrTA1qn9puZ90hvdySLVslYp3hIdSthVBgP nvJFYYHp253k9aVyyso8yAYu48arkyF3H/Vy+nxasFNVix0bj4n7vHSAu3mi2AzJaFHP LzX05dqKzOfw28YjKOdlaK9cumtdlPyR6G+sg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:organization:user-agent:mime-version:to :cc:subject:references:in-reply-to:x-enigmail-version:content-type :content-transfer-encoding; b=K8spxamGi6UCnEL4uzZrXB5Cu0b+G3loUEIUf98KtU01jnZxmu3kK2DcyEEF3O6K9m J7kyekdLW6Xy38T/szEGg+APg8Sr/JId5FdnoOLy9TmTZ8RuJZKAUQ9HhWUs8NLiNhaZ TzNUkmPAiL8wsDU7nmHGRl1ObtQUHiYbbk1gU= Received: by 10.227.135.204 with SMTP id o12mr7516820wbt.97.1276626725517; Tue, 15 Jun 2010 11:32:05 -0700 (PDT) Received: from acer.rene-ladan.nl (ip4da3ae31.direct-adsl.nl [77.163.174.49]) by mx.google.com with ESMTPS id t15sm9548284wbc.17.2010.06.15.11.32.01 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 15 Jun 2010 11:32:03 -0700 (PDT) Sender: =?UTF-8?Q?Ren=C3=A9_Ladan?= Message-ID: <4C17C71E.3060905@freebsd.org> Date: Tue, 15 Jun 2010 20:31:58 +0200 From: Rene Ladan Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; nl-NL; rv:1.9.1.9) Gecko/20100612 Thunderbird/3.0.4 MIME-Version: 1.0 To: Christian Zander References: <4C15A09B.8080501@FreeBSD.org> <201006140848.55979.jhb@freebsd.org> <4C169F5B.7040409@gmail.com> <20100614213122.GS28855@wolf.nvidia.com> In-Reply-To: <20100614213122.GS28855@wolf.nvidia.com> X-Enigmail-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Christian Zander , Doug Barton , "alc@freebsd.org" , Alan Cox , "freebsd-current@freebsd.org" Subject: Re: nvidia-driver 195.22 use horribly broken on amd64 between r206173 and X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 18:32:07 -0000 On 14-06-2010 23:31, Christian Zander wrote: > On Mon, Jun 14, 2010 at 02:30:03PM -0700, Rene Ladan wrote: > (...) >>>>>>> I've asked the driver author if the calls to vm_page_wire() and >>>>>>> vm_page_unwire() can simply be removed but have not heard back yet. >>>>>>> >>>>>> >>>>>> Is there any news on this? I have updated to the latest current so I'm >>>>>> running the nv driver now, but I'd like to get the nvidia driver running >>>>>> again. >>>>>> >>>>>> >>>>> Yes, the unnecessary (and now problematic) wiring and unwiring calls will >>> be >>>>> removed in a future release of the driver. >>>> >>>> Excellent! Any ETA? Or are there patches against an existing version of >>>> the driver? >>> >>> I would just remove the calls to vm_page_wire() and vm_page_unwire() along >>> with the immediately adjacent calls to vm_page_{un,}lock_queues(). >>> >> Just to confirm, like the attached patch? >> > > Yes. > >> This is with a GeForce GT 240M, current/amd64 r209035, nvidia-driver >> 195.36.15 >> >> I haven't runtime-tested it yet... > Using the above configuration, X still locks up but now after showing the NVIDIA splash screen. Without the patch it locks up before that point. Pinging the computer doesn't work anymore, no panic or logs, a hard reset is required. Would disabling DRI and/or Accel in xorg.conf or updating the driver / operating system somehow help? Rene -- http://www.rene-ladan.nl/ GPG fingerprint = ADBC ECCD EB5F A6B4 549F 600D 8C9E 647A E564 2BFC (subkeys.pgp.net) From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 18:37:15 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 201001065677 for ; Tue, 15 Jun 2010 18:37:15 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id D3E2A8FC1A for ; Tue, 15 Jun 2010 18:37:14 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id BEF231FFC33; Tue, 15 Jun 2010 18:37:13 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id 6005584492; Tue, 15 Jun 2010 20:35:03 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Alexander Best References: <86mxuxgwgg.fsf@ds4.des.no> <86d3vspr43.fsf@ds4.des.no> Date: Tue, 15 Jun 2010 20:35:02 +0200 In-Reply-To: (Alexander Best's message of "Tue, 15 Jun 2010 13:11:31 +0200") Message-ID: <86bpbc5ell.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.95 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 18:37:15 -0000 Alexander Best writes: > sorry. i didn't mean to affend you. doug barton already pointed out > that what i had in my make.conf beforehand won't work unless /usr/src > and /usr/obj are literal directories in /usr [1]. The problem is that "/usr/src/" is not a prefix of "/usr/src". DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 20:01:51 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1B1AC106564A; Tue, 15 Jun 2010 20:01:51 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id 9ED7E8FC14; Tue, 15 Jun 2010 20:01:50 +0000 (UTC) Received: from mail-gy0-f182.google.com (mail-gy0-f182.google.com [209.85.160.182]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id 7C90EBF403; Tue, 15 Jun 2010 22:01:47 +0200 (CEST) Received: by gyh20 with SMTP id 20so4540260gyh.13 for ; Tue, 15 Jun 2010 13:01:45 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.218.21 with SMTP id ho21mr3449906qcb.102.1276632104876; Tue, 15 Jun 2010 13:01:44 -0700 (PDT) Received: by 10.229.247.142 with HTTP; Tue, 15 Jun 2010 13:01:44 -0700 (PDT) In-Reply-To: References: <4C17BB76.6020702@FreeBSD.org> Date: Tue, 15 Jun 2010 22:01:44 +0200 Message-ID: From: Alexander Best To: Gabor Kovesdan Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 20:01:51 -0000 On Tue, Jun 15, 2010 at 7:56 PM, Alexander Best wrote: > On Tue, Jun 15, 2010 at 7:42 PM, Gabor Kovesdan wrote= : >> >>> /usr/src/lib/libc/iconv/citrus_none.c: In function >>> '_citrus_NONE_stdenc_cstomb': >>> /usr/src/lib/libc/iconv/citrus_none.c:114: warning: unused variable 're= t' >>> *** Error code 1 >>> >> >> I'm sorry, this one slipped in. Today I've checked the sources with clan= g >> and fixed some minor warnings, including this one. The new patch is here= : >> http://www.kovesdan.org/patches/iconv_base_integrate2.diff >> >> And a gzipped version: >> http://www.kovesdan.org/patches/iconv_base_integrate2.diff.gz > > thanks. i'll revert the previous patch and apply this new one. with the new patch: =3D=3D=3D> lib/libiconv_modules (all) =3D=3D=3D> lib/libiconv_modules/BIG5 (all) cc -fpic -DPIC -O2 -pipe -fno-strict-aliasing -funroll-loops -march=3Dnative --param max-inline-insns-single=3D32 -I/usr/src/lib/libiconv_modules/BIG5/../../libc/iconv -g -std=3Dgnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls -Wold-style-definition -Wno-pointer-sign -c /usr/src/lib/libiconv_modules/BIG5/citrus_big5.c -o citrus_big5.So cc1: warnings being treated as errors /usr/src/lib/libiconv_modules/BIG5/../../libc/iconv/citrus_stdenc_template.= h: In function '_citrus_BIG5_stdenc_cstomb': /usr/src/lib/libiconv_modules/BIG5/../../libc/iconv/citrus_stdenc_template.= h:138: warning: 'ret' may be used uninitialized in this function *** Error code 1 Stop in /usr/src/lib/libiconv_modules/BIG5. *** Error code 1 Stop in /usr/src/lib/libiconv_modules. *** Error code 1 Stop in /usr/src/lib. *** Error code 1 Stop in /usr/src. *** Error code 1 Stop in /usr/src. *** Error code 1 Stop in /usr/src. *** Error code 1 Stop in /usr/src. > > cheers. > alex > >> >> -- >> Gabor Kovesdan >> FreeBSD Volunteer >> >> EMAIL: gabor@FreeBSD.org .:|:. gabor@kovesdan.org >> WEB: =A0 http://people.FreeBSD.org/~gabor .:|:. http://kovesdan.org >> >> > > > > -- > Alexander Best > --=20 Alexander Best From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 20:10:49 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C12FA1065670 for ; Tue, 15 Jun 2010 20:10:49 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id 6930B8FC1E for ; Tue, 15 Jun 2010 20:10:49 +0000 (UTC) Received: from mail-qy0-f182.google.com (mail-qy0-f182.google.com [209.85.216.182]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id 3A392BF410 for ; Tue, 15 Jun 2010 22:10:48 +0200 (CEST) Received: by qyk11 with SMTP id 11so1012127qyk.13 for ; Tue, 15 Jun 2010 13:10:46 -0700 (PDT) MIME-Version: 1.0 Received: by 10.224.66.30 with SMTP id l30mr3592378qai.381.1276632646782; Tue, 15 Jun 2010 13:10:46 -0700 (PDT) Received: by 10.229.247.142 with HTTP; Tue, 15 Jun 2010 13:10:46 -0700 (PDT) In-Reply-To: <86bpbc5ell.fsf@ds4.des.no> References: <86mxuxgwgg.fsf@ds4.des.no> <86d3vspr43.fsf@ds4.des.no> <86bpbc5ell.fsf@ds4.des.no> Date: Tue, 15 Jun 2010 22:10:46 +0200 Message-ID: From: Alexander Best To: =?ISO-8859-1?Q?Dag=2DErling_Sm=F8rgrav?= Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 20:10:49 -0000 2010/6/15 Dag-Erling Sm=F8rgrav : > Alexander Best writes: >> sorry. i didn't mean to affend you. doug barton already pointed out >> that what i had in my make.conf beforehand won't work unless /usr/src >> and /usr/obj are literal directories in /usr [1]. > > The problem is that "/usr/src/" is not a prefix of "/usr/src". ah i see. would something like empty(.CURDIR:M/usr/src*) instead of empty(.CURDIR:M/usr/src/*) work? alex > > DES > -- > Dag-Erling Sm=F8rgrav - des@des.no > --=20 Alexander Best From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 20:19:27 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5ABE1065672 for ; Tue, 15 Jun 2010 20:19:27 +0000 (UTC) (envelope-from ganbold@gmail.com) Received: from mail-pv0-f182.google.com (mail-pv0-f182.google.com [74.125.83.182]) by mx1.freebsd.org (Postfix) with ESMTP id 68C168FC13 for ; Tue, 15 Jun 2010 20:19:27 +0000 (UTC) Received: by pvg2 with SMTP id 2so395892pvg.13 for ; Tue, 15 Jun 2010 13:19:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; bh=prLuekubBf2PD9j9/SXDJXLh4NFC14C9m87NqSOlQ44=; b=LkGdnkd5hg1/lZ0zmREWdOsx8XXhN7umoc42Ksp9hs0dc4LYfUFRpgU+AEExnBzkNm BzcX8j4RfvZtBDeZuzmyBt40zqbQSSdmK1xQFxAjWUxor0ACB1bOcpFA+OKyqgXpQuuy e3nhh6rmi8+nMwHocMcM/qg438BZoxjDAejfo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=DjGYgMzkkTrwXefpimyp5qPyksmvhp893fCwsxSZMUPYtli3F6BsCa9UB7yCntWjWu /peib3Vxh9lI3fs530jnvE9ak2jj+kId+LusKcWI+9ALnWMA/u4ElSbwYFcGDIhPnv4E XvDUyefDdqU4JeBo/S8ew/FeQJOKjaAqDr02U= Received: by 10.115.28.1 with SMTP id f1mr6165722waj.181.1276633166952; Tue, 15 Jun 2010 13:19:26 -0700 (PDT) Received: from beastie.micom.mng.net ([202.179.21.129]) by mx.google.com with ESMTPS id d16sm41272669wam.12.2010.06.15.13.19.22 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 15 Jun 2010 13:19:25 -0700 (PDT) Message-ID: <4C17E047.9020700@gmail.com> Date: Wed, 16 Jun 2010 04:19:19 +0800 From: Ganbold User-Agent: Thunderbird 2.0.0.23 (X11/20091011) MIME-Version: 1.0 To: PseudoCylon References: <16641.96608.qm@web51806.mail.re2.yahoo.com> <4BA38B26.6050208@micom.mng.net> <989377.89740.qm@web51802.mail.re2.yahoo.com> <4BAE01AC.7000509@gmail.com> <623907.37074.qm@web51803.mail.re2.yahoo.com> <4BB3575D.4040506@gmail.com> <87836.79143.qm@web51804.mail.re2.yahoo.com> <4BBB372C.1060302@gmail.com> <665283.95271.qm@web51802.mail.re2.yahoo.com> <4BBDEC8F.9050803@gmail.com> <490521.32714.qm@web51804.mail.re2.yahoo.com> <4BD307DE.5080507@gmail.com> <332448.8676.qm@web51801.mail.re2.yahoo.com> <4BD3F2D4.8000007@gmail.com> <702632.81988.qm@web51803.mail.re2.yahoo.com> <4BDEE393.4080206@gmail.com> <660085.11669.qm@web51802.mail.re2.yahoo.com> <4BFD4806.8070001@gmail.com> <618770.37649.qm@web51807.mail.re2.yahoo.com> <4C0FAEA2.7010204@gmail.com> <94007.38072.qm@web51807.mail.re2.yahoo.com> <4C11188A.1040002@gmail.com> <447555.80295.qm@web51803.mail.re2.yahoo.com> <4C16499A.3050808@gmail.com> <337427.44900.qm@web51804.mail.re2.yahoo.com> In-Reply-To: <337427.44900.qm@web51804.mail.re2.yahoo.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Ganbold Tsagaankhuu , freebsd-current@freebsd.org Subject: Re: CALL for TEST [HOSTAP] run(4) ralink usb wireless X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 20:19:27 -0000 AK-san, PseudoCylon wrote: >>>> From: Ganbold >>>> To: PseudoCylon >>>> Cc: freebsd-current@freebsd.org; Ganbold Tsagaankhuu >>>> Sent: Thu, June 10, 2010 10:53:30 AM >>>> Subject: Re: CALL for TEST [HOSTAP] run(4) ralink usb wireless >>>> >>>> It seems like it is running without any problem so far, no more adsl >>>> modem problem. >>>> I can see arp packets in wlan0 interface as well as in macbook. >>>> I will continue testing and let you know if there comes any problem. >>>> >>>> thanks again, >>>> >>>> Ganbold >>>> >>>> >>> Hello, >>> >>> Glad to hear. It was an encryption problem. A client was dropping packets.. >>> >>> Please let me know if you find another bug. (Hope there won't be) >>> >>> >> Well, looks like I was too fast :( >> >> It seems like client is not receiving any arp packets when rspro doesn't >> first initiate ping (maybe arp request) to client. >> If I first ping to client from rspro, later on arp packets can be seen >> on client. >> When I ping from rspro to client, response is very different: >> >> # arp -a >> ? (192.168.1.43) at 8e:fd:59:d6:3a:50 on bridge0 permanent [bridge] >> ? (192.168.1.42) at 00:22:cf:03:e0:30 on wlan0 permanent [ethernet] >> ? (192.168.1.41) at 00:15:6d:c1:c7:77 on arge0 permanent [ethernet] >> ? (192.168.1.1) at 00:30:54:62:3d:24 on arge0 expires in 1200 seconds >> [ethernet] >> ? (192.168.1.7) at 00:1c:25:9d:36:1d on arge0 expires in 824 seconds >> [ethernet] >> # ping 192.168.1.50 >> PING 192.168.1.50 (192.168.1.50): 56 data bytes >> 64 bytes from 192.168.1.50: icmp_seq=0 ttl=64 time=2.694 ms >> 64 bytes from 192.168.1.50: icmp_seq=1 ttl=64 time=302.177 ms >> 64 bytes from 192.168.1.50: icmp_seq=2 ttl=64 time=1.041 ms >> 64 bytes from 192.168.1.50: icmp_seq=4 ttl=64 time=5234.417 ms >> 64 bytes from 192.168.1.50: icmp_seq=5 ttl=64 time=4225.060 ms >> 64 bytes from 192.168.1.50: icmp_seq=6 ttl=64 time=3214.908 ms >> 64 bytes from 192.168.1.50: icmp_seq=7 ttl=64 time=2207.241 ms >> 64 bytes from 192.168.1.50: icmp_seq=8 ttl=64 time=1197.061 ms >> 64 bytes from 192.168.1.50: icmp_seq=9 ttl=64 time=186.833 ms >> ^C >> --- 192.168.1.50 ping statistics --- >> 11 packets transmitted, 9 packets received, 18.2% packet loss >> round-trip min/avg/max/stddev = 1.041/1841.270/5234.417/1870.962 ms >> # arp -a >> ? (192.168.1.43) at 8e:fd:59:d6:3a:50 on bridge0 permanent [bridge] >> ? (192.168.1.42) at 00:22:cf:03:e0:30 on wlan0 permanent [ethernet] >> ? (192.168.1.41) at 00:15:6d:c1:c7:77 on arge0 permanent [ethernet] >> ? (192.168.1.1) at 00:30:54:62:3d:24 on arge0 expires in 1183 seconds >> [ethernet] >> ? (192.168.1.7) at 00:1c:25:9d:36:1d on arge0 expires in 805 seconds >> [ethernet] >> ? (192.168.1.50) at 00:26:bb:17:f6:61 on arge0 expires in 1186 seconds >> [ethernet] >> # ping 192.168.1.50 >> PING 192.168.1.50 (192.168.1.50): 56 data bytes >> 64 bytes from 192.168.1.50: icmp_seq=2 ttl=64 time=1590.035 ms >> 64 bytes from 192.168.1.50: icmp_seq=3 ttl=64 time=580.201 ms >> 64 bytes from 192.168.1.50: icmp_seq=4 ttl=64 time=528.019 ms >> ^C >> --- 192.168.1.50 ping statistics --- >> 5 packets transmitted, 3 packets received, 40.0% packet loss >> round-trip min/avg/max/stddev = 528.019/899.418/1590.035/488.804 ms >> >> > > Well, the patch is working (sort of). Old driver wouldn't let you ping anywhere. > > Replies are taking awfully long. One of them took 5 sec. This could be a different issue. > > Can you try a few thing? (Unfortunately, everything is working on my side.) > * Before ping from rspro, does ping from macbook to 192.168.1.42 (wlan0) work? > Just tested again, it doesn't work from macbook. > * If you give IP address to only bridge0, does it make any difference? > It makes no difference. Ganbold > * Does it make any difference if use rspro without 192.168.1.7 (if possible)? > > wlandebug doesn't work on macbook, does it? > > Can you show me your hostapd.conf (minus password, of course). I'll try with the same config. > > And, if you ping from macbook, would it take that long? > > > AK > > >> Any idea? >> >> thanks, >> >> Ganbold >> > > > > > -- Optimist, n.: A bagpiper with a beeper. From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 20:29:03 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BCD22106566C for ; Tue, 15 Jun 2010 20:29:03 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from server.mypc.hu (server.mypc.hu [87.229.73.95]) by mx1.freebsd.org (Postfix) with ESMTP id 7433B8FC17 for ; Tue, 15 Jun 2010 20:29:03 +0000 (UTC) Received: from server.mypc.hu (localhost [127.0.0.1]) by server.mypc.hu (Postfix) with ESMTP id 91FDA14DBB32; Tue, 15 Jun 2010 22:29:01 +0200 (CEST) X-Virus-Scanned: amavisd-new at server.mypc.hu Received: from server.mypc.hu ([127.0.0.1]) by server.mypc.hu (server.mypc.hu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id g3lNn0YK0sDJ; Tue, 15 Jun 2010 22:28:59 +0200 (CEST) Received: from [192.168.1.105] (catv-80-99-92-167.catv.broadband.hu [80.99.92.167]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by server.mypc.hu (Postfix) with ESMTPSA id E2CA614DB9B6; Tue, 15 Jun 2010 22:28:58 +0200 (CEST) Message-ID: <4C17E287.8060703@FreeBSD.org> Date: Tue, 15 Jun 2010 22:28:55 +0200 From: Gabor Kovesdan User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.2; es-ES; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: Alexander Best References: <4C17BB76.6020702@FreeBSD.org> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-current@freebsd.org Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 20:29:03 -0000 > > cc1: warnings being treated as errors > /usr/src/lib/libiconv_modules/BIG5/../../libc/iconv/citrus_stdenc_template.h: > In function '_citrus_BIG5_stdenc_cstomb': > /usr/src/lib/libiconv_modules/BIG5/../../libc/iconv/citrus_stdenc_template.h:138: > warning: 'ret' may be used uninitialized in this function > Eeh. I'm sorry, I'll look at it tomorrow. For now you can use WERROR="" and CWARNFLAGS="" to test, actually it was what I used that's why I couldn't catch this. I had the same problem with some code that was not mine so I just set it. I don't know why I'm having that, tohugh, I also have that with a clean unpatched src tree and I'm not using any CFLAGS tweak or such. If you haven't done make clean yet, you can resume the build with: make buildworld -DNO_CLEAN WERROR="" CWARNFLAGS="" -- Gabor Kovesdan FreeBSD Volunteer EMAIL: gabor@FreeBSD.org .:|:. gabor@kovesdan.org WEB: http://people.FreeBSD.org/~gabor .:|:. http://kovesdan.org From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 21:13:08 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D81C7106567D for ; Tue, 15 Jun 2010 21:13:08 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 97D0D8FC21 for ; Tue, 15 Jun 2010 21:13:08 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 6AB311FFC35; Tue, 15 Jun 2010 21:13:07 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id 38622844A3; Tue, 15 Jun 2010 23:10:57 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Alexander Best References: <86mxuxgwgg.fsf@ds4.des.no> <86d3vspr43.fsf@ds4.des.no> <86bpbc5ell.fsf@ds4.des.no> Date: Tue, 15 Jun 2010 23:10:56 +0200 In-Reply-To: (Alexander Best's message of "Tue, 15 Jun 2010 22:10:46 +0200") Message-ID: <864oh42e8v.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.95 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 21:13:08 -0000 Alexander Best writes: > Dag-Erling Sm=C3=B8rgrav writes: > > The problem is that "/usr/src/" is not a prefix of "/usr/src". > ah i see. would something like > > empty(.CURDIR:M/usr/src*) instead of empty(.aCURDIR:M/usr/src/*) work? I think so. My hypothesis is that CC, CXX etc. were set in the top-level Makefile and inherited by sub-makes. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-freebsd-current@FreeBSD.ORG Tue Jun 15 23:05:53 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 243281065672; Tue, 15 Jun 2010 23:05:53 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-bw0-f54.google.com (mail-bw0-f54.google.com [209.85.214.54]) by mx1.freebsd.org (Postfix) with ESMTP id 7126C8FC17; Tue, 15 Jun 2010 23:05:52 +0000 (UTC) Received: by bwz8 with SMTP id 8so463373bwz.13 for ; Tue, 15 Jun 2010 16:05:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:references :date:in-reply-to:message-id:user-agent:mime-version:content-type; bh=+uG5gWRu7IoPXXwvJnsypzT0f3RdNNU4OVRqiQvySH8=; b=LAVOZ+CoT19s/WXS1zN1TddiXAb38q0NyTo7gjsj1788EooKejxR/YYrsJ8tLwQcFA FGhPURJ5XEDVPAb6T9ZWflZQfsHR9m0zdl+WG3AXfVqO4spr6tMXBE0a5ggRFTn7f+Nh ZVgVamktGByR/UU98uT+ke6CaljT3o8xFYr+g= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; b=pszxJUZgWHgSCyDFQrbMNopTtT7ltq3qyR5sMD0r49ajnyYpdmWOFomw1fPGJLcEB1 IXMkDprYqAA4AddyWaYic4YEXDqa1chyAfzhzLkUsuZkwL4hralPSKzKWzwow7lqTpQd 3OUPTzkwchHQyNhRTOdJu2Ir4v1dOn37L1gYw= Received: by 10.204.84.18 with SMTP id h18mr6011453bkl.13.1276643151158; Tue, 15 Jun 2010 16:05:51 -0700 (PDT) Received: from localhost (tor.anonymizer.ccc.de [217.114.211.20]) by mx.google.com with ESMTPS id f13sm26476308bka.5.2010.06.15.16.05.48 (version=SSLv3 cipher=RC4-MD5); Tue, 15 Jun 2010 16:05:50 -0700 (PDT) From: Anonymous To: Gabor Kovesdan References: <4C16C5B5.1070308@FreeBSD.org> Date: Wed, 16 Jun 2010 03:05:36 +0400 In-Reply-To: <4C16C5B5.1070308@FreeBSD.org> (Gabor Kovesdan's message of "Tue, 15 Jun 2010 02:13:41 +0200") Message-ID: <867hlzq4lb.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: FreeBSD Current Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2010 23:05:53 -0000 Gabor Kovesdan writes: [...] > Any comments, suggestions or bugreports are very welcome. Does it respect lib32? $ iconv -f ascii iconv: iconv_open(UTF-8, ascii): Invalid argument /usr/lib/i18n/libiconv_std.so.4: unsupported file layoutzsh: exit 1 iconv -f ascii $ file /usr/lib/i18n/libiconv_std.so.4 /usr/lib/i18n/libiconv_std.so.4: ELF 32-bit LSB shared object, Intel 80386, version 1 (FreeBSD), dynamically linked, stripped $ uname -vm FreeBSD 9.0-CURRENT #0 r209191=1463b20-dirty: Tue Jun 15 04:59:40 UTC 2010 holo@raphael.local:/a/objdir/a/dirty_build/sys/PHOENIX amd64 From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 01:14:12 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AFA52106566B for ; Wed, 16 Jun 2010 01:14:12 +0000 (UTC) (envelope-from jamesbrandongooch@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 79E688FC0C for ; Wed, 16 Jun 2010 01:14:12 +0000 (UTC) Received: by iwn7 with SMTP id 7so7213723iwn.13 for ; Tue, 15 Jun 2010 18:14:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:date:message-id :subject:from:to:cc:content-type; bh=uYLX0Lq/HbyDh2rBtpubFb5NtFKhIkfsx3eIcbzjZY4=; b=Ew8QjW67b6XNoKbY7smuqz92MEaFupiUHPqsliOQcI9oIXRpOJ30BX3N+ZZZ3QhJXb CA7/empGEoM+u2L9CrKnILD+yrZqGbllWJy9ommlhaYeKVoIMOU/803Bfa5RbcntH4By IOfoPhweP7JeUEP1UJjfVJgAC7ZFPfwHYpy90= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=dia5tVegmAF9FoX3+L+dxL/tId1zppfTaZIZ8iWAvNEExA698iDbp/snRkVe0zHvna lpwbDfrwaorv4Ymtt16zuPOHp03EvIqYsT7+CmFDBBWslX91wmqObLO493TqPVk8vSru lYYCemidpEhSZ+A0oiyp5Iei7e79Aw0t/MdFY= MIME-Version: 1.0 Received: by 10.231.149.145 with SMTP id t17mr9099636ibv.25.1276650851810; Tue, 15 Jun 2010 18:14:11 -0700 (PDT) Received: by 10.231.182.212 with HTTP; Tue, 15 Jun 2010 18:14:11 -0700 (PDT) Date: Tue, 15 Jun 2010 20:14:11 -0500 Message-ID: From: Brandon Gooch To: jilles@stack.nl Content-Type: text/plain; charset=ISO-8859-1 Cc: FreeBSD Current Subject: [MFC REQUEST] Filename completion in sh(1) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 01:14:12 -0000 I discovered a few moments ago that filename completion had been committed to HEAD[1]!!! This is a (seemingly) small, yet VERY useful addition, and, of course I'm so grateful to Guy Yur and Jilles for getting this into the tree :) I would like to make an "official" request that this feature be MFC'd to 8-STABLE as soon as reasonably possible. Again, my thanks to you both for your work! -Brandon [1] http://svn.freebsd.org/viewvc/base?view=revision&revision=209221 From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 02:00:49 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33EE41065677 for ; Wed, 16 Jun 2010 02:00:49 +0000 (UTC) (envelope-from jhellenthal@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id C8CAF8FC17 for ; Wed, 16 Jun 2010 02:00:48 +0000 (UTC) Received: by iwn7 with SMTP id 7so7258687iwn.13 for ; Tue, 15 Jun 2010 19:00:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :x-enigmail-version:openpgp:content-type; bh=a1m1K09ZUUmIInWk/rbreS5qVuSIKAZJHtLeU33q9rk=; b=r6xYfNR5tW9YXBE2cf0HsZ3MKsonT3/IL06MIuJnOSksKYcN8oO5IZxk/BqsYxC5XT f3WYWIQ8/VQBrwZYCD98fRvR8NKcOjl3xV5skb1yUoVacTFVqyvLU08Lh716JPLskh7R IKYgZoStXmZE/2tI6mB+SlQ0nHi7SI8imqbes= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:openpgp:content-type; b=CJEVogyWnS55b/1MJAXu+we17oEmnqKhISc3zWHDTdo47F5+xjXWs2Tw35t/WeWaEs sNs+devIpThKzkVfZ8QeJizTLSjZk3AziTR+AmBGTUga/anVFaQTkV1MA7tpCfG5/+6S 2zEEzqYftMR0i7Ch70AZied81ahlsRQNT2i48= Received: by 10.231.120.150 with SMTP id d22mr8767254ibr.91.1276653647765; Tue, 15 Jun 2010 19:00:47 -0700 (PDT) Received: from centel.dataix.local (adsl-99-181-128-180.dsl.klmzmi.sbcglobal.net [99.181.128.180]) by mx.google.com with ESMTPS id d9sm28634669ibl.10.2010.06.15.19.00.43 (version=SSLv3 cipher=RC4-MD5); Tue, 15 Jun 2010 19:00:45 -0700 (PDT) Sender: "J. Hellenthal" Message-ID: <4C18304A.1080601@dataix.net> Date: Tue, 15 Jun 2010 22:00:42 -0400 From: jhell User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100515 Thunderbird MIME-Version: 1.0 To: Brandon Gooch References: In-Reply-To: X-Enigmail-Version: 1.0.1 OpenPGP: id=89D8547E Content-Type: multipart/mixed; boundary="------------070902070808000600040206" Cc: FreeBSD Current , jilles@stack.nl Subject: Re: [MFC REQUEST] Filename completion in sh(1) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 02:00:49 -0000 This is a multi-part message in MIME format. --------------070902070808000600040206 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 06/15/2010 21:14, Brandon Gooch wrote: > I discovered a few moments ago that filename completion had been > committed to HEAD[1]!!! > > This is a (seemingly) small, yet VERY useful addition, and, of course > I'm so grateful to Guy Yur and Jilles for getting this into the tree > :) > > I would like to make an "official" request that this feature be MFC'd > to 8-STABLE as soon as reasonably possible. > > Again, my thanks to you both for your work! > > -Brandon > > [1] http://svn.freebsd.org/viewvc/base?view=revision&revision=209221 Here is a diff from stable/8/bin/sh r209146 -> head/bin/sh. This is quite a large difference among the two with the following diffstats. 44 files changed, 1214 insertions(+), 728 deletions(-) This is untested, use at your own risk. - -- jhell -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iQEcBAEBAgAGBQJMGDBJAAoJEJBXh4mJ2FR+4+EH/1sx2c8dtM88coO61h8BJ6DA lbE/RMgU9mB76kOpNmMb1K8W8wqXP8PpADG5lFkZSH3UWS4qlymkDm2t0TYeDoK7 LT+UOCRjIliefJMlRU45GpvCrf34hSOeP9dsmD6mE+QnXOKRgwhbi7uHZlW1SYfz w45Ft7ZxIblBVwGdsPrzEdqPQ6y1oaIrU4j/RPSabUJWFhdc+Z3YRpYMVFiuqOW+ mKg0f3H2XkkfaIai9TNugmsRX3BBu9GiGkrp57OV4mAVkgQLlaO9/uErStBAholn qMH0UhqvJ7a/Yy0gH9mJFIDOqHnTzraSTJ8YVKn9finv27GSKk+qgpFGIqZAMOk= =2E/M -----END PGP SIGNATURE----- --------------070902070808000600040206 Content-Type: text/x-patch; name="head-sh.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="head-sh.diff" Index: memalloc.h =================================================================== --- memalloc.h (.../stable/8/bin/sh) (revision 209225) +++ memalloc.h (.../head/bin/sh) (revision 209225) @@ -51,7 +51,7 @@ pointer ckmalloc(size_t); pointer ckrealloc(pointer, int); void ckfree(pointer); -char *savestr(char *); +char *savestr(const char *); pointer stalloc(int); void stunalloc(pointer); void setstackmark(struct stackmark *); Index: alias.h =================================================================== --- alias.h (.../stable/8/bin/sh) (revision 209225) +++ alias.h (.../head/bin/sh) (revision 209225) @@ -42,7 +42,7 @@ int flag; }; -struct alias *lookupalias(char *, int); +struct alias *lookupalias(const char *, int); int aliascmd(int, char **); int unaliascmd(int, char **); void rmaliases(void); Index: mkbuiltins =================================================================== --- mkbuiltins (.../stable/8/bin/sh) (revision 209225) +++ mkbuiltins (.../head/bin/sh) (revision 209225) @@ -88,7 +88,7 @@ awk '{ printf "#define %s %d\n", $1, NR-1}' echo ' struct builtincmd { - char *name; + const char *name; int code; int special; }; Index: options.h =================================================================== --- options.h (.../stable/8/bin/sh) (revision 209225) +++ options.h (.../head/bin/sh) (revision 209225) @@ -102,7 +102,7 @@ extern struct shparam shellparam; /* $@ */ extern char **argptr; /* argument list for builtin commands */ extern char *shoptarg; /* set by nextopt */ -extern char *optptr; /* used by nextopt */ +extern char *nextopt_optptr; /* used by nextopt */ void procargs(int, char **); void optschanged(void); @@ -111,5 +111,5 @@ int shiftcmd(int, char **); int setcmd(int, char **); int getoptscmd(int, char **); -int nextopt(char *); +int nextopt(const char *); void getoptsreset(const char *); Index: output.c =================================================================== --- output.c (.../stable/8/bin/sh) (revision 209225) +++ output.c (.../head/bin/sh) (revision 209225) @@ -71,7 +71,7 @@ static int doformat_wr(void *, const char *, int); struct output output = {NULL, 0, NULL, OUTBUFSIZ, 1, 0}; -struct output errout = {NULL, 0, NULL, 100, 2, 0}; +struct output errout = {NULL, 0, NULL, 256, 2, 0}; struct output memout = {NULL, 0, NULL, 0, MEM_OUT, 0}; struct output *out1 = &output; struct output *out2 = &errout; @@ -124,8 +124,6 @@ { while (*p) outc(*p++, file); - if (file == out2) - flushout(file); } /* Like outstr(), but quote for re-input into the shell. */ @@ -255,7 +253,7 @@ } void -dprintf(const char *fmt, ...) +out2fmt_flush(const char *fmt, ...) { va_list ap; @@ -316,7 +314,7 @@ */ int -xwrite(int fd, char *buf, int nbytes) +xwrite(int fd, const char *buf, int nbytes) { int ntry; int i; Index: parser.h =================================================================== --- parser.h (.../stable/8/bin/sh) (revision 209225) +++ parser.h (.../head/bin/sh) (revision 209225) @@ -73,9 +73,10 @@ extern int tokpushback; #define NEOF ((union node *)&tokpushback) extern int whichprompt; /* 1 == PS1, 2 == PS2 */ +extern const char *const parsekwd[]; union node *parsecmd(int); void fixredir(union node *, const char *, int); -int goodname(char *); +int goodname(const char *); char *getprompt(void *); Index: output.h =================================================================== --- output.h (.../stable/8/bin/sh) (revision 209225) +++ output.h (.../head/bin/sh) (revision 209225) @@ -46,13 +46,13 @@ short flags; }; -extern struct output output; -extern struct output errout; +extern struct output output; /* to fd 1 */ +extern struct output errout; /* to fd 2 */ extern struct output memout; -extern struct output *out1; -extern struct output *out2; +extern struct output *out1; /* &memout if backquote, otherwise &output */ +extern struct output *out2; /* &memout if backquote with 2>&1, otherwise + &errout */ -void open_mem(char *, int, struct output *); void out1str(const char *); void out1qstr(const char *); void out2str(const char *); @@ -65,10 +65,10 @@ void freestdout(void); void outfmt(struct output *, const char *, ...) __printflike(2, 3); void out1fmt(const char *, ...) __printflike(1, 2); -void dprintf(const char *, ...) __printflike(1, 2); +void out2fmt_flush(const char *, ...) __printflike(1, 2); void fmtstr(char *, int, const char *, ...) __printflike(3, 4); void doformat(struct output *, const char *, va_list) __printflike(2, 0); -int xwrite(int, char *, int); +int xwrite(int, const char *, int); #define outc(c, file) (--(file)->nleft < 0? (emptyoutbuf(file), *(file)->nextc++ = (c)) : (*(file)->nextc++ = (c))) #define out1c(c) outc(c, out1); Index: mystring.c =================================================================== --- mystring.c (.../stable/8/bin/sh) (revision 209225) +++ mystring.c (.../head/bin/sh) (revision 209225) @@ -108,7 +108,7 @@ number(const char *s) { if (! is_number(s)) - error("Illegal number: %s", (char *)s); + error("Illegal number: %s", s); return atoi(s); } Index: histedit.c =================================================================== --- histedit.c (.../stable/8/bin/sh) (revision 209225) +++ histedit.c (.../head/bin/sh) (revision 209225) @@ -92,12 +92,14 @@ if (hist != NULL) sethistsize(histsizeval()); else - out2str("sh: can't initialize history\n"); + out2fmt_flush("sh: can't initialize history\n"); } if (editing && !el && isatty(0)) { /* && isatty(2) ??? */ /* * turn editing on */ + char *term; + INTOFF; if (el_in == NULL) el_in = fdopen(0, "r"); @@ -107,14 +109,22 @@ el_out = fdopen(2, "w"); if (el_in == NULL || el_err == NULL || el_out == NULL) goto bad; + term = lookupvar("TERM"); + if (term) + setenv("TERM", term, 1); + else + unsetenv("TERM"); el = el_init(arg0, el_in, el_out, el_err); if (el != NULL) { if (hist) el_set(el, EL_HIST, history, hist); el_set(el, EL_PROMPT, getprompt); + el_set(el, EL_ADDFN, "sh-complete", + "Filename completion", + _el_fn_sh_complete); } else { bad: - out2str("sh: can't initialize editing\n"); + out2fmt_flush("sh: can't initialize editing\n"); } INTON; } else if (!editing && el) { @@ -128,6 +138,7 @@ el_set(el, EL_EDITOR, "vi"); else if (Eflag) el_set(el, EL_EDITOR, "emacs"); + el_set(el, EL_BIND, "^I", "sh-complete", NULL); el_source(el, NULL); } } else { @@ -160,23 +171,30 @@ } } +void +setterm(const char *term) +{ + if (rootshell && el != NULL && term != NULL) + el_set(el, EL_TERMINAL, term); +} + int histcmd(int argc, char **argv) { int ch; - char *editor = NULL; + const char *editor = NULL; HistEvent he; int lflg = 0, nflg = 0, rflg = 0, sflg = 0; int i, retval; - char *firststr, *laststr; + const char *firststr, *laststr; int first, last, direction; - char *pat = NULL, *repl; + char *pat = NULL, *repl = NULL; static int active = 0; struct jmploc jmploc; struct jmploc *savehandler; char editfilestr[PATH_MAX]; char *volatile editfile; - FILE *efp; + FILE *efp = NULL; int oldhistnum; if (hist == NULL) @@ -336,6 +354,7 @@ if (sflg) { if (displayhist) { out2str(s); + flushout(out2); } evalstring(s, 0); if (displayhist && hist) { @@ -405,7 +424,7 @@ } int -not_fcnumber(char *s) +not_fcnumber(const char *s) { if (s == NULL) return (0); @@ -415,10 +434,10 @@ } int -str_to_event(char *str, int last) +str_to_event(const char *str, int last) { HistEvent he; - char *s = str; + const char *s = str; int relative = 0; int i, retval; Index: show.c =================================================================== --- show.c (.../stable/8/bin/sh) (revision 209225) +++ show.c (.../head/bin/sh) (revision 209225) @@ -307,7 +307,7 @@ void -trputs(char *s) +trputs(const char *s) { if (tracefile == NULL) return; Index: show.h =================================================================== --- show.h (.../stable/8/bin/sh) (revision 209225) +++ show.h (.../head/bin/sh) (revision 209225) @@ -35,6 +35,6 @@ void sh_trace(const char *, ...) __printflike(1, 2); void trargs(char **); void trputc(int); -void trputs(char *); +void trputs(const char *); void opentrace(void); #endif Index: sh.1 =================================================================== --- sh.1 (.../stable/8/bin/sh) (revision 209225) +++ sh.1 (.../head/bin/sh) (revision 209225) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd January 8, 2010 +.Dd May 24, 2010 .Dt SH 1 .Os .Sh NAME @@ -210,7 +210,8 @@ .Xr emacs 1 command line editor (disables the .Fl V -option if it has been set). +option if it has been set; +set automatically when interactive on terminals). .It Fl e Li errexit Exit immediately if any untested command fails in non-interactive mode. The exit status of a command is considered to be @@ -296,7 +297,10 @@ .Ed .It Fl u Li nounset Write a message to standard error when attempting -to expand a variable that is not set, and if the +to expand a variable, a positional parameter or +the special parameter +.Va \&! +that is not set, and if the shell is not interactive, exit immediately. .It Fl V Li vi Enable the built-in @@ -411,11 +415,11 @@ .Pq Ql \en . A backslash preceding a newline is treated as a line continuation. .El -.Ss Reserved Words -Reserved words are words that have special meaning to the +.Ss Keywords +Keywords or reserved words are words that have special meaning to the shell and are recognized at the beginning of a line and after a control operator. -The following are reserved words: +The following are keywords: .Bl -column "doneXX" "elifXX" "elseXX" "untilXX" "whileX" -offset center .It Li \&! Ta { Ta } Ta Ic case Ta Ic do .It Ic done Ta Ic elif Ta Ic else Ta Ic esac Ta Ic fi @@ -425,8 +429,8 @@ An alias is a name and corresponding value set using the .Ic alias built-in command. -Whenever a reserved word may occur (see above), -and after checking for reserved words, the shell +Whenever a keyword may occur (see above), +and after checking for keywords, the shell checks the word to see if it matches an alias. If it does, it replaces it in the input stream with its value. For example, if there is an alias called @@ -465,7 +469,7 @@ document). Essentially though, a line is read and if the first word of the line (or after a control operator) -is not a reserved word, then the shell has recognized a +is not a keyword, then the shell has recognized a simple command. Otherwise, a complex command or some other special construct may have been recognized. @@ -661,11 +665,11 @@ performing any searches. .It The shell searches each entry in the -.Ev PATH -environment variable +.Va PATH +variable in turn for the command. The value of the -.Ev PATH +.Va PATH variable should be a series of entries separated by colons. Each entry consists of a @@ -691,7 +695,7 @@ .In sys/signal.h . .Ss Complex Commands Complex commands are combinations of simple commands -with control operators or reserved words, together creating a larger complex +with control operators or keywords, together creating a larger complex command. More generally, a command is one of the following: .Bl -item -offset indent @@ -735,7 +739,7 @@ If the pipeline is not in the background (discussed later), the shell waits for all commands to complete. .Pp -If the reserved word +If the keyword .Ic !\& does not precede the pipeline, the exit status is the exit status of the last command specified @@ -1036,13 +1040,9 @@ .Ic set built-in command can also be used to set or reset them. .Ss Special Parameters -A special parameter is a parameter denoted by a special one-character -name. -The special parameters recognized by the -.Nm -shell of -.Fx -are shown in the following list, exactly as they would appear in input +Special parameters are parameters denoted by a single special character +or the digit zero. +They are shown in the following list, exactly as they would appear in input typed by the user or in the source of a shell script. .Bl -hang .It Li $* @@ -1109,6 +1109,84 @@ .It Li $0 (zero) Expands to the name of the shell or shell script. .El +.Ss Special Variables +The following variables are set by the shell or +have special meaning to it: +.Bl -tag -width ".Va HISTSIZE" +.It Va CDPATH +The search path used with the +.Ic cd +built-in. +.It Va EDITOR +The fallback editor used with the +.Ic fc +built-in. +If not set, the default editor is +.Xr ed 1 . +.It Va FCEDIT +The default editor used with the +.Ic fc +built-in. +.It Va HISTSIZE +The number of previous commands that are accessible. +.It Va HOME +The user's home directory, +used in tilde expansion and as a default directory for the +.Ic cd +built-in. +.It Va IFS +Input Field Separators. +This is normally set to +.Aq space , +.Aq tab , +and +.Aq newline . +See the +.Sx White Space Splitting +section for more details. +.It Va LINENO +The current line number in the script or function. +.It Va MAIL +The name of a mail file, that will be checked for the arrival of new +mail. +Overridden by +.Va MAILPATH . +.It Va MAILPATH +A colon +.Pq Ql \&: +separated list of file names, for the shell to check for incoming +mail. +This variable overrides the +.Va MAIL +setting. +There is a maximum of 10 mailboxes that can be monitored at once. +.It Va PATH +The default search path for executables. +See the +.Sx Path Search +section for details. +.It Va PPID +The parent process ID of the invoked shell. +This is set at startup +unless this variable is in the environment. +A later change of parent process ID is not reflected. +A subshell retains the same value of +.Va PPID . +.It Va PS1 +The primary prompt string, which defaults to +.Dq Li "$ " , +unless you are the superuser, in which case it defaults to +.Dq Li "# " . +.It Va PS2 +The secondary prompt string, which defaults to +.Dq Li "> " . +.It Va PS4 +The prefix for the trace output (if +.Fl x +is active). +The default is +.Dq Li "+ " . +.El .Ss Word Expansions This clause describes the various expansions that are performed on words. @@ -1162,7 +1240,7 @@ username is missing (as in .Pa ~/foobar ) , the tilde is replaced with the value of the -.Ev HOME +.Va HOME variable (the current user's home directory). .Ss Parameter Expansion The format for parameter expansion is as follows: @@ -1175,10 +1253,20 @@ .Ql } . Any .Ql } -escaped by a backslash or within a quoted string, and characters in +escaped by a backslash or within a single-quoted string, and characters in embedded arithmetic expansions, command substitutions, and variable expansions, are not examined in determining the matching .Ql } . +Except for the variants with +.Ql + , +.Ql - , +.Ql = +or +.Ql ?\& , +any +.Ql } +within a double-quoted string is also not examined in determining the matching +.Ql } . .Pp The simplest form for parameter expansion is: .Pp @@ -1262,6 +1350,14 @@ In the parameter expansions shown previously, use of the colon in the format results in a test for a parameter that is unset or null; omission of the colon results in a test for a parameter that is only unset. +.Pp +The +.Ar word +inherits the type of quoting +(unquoted, double-quoted or here-document) +from the surroundings, +with the exception that a backslash that quotes a closing brace is removed +during quote removal. .Bl -tag -width indent .It Li ${# Ns Ar parameter Ns Li } String Length. @@ -1469,10 +1565,10 @@ .Ql / characters, it is used as is. Otherwise, the shell searches the -.Ev PATH +.Va PATH for the file. If it is not found in the -.Ev PATH , +.Va PATH , it is sought in the current working directory. .It Ic \&[ A built-in equivalent of @@ -1516,7 +1612,7 @@ Switch to the specified .Ar directory , or to the directory specified in the -.Ev HOME +.Va HOME environment variable if no .Ar directory is specified. @@ -1527,17 +1623,17 @@ or .Pa .. , then the directories listed in the -.Ev CDPATH +.Va CDPATH variable will be searched for the specified .Ar directory . If -.Ev CDPATH +.Va CDPATH is unset, the current directory is searched. The format of -.Ev CDPATH +.Va CDPATH is the same as that of -.Ev PATH . +.Va PATH . In an interactive shell, the .Ic cd @@ -1545,7 +1641,7 @@ that it actually switched to if this is different from the name that the user gave. These may be different either because the -.Ev CDPATH +.Va CDPATH mechanism was used or because a symbolic link was crossed. .Pp If the @@ -1568,16 +1664,18 @@ .It Ic command Oo Fl p Oc Op Ar utility Op Ar argument ... .It Ic command Oo Fl v | V Oc Op Ar utility The first form of invocation executes the specified +.Ar utility , +ignoring shell functions in the search. +If .Ar utility -as a simple command (see the -.Sx Simple Commands -section). +is a special builtin, +it is executed as if it were a regular builtin. .Pp If the .Fl p option is specified, the command search is performed using a default value of -.Ev PATH +.Va PATH that is guaranteed to find all of the standard utilities. .Pp If the @@ -1736,20 +1834,20 @@ .Ar editor string is a command name, subject to search via the -.Ev PATH +.Va PATH variable. The value in the -.Ev FCEDIT +.Va FCEDIT variable is used as a default when .Fl e is not specified. If -.Ev FCEDIT +.Va FCEDIT is null or unset, the value of the -.Ev EDITOR +.Va EDITOR variable is used. If -.Ev EDITOR +.Va EDITOR is null or unset, .Xr ed 1 is used as the editor. @@ -1783,7 +1881,7 @@ Select the commands to list or edit. The number of previous commands that can be accessed are determined by the value of the -.Ev HISTSIZE +.Va HISTSIZE variable. The value of .Ar first @@ -1814,12 +1912,12 @@ .El .El .Pp -The following environment variables affect the execution of +The following variables affect the execution of .Ic fc : -.Bl -tag -width ".Ev HISTSIZE" -.It Ev FCEDIT +.Bl -tag -width ".Va HISTSIZE" +.It Va FCEDIT Name of the editor to use for history editing. -.It Ev HISTSIZE +.It Va HISTSIZE The number of previous commands that are accessible. .El .It Ic fg Op Ar job @@ -2285,74 +2383,27 @@ .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : -.Bl -tag -width ".Ev HISTSIZE" -.It Ev CDPATH -The search path used with the -.Ic cd -built-in. -.It Ev EDITOR -The fallback editor used with the -.Ic fc -built-in. -If not set, the default editor is -.Xr ed 1 . -.It Ev FCEDIT -The default editor used with the -.Ic fc -built-in. -.It Ev HISTSIZE -The number of previous commands that are accessible. -.It Ev HOME -The starting directory of -.Nm . -.It Ev IFS -Input Field Separators. -This is normally set to -.Aq space , -.Aq tab , -and -.Aq newline . -See the -.Sx White Space Splitting -section for more details. -.It Ev MAIL -The name of a mail file, that will be checked for the arrival of new -mail. -Overridden by -.Ev MAILPATH . -.It Ev MAILPATH -A colon -.Pq Ql \&: -separated list of file names, for the shell to check for incoming -mail. -This environment setting overrides the -.Ev MAIL -setting. -There is a maximum of 10 mailboxes that can be monitored at once. -.It Ev PATH -The default search path for executables. -See the -.Sx Path Search -section for details. -.It Ev PS1 -The primary prompt string, which defaults to -.Dq Li "$ " , -unless you are the superuser, in which case it defaults to -.Dq Li "# " . -.It Ev PS2 -The secondary prompt string, which defaults to -.Dq Li "> " . -.It Ev PS4 -The prefix for the trace output (if -.Fl x -is active). -The default is -.Dq Li "+ " . +.Bl -tag -width ".Ev LANGXXXXXX" +.It Ev ENV +Initialization file for interactive shells. +.It Ev LANG , Ev LC_* +Locale settings. +These are inherited by children of the shell, +and is used in a limited manner by the shell itself. +.It Ev PWD +An absolute pathname for the current directory, +possibly containing symbolic links. +This is used and updated by the shell. .It Ev TERM The default terminal setting for the shell. This is inherited by children of the shell, and is used in the history editing modes. .El +.Pp +Additionally, all environment variables are turned into shell variables +at startup, +which may affect the shell as described under +.Sx Special Variables . .Sh EXIT STATUS Errors that are detected by the shell, such as a syntax error, will cause the shell to exit with a non-zero exit status. Index: myhistedit.h =================================================================== --- myhistedit.h (.../stable/8/bin/sh) (revision 209225) +++ myhistedit.h (.../head/bin/sh) (revision 209225) @@ -38,8 +38,9 @@ void histedit(void); void sethistsize(const char *); +void setterm(const char *); int histcmd(int, char **); -int not_fcnumber(char *); -int str_to_event(char *, int); +int not_fcnumber(const char *); +int str_to_event(const char *, int); int bindcmd(int, char **); Index: arith_lex.l =================================================================== --- arith_lex.l (.../stable/8/bin/sh) (revision 209225) +++ arith_lex.l (.../head/bin/sh) (revision 209225) @@ -51,13 +51,6 @@ int yylex(void); -struct varname -{ - struct varname *next; - char name[1]; -}; -static struct varname *varnames; - #undef YY_INPUT #define YY_INPUT(buf,result,max) \ result = (*buf = *arith_buf++) ? 1 : YY_NULL; @@ -87,14 +80,11 @@ * If variable doesn't exist, we should initialize * it to zero. */ - struct varname *temp; + char *temp; if (lookupvar(yytext) == NULL) setvarsafe(yytext, "0", 0); - temp = ckmalloc(sizeof(struct varname) + - strlen(yytext)); - temp->next = varnames; - varnames = temp; - yylval.s_value = strcpy(temp->name, yytext); + temp = stalloc(strlen(yytext) + 1); + yylval.s_value = strcpy(temp, yytext); return ARITH_VAR; } @@ -140,15 +130,5 @@ void arith_lex_reset(void) { - struct varname *name, *next; - YY_NEW_FILE; - - name = varnames; - while (name != NULL) { - next = name->next; - ckfree(name); - name = next; - } - varnames = NULL; } Index: error.c =================================================================== --- error.c (.../stable/8/bin/sh) (revision 209225) +++ error.c (.../head/bin/sh) (revision 209225) @@ -67,17 +67,21 @@ char *commandname; -static void exverror(int, const char *, va_list) __printf0like(2, 0); +static void exverror(int, const char *, va_list) __printf0like(2, 0) __dead2; /* * Called to raise an exception. Since C doesn't include exceptions, we * just do a longjmp to the exception handler. The type of exception is * stored in the global variable "exception". + * + * Interrupts are disabled; they should be reenabled when the exception is + * caught. */ void exraise(int e) { + INTOFF; if (handler == NULL) abort(); exception = e; @@ -138,8 +142,15 @@ static void exverror(int cond, const char *msg, va_list ap) { - CLEAR_PENDING_INT; - INTOFF; + /* + * An interrupt trumps an error. Certain places catch error + * exceptions or transform them to a plain nonzero exit code + * in child processes, and if an error exception can be handled, + * an interrupt can be handled as well. + * + * exraise() will disable interrupts for the exception handler. + */ + FORCEINTON; #ifdef DEBUG if (msg) @@ -149,8 +160,8 @@ #endif if (msg) { if (commandname) - outfmt(&errout, "%s: ", commandname); - doformat(&errout, msg, ap); + outfmt(out2, "%s: ", commandname); + doformat(out2, msg, ap); out2c('\n'); } flushall(); Index: error.h =================================================================== --- error.h (.../stable/8/bin/sh) (revision 209225) +++ error.h (.../head/bin/sh) (revision 209225) @@ -72,14 +72,16 @@ #define INTOFF suppressint++ #define INTON { if (--suppressint == 0 && intpending) onint(); } +#define is_int_on() suppressint +#define SETINTON(s) suppressint = (s) #define FORCEINTON {suppressint = 0; if (intpending) onint();} #define CLEAR_PENDING_INT intpending = 0 #define int_pending() intpending -void exraise(int); +void exraise(int) __dead2; void onint(void); -void error(const char *, ...) __printf0like(1, 2); -void exerror(int, const char *, ...) __printf0like(2, 3); +void error(const char *, ...) __printf0like(1, 2) __dead2; +void exerror(int, const char *, ...) __printf0like(2, 3) __dead2; /* Index: input.c =================================================================== --- input.c (.../stable/8/bin/sh) (revision 209225) +++ input.c (.../head/bin/sh) (revision 209225) @@ -93,7 +93,7 @@ int plinno = 1; /* input line number */ -MKINIT int parsenleft; /* copy of parsefile->nleft */ +int parsenleft; /* copy of parsefile->nleft */ MKINIT int parselleft; /* copy of parsefile->lleft */ char *parsenextc; /* copy of parsefile->nextc */ MKINIT struct parsefile basepf; /* top level input file */ @@ -111,9 +111,9 @@ INCLUDE "input.h" INCLUDE "error.h" -INIT { - extern char basebuf[]; +MKINIT char basebuf[]; +INIT { basepf.nextc = basepf.buf = basebuf; } @@ -215,7 +215,7 @@ if (flags >= 0 && flags & O_NONBLOCK) { flags &=~ O_NONBLOCK; if (fcntl(0, F_SETFL, flags) >= 0) { - out2str("sh: turning off NDELAY mode\n"); + out2fmt_flush("sh: turning off NDELAY mode\n"); goto retry; } } @@ -359,7 +359,7 @@ struct strpush *sp; INTOFF; -/*dprintf("*** calling pushstring: %s, %d\n", s, len);*/ +/*out2fmt_flush("*** calling pushstring: %s, %d\n", s, len);*/ if (parsefile->strpush) { sp = ckmalloc(sizeof (struct strpush)); sp->prev = parsefile->strpush; @@ -386,7 +386,7 @@ parsenextc = sp->prevstring; parsenleft = sp->prevnleft; parselleft = sp->prevlleft; -/*dprintf("*** calling popstring: restoring to '%s'\n", parsenextc);*/ +/*out2fmt_flush("*** calling popstring: restoring to '%s'\n", parsenextc);*/ if (sp->ap) sp->ap->flag &= ~ALIASINUSE; parsefile->strpush = sp->prev; @@ -401,7 +401,7 @@ */ void -setinputfile(char *fname, int push) +setinputfile(const char *fname, int push) { int fd; int fd2; @@ -509,6 +509,32 @@ /* + * Return current file (to go back to it later using popfilesupto()). + */ + +struct parsefile * +getcurrentfile(void) +{ + return parsefile; +} + + +/* + * Pop files until the given file is on top again. Useful for regular + * builtins that read shell commands from files or strings. + * If the given file is not an active file, an error is raised. + */ + +void +popfilesupto(struct parsefile *file) +{ + while (parsefile != file && parsefile != &basepf) + popfile(); + if (parsefile != file) + error("popfilesupto() misused"); +} + +/* * Return to top level. */ Index: input.h =================================================================== --- input.h (.../stable/8/bin/sh) (revision 209225) +++ input.h (.../head/bin/sh) (revision 209225) @@ -45,6 +45,8 @@ extern char *parsenextc; /* next character in input buffer */ extern int init_editline; /* 0 == not setup, 1 == OK, -1 == failed */ +struct parsefile; + char *pfgets(char *, int); int pgetc(void); int preadbuffer(void); @@ -52,10 +54,12 @@ void pungetc(void); void pushstring(char *, int, void *); void popstring(void); -void setinputfile(char *, int); +void setinputfile(const char *, int); void setinputfd(int, int); void setinputstring(char *, int); void popfile(void); +struct parsefile *getcurrentfile(void); +void popfilesupto(struct parsefile *); void popallfiles(void); void closescript(void); Index: redir.c =================================================================== --- redir.c (.../stable/8/bin/sh) (revision 209225) +++ redir.c (.../head/bin/sh) (revision 209225) @@ -63,6 +63,7 @@ #define EMPTY -2 /* marks an unused slot in redirtab */ +#define CLOSED -1 /* fd was not open before redir */ #define PIPESIZE 4096 /* amount of buffering in a pipe */ @@ -101,7 +102,6 @@ struct redirtab *sv = NULL; int i; int fd; - int try; char memory[10]; /* file descriptors to write to memory */ for (i = 10 ; --i >= 0 ; ) @@ -116,38 +116,30 @@ } for (n = redir ; n ; n = n->nfile.next) { fd = n->nfile.fd; - try = 0; if ((n->nfile.type == NTOFD || n->nfile.type == NFROMFD) && n->ndup.dupfd == fd) continue; /* redirect from/to same file descriptor */ if ((flags & REDIR_PUSH) && sv->renamed[fd] == EMPTY) { INTOFF; -again: if ((i = fcntl(fd, F_DUPFD, 10)) == -1) { switch (errno) { case EBADF: - if (!try) { - openredirect(n, memory); - try++; - goto again; - } - /* FALLTHROUGH*/ + i = CLOSED; + break; default: INTON; error("%d: %s", fd, strerror(errno)); break; } - } - if (!try) { - sv->renamed[fd] = i; - } + } else + (void)fcntl(i, F_SETFD, FD_CLOEXEC); + sv->renamed[fd] = i; INTON; } if (fd == 0) fd0_redirected++; - if (!try) - openredirect(n, memory); + openredirect(n, memory); } if (memory[1]) out1 = &memout; @@ -166,8 +158,11 @@ /* * We suppress interrupts so that we won't leave open file - * descriptors around. This may not be such a good idea because - * an open of a device or a fifo can block indefinitely. + * descriptors around. Because the signal handler remains + * installed and we do not use system call restart, interrupts + * will still abort blocking opens such as fifos (they will fail + * with EINTR). There is, however, a race condition if an interrupt + * arrives after INTOFF and before open blocks. */ INTOFF; memory[fd] = 0; Index: trap.c =================================================================== --- trap.c (.../stable/8/bin/sh) (revision 209225) +++ trap.c (.../head/bin/sh) (revision 209225) @@ -149,6 +149,7 @@ { char *action; int signo; + int errors = 0; if (argc <= 1) { for (signo = 0 ; signo < sys_nsig ; signo++) { @@ -183,8 +184,10 @@ } } while (*argv) { - if ((signo = sigstring_to_signum(*argv)) == -1) - error("bad signal %s", *argv); + if ((signo = sigstring_to_signum(*argv)) == -1) { + out2fmt_flush("trap: bad signal %s\n", *argv); + errors = 1; + } INTOFF; if (action) action = savestr(action); @@ -196,7 +199,7 @@ INTON; argv++; } - return 0; + return errors; } @@ -244,7 +247,8 @@ setsignal(int signo) { int action; - sig_t sig, sigact = SIG_DFL; + sig_t sigact = SIG_DFL; + struct sigaction sa; char *t; if ((t = trap[signo]) == NULL) @@ -320,9 +324,10 @@ case S_IGN: sigact = SIG_IGN; break; } *t = action; - sig = signal(signo, sigact); - if (sig != SIG_ERR && action == S_CATCH) - siginterrupt(signo, 1); + sa.sa_handler = sigact; + sa.sa_flags = 0; + sigemptyset(&sa.sa_mask); + sigaction(signo, &sa, NULL); } Index: trap.h =================================================================== --- trap.h (.../stable/8/bin/sh) (revision 209225) +++ trap.h (.../head/bin/sh) (revision 209225) @@ -45,4 +45,4 @@ void onsig(int); void dotrap(void); void setinteractive(int); -void exitshell(int); +void exitshell(int) __dead2; Index: arith.h =================================================================== --- arith.h (.../stable/8/bin/sh) (revision 209225) +++ arith.h (.../head/bin/sh) (revision 209225) @@ -34,8 +34,8 @@ #define DIGITS(var) (3 + (2 + CHAR_BIT * sizeof((var))) / 3) -extern char *arith_buf, *arith_startbuf; +extern const char *arith_buf, *arith_startbuf; -arith_t arith(char *); +arith_t arith(const char *); void arith_lex_reset(void); int expcmd(int, char **); Index: mksyntax.c =================================================================== --- mksyntax.c (.../stable/8/bin/sh) (revision 209225) +++ mksyntax.c (.../head/bin/sh) (revision 209225) @@ -55,8 +55,8 @@ struct synclass { - char *name; - char *comment; + const char *name; + const char *comment; }; /* Syntax classes */ @@ -101,16 +101,16 @@ static FILE *cfile; static FILE *hfile; -static char *syntax[513]; +static const char *syntax[513]; static int base; static int size; /* number of values which a char variable can have */ static int nbits; /* number of bits in a character */ static int digit_contig;/* true if digits are contiguous */ -static void filltable(char *); +static void filltable(const char *); static void init(void); -static void add(char *, char *); -static void print(char *); +static void add(const char *, const char *); +static void print(const char *); static void output_type_macros(void); static void digit_convert(void); @@ -232,7 +232,6 @@ add("\n", "CNL"); add("\\", "CBACK"); add("`", "CBQUOTE"); - add("'", "CSQUOTE"); add("\"", "CDQUOTE"); add("$", "CVAR"); add("}", "CENDVAR"); @@ -259,7 +258,7 @@ */ static void -filltable(char *dftval) +filltable(const char *dftval) { int i; @@ -293,7 +292,7 @@ */ static void -add(char *p, char *type) +add(const char *p, const char *type) { while (*p) syntax[*p++ + base] = type; @@ -306,7 +305,7 @@ */ static void -print(char *name) +print(const char *name) { int i; int col; @@ -338,7 +337,7 @@ * contiguous, we can test for them quickly. */ -static char *macro[] = { +static const char *macro[] = { "#define is_digit(c)\t((is_type+SYNBASE)[c] & ISDIGIT)", "#define is_eof(c)\t((c) == PEOF)", "#define is_alpha(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && isalpha((unsigned char) (c)))", @@ -351,7 +350,7 @@ static void output_type_macros(void) { - char **pp; + const char **pp; if (digit_contig) macro[0] = "#define is_digit(c)\t((unsigned int)((c) - '0') <= 9)"; Index: expand.c =================================================================== --- expand.c (.../stable/8/bin/sh) (revision 209225) +++ expand.c (.../head/bin/sh) (revision 209225) @@ -109,7 +109,7 @@ STATIC void addfname(char *); STATIC struct strlist *expsort(struct strlist *); STATIC struct strlist *msort(struct strlist *, int); -STATIC int pmatch(char *, char *, int); +STATIC int pmatch(const char *, const char *, int); STATIC char *cvtnum(int, char *); STATIC int collate_range_cmp(int, int); @@ -273,8 +273,12 @@ while ((c = *p) != '\0') { switch(c) { - case CTLESC: - return (startp); + case CTLESC: /* This means CTL* are always considered quoted. */ + case CTLVAR: + case CTLBACKQ: + case CTLBACKQ | CTLQUOTE: + case CTLARI: + case CTLENDARI: case CTLQUOTEMARK: return (startp); case ':': @@ -282,6 +286,7 @@ goto done; break; case '/': + case CTLENDVAR: goto done; } p++; @@ -357,7 +362,7 @@ void expari(int flag) { - char *p, *start; + char *p, *q, *start; arith_t result; int begoff; int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); @@ -395,7 +400,9 @@ removerecordregions(begoff); if (quotes) rmescapes(p+2); + q = grabstackstr(expdest); result = arith(p+2); + ungrabstackstr(q, expdest); fmtstr(p, DIGITS(result), ARITH_FORMAT_STR, result); while (*p++) ; @@ -503,7 +510,9 @@ int amount; herefd = -1; - argstr(p, 0); + argstr(p, (subtype == VSTRIMLEFT || subtype == VSTRIMLEFTMAX || + subtype == VSTRIMRIGHT || subtype == VSTRIMRIGHTMAX ? + EXP_CASE : 0) | EXP_TILDE); STACKSTRNUL(expdest); herefd = saveherefd; argbackq = saveargbackq; @@ -523,7 +532,7 @@ case VSQUESTION: if (*p != CTLENDVAR) { - outfmt(&errout, "%s\n", startp); + outfmt(out2, "%s\n", startp); error((char *)NULL); } error("%.*s: parameter %snot set", (int)(p - str - 1), @@ -659,7 +668,7 @@ } varlen = 0; startloc = expdest - stackblock(); - if (!set && uflag) { + if (!set && uflag && *var != '@' && *var != '*') { switch (subtype) { case VSNORMAL: case VSTRIMLEFT: @@ -852,7 +861,6 @@ int num; char *p; int i; - extern int oexitstatus; char sep; char **ap; char const *syntax; @@ -976,7 +984,7 @@ char *start; char *p; char *q; - char *ifs; + const char *ifs; const char *ifsspc; int had_param_ch = 0; @@ -1344,7 +1352,7 @@ */ int -patmatch(char *pattern, char *string, int squoted) +patmatch(const char *pattern, const char *string, int squoted) { #ifdef notdef if (pattern[0] == '!' && pattern[1] == '!') @@ -1356,9 +1364,9 @@ STATIC int -pmatch(char *pattern, char *string, int squoted) +pmatch(const char *pattern, const char *string, int squoted) { - char *p, *q; + const char *p, *q; char c; p = pattern; @@ -1406,7 +1414,7 @@ } while (*q++ != '\0'); return 0; case '[': { - char *endp; + const char *endp; int invert, found; char chr; @@ -1510,7 +1518,7 @@ */ int -casematch(union node *pattern, char *val) +casematch(union node *pattern, const char *val) { struct stackmark smark; int result; Index: mail.c =================================================================== --- mail.c (.../stable/8/bin/sh) (revision 209225) +++ mail.c (.../head/bin/sh) (revision 209225) @@ -72,7 +72,7 @@ chkmail(int silent) { int i; - char *mpath; + const char *mpath; char *p; char *q; struct stackmark smark; Index: main.c =================================================================== --- main.c (.../stable/8/bin/sh) (revision 209225) +++ main.c (.../head/bin/sh) (revision 209225) @@ -75,8 +75,9 @@ int rootpid; int rootshell; +struct jmploc main_handler; -STATIC void read_profile(char *); +STATIC void read_profile(const char *); STATIC char *find_dot_file(char *); /* @@ -90,14 +91,13 @@ int main(int argc, char *argv[]) { - struct jmploc jmploc; struct stackmark smark; volatile int state; char *shinit; (void) setlocale(LC_ALL, ""); state = 0; - if (setjmp(jmploc.loc)) { + if (setjmp(main_handler.loc)) { /* * When a shell procedure is executed, we raise the * exception EXSHELLPROC to clean up before executing @@ -143,7 +143,7 @@ else goto state4; } - handler = &jmploc; + handler = &main_handler; #ifdef DEBUG opentrace(); trputs("Shell args: "); trargs(argv); @@ -153,10 +153,7 @@ init(); setstackmark(&smark); procargs(argc, argv); - if (getpwd() == NULL && iflag) - out2str("sh: cannot determine working directory\n"); - if (getpwd() != NULL) - setvar ("PWD", getpwd(), VEXPORT); + pwd_init(iflag); if (iflag) chkmail(1); if (argv[0] && argv[0][0] == '-') { @@ -225,7 +222,7 @@ if (!stoppedjobs()) { if (!Iflag) break; - out2str("\nUse \"exit\" to leave shell.\n"); + out2fmt_flush("\nUse \"exit\" to leave shell.\n"); } numeof++; } else if (n != NULL && nflag == 0) { @@ -250,7 +247,7 @@ */ STATIC void -read_profile(char *name) +read_profile(const char *name) { int fd; @@ -271,7 +268,7 @@ */ void -readcmdfile(char *name) +readcmdfile(const char *name) { int fd; @@ -298,7 +295,7 @@ { static char localname[FILENAME_MAX+1]; char *fullname; - char *path = pathval(); + const char *path = pathval(); struct stat statb; /* don't try this for absolute or relative paths */ @@ -317,14 +314,20 @@ int dotcmd(int argc, char **argv) { - char *fullname; + char *filename, *fullname; if (argc < 2) error("missing filename"); exitstatus = 0; - fullname = find_dot_file(argv[1]); + /* + * Because we have historically not supported any options, + * only treat "--" specially. + */ + filename = argc > 2 && strcmp(argv[1], "--") == 0 ? argv[2] : argv[1]; + + fullname = find_dot_file(filename); setinputfile(fullname, 1); commandname = fullname; cmdloop(0); @@ -336,8 +339,6 @@ int exitcmd(int argc, char **argv) { - extern int oexitstatus; - if (stoppedjobs()) return 0; if (argc > 1) Index: expand.h =================================================================== --- expand.h (.../stable/8/bin/sh) (revision 209225) +++ expand.h (.../head/bin/sh) (revision 209225) @@ -58,7 +58,7 @@ void expandhere(union node *, int); void expandarg(union node *, struct arglist *, int); void expari(int); -int patmatch(char *, char *, int); +int patmatch(const char *, const char *, int); void rmescapes(char *); -int casematch(union node *, char *); +int casematch(union node *, const char *); int wordexpcmd(int, char **); Index: exec.c =================================================================== --- exec.c (.../stable/8/bin/sh) (revision 209225) +++ exec.c (.../head/bin/sh) (revision 209225) @@ -98,7 +98,7 @@ STATIC void tryexec(char *, char **, char **); STATIC void printentry(struct tblentry *, int); -STATIC struct tblentry *cmdlookup(char *, int); +STATIC struct tblentry *cmdlookup(const char *, int); STATIC void delete_cmd_entry(void); @@ -109,7 +109,7 @@ */ void -shellexec(char **argv, char **envp, char *path, int index) +shellexec(char **argv, char **envp, const char *path, int idx) { char *cmdname; int e; @@ -120,7 +120,7 @@ } else { e = ENOENT; while ((cmdname = padvance(&path, argv[0])) != NULL) { - if (--index < 0 && pathopt == NULL) { + if (--idx < 0 && pathopt == NULL) { tryexec(cmdname, argv, envp); if (errno != ENOENT && errno != ENOTDIR) e = errno; @@ -175,13 +175,13 @@ * NULL. */ -char *pathopt; +const char *pathopt; char * -padvance(char **path, char *name) +padvance(const char **path, const char *name) { - char *p, *q; - char *start; + const char *p, *start; + char *q; int len; if (*path == NULL) @@ -248,14 +248,14 @@ && (cmdp->cmdtype == CMDNORMAL || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0))) delete_cmd_entry(); - find_command(name, &entry, 1, pathval()); + find_command(name, &entry, DO_ERR, pathval()); if (verbose) { if (entry.cmdtype != CMDUNKNOWN) { /* if no error msg */ cmdp = cmdlookup(name, 0); if (cmdp != NULL) printentry(cmdp, verbose); else - outfmt(&errout, "%s: not found\n", name); + outfmt(out2, "%s: not found\n", name); } flushall(); } @@ -268,17 +268,17 @@ STATIC void printentry(struct tblentry *cmdp, int verbose) { - int index; - char *path; + int idx; + const char *path; char *name; if (cmdp->cmdtype == CMDNORMAL) { - index = cmdp->param.index; + idx = cmdp->param.index; path = pathval(); do { name = padvance(&path, cmdp->cmdname); stunalloc(name); - } while (--index >= 0); + } while (--idx >= 0); out1str(name); } else if (cmdp->cmdtype == CMDBUILTIN) { out1fmt("builtin %s", cmdp->cmdname); @@ -310,10 +310,11 @@ */ void -find_command(char *name, struct cmdentry *entry, int printerr, char *path) +find_command(const char *name, struct cmdentry *entry, int act, + const char *path) { - struct tblentry *cmdp; - int index; + struct tblentry *cmdp, loc_cmd; + int idx; int prev; char *fullname; struct stat statb; @@ -329,13 +330,19 @@ } /* If name is in the table, and not invalidated by cd, we're done */ - if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->rehash == 0) - goto success; + if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->rehash == 0) { + if (cmdp->cmdtype == CMDFUNCTION && act & DO_NOFUNC) + cmdp = NULL; + else + goto success; + } /* If %builtin not in path, check for builtin next */ if (builtinloc < 0 && (i = find_builtin(name, &spec)) >= 0) { INTOFF; cmdp = cmdlookup(name, 1); + if (cmdp->cmdtype == CMDFUNCTION) + cmdp = &loc_cmd; cmdp->cmdtype = CMDBUILTIN; cmdp->param.index = i; cmdp->special = spec; @@ -353,17 +360,19 @@ } e = ENOENT; - index = -1; + idx = -1; loop: while ((fullname = padvance(&path, name)) != NULL) { stunalloc(fullname); - index++; + idx++; if (pathopt) { if (prefix("builtin", pathopt)) { if ((i = find_builtin(name, &spec)) < 0) goto loop; INTOFF; cmdp = cmdlookup(name, 1); + if (cmdp->cmdtype == CMDFUNCTION) + cmdp = &loc_cmd; cmdp->cmdtype = CMDBUILTIN; cmdp->param.index = i; cmdp->special = spec; @@ -376,8 +385,8 @@ } } /* if rehash, don't redo absolute path names */ - if (fullname[0] == '/' && index <= prev) { - if (index < prev) + if (fullname[0] == '/' && idx <= prev) { + if (idx < prev) goto loop; TRACE(("searchexec \"%s\": no change\n", name)); goto success; @@ -413,22 +422,25 @@ TRACE(("searchexec \"%s\" returns \"%s\"\n", name, fullname)); INTOFF; cmdp = cmdlookup(name, 1); + if (cmdp->cmdtype == CMDFUNCTION) + cmdp = &loc_cmd; cmdp->cmdtype = CMDNORMAL; - cmdp->param.index = index; + cmdp->param.index = idx; INTON; goto success; } /* We failed. If there was an entry for this command, delete it */ - if (cmdp) + if (cmdp && cmdp->cmdtype != CMDFUNCTION) delete_cmd_entry(); - if (printerr) { + if (act & DO_ERR) { if (e == ENOENT || e == ENOTDIR) outfmt(out2, "%s: not found\n", name); else outfmt(out2, "%s: %s\n", name, strerror(e)); } entry->cmdtype = CMDUNKNOWN; + entry->u.index = 0; return; success: @@ -445,7 +457,7 @@ */ int -find_builtin(char *name, int *special) +find_builtin(const char *name, int *special) { const struct builtincmd *bp; @@ -492,18 +504,18 @@ changepath(const char *newval) { const char *old, *new; - int index; + int idx; int firstchange; int bltin; old = pathval(); new = newval; firstchange = 9999; /* assume no change */ - index = 0; + idx = 0; bltin = -1; for (;;) { if (*old != *new) { - firstchange = index; + firstchange = idx; if ((*old == '\0' && *new == ':') || (*old == ':' && *new == '\0')) firstchange++; @@ -512,9 +524,9 @@ if (*new == '\0') break; if (*new == '%' && bltin < 0 && prefix("builtin", new + 1)) - bltin = index; + bltin = idx; if (*new == ':') { - index++; + idx++; } new++, old++; } @@ -607,10 +619,10 @@ STATIC struct tblentry * -cmdlookup(char *name, int add) +cmdlookup(const char *name, int add) { int hashval; - char *p; + const char *p; struct tblentry *cmdp; struct tblentry **pp; @@ -663,7 +675,7 @@ */ void -addcmdentry(char *name, struct cmdentry *entry) +addcmdentry(const char *name, struct cmdentry *entry) { struct tblentry *cmdp; @@ -683,7 +695,7 @@ */ void -defun(char *name, union node *func) +defun(const char *name, union node *func) { struct cmdentry entry; @@ -700,7 +712,7 @@ */ int -unsetfunc(char *name) +unsetfunc(const char *name) { struct tblentry *cmdp; @@ -718,19 +730,21 @@ */ int -typecmd_impl(int argc, char **argv, int cmd) +typecmd_impl(int argc, char **argv, int cmd, const char *path) { struct cmdentry entry; struct tblentry *cmdp; - char **pp; + const char *const *pp; struct alias *ap; int i; - int error = 0; - extern char *const parsekwd[]; + int error1 = 0; + + if (path != pathval()) + clearcmdentry(0); for (i = 1; i < argc; i++) { /* First look at the keywords */ - for (pp = (char **)parsekwd; *pp; pp++) + for (pp = parsekwd; *pp; pp++) if (**pp == *argv[i] && equal(*pp, argv[i])) break; @@ -760,16 +774,17 @@ } else { /* Finally use brute force */ - find_command(argv[i], &entry, 0, pathval()); + find_command(argv[i], &entry, 0, path); } switch (entry.cmdtype) { case CMDNORMAL: { if (strchr(argv[i], '/') == NULL) { - char *path = pathval(), *name; + const char *path2 = path; + char *name; int j = entry.u.index; do { - name = padvance(&path, argv[i]); + name = padvance(&path2, argv[i]); stunalloc(name); } while (--j >= 0); if (cmd == TYPECMD_SMALLV) @@ -790,7 +805,7 @@ if (cmd != TYPECMD_SMALLV) outfmt(out2, "%s: %s\n", argv[i], strerror(errno)); - error |= 127; + error1 |= 127; } } break; @@ -815,11 +830,15 @@ default: if (cmd != TYPECMD_SMALLV) outfmt(out2, "%s: not found\n", argv[i]); - error |= 127; + error1 |= 127; break; } } - return error; + + if (path != pathval()) + clearcmdentry(0); + + return error1; } /* @@ -829,5 +848,5 @@ int typecmd(int argc, char **argv) { - return typecmd_impl(argc, argv, TYPECMD_TYPE); + return typecmd_impl(argc, argv, TYPECMD_TYPE, bltinlookup("PATH", 1)); } Index: miscbltin.c =================================================================== --- miscbltin.c (.../stable/8/bin/sh) (revision 209225) +++ miscbltin.c (.../head/bin/sh) (revision 209225) @@ -93,7 +93,7 @@ char c; int rflag; char *prompt; - char *ifs; + const char *ifs; char *p; int startword; int status; @@ -254,7 +254,7 @@ int -umaskcmd(int argc __unused, char **argv) +umaskcmd(int argc __unused, char **argv __unused) { char *ap; int mask; Index: cd.c =================================================================== --- cd.c (.../stable/8/bin/sh) (revision 209225) +++ cd.c (.../head/bin/sh) (revision 209225) @@ -70,6 +70,7 @@ STATIC char *getcomponent(void); STATIC char *findcwd(char *); STATIC void updatepwd(char *); +STATIC char *getpwd(void); STATIC char *getpwd2(void); STATIC char *curdir = NULL; /* current working directory */ @@ -79,8 +80,8 @@ int cdcmd(int argc, char **argv) { - char *dest; - char *path; + const char *dest; + const char *path; char *p; struct stat statb; int ch, phys, print = 0; @@ -351,7 +352,7 @@ /* * Get the current directory and cache the result in curdir. */ -char * +STATIC char * getpwd(void) { char *p; @@ -374,7 +375,6 @@ STATIC char * getpwd2(void) { - struct stat stdot, stpwd; char *pwd; int i; @@ -387,12 +387,29 @@ break; } - pwd = getenv("PWD"); + return NULL; +} + +/* + * Initialize PWD in a new shell. + * If the shell is interactive, we need to warn if this fails. + */ +void +pwd_init(int warn) +{ + char *pwd; + struct stat stdot, stpwd; + + pwd = lookupvar("PWD"); if (pwd && *pwd == '/' && stat(".", &stdot) != -1 && stat(pwd, &stpwd) != -1 && stdot.st_dev == stpwd.st_dev && stdot.st_ino == stpwd.st_ino) { - return pwd; + if (curdir) + ckfree(curdir); + curdir = savestr(pwd); } - return NULL; + if (getpwd() == NULL && warn) + out2fmt_flush("sh: cannot determine working directory\n"); + setvar("PWD", curdir, VEXPORT); } Index: eval.c =================================================================== --- eval.c (.../stable/8/bin/sh) (revision 209225) +++ eval.c (.../head/bin/sh) (revision 209225) @@ -74,7 +74,7 @@ #endif -MKINIT int evalskip; /* set if we are skipping commands */ +int evalskip; /* set if we are skipping commands */ STATIC int skipcount; /* number of levels to skip */ MKINIT int loopnest; /* current loop nesting level */ int funcnest; /* depth of function calls */ @@ -91,6 +91,7 @@ STATIC void evalfor(union node *, int); STATIC void evalcase(union node *, int); STATIC void evalsubshell(union node *, int); +STATIC void evalredir(union node *, int); STATIC void expredir(union node *); STATIC void evalpipe(union node *); STATIC void evalcommand(union node *, int, struct backcmd *); @@ -221,10 +222,7 @@ evaltree(n->nbinary.ch2, flags); break; case NREDIR: - expredir(n->nredir.redirect); - redirect(n->nredir.redirect, REDIR_PUSH); - evaltree(n->nredir.n, flags); - popredir(); + evalredir(n, flags); break; case NSUBSHELL: evalsubshell(n, flags); @@ -407,8 +405,7 @@ flags &=~ EV_TESTED; redirect(n->nredir.redirect, 0); evaltree(n->nredir.n, flags | EV_EXIT); /* never returns */ - } - if (! backgnd) { + } else if (! backgnd) { INTOFF; exitstatus = waitforjob(jp, (int *)NULL); INTON; @@ -416,6 +413,46 @@ } +/* + * Evaluate a redirected compound command. + */ + +STATIC void +evalredir(union node *n, int flags) +{ + struct jmploc jmploc; + struct jmploc *savehandler; + volatile int in_redirect = 1; + + expredir(n->nredir.redirect); + savehandler = handler; + if (setjmp(jmploc.loc)) { + int e; + + handler = savehandler; + e = exception; + if (e == EXERROR || e == EXEXEC) { + popredir(); + if (in_redirect) { + exitstatus = 2; + return; + } + } + longjmp(handler->loc, 1); + } else { + INTOFF; + handler = &jmploc; + redirect(n->nredir.redirect, REDIR_PUSH); + in_redirect = 0; + INTON; + evaltree(n->nredir.n, flags); + } + INTOFF; + handler = savehandler; + popredir(); + INTON; +} + /* * Compute the names of the files in a redirection list. @@ -593,10 +630,12 @@ char *savecmdname; struct shparam saveparam; struct localvar *savelocalvars; + struct parsefile *savetopfile; volatile int e; char *lastarg; int realstatus; int do_clearcmdentry; + char *path = pathval(); /* First expand the arguments. */ TRACE(("evalcommand(%p, %d) called\n", (void *)cmd, flags)); @@ -646,7 +685,7 @@ out2str(ps4val()); for (sp = varlist.list ; sp ; sp = sp->next) { if (sep != 0) - outc(' ', &errout); + out2c(' '); p = sp->text; while (*p != '=' && *p != '\0') out2c(*p++); @@ -658,7 +697,7 @@ } for (sp = arglist.list ; sp ; sp = sp->next) { if (sep != 0) - outc(' ', &errout); + out2c(' '); /* Disambiguate command looking like assignment. */ if (sp == arglist.list && strchr(sp->text, '=') != NULL && @@ -670,7 +709,7 @@ out2qstr(sp->text); sep = ' '; } - outc('\n', &errout); + out2c('\n'); flushout(&errout); } @@ -679,10 +718,10 @@ /* Variable assignment(s) without command */ cmdentry.cmdtype = CMDBUILTIN; cmdentry.u.index = BLTINCMD; - cmdentry.special = 1; + cmdentry.special = 0; } else { static const char PATH[] = "PATH="; - char *path = pathval(); + int cmd_flags = 0, bltinonly = 0; /* * Modify the command lookup path, if a PATH= assignment @@ -713,42 +752,79 @@ do_clearcmdentry = 1; } - find_command(argv[0], &cmdentry, 1, path); - if (cmdentry.cmdtype == CMDUNKNOWN) { /* command not found */ - exitstatus = 127; - flushout(&errout); - return; - } - /* implement the bltin builtin here */ - if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == BLTINCMD) { - for (;;) { - argv++; - if (--argc == 0) + for (;;) { + if (bltinonly) { + cmdentry.u.index = find_builtin(*argv, &cmdentry.special); + if (cmdentry.u.index < 0) { + cmdentry.u.index = BLTINCMD; + argv--; + argc++; break; - if ((cmdentry.u.index = find_builtin(*argv, - &cmdentry.special)) < 0) { - outfmt(&errout, "%s: not found\n", *argv); - exitstatus = 127; - flushout(&errout); - return; } - if (cmdentry.u.index != BLTINCMD) + } else + find_command(argv[0], &cmdentry, cmd_flags, path); + /* implement the bltin and command builtins here */ + if (cmdentry.cmdtype != CMDBUILTIN) + break; + if (cmdentry.u.index == BLTINCMD) { + if (argc == 1) break; - } + argv++; + argc--; + bltinonly = 1; + } else if (cmdentry.u.index == COMMANDCMD) { + if (argc == 1) + break; + if (!strcmp(argv[1], "-p")) { + if (argc == 2) + break; + if (argv[2][0] == '-') { + if (strcmp(argv[2], "--")) + break; + if (argc == 3) + break; + argv += 3; + argc -= 3; + } else { + argv += 2; + argc -= 2; + } + path = _PATH_STDPATH; + clearcmdentry(0); + do_clearcmdentry = 1; + } else if (!strcmp(argv[1], "--")) { + if (argc == 2) + break; + argv += 2; + argc -= 2; + } else if (argv[1][0] == '-') + break; + else { + argv++; + argc--; + } + cmd_flags |= DO_NOFUNC; + bltinonly = 0; + } else + break; } + /* + * Special builtins lose their special properties when + * called via 'command'. + */ + if (cmd_flags & DO_NOFUNC) + cmdentry.special = 0; } /* Fork off a child process if necessary. */ if (cmd->ncmd.backgnd - || (cmdentry.cmdtype == CMDNORMAL + || ((cmdentry.cmdtype == CMDNORMAL || cmdentry.cmdtype == CMDUNKNOWN) && ((flags & EV_EXIT) == 0 || have_traps())) || ((flags & EV_BACKCMD) != 0 && (cmdentry.cmdtype != CMDBUILTIN || cmdentry.u.index == CDCMD || cmdentry.u.index == DOTCMD - || cmdentry.u.index == EVALCMD)) - || (cmdentry.cmdtype == CMDBUILTIN && - cmdentry.u.index == COMMANDCMD)) { + || cmdentry.u.index == EVALCMD))) { jp = makejob(cmd, 1); mode = cmd->ncmd.backgnd; if (flags & EV_BACKCMD) { @@ -775,7 +851,6 @@ #ifdef DEBUG trputs("Shell function: "); trargs(argv); #endif - redirect(cmd->ncmd.redirect, REDIR_PUSH); saveparam = shellparam; shellparam.malloc = 0; shellparam.reset = 1; @@ -786,7 +861,6 @@ savelocalvars = localvars; localvars = NULL; reffunc(cmdentry.u.func); - INTON; savehandler = handler; if (setjmp(jmploc.loc)) { if (exception == EXSHELLPROC) @@ -794,23 +868,27 @@ else { freeparam(&shellparam); shellparam = saveparam; + if (exception == EXERROR || exception == EXEXEC) + popredir(); } unreffunc(cmdentry.u.func); poplocalvars(); localvars = savelocalvars; + funcnest--; handler = savehandler; longjmp(handler->loc, 1); } handler = &jmploc; + funcnest++; + redirect(cmd->ncmd.redirect, REDIR_PUSH); + INTON; for (sp = varlist.list ; sp ; sp = sp->next) mklocal(sp->text); - funcnest++; exitstatus = oexitstatus; if (flags & EV_TESTED) evaltree(getfuncnode(cmdentry.u.func), EV_TESTED); else evaltree(getfuncnode(cmdentry.u.func), 0); - funcnest--; INTOFF; unreffunc(cmdentry.u.func); poplocalvars(); @@ -818,6 +896,7 @@ freeparam(&shellparam); shellparam = saveparam; handler = savehandler; + funcnest--; popredir(); INTON; if (evalskip == SKIPFUNC) { @@ -836,8 +915,10 @@ memout.nextc = memout.buf; memout.bufsize = 64; mode |= REDIR_BACKQ; + cmdentry.special = 0; } savecmdname = commandname; + savetopfile = getcurrentfile(); cmdenviron = varlist.list; e = -1; savehandler = handler; @@ -848,15 +929,25 @@ } handler = &jmploc; redirect(cmd->ncmd.redirect, mode); + /* + * If there is no command word, redirection errors should + * not be fatal but assignment errors should. + */ + if (argc == 0 && !(flags & EV_BACKCMD)) + cmdentry.special = 1; if (cmdentry.special) listsetvar(cmdenviron); + if (argc > 0) + bltinsetlocale(); commandname = argv[0]; argptr = argv + 1; - optptr = NULL; /* initialize nextopt */ + nextopt_optptr = NULL; /* initialize nextopt */ builtin_flags = flags; exitstatus = (*builtinfunc[cmdentry.u.index])(argc, argv); flushall(); cmddone: + if (argc > 0) + bltinunsetlocale(); cmdenviron = NULL; out1 = &output; out2 = &errout; @@ -868,29 +959,31 @@ } } handler = savehandler; - if (e != -1) { - if ((e != EXERROR && e != EXEXEC) - || cmdentry.special) - exraise(e); - FORCEINTON; - } - if (cmdentry.u.index != EXECCMD) - popredir(); if (flags == EV_BACKCMD) { backcmd->buf = memout.buf; backcmd->nleft = memout.nextc - memout.buf; memout.buf = NULL; } + if (cmdentry.u.index != EXECCMD && + (e == -1 || e == EXERROR || e == EXEXEC)) + popredir(); + if (e != -1) { + if ((e != EXERROR && e != EXEXEC) + || cmdentry.special) + exraise(e); + popfilesupto(savetopfile); + if (flags != EV_BACKCMD) + FORCEINTON; + } } else { #ifdef DEBUG trputs("normal command: "); trargs(argv); #endif - clearredir(); redirect(cmd->ncmd.redirect, 0); for (sp = varlist.list ; sp ; sp = sp->next) setvareq(sp->text, VEXPORT|VSTACK); envp = environment(); - shellexec(argv, envp, pathval(), cmdentry.u.index); + shellexec(argv, envp, path, cmdentry.u.index); /*NOTREACHED*/ } goto out; @@ -946,12 +1039,17 @@ */ /* - * No command given, or a bltin command with no arguments. + * No command given, a bltin command with no arguments, or a bltin command + * with an invalid name. */ int -bltincmd(int argc __unused, char **argv __unused) +bltincmd(int argc, char **argv) { + if (argc > 1) { + out2fmt_flush("%s: not found\n", argv[1]); + return 127; + } /* * Preserve exitstatus of a previous possible redirection * as POSIX mandates @@ -991,23 +1089,18 @@ int commandcmd(int argc, char **argv) { - static char stdpath[] = _PATH_STDPATH; - struct jmploc loc, *old; - struct strlist *sp; - char *path; + const char *path; int ch; int cmd = -1; - for (sp = cmdenviron; sp ; sp = sp->next) - setvareq(sp->text, VEXPORT|VSTACK); - path = pathval(); + path = bltinlookup("PATH", 1); optind = optreset = 1; opterr = 0; while ((ch = getopt(argc, argv, "pvV")) != -1) { switch (ch) { case 'p': - path = stdpath; + path = _PATH_STDPATH; break; case 'v': cmd = TYPECMD_SMALLV; @@ -1026,24 +1119,16 @@ if (cmd != -1) { if (argc != 1) error("wrong number of arguments"); - return typecmd_impl(2, argv - 1, cmd); - } - if (argc != 0) { - old = handler; - handler = &loc; - if (setjmp(handler->loc) == 0) - shellexec(argv, environment(), path, 0); - handler = old; - if (exception == EXEXEC) - exit(exerrno); - exraise(exception); + return typecmd_impl(2, argv - 1, cmd, path); } + if (argc != 0) + error("commandcmd() called while it should not be"); /* * Do nothing successfully if no command was specified; * ksh also does this. */ - exit(0); + return 0; } @@ -1085,6 +1170,12 @@ int execcmd(int argc, char **argv) { + /* + * Because we have historically not supported any options, + * only treat "--" specially. + */ + if (argc > 1 && strcmp(argv[1], "--") == 0) + argc--, argv++; if (argc > 1) { struct strlist *sp; Index: var.c =================================================================== --- var.c (.../stable/8/bin/sh) (revision 209225) +++ var.c (.../head/bin/sh) (revision 209225) @@ -73,13 +73,14 @@ struct varinit { struct var *var; int flags; - char *text; + const char *text; void (*func)(const char *); }; #ifndef NO_HISTORY struct var vhistsize; +struct var vterm; #endif struct var vifs; struct var vmail; @@ -94,27 +95,31 @@ STATIC const struct varinit varinit[] = { #ifndef NO_HISTORY - { &vhistsize, VSTRFIXED|VTEXTFIXED|VUNSET, "HISTSIZE=", + { &vhistsize, VUNSET, "HISTSIZE=", sethistsize }, #endif - { &vifs, VSTRFIXED|VTEXTFIXED, "IFS= \t\n", + { &vifs, 0, "IFS= \t\n", NULL }, - { &vmail, VSTRFIXED|VTEXTFIXED|VUNSET, "MAIL=", + { &vmail, VUNSET, "MAIL=", NULL }, - { &vmpath, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH=", + { &vmpath, VUNSET, "MAILPATH=", NULL }, - { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=" _PATH_DEFPATH, + { &vpath, 0, "PATH=" _PATH_DEFPATH, changepath }, - { &vppid, VSTRFIXED|VTEXTFIXED|VUNSET, "PPID=", + { &vppid, VUNSET, "PPID=", NULL }, /* * vps1 depends on uid */ - { &vps2, VSTRFIXED|VTEXTFIXED, "PS2=> ", + { &vps2, 0, "PS2=> ", NULL }, - { &vps4, VSTRFIXED|VTEXTFIXED, "PS4=+ ", + { &vps4, 0, "PS4=+ ", NULL }, - { &voptind, VSTRFIXED|VTEXTFIXED, "OPTIND=1", +#ifndef NO_HISTORY + { &vterm, VUNSET, "TERM=", + setterm }, +#endif + { &voptind, 0, "OPTIND=1", getoptsreset }, { NULL, 0, NULL, NULL } @@ -122,9 +127,17 @@ STATIC struct var *vartab[VTABSIZE]; -STATIC struct var **hashvar(char *); -STATIC int varequal(char *, char *); -STATIC int localevar(char *); +STATIC const char *const locale_names[7] = { + "LC_COLLATE", "LC_CTYPE", "LC_MONETARY", + "LC_NUMERIC", "LC_TIME", "LC_MESSAGES", NULL +}; +STATIC const int locale_categories[7] = { + LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, LC_TIME, LC_MESSAGES, 0 +}; + +STATIC struct var **hashvar(const char *); +STATIC int varequal(const char *, const char *); +STATIC int localevar(const char *); /* * Initialize the variable symbol tables and import the environment. @@ -132,9 +145,9 @@ #ifdef mkinit INCLUDE "var.h" +MKINIT char **environ; INIT { char **envp; - extern char **environ; initvar(); for (envp = environ ; *envp ; envp++) { @@ -164,8 +177,8 @@ vpp = hashvar(ip->text); vp->next = *vpp; *vpp = vp; - vp->text = ip->text; - vp->flags = ip->flags; + vp->text = __DECONST(char *, ip->text); + vp->flags = ip->flags | VSTRFIXED | VTEXTFIXED; vp->func = ip->func; } } @@ -176,7 +189,7 @@ vpp = hashvar("PS1="); vps1.next = *vpp; *vpp = &vps1; - vps1.text = geteuid() ? "PS1=$ " : "PS1=# "; + vps1.text = __DECONST(char *, geteuid() ? "PS1=$ " : "PS1=# "); vps1.flags = VSTRFIXED|VTEXTFIXED; } if ((vppid.flags & VEXPORT) == 0) { @@ -190,12 +203,14 @@ */ int -setvarsafe(char *name, char *val, int flags) +setvarsafe(const char *name, const char *val, int flags) { struct jmploc jmploc; struct jmploc *const savehandler = handler; int err = 0; + int inton; + inton = is_int_on(); if (setjmp(jmploc.loc)) err = 1; else { @@ -203,6 +218,7 @@ setvar(name, val, flags); } handler = savehandler; + SETINTON(inton); return err; } @@ -212,9 +228,9 @@ */ void -setvar(char *name, char *val, int flags) +setvar(const char *name, const char *val, int flags) { - char *p, *q; + const char *p; int len; int namelen; char *nameeq; @@ -242,25 +258,20 @@ } else { len += strlen(val); } - p = nameeq = ckmalloc(len); - q = name; - while (--namelen >= 0) - *p++ = *q++; - *p++ = '='; - *p = '\0'; + nameeq = ckmalloc(len); + memcpy(nameeq, name, namelen); + nameeq[namelen] = '='; if (val) - scopy(val, p); + scopy(val, nameeq + namelen + 1); + else + nameeq[namelen + 1] = '\0'; setvareq(nameeq, flags); } STATIC int -localevar(char *s) +localevar(const char *s) { - static char *lnames[7] = { - "ALL", "COLLATE", "CTYPE", "MONETARY", - "NUMERIC", "TIME", NULL - }; - char **ss; + const char *const *ss; if (*s != 'L') return 0; @@ -268,8 +279,10 @@ return 1; if (strncmp(s + 1, "C_", 2) != 0) return 0; - for (ss = lnames; *ss ; ss++) - if (varequal(s + 3, *ss)) + if (varequal(s + 3, "ALL")) + return 1; + for (ss = locale_names; *ss ; ss++) + if (varequal(s + 3, *ss + 3)) return 1; return 0; } @@ -280,7 +293,7 @@ * pointer into environ where the string should not be manipulated. */ static void -change_env(char *s, int set) +change_env(const char *s, int set) { char *eqp; char *ss; @@ -391,7 +404,7 @@ */ char * -lookupvar(char *name) +lookupvar(const char *name) { struct var *v; @@ -414,7 +427,7 @@ */ char * -bltinlookup(char *name, int doall) +bltinlookup(const char *name, int doall) { struct strlist *sp; struct var *v; @@ -435,6 +448,61 @@ } +/* + * Set up locale for a builtin (LANG/LC_* assignments). + */ +void +bltinsetlocale(void) +{ + struct strlist *lp; + int act = 0; + char *loc, *locdef; + int i; + + for (lp = cmdenviron ; lp ; lp = lp->next) { + if (localevar(lp->text)) { + act = 1; + break; + } + } + if (!act) + return; + loc = bltinlookup("LC_ALL", 0); + INTOFF; + if (loc != NULL) { + setlocale(LC_ALL, loc); + INTON; + return; + } + locdef = bltinlookup("LANG", 0); + for (i = 0; locale_names[i] != NULL; i++) { + loc = bltinlookup(locale_names[i], 0); + if (loc == NULL) + loc = locdef; + if (loc != NULL) + setlocale(locale_categories[i], loc); + } + INTON; +} + +/* + * Undo the effect of bltinlocaleset(). + */ +void +bltinunsetlocale(void) +{ + struct strlist *lp; + + INTOFF; + for (lp = cmdenviron ; lp ; lp = lp->next) { + if (localevar(lp->text)) { + setlocale(LC_ALL, ""); + return; + } + } + INTON; +} + /* * Generate a list of exported variables. This routine is used to construct @@ -472,9 +540,9 @@ * VSTACK set since these are currently allocated on the stack. */ -#ifdef mkinit MKINIT void shprocvar(void); +#ifdef mkinit SHELLPROC { shprocvar(); } @@ -798,7 +866,7 @@ */ int -unsetvar(char *s) +unsetvar(const char *s) { struct var **vpp; struct var *vp; @@ -838,7 +906,7 @@ */ STATIC struct var ** -hashvar(char *p) +hashvar(const char *p) { unsigned int hashval; @@ -857,7 +925,7 @@ */ STATIC int -varequal(char *p, char *q) +varequal(const char *p, const char *q) { while (*p == *q++) { if (*p++ == '=') Index: memalloc.c =================================================================== --- memalloc.c (.../stable/8/bin/sh) (revision 209225) +++ memalloc.c (.../head/bin/sh) (revision 209225) @@ -95,7 +95,7 @@ */ char * -savestr(char *s) +savestr(const char *s) { char *p; Index: main.h =================================================================== --- main.h (.../stable/8/bin/sh) (revision 209225) +++ main.h (.../head/bin/sh) (revision 209225) @@ -35,8 +35,9 @@ extern int rootpid; /* pid of main shell */ extern int rootshell; /* true if we aren't a child of the main shell */ +extern struct jmploc main_handler; /* top level exception handler */ -void readcmdfile(char *); +void readcmdfile(const char *); void cmdloop(int); int dotcmd(int, char **); int exitcmd(int, char **); Index: exec.h =================================================================== --- exec.h (.../stable/8/bin/sh) (revision 209225) +++ exec.h (.../head/bin/sh) (revision 209225) @@ -57,20 +57,24 @@ }; -extern char *pathopt; /* set by padvance */ +/* action to find_command() */ +#define DO_ERR 0x01 /* prints errors */ +#define DO_NOFUNC 0x02 /* don't return shell functions, for command */ + +extern const char *pathopt; /* set by padvance */ extern int exerrno; /* last exec error */ -void shellexec(char **, char **, char *, int); -char *padvance(char **, char *); +void shellexec(char **, char **, const char *, int) __dead2; +char *padvance(const char **, const char *); int hashcmd(int, char **); -void find_command(char *, struct cmdentry *, int, char *); -int find_builtin(char *, int *); +void find_command(const char *, struct cmdentry *, int, const char *); +int find_builtin(const char *, int *); void hashcd(void); void changepath(const char *); void deletefuncs(void); -void addcmdentry(char *, struct cmdentry *); -void defun(char *, union node *); -int unsetfunc(char *); -int typecmd_impl(int, char **, int); +void addcmdentry(const char *, struct cmdentry *); +void defun(const char *, union node *); +int unsetfunc(const char *); +int typecmd_impl(int, char **, int, const char *); int typecmd(int, char **); void clearcmdentry(int); Index: alias.c =================================================================== --- alias.c (.../stable/8/bin/sh) (revision 209225) +++ alias.c (.../head/bin/sh) (revision 209225) @@ -52,13 +52,13 @@ STATIC struct alias *atab[ATABSIZE]; STATIC int aliases; -STATIC void setalias(char *, char *); +STATIC void setalias(const char *, const char *); STATIC int unalias(const char *); STATIC struct alias **hashalias(const char *); STATIC void -setalias(char *name, char *val) +setalias(const char *name, const char *val) { struct alias *ap, **app; @@ -176,7 +176,7 @@ } struct alias * -lookupalias(char *name, int check) +lookupalias(const char *name, int check) { struct alias *ap = *hashalias(name); Index: cd.h =================================================================== --- cd.h (.../stable/8/bin/sh) (revision 209225) +++ cd.h (.../head/bin/sh) (revision 209225) @@ -29,6 +29,6 @@ * $FreeBSD$ */ -char *getpwd(void); +void pwd_init(int); int cdcmd (int, char **); int pwdcmd(int, char **); Index: mkinit.c =================================================================== --- mkinit.c (.../stable/8/bin/sh) (revision 209225) +++ mkinit.c (.../head/bin/sh) (revision 209225) @@ -102,9 +102,9 @@ */ struct event { - char *name; /* name of event (e.g. INIT) */ - char *routine; /* name of routine called on event */ - char *comment; /* comment describing routine */ + const char *name; /* name of event (e.g. INIT) */ + const char *routine; /* name of routine called on event */ + const char *comment; /* comment describing routine */ struct text code; /* code for handling event */ }; @@ -140,7 +140,7 @@ }; -char *curfile; /* current file */ +const char *curfile; /* current file */ int linno; /* current line */ char *header_files[200]; /* list of header files */ struct text defines; /* #define statements */ @@ -148,20 +148,20 @@ int amiddecls; /* for formatting */ -void readfile(char *); -int match(char *, char *); -int gooddefine(char *); -void doevent(struct event *, FILE *, char *); +void readfile(const char *); +int match(const char *, const char *); +int gooddefine(const char *); +void doevent(struct event *, FILE *, const char *); void doinclude(char *); void dodecl(char *, FILE *); void output(void); -void addstr(char *, struct text *); +void addstr(const char *, struct text *); void addchar(int, struct text *); void writetext(struct text *, FILE *); -FILE *ckfopen(char *, char *); +FILE *ckfopen(const char *, const char *); void *ckmalloc(size_t); -char *savestr(char *); -void error(char *); +char *savestr(const char *); +void error(const char *); #define equal(s1, s2) (strcmp(s1, s2) == 0) @@ -170,9 +170,9 @@ { char **ap; - header_files[0] = "\"shell.h\""; - header_files[1] = "\"mystring.h\""; - header_files[2] = "\"init.h\""; + header_files[0] = savestr("\"shell.h\""); + header_files[1] = savestr("\"mystring.h\""); + header_files[2] = savestr("\"init.h\""); for (ap = argv + 1 ; *ap ; ap++) readfile(*ap); output(); @@ -186,7 +186,7 @@ */ void -readfile(char *fname) +readfile(const char *fname) { FILE *fp; char line[1024]; @@ -230,9 +230,9 @@ int -match(char *name, char *line) +match(const char *name, const char *line) { - char *p, *q; + const char *p, *q; p = name, q = line; while (*p) { @@ -246,9 +246,9 @@ int -gooddefine(char *line) +gooddefine(const char *line) { - char *p; + const char *p; if (! match("#define", line)) return 0; /* not a define */ @@ -269,11 +269,11 @@ void -doevent(struct event *ep, FILE *fp, char *fname) +doevent(struct event *ep, FILE *fp, const char *fname) { char line[1024]; int indent; - char *p; + const char *p; sprintf(line, "\n /* from %s: */\n", fname); addstr(line, &ep->code); @@ -407,7 +407,7 @@ */ void -addstr(char *s, struct text *text) +addstr(const char *s, struct text *text) { while (*s) { if (--text->nleft < 0) @@ -452,7 +452,7 @@ } FILE * -ckfopen(char *file, char *mode) +ckfopen(const char *file, const char *mode) { FILE *fp; @@ -474,7 +474,7 @@ } char * -savestr(char *s) +savestr(const char *s) { char *p; @@ -484,7 +484,7 @@ } void -error(char *msg) +error(const char *msg) { if (curfile != NULL) fprintf(stderr, "%s:%d: ", curfile, linno); Index: options.c =================================================================== --- options.c (.../stable/8/bin/sh) (revision 209225) +++ options.c (.../head/bin/sh) (revision 209225) @@ -64,7 +64,7 @@ struct shparam shellparam; /* current positional parameters */ char **argptr; /* argument list for builtin commands */ char *shoptarg; /* set by nextopt (like getopt) */ -char *optptr; /* used by nextopt */ +char *nextopt_optptr; /* used by nextopt */ char *minusc; /* argument to -c option */ @@ -93,8 +93,11 @@ options(1); if (*argptr == NULL && minusc == NULL) sflag = 1; - if (iflag == 2 && sflag == 1 && isatty(0) && isatty(1)) + if (iflag != 0 && sflag == 1 && isatty(0) && isatty(1)) { iflag = 1; + if (Eflag == 2) + Eflag = 1; + } if (mflag == 2) mflag = iflag; for (i = 0; i < NOPTS; i++) @@ -554,12 +557,13 @@ */ int -nextopt(char *optstring) +nextopt(const char *optstring) { - char *p, *q; + char *p; + const char *q; char c; - if ((p = optptr) == NULL || *p == '\0') { + if ((p = nextopt_optptr) == NULL || *p == '\0') { p = *argptr; if (p == NULL || *p != '-' || *++p == '\0') return '\0'; @@ -580,6 +584,6 @@ shoptarg = p; p = NULL; } - optptr = p; + nextopt_optptr = p; return c; } Index: eval.h =================================================================== --- eval.h (.../stable/8/bin/sh) (revision 209225) +++ eval.h (.../head/bin/sh) (revision 209225) @@ -35,6 +35,7 @@ extern char *commandname; /* currently executing command */ extern int exitstatus; /* exit status of last command */ +extern int oexitstatus; /* saved exit status */ extern struct strlist *cmdenviron; /* environment for builtin command */ Index: parser.c =================================================================== --- parser.c (.../stable/8/bin/sh) (revision 209225) +++ parser.c (.../head/bin/sh) (revision 209225) @@ -79,10 +79,13 @@ int striptabs; /* if set, strip leading tabs */ }; +struct parser_temp { + struct parser_temp *next; + void *data; +}; STATIC struct heredoc *heredoclist; /* list of here documents to read */ -STATIC int parsebackquote; /* nonzero if we are inside backquotes */ STATIC int doprompt; /* if set, prompt the user */ STATIC int needprompt; /* true if interactive and at start of line */ STATIC int lasttoken; /* last token read */ @@ -95,6 +98,7 @@ STATIC int quoteflag; /* set if (part of) last token was quoted */ STATIC int startlinno; /* line # where last token started */ STATIC int funclinno; /* line # where the current function started */ +STATIC struct parser_temp *parser_temp; /* XXX When 'noaliases' is set to one, no alias expansion takes place. */ static int noaliases = 0; @@ -114,10 +118,77 @@ STATIC int readtoken1(int, char const *, char *, int); STATIC int noexpand(char *); STATIC void synexpect(int); -STATIC void synerror(char *); +STATIC void synerror(const char *); STATIC void setprompt(int); +STATIC void * +parser_temp_alloc(size_t len) +{ + struct parser_temp *t; + + INTOFF; + t = ckmalloc(sizeof(*t)); + t->data = NULL; + t->next = parser_temp; + parser_temp = t; + t->data = ckmalloc(len); + INTON; + return t->data; +} + + +STATIC void * +parser_temp_realloc(void *ptr, size_t len) +{ + struct parser_temp *t; + + INTOFF; + t = parser_temp; + if (ptr != t->data) + error("bug: parser_temp_realloc misused"); + t->data = ckrealloc(t->data, len); + INTON; + return t->data; +} + + +STATIC void +parser_temp_free_upto(void *ptr) +{ + struct parser_temp *t; + int done = 0; + + INTOFF; + while (parser_temp != NULL && !done) { + t = parser_temp; + parser_temp = t->next; + done = t->data == ptr; + ckfree(t->data); + ckfree(t); + } + INTON; + if (!done) + error("bug: parser_temp_free_upto misused"); +} + + +STATIC void +parser_temp_free_all(void) +{ + struct parser_temp *t; + + INTOFF; + while (parser_temp != NULL) { + t = parser_temp; + parser_temp = t->next; + ckfree(t->data); + ckfree(t); + } + INTON; +} + + /* * Read and parse a command. Returns NEOF on end of file. (NULL is a * valid parse tree indicating a blank line.) @@ -128,6 +199,12 @@ { int t; + /* This assumes the parser is not re-entered, + * which could happen if we add command substitution on PS1/PS2. + */ + parser_temp_free_all(); + heredoclist = NULL; + tokpushback = 0; doprompt = interact; if (doprompt) @@ -864,6 +941,188 @@ } +#define MAXNEST_STATIC 8 +struct tokenstate +{ + const char *syntax; /* *SYNTAX */ + int parenlevel; /* levels of parentheses in arithmetic */ + enum tokenstate_category + { + TSTATE_TOP, + TSTATE_VAR_OLD, /* ${var+-=?}, inherits dquotes */ + TSTATE_VAR_NEW, /* other ${var...}, own dquote state */ + TSTATE_ARITH + } category; +}; + + +/* + * Called to parse command substitutions. + */ + +STATIC char * +parsebackq(char *out, struct nodelist **pbqlist, + int oldstyle, int dblquote, int quoted) +{ + struct nodelist **nlpp; + union node *n; + char *volatile str; + struct jmploc jmploc; + struct jmploc *const savehandler = handler; + int savelen; + int saveprompt; + const int bq_startlinno = plinno; + char *volatile ostr = NULL; + struct parsefile *const savetopfile = getcurrentfile(); + struct heredoc *const saveheredoclist = heredoclist; + struct heredoc *here; + + str = NULL; + if (setjmp(jmploc.loc)) { + popfilesupto(savetopfile); + if (str) + ckfree(str); + if (ostr) + ckfree(ostr); + heredoclist = saveheredoclist; + handler = savehandler; + if (exception == EXERROR) { + startlinno = bq_startlinno; + synerror("Error in command substitution"); + } + longjmp(handler->loc, 1); + } + INTOFF; + savelen = out - stackblock(); + if (savelen > 0) { + str = ckmalloc(savelen); + memcpy(str, stackblock(), savelen); + } + handler = &jmploc; + heredoclist = NULL; + INTON; + if (oldstyle) { + /* We must read until the closing backquote, giving special + treatment to some slashes, and then push the string and + reread it as input, interpreting it normally. */ + char *oout; + int c; + int olen; + + + STARTSTACKSTR(oout); + for (;;) { + if (needprompt) { + setprompt(2); + needprompt = 0; + } + switch (c = pgetc()) { + case '`': + goto done; + + case '\\': + if ((c = pgetc()) == '\n') { + plinno++; + if (doprompt) + setprompt(2); + else + setprompt(0); + /* + * If eating a newline, avoid putting + * the newline into the new character + * stream (via the STPUTC after the + * switch). + */ + continue; + } + if (c != '\\' && c != '`' && c != '$' + && (!dblquote || c != '"')) + STPUTC('\\', oout); + break; + + case '\n': + plinno++; + needprompt = doprompt; + break; + + case PEOF: + startlinno = plinno; + synerror("EOF in backquote substitution"); + break; + + default: + break; + } + STPUTC(c, oout); + } +done: + STPUTC('\0', oout); + olen = oout - stackblock(); + INTOFF; + ostr = ckmalloc(olen); + memcpy(ostr, stackblock(), olen); + setinputstring(ostr, 1); + INTON; + } + nlpp = pbqlist; + while (*nlpp) + nlpp = &(*nlpp)->next; + *nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist)); + (*nlpp)->next = NULL; + + if (oldstyle) { + saveprompt = doprompt; + doprompt = 0; + } + + n = list(0); + + if (oldstyle) + doprompt = saveprompt; + else { + if (readtoken() != TRP) + synexpect(TRP); + } + + (*nlpp)->n = n; + if (oldstyle) { + /* + * Start reading from old file again, ignoring any pushed back + * tokens left from the backquote parsing + */ + popfile(); + tokpushback = 0; + } + while (stackblocksize() <= savelen) + growstackblock(); + STARTSTACKSTR(out); + INTOFF; + if (str) { + memcpy(out, str, savelen); + STADJUST(savelen, out); + ckfree(str); + str = NULL; + } + if (ostr) { + ckfree(ostr); + ostr = NULL; + } + here = saveheredoclist; + if (here != NULL) { + while (here->next != NULL) + here = here->next; + here->next = heredoclist; + heredoclist = saveheredoclist; + } + handler = savehandler; + INTON; + if (quoted) + USTPUTC(CTLBACKQ | CTLQUOTE, out); + else + USTPUTC(CTLBACKQ, out); + return out; +} + /* * If eofmark is NULL, read a word or a redirection symbol. If eofmark @@ -880,12 +1139,10 @@ #define CHECKEND() {goto checkend; checkend_return:;} #define PARSEREDIR() {goto parseredir; parseredir_return:;} #define PARSESUB() {goto parsesub; parsesub_return:;} -#define PARSEBACKQOLD() {oldstyle = 1; goto parsebackq; parsebackq_oldreturn:;} -#define PARSEBACKQNEW() {oldstyle = 0; goto parsebackq; parsebackq_newreturn:;} #define PARSEARITH() {goto parsearith; parsearith_return:;} STATIC int -readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs) +readtoken1(int firstc, char const *initialsyntax, char *eofmark, int striptabs) { int c = firstc; char *out; @@ -893,23 +1150,21 @@ char line[EOFMARKLEN + 1]; struct nodelist *bqlist; int quotef; - int dblquote; - int varnest; /* levels of variables expansion */ - int arinest; /* levels of arithmetic expansion */ - int parenlevel; /* levels of parens in arithmetic */ - int oldstyle; - char const *prevsyntax; /* syntax before arithmetic */ + int newvarnest; + int level; int synentry; + struct tokenstate state_static[MAXNEST_STATIC]; + int maxnest = MAXNEST_STATIC; + struct tokenstate *state = state_static; startlinno = plinno; - dblquote = 0; - if (syntax == DQSYNTAX) - dblquote = 1; quotef = 0; bqlist = NULL; - varnest = 0; - arinest = 0; - parenlevel = 0; + newvarnest = 0; + level = 0; + state[level].syntax = initialsyntax; + state[level].parenlevel = 0; + state[level].category = TSTATE_TOP; STARTSTACKSTR(out); loop: { /* for each line, until end of word */ @@ -917,11 +1172,11 @@ for (;;) { /* until end of line or end of word */ CHECKSTRSPACE(3, out); /* permit 3 calls to USTPUTC */ - synentry = syntax[c]; + synentry = state[level].syntax[c]; switch(synentry) { case CNL: /* '\n' */ - if (syntax == BASESYNTAX) + if (state[level].syntax == BASESYNTAX) goto endword; /* exit outer loop */ USTPUTC(c, out); plinno++; @@ -935,7 +1190,7 @@ USTPUTC(c, out); break; case CCTL: - if (eofmark == NULL || dblquote) + if (eofmark == NULL || initialsyntax != SQSYNTAX) USTPUTC(CTLESC, out); USTPUTC(c, out); break; @@ -951,41 +1206,37 @@ else setprompt(0); } else { - if (dblquote && c != '\\' && - c != '`' && c != '$' && - (c != '"' || eofmark != NULL)) + if (state[level].syntax == DQSYNTAX && + c != '\\' && c != '`' && c != '$' && + (c != '"' || (eofmark != NULL && + newvarnest == 0)) && + (c != '}' || state[level].category != TSTATE_VAR_OLD)) USTPUTC('\\', out); if (SQSYNTAX[c] == CCTL) USTPUTC(CTLESC, out); - else if (eofmark == NULL) + else if (eofmark == NULL || + newvarnest > 0) USTPUTC(CTLQUOTEMARK, out); USTPUTC(c, out); quotef++; } break; case CSQUOTE: - if (eofmark == NULL) - USTPUTC(CTLQUOTEMARK, out); - syntax = SQSYNTAX; + USTPUTC(CTLQUOTEMARK, out); + state[level].syntax = SQSYNTAX; break; case CDQUOTE: - if (eofmark == NULL) - USTPUTC(CTLQUOTEMARK, out); - syntax = DQSYNTAX; - dblquote = 1; + USTPUTC(CTLQUOTEMARK, out); + state[level].syntax = DQSYNTAX; break; case CENDQUOTE: - if (eofmark != NULL && arinest == 0 && - varnest == 0) { + if (eofmark != NULL && newvarnest == 0) USTPUTC(c, out); - } else { - if (arinest) { - syntax = ARISYNTAX; - dblquote = 0; - } else if (eofmark == NULL) { - syntax = BASESYNTAX; - dblquote = 0; - } + else { + if (state[level].category == TSTATE_ARITH) + state[level].syntax = ARISYNTAX; + else + state[level].syntax = BASESYNTAX; quotef++; } break; @@ -993,30 +1244,33 @@ PARSESUB(); /* parse substitution */ break; case CENDVAR: /* '}' */ - if (varnest > 0) { - varnest--; + if (level > 0 && + (state[level].category == TSTATE_VAR_OLD || + state[level].category == TSTATE_VAR_NEW)) { + if (state[level].category == TSTATE_VAR_OLD) + state[level - 1].syntax = state[level].syntax; + else + newvarnest--; + level--; USTPUTC(CTLENDVAR, out); } else { USTPUTC(c, out); } break; case CLP: /* '(' in arithmetic */ - parenlevel++; + state[level].parenlevel++; USTPUTC(c, out); break; case CRP: /* ')' in arithmetic */ - if (parenlevel > 0) { + if (state[level].parenlevel > 0) { USTPUTC(c, out); - --parenlevel; + --state[level].parenlevel; } else { if (pgetc() == ')') { - if (--arinest == 0) { + if (level > 0 && + state[level].category == TSTATE_ARITH) { + level--; USTPUTC(CTLENDARI, out); - syntax = prevsyntax; - if (syntax == DQSYNTAX) - dblquote = 1; - else - dblquote = 0; } else USTPUTC(')', out); } else { @@ -1030,12 +1284,15 @@ } break; case CBQUOTE: /* '`' */ - PARSEBACKQOLD(); + out = parsebackq(out, &bqlist, 1, + state[level].syntax == DQSYNTAX && + (eofmark == NULL || newvarnest > 0), + state[level].syntax == DQSYNTAX || state[level].syntax == ARISYNTAX); break; case CEOF: goto endword; /* exit outer loop */ default: - if (varnest == 0) + if (level == 0) goto endword; /* exit outer loop */ USTPUTC(c, out); } @@ -1043,14 +1300,17 @@ } } endword: - if (syntax == ARISYNTAX) + if (state[level].syntax == ARISYNTAX) synerror("Missing '))'"); - if (syntax != BASESYNTAX && ! parsebackquote && eofmark == NULL) + if (state[level].syntax != BASESYNTAX && eofmark == NULL) synerror("Unterminated quoted string"); - if (varnest != 0) { + if (state[level].category == TSTATE_VAR_OLD || + state[level].category == TSTATE_VAR_NEW) { startlinno = plinno; synerror("Missing '}'"); } + if (state != state_static) + parser_temp_free_upto(state); USTPUTC('\0', out); len = out - stackblock(); out = stackblock(); @@ -1073,7 +1333,6 @@ /* end of readtoken routine */ - /* * Check to see whether we are at the end of the here document. When this * is called, c is set to the first character of the next input line. If @@ -1190,7 +1449,11 @@ PARSEARITH(); } else { pungetc(); - PARSEBACKQNEW(); + out = parsebackq(out, &bqlist, 0, + state[level].syntax == DQSYNTAX && + (eofmark == NULL || newvarnest > 0), + state[level].syntax == DQSYNTAX || + state[level].syntax == ARISYNTAX); } } else { USTPUTC(CTLVAR, out); @@ -1245,6 +1508,8 @@ subtype = VSERROR; if (c == '}') pungetc(); + else if (c == '\n' || c == PEOF) + synerror("Unexpected end of line in substitution"); else USTPUTC(c, out); } else { @@ -1261,6 +1526,8 @@ default: p = strchr(types, c); if (p == NULL) { + if (c == '\n' || c == PEOF) + synerror("Unexpected end of line in substitution"); if (flags == VSNUL) STPUTC(':', out); STPUTC(c, out); @@ -1286,192 +1553,74 @@ pungetc(); } STPUTC('=', out); - if (subtype != VSLENGTH && (dblquote || arinest)) + if (subtype != VSLENGTH && (state[level].syntax == DQSYNTAX || + state[level].syntax == ARISYNTAX)) flags |= VSQUOTE; *(stackblock() + typeloc) = subtype | flags; - if (subtype != VSNORMAL) - varnest++; - } - goto parsesub_return; -} - - -/* - * Called to parse command substitutions. Newstyle is set if the command - * is enclosed inside $(...); nlpp is a pointer to the head of the linked - * list of commands (passed by reference), and savelen is the number of - * characters on the top of the stack which must be preserved. - */ - -parsebackq: { - struct nodelist **nlpp; - int savepbq; - union node *n; - char *volatile str; - struct jmploc jmploc; - struct jmploc *const savehandler = handler; - int savelen; - int saveprompt; - const int bq_startlinno = plinno; - - savepbq = parsebackquote; - if (setjmp(jmploc.loc)) { - if (str) - ckfree(str); - parsebackquote = 0; - handler = savehandler; - if (exception == EXERROR) { - startlinno = bq_startlinno; - synerror("Error in command substitution"); - } - longjmp(handler->loc, 1); - } - INTOFF; - str = NULL; - savelen = out - stackblock(); - if (savelen > 0) { - str = ckmalloc(savelen); - memcpy(str, stackblock(), savelen); - } - handler = &jmploc; - INTON; - if (oldstyle) { - /* We must read until the closing backquote, giving special - treatment to some slashes, and then push the string and - reread it as input, interpreting it normally. */ - char *out; - int c; - int savelen; - char *str; - - - STARTSTACKSTR(out); - for (;;) { - if (needprompt) { - setprompt(2); - needprompt = 0; + if (subtype != VSNORMAL) { + if (level + 1 >= maxnest) { + maxnest *= 2; + if (state == state_static) { + state = parser_temp_alloc( + maxnest * sizeof(*state)); + memcpy(state, state_static, + MAXNEST_STATIC * sizeof(*state)); + } else + state = parser_temp_realloc(state, + maxnest * sizeof(*state)); } - switch (c = pgetc()) { - case '`': - goto done; - - case '\\': - if ((c = pgetc()) == '\n') { - plinno++; - if (doprompt) - setprompt(2); - else - setprompt(0); - /* - * If eating a newline, avoid putting - * the newline into the new character - * stream (via the STPUTC after the - * switch). - */ - continue; - } - if (c != '\\' && c != '`' && c != '$' - && (!dblquote || c != '"')) - STPUTC('\\', out); - break; - - case '\n': - plinno++; - needprompt = doprompt; - break; - - case PEOF: - startlinno = plinno; - synerror("EOF in backquote substitution"); - break; - - default: - break; + level++; + state[level].parenlevel = 0; + if (subtype == VSMINUS || subtype == VSPLUS || + subtype == VSQUESTION || subtype == VSASSIGN) { + /* + * For operators that were in the Bourne shell, + * inherit the double-quote state. + */ + state[level].syntax = state[level - 1].syntax; + state[level].category = TSTATE_VAR_OLD; + } else { + /* + * The other operators take a pattern, + * so go to BASESYNTAX. + * Also, ' and " are now special, even + * in here documents. + */ + state[level].syntax = BASESYNTAX; + state[level].category = TSTATE_VAR_NEW; + newvarnest++; } - STPUTC(c, out); - } -done: - STPUTC('\0', out); - savelen = out - stackblock(); - if (savelen > 0) { - str = ckmalloc(savelen); - memcpy(str, stackblock(), savelen); - setinputstring(str, 1); - } - } - nlpp = &bqlist; - while (*nlpp) - nlpp = &(*nlpp)->next; - *nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist)); - (*nlpp)->next = NULL; - parsebackquote = oldstyle; - - if (oldstyle) { - saveprompt = doprompt; - doprompt = 0; - } - - n = list(0); - - if (oldstyle) - doprompt = saveprompt; - else { - if (readtoken() != TRP) - synexpect(TRP); - } - - (*nlpp)->n = n; - if (oldstyle) { - /* - * Start reading from old file again, ignoring any pushed back - * tokens left from the backquote parsing - */ - popfile(); - tokpushback = 0; - } - while (stackblocksize() <= savelen) - growstackblock(); - STARTSTACKSTR(out); - if (str) { - memcpy(out, str, savelen); - STADJUST(savelen, out); - INTOFF; - ckfree(str); - str = NULL; - INTON; + } } - parsebackquote = savepbq; - handler = savehandler; - if (arinest || dblquote) - USTPUTC(CTLBACKQ | CTLQUOTE, out); - else - USTPUTC(CTLBACKQ, out); - if (oldstyle) - goto parsebackq_oldreturn; - else - goto parsebackq_newreturn; + goto parsesub_return; } + /* * Parse an arithmetic expansion (indicate start of one and set state) */ parsearith: { - if (++arinest == 1) { - prevsyntax = syntax; - syntax = ARISYNTAX; - USTPUTC(CTLARI, out); - if (dblquote) - USTPUTC('"',out); - else - USTPUTC(' ',out); - } else { - /* - * we collapse embedded arithmetic expansion to - * parenthesis, which should be equivalent - */ - USTPUTC('(', out); + if (level + 1 >= maxnest) { + maxnest *= 2; + if (state == state_static) { + state = parser_temp_alloc( + maxnest * sizeof(*state)); + memcpy(state, state_static, + MAXNEST_STATIC * sizeof(*state)); + } else + state = parser_temp_realloc(state, + maxnest * sizeof(*state)); } + level++; + state[level].syntax = ARISYNTAX; + state[level].parenlevel = 0; + state[level].category = TSTATE_ARITH; + USTPUTC(CTLARI, out); + if (state[level - 1].syntax == DQSYNTAX) + USTPUTC('"',out); + else + USTPUTC(' ',out); goto parsearith_return; } @@ -1516,9 +1665,9 @@ */ int -goodname(char *name) +goodname(const char *name) { - char *p; + const char *p; p = name; if (! is_name(*p)) @@ -1553,11 +1702,11 @@ STATIC void -synerror(char *msg) +synerror(const char *msg) { if (commandname) - outfmt(&errout, "%s: %d: ", commandname, startlinno); - outfmt(&errout, "Syntax error: %s\n", msg); + outfmt(out2, "%s: %d: ", commandname, startlinno); + outfmt(out2, "Syntax error: %s\n", msg); error((char *)NULL); } @@ -1569,7 +1718,10 @@ #ifndef NO_HISTORY if (!el) #endif + { out2str(getprompt(NULL)); + flushout(out2); + } } /* @@ -1582,13 +1734,14 @@ static char ps[PROMPTLEN]; char *fmt; int i, j, trim; + static char internal_error[] = ""; /* * Select prompt format. */ switch (whichprompt) { case 0: - fmt = ""; + fmt = nullstr; break; case 1: fmt = ps1val(); @@ -1597,7 +1750,7 @@ fmt = ps2val(); break; default: - return ""; + return internal_error; } /* Index: jobs.c =================================================================== --- jobs.c (.../stable/8/bin/sh) (revision 209225) +++ jobs.c (.../head/bin/sh) (revision 209225) @@ -91,8 +91,9 @@ STATIC struct job *getjob(char *); STATIC pid_t dowait(int, struct job *); STATIC pid_t waitproc(int, int *); +STATIC void checkzombies(void); STATIC void cmdtxt(union node *); -STATIC void cmdputs(char *); +STATIC void cmdputs(const char *); #if JOBS STATIC void setcurjob(struct job *); STATIC void deljob(struct job *); @@ -146,7 +147,7 @@ do { /* while we are in the background */ initialpgrp = tcgetpgrp(ttyfd); if (initialpgrp < 0) { -out: out2str("sh: can't access tty; job control turned off\n"); +out: out2fmt_flush("sh: can't access tty; job control turned off\n"); mflag = 0; return; } @@ -400,7 +401,7 @@ struct job *jp; TRACE(("showjobs(%d) called\n", change)); - while (dowait(0, (struct job *)NULL) > 0); + checkzombies(); for (jobno = 1, jp = jobtab ; jobno <= njobs ; jobno++, jp++) { if (! jp->used) continue; @@ -742,6 +743,8 @@ TRACE(("forkshell(%%%d, %p, %d) called\n", jp - jobtab, (void *)n, mode)); INTOFF; + if (mode == FORK_BG) + checkzombies(); flushall(); pid = fork(); if (pid == -1) { @@ -757,6 +760,7 @@ TRACE(("Child shell %d\n", (int)getpid())); wasroot = rootshell; rootshell = 0; + handler = &main_handler; closescript(); INTON; clear_traps(); @@ -862,6 +866,7 @@ { #if JOBS pid_t mypgrp = getpgrp(); + int propagate_int = jp->jobctl && jp->foreground; #endif int status; int st; @@ -899,6 +904,11 @@ else CLEAR_PENDING_INT; } +#if JOBS + else if (rootshell && iflag && propagate_int && + WIFSIGNALED(status) && WTERMSIG(status) == SIGINT) + kill(getpid(), SIGINT); +#endif INTON; return st; } @@ -1046,7 +1056,7 @@ if (jp->used == 0) continue; if (jp->state == JOBSTOPPED) { - out2str("You have stopped jobs.\n"); + out2fmt_flush("You have stopped jobs.\n"); job_warning = 2; return (1); } @@ -1055,6 +1065,15 @@ return (0); } + +STATIC void +checkzombies(void) +{ + while (njobs > 0 && dowait(0, NULL) > 0) + ; +} + + /* * Return a string identifying a command (to be printed by the * jobs command. @@ -1082,7 +1101,7 @@ { union node *np; struct nodelist *lp; - char *p; + const char *p; int i; char s[2]; @@ -1211,9 +1230,10 @@ STATIC void -cmdputs(char *s) +cmdputs(const char *s) { - char *p, *q; + const char *p; + char *q; char c; int subtype = 0; Index: arith.y =================================================================== --- arith.y (.../stable/8/bin/sh) (revision 209225) +++ arith.y (.../head/bin/sh) (revision 209225) @@ -85,9 +85,9 @@ ARITH_LPAREN expr ARITH_RPAREN { $$ = $2; } | expr ARITH_OR expr - { $$ = $1 ? $1 : $3 ? $3 : 0; } | + { $$ = $1 || $3; } | expr ARITH_AND expr - { $$ = $1 ? ( $3 ? $3 : 0 ) : 0; } | + { $$ = $1 && $3; } | expr ARITH_BOR expr { $$ = $1 | $3; } | expr ARITH_BXOR expr @@ -265,7 +265,7 @@ #define YYPARSE_PARAM_TYPE arith_t * #define YYPARSE_PARAM result -char *arith_buf, *arith_startbuf; +const char *arith_buf, *arith_startbuf; int yylex(void); int yyparse(YYPARSE_PARAM_TYPE); @@ -284,10 +284,12 @@ } arith_t -arith(char *s) +arith(const char *s) { arith_t result; + struct stackmark smark; + setstackmark(&smark); arith_buf = arith_startbuf = s; INTOFF; @@ -295,11 +297,13 @@ arith_lex_reset(); /* Reprime lex. */ INTON; + popstackmark(&smark); + return result; } static void -yyerror(char *s) +yyerror(const char *s) { yyerrok; @@ -314,7 +318,7 @@ int expcmd(int argc, char **argv) { - char *p; + const char *p; char *concat; char **ap; arith_t i; @@ -354,7 +358,7 @@ printf("%d\n", exp(argv[1])); } -error(char *s) +error(const char *s) { fprintf(stderr, "exp: %s\n", s); exit(1); Index: var.h =================================================================== --- var.h (.../stable/8/bin/sh) (revision 209225) +++ var.h (.../head/bin/sh) (revision 209225) @@ -77,6 +77,7 @@ extern struct var vps4; #ifndef NO_HISTORY extern struct var vhistsize; +extern struct var vterm; #endif /* @@ -96,19 +97,21 @@ #define optindval() (voptind.text + 7) #ifndef NO_HISTORY #define histsizeval() (vhistsize.text + 9) +#define termval() (vterm.text + 5) #endif #define mpathset() ((vmpath.flags & VUNSET) == 0) void initvar(void); -void setvar(char *, char *, int); +void setvar(const char *, const char *, int); void setvareq(char *, int); struct strlist; void listsetvar(struct strlist *); -char *lookupvar(char *); -char *bltinlookup(char *, int); +char *lookupvar(const char *); +char *bltinlookup(const char *, int); +void bltinsetlocale(void); +void bltinunsetlocale(void); char **environment(void); -void shprocvar(void); int showvarscmd(int, char **); int exportcmd(int, char **); int localcmd(int, char **); @@ -116,5 +119,5 @@ void poplocalvars(void); int setvarcmd(int, char **); int unsetcmd(int, char **); -int unsetvar(char *); -int setvarsafe(char *, char *, int); +int unsetvar(const char *); +int setvarsafe(const char *, const char *, int); Property changes on: . ___________________________________________________________________ Deleted: svn:mergeinfo Reverse-merged /head/bin/sh:r196483,196634,196879,197371,197848,198020,198173,198480,198483,198897,198963,199282,199458,199631,199747,199799,199821-199822,200171,200182,200275,200295,200359,200943,201354-201355,203376,203384,203576,204195,204276,207944 Reverse-merged /vendor/resolver/dist/bin/sh:r1540-186085 Reverse-merged /user/luigi/ipfw3-r8/bin/sh:r204833-205419 --------------070902070808000600040206 Content-Type: application/octet-stream; name="head-sh.diff.sig" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="head-sh.diff.sig" iQEcBAABAgAGBQJMGDBJAAoJEJBXh4mJ2FR+1iEH/Awif1plqc3whuiNz8SHBpnCS+LBe2Bi oWZnrqtZaX/z+RSnvSj5nHmG2uXX087Y1oOz4ru5A2icmtXY5ehiecRDH9uXDxBq29BV3ZYV gBQw2ADBDgfWNUjgLkOXMvKWVIx7PB1a32Yr9naIfOCqV7j1waXKN1p2rGz7R0ZS2d6Wgp7m HVi1jLdw6ctvYUcC4q224b7qHi7jg83knh2Y0rmy04aCq6X1TM4qBm5w6JABvp6AMoUXeg4Y P2zFwrHRF7gr/SbHZcUCLeESjiTUkK2dCx9fY1lWAc9rjEPER7tld9DBTUUW+hm73LlFCjgZ 78noVKGH8w4K4OzDxonkYwU= --------------070902070808000600040206-- From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 02:09:02 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C24571065678 for ; Wed, 16 Jun 2010 02:09:02 +0000 (UTC) (envelope-from jhellenthal@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 450E88FC17 for ; Wed, 16 Jun 2010 02:09:01 +0000 (UTC) Received: by iwn7 with SMTP id 7so7267106iwn.13 for ; Tue, 15 Jun 2010 19:09:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :x-enigmail-version:openpgp:content-type:content-transfer-encoding; bh=t+xmyPbJgkJYF5aleK9SJPveSLTKIZmaJlozS47GVLg=; b=vqgVQvbDMWlL6PQRGsx0ShOmC7kBDxf4Q/wHuwnWxH6eXDfRqvgA6+k9WAiO8IueRK 2b6quSQjZZCtGahNbDfWS+zvgDeKz/50HHRcKKGBvtcxLdyk4voknZucu6cAV4Mv3l67 cJWGWNwPooxgerSnNI0TGaCApWx9SuaHtQiEw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:openpgp:content-type :content-transfer-encoding; b=pV1db/lu1PWPQD0CsBML7dc2ICxtDo60u8JGI4ltm0HegzBaTENhkGHpKY2WkHZR9B N2Qhrh0effQA7rmuqEhXCuknXAqa8IiWOvalq8wt9zgNv2TeDTqlV/FcU5ByXR7zD+UB olQU/6ziwgqV/9S0i6k+8sL/9J7DrVYBk35T0= Received: by 10.231.173.145 with SMTP id p17mr9000862ibz.32.1276654140627; Tue, 15 Jun 2010 19:09:00 -0700 (PDT) Received: from centel.dataix.local (adsl-99-181-128-180.dsl.klmzmi.sbcglobal.net [99.181.128.180]) by mx.google.com with ESMTPS id r12sm28656154ibi.20.2010.06.15.19.08.43 (version=SSLv3 cipher=RC4-MD5); Tue, 15 Jun 2010 19:08:54 -0700 (PDT) Sender: "J. Hellenthal" Message-ID: <4C18322A.6050007@dataix.net> Date: Tue, 15 Jun 2010 22:08:42 -0400 From: jhell User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100515 Thunderbird MIME-Version: 1.0 To: Brandon Gooch References: <4C18304A.1080601@dataix.net> In-Reply-To: <4C18304A.1080601@dataix.net> X-Enigmail-Version: 1.0.1 OpenPGP: id=89D8547E Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: FreeBSD Current , jilles@stack.nl Subject: Re: [MFC REQUEST] Filename completion in sh(1) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 02:09:02 -0000 On 06/15/2010 22:00, jhell wrote: > On 06/15/2010 21:14, Brandon Gooch wrote: >> I discovered a few moments ago that filename completion had been >> committed to HEAD[1]!!! > >> This is a (seemingly) small, yet VERY useful addition, and, of course >> I'm so grateful to Guy Yur and Jilles for getting this into the tree >> :) > >> I would like to make an "official" request that this feature be MFC'd >> to 8-STABLE as soon as reasonably possible. > >> Again, my thanks to you both for your work! > >> -Brandon > >> [1] http://svn.freebsd.org/viewvc/base?view=revision&revision=209221 > > Here is a diff from stable/8/bin/sh r209146 -> head/bin/sh. This is > quite a large difference among the two with the following diffstats. > > 44 files changed, 1214 insertions(+), 728 deletions(-) > > This is untested, use at your own risk. > Actually, I lied. I have just tested it and it does not compile for the following errors: /usr/src/bin/sh/histedit.c: In function 'histedit': /usr/src/bin/sh/histedit.c:124: error: '_el_fn_sh_complete' undeclared (first use in this function) /usr/src/bin/sh/histedit.c:124: error: (Each undeclared identifier is reported only once /usr/src/bin/sh/histedit.c:124: error: for each function it appears in.) But I do not have time to look into this further until tommorow. Regards, -- jhell From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 02:17:43 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 158201065673 for ; Wed, 16 Jun 2010 02:17:43 +0000 (UTC) (envelope-from jamesbrandongooch@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id CDDA08FC16 for ; Wed, 16 Jun 2010 02:17:42 +0000 (UTC) Received: by iwn7 with SMTP id 7so7275744iwn.13 for ; Tue, 15 Jun 2010 19:17:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=cpcX/txBHZs9VKI+F6TzsPhKbDeIAB2SvMHrUlSg5wA=; b=Br6Ge/EnW05XTOnfPKEvfMbuj5xj/mhfvOGatOctXxpddwOcJia89sCHdkSUHR+0G6 WC6ud/yv8WZcX/Bf8vUVO+ouj2OOvS3IJAgwzkPZpVB8Xl8gg1Hnt32v27fndnOEOPyY MYTNj+4eB+fJ8AqfGBpnvIlD+kUTC5jv8MCms= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=ZHdaH8sikuRK8OfvkfcVrIA456uG/HXmlRgTCgply2ASaSZ7eIKDLvR5aA0qh8nRg5 VDcZA0/Tu8kWFntZxug8zHVlbRDtxtw3Zu/javwJ4PGTtECV5NshzC2k33gRv+igtXfj ZHT05BJ5cYB+hi/9HVHlY9Nahy+Yy8HR9BGWQ= MIME-Version: 1.0 Received: by 10.231.149.145 with SMTP id t17mr9167210ibv.25.1276654662081; Tue, 15 Jun 2010 19:17:42 -0700 (PDT) Received: by 10.231.182.212 with HTTP; Tue, 15 Jun 2010 19:17:42 -0700 (PDT) In-Reply-To: <4C18322A.6050007@dataix.net> References: <4C18304A.1080601@dataix.net> <4C18322A.6050007@dataix.net> Date: Tue, 15 Jun 2010 21:17:42 -0500 Message-ID: From: Brandon Gooch To: jhell Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: FreeBSD Current , jilles@stack.nl Subject: Re: [MFC REQUEST] Filename completion in sh(1) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 02:17:43 -0000 On Tue, Jun 15, 2010 at 9:08 PM, jhell wrote: > On 06/15/2010 22:00, jhell wrote: >> On 06/15/2010 21:14, Brandon Gooch wrote: >>> I discovered a few moments ago that filename completion had been >>> committed to HEAD[1]!!! >> >>> This is a (seemingly) small, yet VERY useful addition, and, of course >>> I'm so grateful to Guy Yur and Jilles for getting this into the tree >>> :) >> >>> I would like to make an "official" request that this feature be MFC'd >>> to 8-STABLE as soon as reasonably possible. >> >>> Again, my thanks to you both for your work! >> >>> -Brandon >> >>> [1] http://svn.freebsd.org/viewvc/base?view=3Drevision&revision=3D20922= 1 >> >> Here is a diff from stable/8/bin/sh r209146 -> head/bin/sh. This is >> quite a large difference among the two with the following diffstats. >> >> =A044 files changed, 1214 insertions(+), 728 deletions(-) >> >> This is untested, use at your own risk. >> > > Actually, I lied. I have just tested it and it does not compile for the > following errors: > > /usr/src/bin/sh/histedit.c: In function 'histedit': > /usr/src/bin/sh/histedit.c:124: error: '_el_fn_sh_complete' undeclared > (first use in this function) > /usr/src/bin/sh/histedit.c:124: error: (Each undeclared identifier is > reported only once > /usr/src/bin/sh/histedit.c:124: error: for each function it appears in.) > > But I do not have time to look into this further until tommorow. Thanks for this jhell! It appears that a C header file is missing from /usr/include; the function declaration is "histedit.h". No problem, just `make install` in /usr/src/include and it should build. -Brandon From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 02:23:54 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 790411065670 for ; Wed, 16 Jun 2010 02:23:54 +0000 (UTC) (envelope-from jamesbrandongooch@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 3BC358FC14 for ; Wed, 16 Jun 2010 02:23:53 +0000 (UTC) Received: by iwn7 with SMTP id 7so7282275iwn.13 for ; Tue, 15 Jun 2010 19:23:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=MYPV9cFiS5M/wwxNlBp+eKQpp5ZTEK4ncgnjvbAoqec=; b=QEwOvoC1jRAGtjPLe3aPIoYzR0LxiDAFXJelFT7nDdkaJwR+z7ZFBF5JEq5wwdBGDc IjOmUHExk+AHcbjSuJd3VUhqWoMtSJC9i50M2Grqq5+OE9iKriS5Q380u9fTlTBBMplo 6us2JpcINrmMbatPD4WlWYO4P34n1H2Oe5wAk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=KCDFKI4dfcYW1AKIC/zlkJiye9i1qjmrofBdURS3o+qMGtv+5lgibgmwHH5SE1FZTI dmjeJbywA8iu7FcQSZ7Gxwkfn81E0OeFFk4SP56wckL4UH0Z+n8tKy+d33XAYAmmSnF6 sN4OacNm5QoOCVinxZXdCBzekv6RNn/Py4uvo= MIME-Version: 1.0 Received: by 10.231.170.201 with SMTP id e9mr8533534ibz.119.1276655033528; Tue, 15 Jun 2010 19:23:53 -0700 (PDT) Received: by 10.231.182.212 with HTTP; Tue, 15 Jun 2010 19:23:53 -0700 (PDT) In-Reply-To: References: <4C18304A.1080601@dataix.net> <4C18322A.6050007@dataix.net> Date: Tue, 15 Jun 2010 21:23:53 -0500 Message-ID: From: Brandon Gooch To: jhell Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: FreeBSD Current , jilles@stack.nl Subject: Re: [MFC REQUEST] Filename completion in sh(1) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 02:23:54 -0000 On Tue, Jun 15, 2010 at 9:17 PM, Brandon Gooch wrote: > On Tue, Jun 15, 2010 at 9:08 PM, jhell wrote: >> On 06/15/2010 22:00, jhell wrote: >>> On 06/15/2010 21:14, Brandon Gooch wrote: >>>> I discovered a few moments ago that filename completion had been >>>> committed to HEAD[1]!!! >>> >>>> This is a (seemingly) small, yet VERY useful addition, and, of course >>>> I'm so grateful to Guy Yur and Jilles for getting this into the tree >>>> :) >>> >>>> I would like to make an "official" request that this feature be MFC'd >>>> to 8-STABLE as soon as reasonably possible. >>> >>>> Again, my thanks to you both for your work! >>> >>>> -Brandon >>> >>>> [1] http://svn.freebsd.org/viewvc/base?view=3Drevision&revision=3D2092= 21 >>> >>> Here is a diff from stable/8/bin/sh r209146 -> head/bin/sh. This is >>> quite a large difference among the two with the following diffstats. >>> >>> =A044 files changed, 1214 insertions(+), 728 deletions(-) >>> >>> This is untested, use at your own risk. >>> >> >> Actually, I lied. I have just tested it and it does not compile for the >> following errors: >> >> /usr/src/bin/sh/histedit.c: In function 'histedit': >> /usr/src/bin/sh/histedit.c:124: error: '_el_fn_sh_complete' undeclared >> (first use in this function) >> /usr/src/bin/sh/histedit.c:124: error: (Each undeclared identifier is >> reported only once >> /usr/src/bin/sh/histedit.c:124: error: for each function it appears in.) >> >> But I do not have time to look into this further until tommorow. > > Thanks for this jhell! > > It appears that a C header file is missing from /usr/include; the > function declaration is "histedit.h". > > No problem, just `make install` in /usr/src/include and it should build. > > -Brandon Oh, I see. The diff doesn't include the change(s) to histedit.h :( oh well, thanks anyway! -Brandon From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 06:20:26 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BCA381065673 for ; Wed, 16 Jun 2010 06:20:26 +0000 (UTC) (envelope-from sfourman@gmail.com) Received: from mail-vw0-f54.google.com (mail-vw0-f54.google.com [209.85.212.54]) by mx1.freebsd.org (Postfix) with ESMTP id 5628F8FC14 for ; Wed, 16 Jun 2010 06:20:25 +0000 (UTC) Received: by vws20 with SMTP id 20so8055097vws.13 for ; Tue, 15 Jun 2010 23:20:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type; bh=Bs5inZzCLQlb8tOEfXLE2hAQgS3PJemXXcTTpPd8IxQ=; b=OG0UCQetrQxnDnSz7iX4ORTl9ysRlN/FytJp5Uz6c3vwrBT47EPGKi/o0oau90St9a GtxKBPbRgnPEV0nPaOpBuCQdXaWS2mSuIB5nwCyHY88JJOIjYNqE0qDLlzXdD6h/xZ6V k1QHY4FJ7tUA28uhtENHC/29HsRSRru2shXF0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=tStcuiqLEJedn1XUjGgnzyxZay6Kzkmw6O1umttX1z5YneJzzwD1o5kb3w64zILlVI cCy44X12xpeyVoEiYvWt5ybY+Is9EB9ylNKGFEU1wzSk67NdvSCqrzCwTv6bodGzvUYq K31jGOEXiAshJtFjHydrNs7qsF11WZAGsMFi0= MIME-Version: 1.0 Received: by 10.229.220.73 with SMTP id hx9mr3667133qcb.136.1276669224493; Tue, 15 Jun 2010 23:20:24 -0700 (PDT) Received: by 10.229.250.194 with HTTP; Tue, 15 Jun 2010 23:20:23 -0700 (PDT) In-Reply-To: References: <4C18304A.1080601@dataix.net> <4C18322A.6050007@dataix.net> Date: Wed, 16 Jun 2010 01:20:23 -0500 Message-ID: From: "Sam Fourman Jr." To: Brandon Gooch Content-Type: text/plain; charset=ISO-8859-1 Cc: FreeBSD Current , jilles@stack.nl Subject: Re: [MFC REQUEST] Filename completion in sh(1) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 06:20:26 -0000 >> -Brandon > > Oh, I see. The diff doesn't include the change(s) to histedit.h > I would be very interested in a diff for FreeBSD 8.1 Sam Fourman Jr. http://www.fourmannetworks.com/ From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 07:04:26 2010 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE9BB106566B for ; Wed, 16 Jun 2010 07:04:26 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id 826C98FC19 for ; Wed, 16 Jun 2010 07:04:26 +0000 (UTC) Received: (qmail 19420 invoked by uid 399); 16 Jun 2010 07:04:25 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 16 Jun 2010 07:04:25 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4C187778.9060909@FreeBSD.org> Date: Wed, 16 Jun 2010 00:04:24 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100330 Thunderbird/3.0.4 MIME-Version: 1.0 To: freebsd-current@FreeBSD.org X-Enigmail-Version: 1.0.1 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Subject: devd and/or ACPI not reporting a heat problem X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 07:04:26 -0000 Howdy, I thought my heat problems were over with this laptop thanks to all the great suggestions I've received about powerd, no stepping, etc. (I also propped up both the back and the front to make a nice big air pocket.) I've always been pretty religious about blowing the dust off the fans and heat sinks, but I guess it's been dustier than I thought lately because I finally "caught" my laptop doing what it's been doing for the last 2 weeks, which is (occasionally) powering down when it was unattended; and the problem was heat. Of course I've been running devd all along, and so I initially ruled out the heat problem due to this entry in devd.conf: # Notify all users before beginning emergency shutdown when we get # a _CRT or _HOT thermal event and we're going to power down the system # very soon. notify 10 { match "system" "ACPI"; match "subsystem" "Thermal"; match "notify" "0xcc"; action "logger -p kern.emerg 'WARNING: system temperature too high, shutting down soon!'"; }; I'm not getting any of those notices in the logs, so I was looking other places. (I do get other ACPI-related activity from devd, such as the notice that it's going on and off AC power.) So, 2-part question, how can I make sure that devd gets the message, and how do I make sure that the notice comes _before_ the BIOS forces the system to power off. I.e., I'd like to have some sort of devd notice that comes in time to do a clean shutdown, or perhaps some other mitigation strategy prior to the BIOS taking over. Any -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/ From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 09:57:35 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 61C531065674 for ; Wed, 16 Jun 2010 09:57:35 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 29B7E8FC18 for ; Wed, 16 Jun 2010 09:57:33 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 1B3011FFC34; Wed, 16 Jun 2010 09:57:32 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id C8E24844DF; Wed, 16 Jun 2010 11:55:21 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: "Sam Fourman Jr." References: <4C18304A.1080601@dataix.net> <4C18322A.6050007@dataix.net> Date: Wed, 16 Jun 2010 11:55:21 +0200 In-Reply-To: (Sam Fourman, Jr.'s message of "Wed, 16 Jun 2010 01:20:23 -0500") Message-ID: <86wrtz5mk6.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.95 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Cc: Brandon Gooch , FreeBSD Current , jilles@stack.nl Subject: Re: [MFC REQUEST] Filename completion in sh(1) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 09:57:35 -0000 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable "Sam Fourman Jr." writes: > I would be very interested in a diff for FreeBSD 8.1 See attached patch. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=sh-tab-completion-stable-8.diff Index: include/histedit.h =================================================================== --- include/histedit.h (revision 209229) +++ include/histedit.h (working copy) @@ -105,9 +105,8 @@ */ int el_set(EditLine *, int, ...); int el_get(EditLine *, int, ...); -#if 0 unsigned char _el_fn_complete(EditLine *, int); -#endif +unsigned char _el_fn_sh_complete(EditLine *, int); /* * el_set/el_get parameters Index: lib/libedit/read.h =================================================================== --- lib/libedit/read.h (revision 209229) +++ lib/libedit/read.h (working copy) @@ -13,9 +13,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Index: lib/libedit/Makefile =================================================================== --- lib/libedit/Makefile (revision 209229) +++ lib/libedit/Makefile (working copy) @@ -6,7 +6,8 @@ SHLIB_MAJOR= 7 SHLIBDIR?= /lib -OSRCS= chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \ +OSRCS= chared.c common.c el.c emacs.c fcns.c filecomplete.c help.c \ + hist.c key.c map.c \ parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c DPADD= ${LIBNCURSES} @@ -35,6 +36,8 @@ CFLAGS+= #-DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG -DDEBUG_REFRESH CFLAGS+= #-DDEBUG_PASTE -DDEBUG_EDIT +WARNS?= 1 + AHDR= vi.h emacs.h common.h ASRC= ${.CURDIR}/vi.c ${.CURDIR}/emacs.c ${.CURDIR}/common.c Index: lib/libedit/editrc.5 =================================================================== --- lib/libedit/editrc.5 (revision 209229) +++ lib/libedit/editrc.5 (working copy) @@ -13,9 +13,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of The NetBSD Foundation nor the names of its -.\" contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -32,8 +29,8 @@ .\" $FreeBSD$ .\" .Dd October 18, 2003 -.Os .Dt EDITRC 5 +.Os .Sh NAME .Nm editrc .Nd configuration file for editline library Index: lib/libedit/editline.3 =================================================================== --- lib/libedit/editline.3 (revision 209229) +++ lib/libedit/editline.3 (working copy) @@ -13,9 +13,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of The NetBSD Foundation nor the names of its -.\" contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -32,8 +29,8 @@ .\" $FreeBSD$ .\" .Dd January 12, 2007 -.Os .Dt EDITLINE 3 +.Os .Sh NAME .Nm editline , .Nm el_init , Index: bin/sh/memalloc.h =================================================================== --- bin/sh/memalloc.h (revision 209229) +++ bin/sh/memalloc.h (working copy) @@ -51,7 +51,7 @@ pointer ckmalloc(size_t); pointer ckrealloc(pointer, int); void ckfree(pointer); -char *savestr(char *); +char *savestr(const char *); pointer stalloc(int); void stunalloc(pointer); void setstackmark(struct stackmark *); Index: bin/sh/alias.h =================================================================== --- bin/sh/alias.h (revision 209229) +++ bin/sh/alias.h (working copy) @@ -42,7 +42,7 @@ int flag; }; -struct alias *lookupalias(char *, int); +struct alias *lookupalias(const char *, int); int aliascmd(int, char **); int unaliascmd(int, char **); void rmaliases(void); Index: bin/sh/mkbuiltins =================================================================== --- bin/sh/mkbuiltins (revision 209229) +++ bin/sh/mkbuiltins (working copy) @@ -88,7 +88,7 @@ awk '{ printf "#define %s %d\n", $1, NR-1}' echo ' struct builtincmd { - char *name; + const char *name; int code; int special; }; Index: bin/sh/options.h =================================================================== --- bin/sh/options.h (revision 209229) +++ bin/sh/options.h (working copy) @@ -102,7 +102,7 @@ extern struct shparam shellparam; /* $@ */ extern char **argptr; /* argument list for builtin commands */ extern char *shoptarg; /* set by nextopt */ -extern char *optptr; /* used by nextopt */ +extern char *nextopt_optptr; /* used by nextopt */ void procargs(int, char **); void optschanged(void); @@ -111,5 +111,5 @@ int shiftcmd(int, char **); int setcmd(int, char **); int getoptscmd(int, char **); -int nextopt(char *); +int nextopt(const char *); void getoptsreset(const char *); Index: bin/sh/output.c =================================================================== --- bin/sh/output.c (revision 209229) +++ bin/sh/output.c (working copy) @@ -71,7 +71,7 @@ static int doformat_wr(void *, const char *, int); struct output output = {NULL, 0, NULL, OUTBUFSIZ, 1, 0}; -struct output errout = {NULL, 0, NULL, 100, 2, 0}; +struct output errout = {NULL, 0, NULL, 256, 2, 0}; struct output memout = {NULL, 0, NULL, 0, MEM_OUT, 0}; struct output *out1 = &output; struct output *out2 = &errout; @@ -124,8 +124,6 @@ { while (*p) outc(*p++, file); - if (file == out2) - flushout(file); } /* Like outstr(), but quote for re-input into the shell. */ @@ -255,7 +253,7 @@ } void -dprintf(const char *fmt, ...) +out2fmt_flush(const char *fmt, ...) { va_list ap; @@ -316,7 +314,7 @@ */ int -xwrite(int fd, char *buf, int nbytes) +xwrite(int fd, const char *buf, int nbytes) { int ntry; int i; Index: bin/sh/parser.h =================================================================== --- bin/sh/parser.h (revision 209229) +++ bin/sh/parser.h (working copy) @@ -73,9 +73,10 @@ extern int tokpushback; #define NEOF ((union node *)&tokpushback) extern int whichprompt; /* 1 == PS1, 2 == PS2 */ +extern const char *const parsekwd[]; union node *parsecmd(int); void fixredir(union node *, const char *, int); -int goodname(char *); +int goodname(const char *); char *getprompt(void *); Index: bin/sh/output.h =================================================================== --- bin/sh/output.h (revision 209229) +++ bin/sh/output.h (working copy) @@ -46,13 +46,13 @@ short flags; }; -extern struct output output; -extern struct output errout; +extern struct output output; /* to fd 1 */ +extern struct output errout; /* to fd 2 */ extern struct output memout; -extern struct output *out1; -extern struct output *out2; +extern struct output *out1; /* &memout if backquote, otherwise &output */ +extern struct output *out2; /* &memout if backquote with 2>&1, otherwise + &errout */ -void open_mem(char *, int, struct output *); void out1str(const char *); void out1qstr(const char *); void out2str(const char *); @@ -65,10 +65,10 @@ void freestdout(void); void outfmt(struct output *, const char *, ...) __printflike(2, 3); void out1fmt(const char *, ...) __printflike(1, 2); -void dprintf(const char *, ...) __printflike(1, 2); +void out2fmt_flush(const char *, ...) __printflike(1, 2); void fmtstr(char *, int, const char *, ...) __printflike(3, 4); void doformat(struct output *, const char *, va_list) __printflike(2, 0); -int xwrite(int, char *, int); +int xwrite(int, const char *, int); #define outc(c, file) (--(file)->nleft < 0? (emptyoutbuf(file), *(file)->nextc++ = (c)) : (*(file)->nextc++ = (c))) #define out1c(c) outc(c, out1); Index: bin/sh/mystring.c =================================================================== --- bin/sh/mystring.c (revision 209229) +++ bin/sh/mystring.c (working copy) @@ -108,7 +108,7 @@ number(const char *s) { if (! is_number(s)) - error("Illegal number: %s", (char *)s); + error("Illegal number: %s", s); return atoi(s); } Index: bin/sh/histedit.c =================================================================== --- bin/sh/histedit.c (revision 209229) +++ bin/sh/histedit.c (working copy) @@ -92,12 +92,14 @@ if (hist != NULL) sethistsize(histsizeval()); else - out2str("sh: can't initialize history\n"); + out2fmt_flush("sh: can't initialize history\n"); } if (editing && !el && isatty(0)) { /* && isatty(2) ??? */ /* * turn editing on */ + char *term; + INTOFF; if (el_in == NULL) el_in = fdopen(0, "r"); @@ -107,14 +109,22 @@ el_out = fdopen(2, "w"); if (el_in == NULL || el_err == NULL || el_out == NULL) goto bad; + term = lookupvar("TERM"); + if (term) + setenv("TERM", term, 1); + else + unsetenv("TERM"); el = el_init(arg0, el_in, el_out, el_err); if (el != NULL) { if (hist) el_set(el, EL_HIST, history, hist); el_set(el, EL_PROMPT, getprompt); + el_set(el, EL_ADDFN, "sh-complete", + "Filename completion", + _el_fn_sh_complete); } else { bad: - out2str("sh: can't initialize editing\n"); + out2fmt_flush("sh: can't initialize editing\n"); } INTON; } else if (!editing && el) { @@ -128,6 +138,7 @@ el_set(el, EL_EDITOR, "vi"); else if (Eflag) el_set(el, EL_EDITOR, "emacs"); + el_set(el, EL_BIND, "^I", "sh-complete", NULL); el_source(el, NULL); } } else { @@ -160,23 +171,30 @@ } } +void +setterm(const char *term) +{ + if (rootshell && el != NULL && term != NULL) + el_set(el, EL_TERMINAL, term); +} + int histcmd(int argc, char **argv) { int ch; - char *editor = NULL; + const char *editor = NULL; HistEvent he; int lflg = 0, nflg = 0, rflg = 0, sflg = 0; int i, retval; - char *firststr, *laststr; + const char *firststr, *laststr; int first, last, direction; - char *pat = NULL, *repl; + char *pat = NULL, *repl = NULL; static int active = 0; struct jmploc jmploc; struct jmploc *savehandler; char editfilestr[PATH_MAX]; char *volatile editfile; - FILE *efp; + FILE *efp = NULL; int oldhistnum; if (hist == NULL) @@ -336,6 +354,7 @@ if (sflg) { if (displayhist) { out2str(s); + flushout(out2); } evalstring(s, 0); if (displayhist && hist) { @@ -405,7 +424,7 @@ } int -not_fcnumber(char *s) +not_fcnumber(const char *s) { if (s == NULL) return (0); @@ -415,10 +434,10 @@ } int -str_to_event(char *str, int last) +str_to_event(const char *str, int last) { HistEvent he; - char *s = str; + const char *s = str; int relative = 0; int i, retval; Index: bin/sh/show.c =================================================================== --- bin/sh/show.c (revision 209229) +++ bin/sh/show.c (working copy) @@ -307,7 +307,7 @@ void -trputs(char *s) +trputs(const char *s) { if (tracefile == NULL) return; Index: bin/sh/show.h =================================================================== --- bin/sh/show.h (revision 209229) +++ bin/sh/show.h (working copy) @@ -35,6 +35,6 @@ void sh_trace(const char *, ...) __printflike(1, 2); void trargs(char **); void trputc(int); -void trputs(char *); +void trputs(const char *); void opentrace(void); #endif Index: bin/sh/arith_lex.l =================================================================== --- bin/sh/arith_lex.l (revision 209229) +++ bin/sh/arith_lex.l (working copy) @@ -51,13 +51,6 @@ int yylex(void); -struct varname -{ - struct varname *next; - char name[1]; -}; -static struct varname *varnames; - #undef YY_INPUT #define YY_INPUT(buf,result,max) \ result = (*buf = *arith_buf++) ? 1 : YY_NULL; @@ -87,14 +80,11 @@ * If variable doesn't exist, we should initialize * it to zero. */ - struct varname *temp; + char *temp; if (lookupvar(yytext) == NULL) setvarsafe(yytext, "0", 0); - temp = ckmalloc(sizeof(struct varname) + - strlen(yytext)); - temp->next = varnames; - varnames = temp; - yylval.s_value = strcpy(temp->name, yytext); + temp = stalloc(strlen(yytext) + 1); + yylval.s_value = strcpy(temp, yytext); return ARITH_VAR; } @@ -140,15 +130,5 @@ void arith_lex_reset(void) { - struct varname *name, *next; - YY_NEW_FILE; - - name = varnames; - while (name != NULL) { - next = name->next; - ckfree(name); - name = next; - } - varnames = NULL; } Index: bin/sh/myhistedit.h =================================================================== --- bin/sh/myhistedit.h (revision 209229) +++ bin/sh/myhistedit.h (working copy) @@ -38,8 +38,9 @@ void histedit(void); void sethistsize(const char *); +void setterm(const char *); int histcmd(int, char **); -int not_fcnumber(char *); -int str_to_event(char *, int); +int not_fcnumber(const char *); +int str_to_event(const char *, int); int bindcmd(int, char **); Index: bin/sh/sh.1 =================================================================== --- bin/sh/sh.1 (revision 209229) +++ bin/sh/sh.1 (working copy) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd January 8, 2010 +.Dd May 24, 2010 .Dt SH 1 .Os .Sh NAME @@ -210,7 +210,8 @@ .Xr emacs 1 command line editor (disables the .Fl V -option if it has been set). +option if it has been set; +set automatically when interactive on terminals). .It Fl e Li errexit Exit immediately if any untested command fails in non-interactive mode. The exit status of a command is considered to be @@ -296,7 +297,10 @@ .Ed .It Fl u Li nounset Write a message to standard error when attempting -to expand a variable that is not set, and if the +to expand a variable, a positional parameter or +the special parameter +.Va \&! +that is not set, and if the shell is not interactive, exit immediately. .It Fl V Li vi Enable the built-in @@ -411,11 +415,11 @@ .Pq Ql \en . A backslash preceding a newline is treated as a line continuation. .El -.Ss Reserved Words -Reserved words are words that have special meaning to the +.Ss Keywords +Keywords or reserved words are words that have special meaning to the shell and are recognized at the beginning of a line and after a control operator. -The following are reserved words: +The following are keywords: .Bl -column "doneXX" "elifXX" "elseXX" "untilXX" "whileX" -offset center .It Li \&! Ta { Ta } Ta Ic case Ta Ic do .It Ic done Ta Ic elif Ta Ic else Ta Ic esac Ta Ic fi @@ -425,8 +429,8 @@ An alias is a name and corresponding value set using the .Ic alias built-in command. -Whenever a reserved word may occur (see above), -and after checking for reserved words, the shell +Whenever a keyword may occur (see above), +and after checking for keywords, the shell checks the word to see if it matches an alias. If it does, it replaces it in the input stream with its value. For example, if there is an alias called @@ -465,7 +469,7 @@ document). Essentially though, a line is read and if the first word of the line (or after a control operator) -is not a reserved word, then the shell has recognized a +is not a keyword, then the shell has recognized a simple command. Otherwise, a complex command or some other special construct may have been recognized. @@ -661,11 +665,11 @@ performing any searches. .It The shell searches each entry in the -.Ev PATH -environment variable +.Va PATH +variable in turn for the command. The value of the -.Ev PATH +.Va PATH variable should be a series of entries separated by colons. Each entry consists of a @@ -691,7 +695,7 @@ .In sys/signal.h . .Ss Complex Commands Complex commands are combinations of simple commands -with control operators or reserved words, together creating a larger complex +with control operators or keywords, together creating a larger complex command. More generally, a command is one of the following: .Bl -item -offset indent @@ -735,7 +739,7 @@ If the pipeline is not in the background (discussed later), the shell waits for all commands to complete. .Pp -If the reserved word +If the keyword .Ic !\& does not precede the pipeline, the exit status is the exit status of the last command specified @@ -1036,13 +1040,9 @@ .Ic set built-in command can also be used to set or reset them. .Ss Special Parameters -A special parameter is a parameter denoted by a special one-character -name. -The special parameters recognized by the -.Nm -shell of -.Fx -are shown in the following list, exactly as they would appear in input +Special parameters are parameters denoted by a single special character +or the digit zero. +They are shown in the following list, exactly as they would appear in input typed by the user or in the source of a shell script. .Bl -hang .It Li $* @@ -1109,6 +1109,84 @@ .It Li $0 (zero) Expands to the name of the shell or shell script. .El +.Ss Special Variables +The following variables are set by the shell or +have special meaning to it: +.Bl -tag -width ".Va HISTSIZE" +.It Va CDPATH +The search path used with the +.Ic cd +built-in. +.It Va EDITOR +The fallback editor used with the +.Ic fc +built-in. +If not set, the default editor is +.Xr ed 1 . +.It Va FCEDIT +The default editor used with the +.Ic fc +built-in. +.It Va HISTSIZE +The number of previous commands that are accessible. +.It Va HOME +The user's home directory, +used in tilde expansion and as a default directory for the +.Ic cd +built-in. +.It Va IFS +Input Field Separators. +This is normally set to +.Aq space , +.Aq tab , +and +.Aq newline . +See the +.Sx White Space Splitting +section for more details. +.It Va LINENO +The current line number in the script or function. +.It Va MAIL +The name of a mail file, that will be checked for the arrival of new +mail. +Overridden by +.Va MAILPATH . +.It Va MAILPATH +A colon +.Pq Ql \&: +separated list of file names, for the shell to check for incoming +mail. +This variable overrides the +.Va MAIL +setting. +There is a maximum of 10 mailboxes that can be monitored at once. +.It Va PATH +The default search path for executables. +See the +.Sx Path Search +section for details. +.It Va PPID +The parent process ID of the invoked shell. +This is set at startup +unless this variable is in the environment. +A later change of parent process ID is not reflected. +A subshell retains the same value of +.Va PPID . +.It Va PS1 +The primary prompt string, which defaults to +.Dq Li "$ " , +unless you are the superuser, in which case it defaults to +.Dq Li "# " . +.It Va PS2 +The secondary prompt string, which defaults to +.Dq Li "> " . +.It Va PS4 +The prefix for the trace output (if +.Fl x +is active). +The default is +.Dq Li "+ " . +.El .Ss Word Expansions This clause describes the various expansions that are performed on words. @@ -1162,7 +1240,7 @@ username is missing (as in .Pa ~/foobar ) , the tilde is replaced with the value of the -.Ev HOME +.Va HOME variable (the current user's home directory). .Ss Parameter Expansion The format for parameter expansion is as follows: @@ -1175,10 +1253,20 @@ .Ql } . Any .Ql } -escaped by a backslash or within a quoted string, and characters in +escaped by a backslash or within a single-quoted string, and characters in embedded arithmetic expansions, command substitutions, and variable expansions, are not examined in determining the matching .Ql } . +Except for the variants with +.Ql + , +.Ql - , +.Ql = +or +.Ql ?\& , +any +.Ql } +within a double-quoted string is also not examined in determining the matching +.Ql } . .Pp The simplest form for parameter expansion is: .Pp @@ -1262,6 +1350,14 @@ In the parameter expansions shown previously, use of the colon in the format results in a test for a parameter that is unset or null; omission of the colon results in a test for a parameter that is only unset. +.Pp +The +.Ar word +inherits the type of quoting +(unquoted, double-quoted or here-document) +from the surroundings, +with the exception that a backslash that quotes a closing brace is removed +during quote removal. .Bl -tag -width indent .It Li ${# Ns Ar parameter Ns Li } String Length. @@ -1469,10 +1565,10 @@ .Ql / characters, it is used as is. Otherwise, the shell searches the -.Ev PATH +.Va PATH for the file. If it is not found in the -.Ev PATH , +.Va PATH , it is sought in the current working directory. .It Ic \&[ A built-in equivalent of @@ -1516,7 +1612,7 @@ Switch to the specified .Ar directory , or to the directory specified in the -.Ev HOME +.Va HOME environment variable if no .Ar directory is specified. @@ -1527,17 +1623,17 @@ or .Pa .. , then the directories listed in the -.Ev CDPATH +.Va CDPATH variable will be searched for the specified .Ar directory . If -.Ev CDPATH +.Va CDPATH is unset, the current directory is searched. The format of -.Ev CDPATH +.Va CDPATH is the same as that of -.Ev PATH . +.Va PATH . In an interactive shell, the .Ic cd @@ -1545,7 +1641,7 @@ that it actually switched to if this is different from the name that the user gave. These may be different either because the -.Ev CDPATH +.Va CDPATH mechanism was used or because a symbolic link was crossed. .Pp If the @@ -1568,16 +1664,18 @@ .It Ic command Oo Fl p Oc Op Ar utility Op Ar argument ... .It Ic command Oo Fl v | V Oc Op Ar utility The first form of invocation executes the specified +.Ar utility , +ignoring shell functions in the search. +If .Ar utility -as a simple command (see the -.Sx Simple Commands -section). +is a special builtin, +it is executed as if it were a regular builtin. .Pp If the .Fl p option is specified, the command search is performed using a default value of -.Ev PATH +.Va PATH that is guaranteed to find all of the standard utilities. .Pp If the @@ -1736,20 +1834,20 @@ .Ar editor string is a command name, subject to search via the -.Ev PATH +.Va PATH variable. The value in the -.Ev FCEDIT +.Va FCEDIT variable is used as a default when .Fl e is not specified. If -.Ev FCEDIT +.Va FCEDIT is null or unset, the value of the -.Ev EDITOR +.Va EDITOR variable is used. If -.Ev EDITOR +.Va EDITOR is null or unset, .Xr ed 1 is used as the editor. @@ -1783,7 +1881,7 @@ Select the commands to list or edit. The number of previous commands that can be accessed are determined by the value of the -.Ev HISTSIZE +.Va HISTSIZE variable. The value of .Ar first @@ -1814,12 +1912,12 @@ .El .El .Pp -The following environment variables affect the execution of +The following variables affect the execution of .Ic fc : -.Bl -tag -width ".Ev HISTSIZE" -.It Ev FCEDIT +.Bl -tag -width ".Va HISTSIZE" +.It Va FCEDIT Name of the editor to use for history editing. -.It Ev HISTSIZE +.It Va HISTSIZE The number of previous commands that are accessible. .El .It Ic fg Op Ar job @@ -2285,74 +2383,27 @@ .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : -.Bl -tag -width ".Ev HISTSIZE" -.It Ev CDPATH -The search path used with the -.Ic cd -built-in. -.It Ev EDITOR -The fallback editor used with the -.Ic fc -built-in. -If not set, the default editor is -.Xr ed 1 . -.It Ev FCEDIT -The default editor used with the -.Ic fc -built-in. -.It Ev HISTSIZE -The number of previous commands that are accessible. -.It Ev HOME -The starting directory of -.Nm . -.It Ev IFS -Input Field Separators. -This is normally set to -.Aq space , -.Aq tab , -and -.Aq newline . -See the -.Sx White Space Splitting -section for more details. -.It Ev MAIL -The name of a mail file, that will be checked for the arrival of new -mail. -Overridden by -.Ev MAILPATH . -.It Ev MAILPATH -A colon -.Pq Ql \&: -separated list of file names, for the shell to check for incoming -mail. -This environment setting overrides the -.Ev MAIL -setting. -There is a maximum of 10 mailboxes that can be monitored at once. -.It Ev PATH -The default search path for executables. -See the -.Sx Path Search -section for details. -.It Ev PS1 -The primary prompt string, which defaults to -.Dq Li "$ " , -unless you are the superuser, in which case it defaults to -.Dq Li "# " . -.It Ev PS2 -The secondary prompt string, which defaults to -.Dq Li "> " . -.It Ev PS4 -The prefix for the trace output (if -.Fl x -is active). -The default is -.Dq Li "+ " . +.Bl -tag -width ".Ev LANGXXXXXX" +.It Ev ENV +Initialization file for interactive shells. +.It Ev LANG , Ev LC_* +Locale settings. +These are inherited by children of the shell, +and is used in a limited manner by the shell itself. +.It Ev PWD +An absolute pathname for the current directory, +possibly containing symbolic links. +This is used and updated by the shell. .It Ev TERM The default terminal setting for the shell. This is inherited by children of the shell, and is used in the history editing modes. .El +.Pp +Additionally, all environment variables are turned into shell variables +at startup, +which may affect the shell as described under +.Sx Special Variables . .Sh EXIT STATUS Errors that are detected by the shell, such as a syntax error, will cause the shell to exit with a non-zero exit status. Index: bin/sh/error.c =================================================================== --- bin/sh/error.c (revision 209229) +++ bin/sh/error.c (working copy) @@ -67,17 +67,21 @@ char *commandname; -static void exverror(int, const char *, va_list) __printf0like(2, 0); +static void exverror(int, const char *, va_list) __printf0like(2, 0) __dead2; /* * Called to raise an exception. Since C doesn't include exceptions, we * just do a longjmp to the exception handler. The type of exception is * stored in the global variable "exception". + * + * Interrupts are disabled; they should be reenabled when the exception is + * caught. */ void exraise(int e) { + INTOFF; if (handler == NULL) abort(); exception = e; @@ -138,8 +142,15 @@ static void exverror(int cond, const char *msg, va_list ap) { - CLEAR_PENDING_INT; - INTOFF; + /* + * An interrupt trumps an error. Certain places catch error + * exceptions or transform them to a plain nonzero exit code + * in child processes, and if an error exception can be handled, + * an interrupt can be handled as well. + * + * exraise() will disable interrupts for the exception handler. + */ + FORCEINTON; #ifdef DEBUG if (msg) @@ -149,8 +160,8 @@ #endif if (msg) { if (commandname) - outfmt(&errout, "%s: ", commandname); - doformat(&errout, msg, ap); + outfmt(out2, "%s: ", commandname); + doformat(out2, msg, ap); out2c('\n'); } flushall(); Index: bin/sh/error.h =================================================================== --- bin/sh/error.h (revision 209229) +++ bin/sh/error.h (working copy) @@ -72,14 +72,16 @@ #define INTOFF suppressint++ #define INTON { if (--suppressint == 0 && intpending) onint(); } +#define is_int_on() suppressint +#define SETINTON(s) suppressint = (s) #define FORCEINTON {suppressint = 0; if (intpending) onint();} #define CLEAR_PENDING_INT intpending = 0 #define int_pending() intpending -void exraise(int); +void exraise(int) __dead2; void onint(void); -void error(const char *, ...) __printf0like(1, 2); -void exerror(int, const char *, ...) __printf0like(2, 3); +void error(const char *, ...) __printf0like(1, 2) __dead2; +void exerror(int, const char *, ...) __printf0like(2, 3) __dead2; /* Index: bin/sh/input.c =================================================================== --- bin/sh/input.c (revision 209229) +++ bin/sh/input.c (working copy) @@ -93,7 +93,7 @@ int plinno = 1; /* input line number */ -MKINIT int parsenleft; /* copy of parsefile->nleft */ +int parsenleft; /* copy of parsefile->nleft */ MKINIT int parselleft; /* copy of parsefile->lleft */ char *parsenextc; /* copy of parsefile->nextc */ MKINIT struct parsefile basepf; /* top level input file */ @@ -111,9 +111,9 @@ INCLUDE "input.h" INCLUDE "error.h" +MKINIT char basebuf[]; + INIT { - extern char basebuf[]; - basepf.nextc = basepf.buf = basebuf; } @@ -215,7 +215,7 @@ if (flags >= 0 && flags & O_NONBLOCK) { flags &=~ O_NONBLOCK; if (fcntl(0, F_SETFL, flags) >= 0) { - out2str("sh: turning off NDELAY mode\n"); + out2fmt_flush("sh: turning off NDELAY mode\n"); goto retry; } } @@ -359,7 +359,7 @@ struct strpush *sp; INTOFF; -/*dprintf("*** calling pushstring: %s, %d\n", s, len);*/ +/*out2fmt_flush("*** calling pushstring: %s, %d\n", s, len);*/ if (parsefile->strpush) { sp = ckmalloc(sizeof (struct strpush)); sp->prev = parsefile->strpush; @@ -386,7 +386,7 @@ parsenextc = sp->prevstring; parsenleft = sp->prevnleft; parselleft = sp->prevlleft; -/*dprintf("*** calling popstring: restoring to '%s'\n", parsenextc);*/ +/*out2fmt_flush("*** calling popstring: restoring to '%s'\n", parsenextc);*/ if (sp->ap) sp->ap->flag &= ~ALIASINUSE; parsefile->strpush = sp->prev; @@ -401,7 +401,7 @@ */ void -setinputfile(char *fname, int push) +setinputfile(const char *fname, int push) { int fd; int fd2; @@ -509,6 +509,32 @@ /* + * Return current file (to go back to it later using popfilesupto()). + */ + +struct parsefile * +getcurrentfile(void) +{ + return parsefile; +} + + +/* + * Pop files until the given file is on top again. Useful for regular + * builtins that read shell commands from files or strings. + * If the given file is not an active file, an error is raised. + */ + +void +popfilesupto(struct parsefile *file) +{ + while (parsefile != file && parsefile != &basepf) + popfile(); + if (parsefile != file) + error("popfilesupto() misused"); +} + +/* * Return to top level. */ Index: bin/sh/input.h =================================================================== --- bin/sh/input.h (revision 209229) +++ bin/sh/input.h (working copy) @@ -45,6 +45,8 @@ extern char *parsenextc; /* next character in input buffer */ extern int init_editline; /* 0 == not setup, 1 == OK, -1 == failed */ +struct parsefile; + char *pfgets(char *, int); int pgetc(void); int preadbuffer(void); @@ -52,10 +54,12 @@ void pungetc(void); void pushstring(char *, int, void *); void popstring(void); -void setinputfile(char *, int); +void setinputfile(const char *, int); void setinputfd(int, int); void setinputstring(char *, int); void popfile(void); +struct parsefile *getcurrentfile(void); +void popfilesupto(struct parsefile *); void popallfiles(void); void closescript(void); Index: bin/sh/redir.c =================================================================== --- bin/sh/redir.c (revision 209229) +++ bin/sh/redir.c (working copy) @@ -63,6 +63,7 @@ #define EMPTY -2 /* marks an unused slot in redirtab */ +#define CLOSED -1 /* fd was not open before redir */ #define PIPESIZE 4096 /* amount of buffering in a pipe */ @@ -101,7 +102,6 @@ struct redirtab *sv = NULL; int i; int fd; - int try; char memory[10]; /* file descriptors to write to memory */ for (i = 10 ; --i >= 0 ; ) @@ -116,38 +116,30 @@ } for (n = redir ; n ; n = n->nfile.next) { fd = n->nfile.fd; - try = 0; if ((n->nfile.type == NTOFD || n->nfile.type == NFROMFD) && n->ndup.dupfd == fd) continue; /* redirect from/to same file descriptor */ if ((flags & REDIR_PUSH) && sv->renamed[fd] == EMPTY) { INTOFF; -again: if ((i = fcntl(fd, F_DUPFD, 10)) == -1) { switch (errno) { case EBADF: - if (!try) { - openredirect(n, memory); - try++; - goto again; - } - /* FALLTHROUGH*/ + i = CLOSED; + break; default: INTON; error("%d: %s", fd, strerror(errno)); break; } - } - if (!try) { - sv->renamed[fd] = i; - } + } else + (void)fcntl(i, F_SETFD, FD_CLOEXEC); + sv->renamed[fd] = i; INTON; } if (fd == 0) fd0_redirected++; - if (!try) - openredirect(n, memory); + openredirect(n, memory); } if (memory[1]) out1 = &memout; @@ -166,8 +158,11 @@ /* * We suppress interrupts so that we won't leave open file - * descriptors around. This may not be such a good idea because - * an open of a device or a fifo can block indefinitely. + * descriptors around. Because the signal handler remains + * installed and we do not use system call restart, interrupts + * will still abort blocking opens such as fifos (they will fail + * with EINTR). There is, however, a race condition if an interrupt + * arrives after INTOFF and before open blocks. */ INTOFF; memory[fd] = 0; Index: bin/sh/trap.c =================================================================== --- bin/sh/trap.c (revision 209229) +++ bin/sh/trap.c (working copy) @@ -149,6 +149,7 @@ { char *action; int signo; + int errors = 0; if (argc <= 1) { for (signo = 0 ; signo < sys_nsig ; signo++) { @@ -183,8 +184,10 @@ } } while (*argv) { - if ((signo = sigstring_to_signum(*argv)) == -1) - error("bad signal %s", *argv); + if ((signo = sigstring_to_signum(*argv)) == -1) { + out2fmt_flush("trap: bad signal %s\n", *argv); + errors = 1; + } INTOFF; if (action) action = savestr(action); @@ -196,7 +199,7 @@ INTON; argv++; } - return 0; + return errors; } @@ -244,7 +247,8 @@ setsignal(int signo) { int action; - sig_t sig, sigact = SIG_DFL; + sig_t sigact = SIG_DFL; + struct sigaction sa; char *t; if ((t = trap[signo]) == NULL) @@ -320,9 +324,10 @@ case S_IGN: sigact = SIG_IGN; break; } *t = action; - sig = signal(signo, sigact); - if (sig != SIG_ERR && action == S_CATCH) - siginterrupt(signo, 1); + sa.sa_handler = sigact; + sa.sa_flags = 0; + sigemptyset(&sa.sa_mask); + sigaction(signo, &sa, NULL); } Index: bin/sh/trap.h =================================================================== --- bin/sh/trap.h (revision 209229) +++ bin/sh/trap.h (working copy) @@ -45,4 +45,4 @@ void onsig(int); void dotrap(void); void setinteractive(int); -void exitshell(int); +void exitshell(int) __dead2; Index: bin/sh/arith.h =================================================================== --- bin/sh/arith.h (revision 209229) +++ bin/sh/arith.h (working copy) @@ -34,8 +34,8 @@ #define DIGITS(var) (3 + (2 + CHAR_BIT * sizeof((var))) / 3) -extern char *arith_buf, *arith_startbuf; +extern const char *arith_buf, *arith_startbuf; -arith_t arith(char *); +arith_t arith(const char *); void arith_lex_reset(void); int expcmd(int, char **); Index: bin/sh/mksyntax.c =================================================================== --- bin/sh/mksyntax.c (revision 209229) +++ bin/sh/mksyntax.c (working copy) @@ -55,8 +55,8 @@ struct synclass { - char *name; - char *comment; + const char *name; + const char *comment; }; /* Syntax classes */ @@ -101,16 +101,16 @@ static FILE *cfile; static FILE *hfile; -static char *syntax[513]; +static const char *syntax[513]; static int base; static int size; /* number of values which a char variable can have */ static int nbits; /* number of bits in a character */ static int digit_contig;/* true if digits are contiguous */ -static void filltable(char *); +static void filltable(const char *); static void init(void); -static void add(char *, char *); -static void print(char *); +static void add(const char *, const char *); +static void print(const char *); static void output_type_macros(void); static void digit_convert(void); @@ -232,7 +232,6 @@ add("\n", "CNL"); add("\\", "CBACK"); add("`", "CBQUOTE"); - add("'", "CSQUOTE"); add("\"", "CDQUOTE"); add("$", "CVAR"); add("}", "CENDVAR"); @@ -259,7 +258,7 @@ */ static void -filltable(char *dftval) +filltable(const char *dftval) { int i; @@ -293,7 +292,7 @@ */ static void -add(char *p, char *type) +add(const char *p, const char *type) { while (*p) syntax[*p++ + base] = type; @@ -306,7 +305,7 @@ */ static void -print(char *name) +print(const char *name) { int i; int col; @@ -338,7 +337,7 @@ * contiguous, we can test for them quickly. */ -static char *macro[] = { +static const char *macro[] = { "#define is_digit(c)\t((is_type+SYNBASE)[c] & ISDIGIT)", "#define is_eof(c)\t((c) == PEOF)", "#define is_alpha(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && isalpha((unsigned char) (c)))", @@ -351,7 +350,7 @@ static void output_type_macros(void) { - char **pp; + const char **pp; if (digit_contig) macro[0] = "#define is_digit(c)\t((unsigned int)((c) - '0') <= 9)"; Index: bin/sh/expand.c =================================================================== --- bin/sh/expand.c (revision 209229) +++ bin/sh/expand.c (working copy) @@ -109,7 +109,7 @@ STATIC void addfname(char *); STATIC struct strlist *expsort(struct strlist *); STATIC struct strlist *msort(struct strlist *, int); -STATIC int pmatch(char *, char *, int); +STATIC int pmatch(const char *, const char *, int); STATIC char *cvtnum(int, char *); STATIC int collate_range_cmp(int, int); @@ -273,8 +273,12 @@ while ((c = *p) != '\0') { switch(c) { - case CTLESC: - return (startp); + case CTLESC: /* This means CTL* are always considered quoted. */ + case CTLVAR: + case CTLBACKQ: + case CTLBACKQ | CTLQUOTE: + case CTLARI: + case CTLENDARI: case CTLQUOTEMARK: return (startp); case ':': @@ -282,6 +286,7 @@ goto done; break; case '/': + case CTLENDVAR: goto done; } p++; @@ -357,7 +362,7 @@ void expari(int flag) { - char *p, *start; + char *p, *q, *start; arith_t result; int begoff; int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); @@ -395,7 +400,9 @@ removerecordregions(begoff); if (quotes) rmescapes(p+2); + q = grabstackstr(expdest); result = arith(p+2); + ungrabstackstr(q, expdest); fmtstr(p, DIGITS(result), ARITH_FORMAT_STR, result); while (*p++) ; @@ -503,7 +510,9 @@ int amount; herefd = -1; - argstr(p, 0); + argstr(p, (subtype == VSTRIMLEFT || subtype == VSTRIMLEFTMAX || + subtype == VSTRIMRIGHT || subtype == VSTRIMRIGHTMAX ? + EXP_CASE : 0) | EXP_TILDE); STACKSTRNUL(expdest); herefd = saveherefd; argbackq = saveargbackq; @@ -523,7 +532,7 @@ case VSQUESTION: if (*p != CTLENDVAR) { - outfmt(&errout, "%s\n", startp); + outfmt(out2, "%s\n", startp); error((char *)NULL); } error("%.*s: parameter %snot set", (int)(p - str - 1), @@ -659,7 +668,7 @@ } varlen = 0; startloc = expdest - stackblock(); - if (!set && uflag) { + if (!set && uflag && *var != '@' && *var != '*') { switch (subtype) { case VSNORMAL: case VSTRIMLEFT: @@ -852,7 +861,6 @@ int num; char *p; int i; - extern int oexitstatus; char sep; char **ap; char const *syntax; @@ -976,7 +984,7 @@ char *start; char *p; char *q; - char *ifs; + const char *ifs; const char *ifsspc; int had_param_ch = 0; @@ -1344,7 +1352,7 @@ */ int -patmatch(char *pattern, char *string, int squoted) +patmatch(const char *pattern, const char *string, int squoted) { #ifdef notdef if (pattern[0] == '!' && pattern[1] == '!') @@ -1356,9 +1364,9 @@ STATIC int -pmatch(char *pattern, char *string, int squoted) +pmatch(const char *pattern, const char *string, int squoted) { - char *p, *q; + const char *p, *q; char c; p = pattern; @@ -1406,7 +1414,7 @@ } while (*q++ != '\0'); return 0; case '[': { - char *endp; + const char *endp; int invert, found; char chr; @@ -1510,7 +1518,7 @@ */ int -casematch(union node *pattern, char *val) +casematch(union node *pattern, const char *val) { struct stackmark smark; int result; Index: bin/sh/mail.c =================================================================== --- bin/sh/mail.c (revision 209229) +++ bin/sh/mail.c (working copy) @@ -72,7 +72,7 @@ chkmail(int silent) { int i; - char *mpath; + const char *mpath; char *p; char *q; struct stackmark smark; Index: bin/sh/main.c =================================================================== --- bin/sh/main.c (revision 209229) +++ bin/sh/main.c (working copy) @@ -75,8 +75,9 @@ int rootpid; int rootshell; +struct jmploc main_handler; -STATIC void read_profile(char *); +STATIC void read_profile(const char *); STATIC char *find_dot_file(char *); /* @@ -90,14 +91,13 @@ int main(int argc, char *argv[]) { - struct jmploc jmploc; struct stackmark smark; volatile int state; char *shinit; (void) setlocale(LC_ALL, ""); state = 0; - if (setjmp(jmploc.loc)) { + if (setjmp(main_handler.loc)) { /* * When a shell procedure is executed, we raise the * exception EXSHELLPROC to clean up before executing @@ -143,7 +143,7 @@ else goto state4; } - handler = &jmploc; + handler = &main_handler; #ifdef DEBUG opentrace(); trputs("Shell args: "); trargs(argv); @@ -153,10 +153,7 @@ init(); setstackmark(&smark); procargs(argc, argv); - if (getpwd() == NULL && iflag) - out2str("sh: cannot determine working directory\n"); - if (getpwd() != NULL) - setvar ("PWD", getpwd(), VEXPORT); + pwd_init(iflag); if (iflag) chkmail(1); if (argv[0] && argv[0][0] == '-') { @@ -225,7 +222,7 @@ if (!stoppedjobs()) { if (!Iflag) break; - out2str("\nUse \"exit\" to leave shell.\n"); + out2fmt_flush("\nUse \"exit\" to leave shell.\n"); } numeof++; } else if (n != NULL && nflag == 0) { @@ -250,7 +247,7 @@ */ STATIC void -read_profile(char *name) +read_profile(const char *name) { int fd; @@ -271,7 +268,7 @@ */ void -readcmdfile(char *name) +readcmdfile(const char *name) { int fd; @@ -298,7 +295,7 @@ { static char localname[FILENAME_MAX+1]; char *fullname; - char *path = pathval(); + const char *path = pathval(); struct stat statb; /* don't try this for absolute or relative paths */ @@ -317,14 +314,20 @@ int dotcmd(int argc, char **argv) { - char *fullname; + char *filename, *fullname; if (argc < 2) error("missing filename"); exitstatus = 0; - fullname = find_dot_file(argv[1]); + /* + * Because we have historically not supported any options, + * only treat "--" specially. + */ + filename = argc > 2 && strcmp(argv[1], "--") == 0 ? argv[2] : argv[1]; + + fullname = find_dot_file(filename); setinputfile(fullname, 1); commandname = fullname; cmdloop(0); @@ -336,8 +339,6 @@ int exitcmd(int argc, char **argv) { - extern int oexitstatus; - if (stoppedjobs()) return 0; if (argc > 1) Index: bin/sh/expand.h =================================================================== --- bin/sh/expand.h (revision 209229) +++ bin/sh/expand.h (working copy) @@ -58,7 +58,7 @@ void expandhere(union node *, int); void expandarg(union node *, struct arglist *, int); void expari(int); -int patmatch(char *, char *, int); +int patmatch(const char *, const char *, int); void rmescapes(char *); -int casematch(union node *, char *); +int casematch(union node *, const char *); int wordexpcmd(int, char **); Index: bin/sh/exec.c =================================================================== --- bin/sh/exec.c (revision 209229) +++ bin/sh/exec.c (working copy) @@ -98,7 +98,7 @@ STATIC void tryexec(char *, char **, char **); STATIC void printentry(struct tblentry *, int); -STATIC struct tblentry *cmdlookup(char *, int); +STATIC struct tblentry *cmdlookup(const char *, int); STATIC void delete_cmd_entry(void); @@ -109,7 +109,7 @@ */ void -shellexec(char **argv, char **envp, char *path, int index) +shellexec(char **argv, char **envp, const char *path, int idx) { char *cmdname; int e; @@ -120,7 +120,7 @@ } else { e = ENOENT; while ((cmdname = padvance(&path, argv[0])) != NULL) { - if (--index < 0 && pathopt == NULL) { + if (--idx < 0 && pathopt == NULL) { tryexec(cmdname, argv, envp); if (errno != ENOENT && errno != ENOTDIR) e = errno; @@ -175,13 +175,13 @@ * NULL. */ -char *pathopt; +const char *pathopt; char * -padvance(char **path, char *name) +padvance(const char **path, const char *name) { - char *p, *q; - char *start; + const char *p, *start; + char *q; int len; if (*path == NULL) @@ -248,14 +248,14 @@ && (cmdp->cmdtype == CMDNORMAL || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0))) delete_cmd_entry(); - find_command(name, &entry, 1, pathval()); + find_command(name, &entry, DO_ERR, pathval()); if (verbose) { if (entry.cmdtype != CMDUNKNOWN) { /* if no error msg */ cmdp = cmdlookup(name, 0); if (cmdp != NULL) printentry(cmdp, verbose); else - outfmt(&errout, "%s: not found\n", name); + outfmt(out2, "%s: not found\n", name); } flushall(); } @@ -268,17 +268,17 @@ STATIC void printentry(struct tblentry *cmdp, int verbose) { - int index; - char *path; + int idx; + const char *path; char *name; if (cmdp->cmdtype == CMDNORMAL) { - index = cmdp->param.index; + idx = cmdp->param.index; path = pathval(); do { name = padvance(&path, cmdp->cmdname); stunalloc(name); - } while (--index >= 0); + } while (--idx >= 0); out1str(name); } else if (cmdp->cmdtype == CMDBUILTIN) { out1fmt("builtin %s", cmdp->cmdname); @@ -310,10 +310,11 @@ */ void -find_command(char *name, struct cmdentry *entry, int printerr, char *path) +find_command(const char *name, struct cmdentry *entry, int act, + const char *path) { - struct tblentry *cmdp; - int index; + struct tblentry *cmdp, loc_cmd; + int idx; int prev; char *fullname; struct stat statb; @@ -329,13 +330,19 @@ } /* If name is in the table, and not invalidated by cd, we're done */ - if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->rehash == 0) - goto success; + if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->rehash == 0) { + if (cmdp->cmdtype == CMDFUNCTION && act & DO_NOFUNC) + cmdp = NULL; + else + goto success; + } /* If %builtin not in path, check for builtin next */ if (builtinloc < 0 && (i = find_builtin(name, &spec)) >= 0) { INTOFF; cmdp = cmdlookup(name, 1); + if (cmdp->cmdtype == CMDFUNCTION) + cmdp = &loc_cmd; cmdp->cmdtype = CMDBUILTIN; cmdp->param.index = i; cmdp->special = spec; @@ -353,17 +360,19 @@ } e = ENOENT; - index = -1; + idx = -1; loop: while ((fullname = padvance(&path, name)) != NULL) { stunalloc(fullname); - index++; + idx++; if (pathopt) { if (prefix("builtin", pathopt)) { if ((i = find_builtin(name, &spec)) < 0) goto loop; INTOFF; cmdp = cmdlookup(name, 1); + if (cmdp->cmdtype == CMDFUNCTION) + cmdp = &loc_cmd; cmdp->cmdtype = CMDBUILTIN; cmdp->param.index = i; cmdp->special = spec; @@ -376,8 +385,8 @@ } } /* if rehash, don't redo absolute path names */ - if (fullname[0] == '/' && index <= prev) { - if (index < prev) + if (fullname[0] == '/' && idx <= prev) { + if (idx < prev) goto loop; TRACE(("searchexec \"%s\": no change\n", name)); goto success; @@ -413,22 +422,25 @@ TRACE(("searchexec \"%s\" returns \"%s\"\n", name, fullname)); INTOFF; cmdp = cmdlookup(name, 1); + if (cmdp->cmdtype == CMDFUNCTION) + cmdp = &loc_cmd; cmdp->cmdtype = CMDNORMAL; - cmdp->param.index = index; + cmdp->param.index = idx; INTON; goto success; } /* We failed. If there was an entry for this command, delete it */ - if (cmdp) + if (cmdp && cmdp->cmdtype != CMDFUNCTION) delete_cmd_entry(); - if (printerr) { + if (act & DO_ERR) { if (e == ENOENT || e == ENOTDIR) outfmt(out2, "%s: not found\n", name); else outfmt(out2, "%s: %s\n", name, strerror(e)); } entry->cmdtype = CMDUNKNOWN; + entry->u.index = 0; return; success: @@ -445,7 +457,7 @@ */ int -find_builtin(char *name, int *special) +find_builtin(const char *name, int *special) { const struct builtincmd *bp; @@ -492,18 +504,18 @@ changepath(const char *newval) { const char *old, *new; - int index; + int idx; int firstchange; int bltin; old = pathval(); new = newval; firstchange = 9999; /* assume no change */ - index = 0; + idx = 0; bltin = -1; for (;;) { if (*old != *new) { - firstchange = index; + firstchange = idx; if ((*old == '\0' && *new == ':') || (*old == ':' && *new == '\0')) firstchange++; @@ -512,9 +524,9 @@ if (*new == '\0') break; if (*new == '%' && bltin < 0 && prefix("builtin", new + 1)) - bltin = index; + bltin = idx; if (*new == ':') { - index++; + idx++; } new++, old++; } @@ -607,10 +619,10 @@ STATIC struct tblentry * -cmdlookup(char *name, int add) +cmdlookup(const char *name, int add) { int hashval; - char *p; + const char *p; struct tblentry *cmdp; struct tblentry **pp; @@ -663,7 +675,7 @@ */ void -addcmdentry(char *name, struct cmdentry *entry) +addcmdentry(const char *name, struct cmdentry *entry) { struct tblentry *cmdp; @@ -683,7 +695,7 @@ */ void -defun(char *name, union node *func) +defun(const char *name, union node *func) { struct cmdentry entry; @@ -700,7 +712,7 @@ */ int -unsetfunc(char *name) +unsetfunc(const char *name) { struct tblentry *cmdp; @@ -718,19 +730,21 @@ */ int -typecmd_impl(int argc, char **argv, int cmd) +typecmd_impl(int argc, char **argv, int cmd, const char *path) { struct cmdentry entry; struct tblentry *cmdp; - char **pp; + const char *const *pp; struct alias *ap; int i; - int error = 0; - extern char *const parsekwd[]; + int error1 = 0; + if (path != pathval()) + clearcmdentry(0); + for (i = 1; i < argc; i++) { /* First look at the keywords */ - for (pp = (char **)parsekwd; *pp; pp++) + for (pp = parsekwd; *pp; pp++) if (**pp == *argv[i] && equal(*pp, argv[i])) break; @@ -760,16 +774,17 @@ } else { /* Finally use brute force */ - find_command(argv[i], &entry, 0, pathval()); + find_command(argv[i], &entry, 0, path); } switch (entry.cmdtype) { case CMDNORMAL: { if (strchr(argv[i], '/') == NULL) { - char *path = pathval(), *name; + const char *path2 = path; + char *name; int j = entry.u.index; do { - name = padvance(&path, argv[i]); + name = padvance(&path2, argv[i]); stunalloc(name); } while (--j >= 0); if (cmd == TYPECMD_SMALLV) @@ -790,7 +805,7 @@ if (cmd != TYPECMD_SMALLV) outfmt(out2, "%s: %s\n", argv[i], strerror(errno)); - error |= 127; + error1 |= 127; } } break; @@ -815,11 +830,15 @@ default: if (cmd != TYPECMD_SMALLV) outfmt(out2, "%s: not found\n", argv[i]); - error |= 127; + error1 |= 127; break; } } - return error; + + if (path != pathval()) + clearcmdentry(0); + + return error1; } /* @@ -829,5 +848,5 @@ int typecmd(int argc, char **argv) { - return typecmd_impl(argc, argv, TYPECMD_TYPE); + return typecmd_impl(argc, argv, TYPECMD_TYPE, bltinlookup("PATH", 1)); } Index: bin/sh/miscbltin.c =================================================================== --- bin/sh/miscbltin.c (revision 209229) +++ bin/sh/miscbltin.c (working copy) @@ -93,7 +93,7 @@ char c; int rflag; char *prompt; - char *ifs; + const char *ifs; char *p; int startword; int status; @@ -254,7 +254,7 @@ int -umaskcmd(int argc __unused, char **argv) +umaskcmd(int argc __unused, char **argv __unused) { char *ap; int mask; Index: bin/sh/cd.c =================================================================== --- bin/sh/cd.c (revision 209229) +++ bin/sh/cd.c (working copy) @@ -70,6 +70,7 @@ STATIC char *getcomponent(void); STATIC char *findcwd(char *); STATIC void updatepwd(char *); +STATIC char *getpwd(void); STATIC char *getpwd2(void); STATIC char *curdir = NULL; /* current working directory */ @@ -79,8 +80,8 @@ int cdcmd(int argc, char **argv) { - char *dest; - char *path; + const char *dest; + const char *path; char *p; struct stat statb; int ch, phys, print = 0; @@ -351,7 +352,7 @@ /* * Get the current directory and cache the result in curdir. */ -char * +STATIC char * getpwd(void) { char *p; @@ -374,7 +375,6 @@ STATIC char * getpwd2(void) { - struct stat stdot, stpwd; char *pwd; int i; @@ -387,12 +387,29 @@ break; } - pwd = getenv("PWD"); + return NULL; +} + +/* + * Initialize PWD in a new shell. + * If the shell is interactive, we need to warn if this fails. + */ +void +pwd_init(int warn) +{ + char *pwd; + struct stat stdot, stpwd; + + pwd = lookupvar("PWD"); if (pwd && *pwd == '/' && stat(".", &stdot) != -1 && stat(pwd, &stpwd) != -1 && stdot.st_dev == stpwd.st_dev && stdot.st_ino == stpwd.st_ino) { - return pwd; + if (curdir) + ckfree(curdir); + curdir = savestr(pwd); } - return NULL; + if (getpwd() == NULL && warn) + out2fmt_flush("sh: cannot determine working directory\n"); + setvar("PWD", curdir, VEXPORT); } Index: bin/sh/eval.c =================================================================== --- bin/sh/eval.c (revision 209229) +++ bin/sh/eval.c (working copy) @@ -74,7 +74,7 @@ #endif -MKINIT int evalskip; /* set if we are skipping commands */ +int evalskip; /* set if we are skipping commands */ STATIC int skipcount; /* number of levels to skip */ MKINIT int loopnest; /* current loop nesting level */ int funcnest; /* depth of function calls */ @@ -91,6 +91,7 @@ STATIC void evalfor(union node *, int); STATIC void evalcase(union node *, int); STATIC void evalsubshell(union node *, int); +STATIC void evalredir(union node *, int); STATIC void expredir(union node *); STATIC void evalpipe(union node *); STATIC void evalcommand(union node *, int, struct backcmd *); @@ -221,10 +222,7 @@ evaltree(n->nbinary.ch2, flags); break; case NREDIR: - expredir(n->nredir.redirect); - redirect(n->nredir.redirect, REDIR_PUSH); - evaltree(n->nredir.n, flags); - popredir(); + evalredir(n, flags); break; case NSUBSHELL: evalsubshell(n, flags); @@ -407,8 +405,7 @@ flags &=~ EV_TESTED; redirect(n->nredir.redirect, 0); evaltree(n->nredir.n, flags | EV_EXIT); /* never returns */ - } - if (! backgnd) { + } else if (! backgnd) { INTOFF; exitstatus = waitforjob(jp, (int *)NULL); INTON; @@ -416,7 +413,47 @@ } +/* + * Evaluate a redirected compound command. + */ +STATIC void +evalredir(union node *n, int flags) +{ + struct jmploc jmploc; + struct jmploc *savehandler; + volatile int in_redirect = 1; + + expredir(n->nredir.redirect); + savehandler = handler; + if (setjmp(jmploc.loc)) { + int e; + + handler = savehandler; + e = exception; + if (e == EXERROR || e == EXEXEC) { + popredir(); + if (in_redirect) { + exitstatus = 2; + return; + } + } + longjmp(handler->loc, 1); + } else { + INTOFF; + handler = &jmploc; + redirect(n->nredir.redirect, REDIR_PUSH); + in_redirect = 0; + INTON; + evaltree(n->nredir.n, flags); + } + INTOFF; + handler = savehandler; + popredir(); + INTON; +} + + /* * Compute the names of the files in a redirection list. */ @@ -593,10 +630,12 @@ char *savecmdname; struct shparam saveparam; struct localvar *savelocalvars; + struct parsefile *savetopfile; volatile int e; char *lastarg; int realstatus; int do_clearcmdentry; + char *path = pathval(); /* First expand the arguments. */ TRACE(("evalcommand(%p, %d) called\n", (void *)cmd, flags)); @@ -646,7 +685,7 @@ out2str(ps4val()); for (sp = varlist.list ; sp ; sp = sp->next) { if (sep != 0) - outc(' ', &errout); + out2c(' '); p = sp->text; while (*p != '=' && *p != '\0') out2c(*p++); @@ -658,7 +697,7 @@ } for (sp = arglist.list ; sp ; sp = sp->next) { if (sep != 0) - outc(' ', &errout); + out2c(' '); /* Disambiguate command looking like assignment. */ if (sp == arglist.list && strchr(sp->text, '=') != NULL && @@ -670,7 +709,7 @@ out2qstr(sp->text); sep = ' '; } - outc('\n', &errout); + out2c('\n'); flushout(&errout); } @@ -679,10 +718,10 @@ /* Variable assignment(s) without command */ cmdentry.cmdtype = CMDBUILTIN; cmdentry.u.index = BLTINCMD; - cmdentry.special = 1; + cmdentry.special = 0; } else { static const char PATH[] = "PATH="; - char *path = pathval(); + int cmd_flags = 0, bltinonly = 0; /* * Modify the command lookup path, if a PATH= assignment @@ -713,42 +752,79 @@ do_clearcmdentry = 1; } - find_command(argv[0], &cmdentry, 1, path); - if (cmdentry.cmdtype == CMDUNKNOWN) { /* command not found */ - exitstatus = 127; - flushout(&errout); - return; - } - /* implement the bltin builtin here */ - if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == BLTINCMD) { - for (;;) { + for (;;) { + if (bltinonly) { + cmdentry.u.index = find_builtin(*argv, &cmdentry.special); + if (cmdentry.u.index < 0) { + cmdentry.u.index = BLTINCMD; + argv--; + argc++; + break; + } + } else + find_command(argv[0], &cmdentry, cmd_flags, path); + /* implement the bltin and command builtins here */ + if (cmdentry.cmdtype != CMDBUILTIN) + break; + if (cmdentry.u.index == BLTINCMD) { + if (argc == 1) + break; argv++; - if (--argc == 0) + argc--; + bltinonly = 1; + } else if (cmdentry.u.index == COMMANDCMD) { + if (argc == 1) break; - if ((cmdentry.u.index = find_builtin(*argv, - &cmdentry.special)) < 0) { - outfmt(&errout, "%s: not found\n", *argv); - exitstatus = 127; - flushout(&errout); - return; + if (!strcmp(argv[1], "-p")) { + if (argc == 2) + break; + if (argv[2][0] == '-') { + if (strcmp(argv[2], "--")) + break; + if (argc == 3) + break; + argv += 3; + argc -= 3; + } else { + argv += 2; + argc -= 2; + } + path = _PATH_STDPATH; + clearcmdentry(0); + do_clearcmdentry = 1; + } else if (!strcmp(argv[1], "--")) { + if (argc == 2) + break; + argv += 2; + argc -= 2; + } else if (argv[1][0] == '-') + break; + else { + argv++; + argc--; } - if (cmdentry.u.index != BLTINCMD) - break; - } + cmd_flags |= DO_NOFUNC; + bltinonly = 0; + } else + break; } + /* + * Special builtins lose their special properties when + * called via 'command'. + */ + if (cmd_flags & DO_NOFUNC) + cmdentry.special = 0; } /* Fork off a child process if necessary. */ if (cmd->ncmd.backgnd - || (cmdentry.cmdtype == CMDNORMAL + || ((cmdentry.cmdtype == CMDNORMAL || cmdentry.cmdtype == CMDUNKNOWN) && ((flags & EV_EXIT) == 0 || have_traps())) || ((flags & EV_BACKCMD) != 0 && (cmdentry.cmdtype != CMDBUILTIN || cmdentry.u.index == CDCMD || cmdentry.u.index == DOTCMD - || cmdentry.u.index == EVALCMD)) - || (cmdentry.cmdtype == CMDBUILTIN && - cmdentry.u.index == COMMANDCMD)) { + || cmdentry.u.index == EVALCMD))) { jp = makejob(cmd, 1); mode = cmd->ncmd.backgnd; if (flags & EV_BACKCMD) { @@ -775,7 +851,6 @@ #ifdef DEBUG trputs("Shell function: "); trargs(argv); #endif - redirect(cmd->ncmd.redirect, REDIR_PUSH); saveparam = shellparam; shellparam.malloc = 0; shellparam.reset = 1; @@ -786,7 +861,6 @@ savelocalvars = localvars; localvars = NULL; reffunc(cmdentry.u.func); - INTON; savehandler = handler; if (setjmp(jmploc.loc)) { if (exception == EXSHELLPROC) @@ -794,23 +868,27 @@ else { freeparam(&shellparam); shellparam = saveparam; + if (exception == EXERROR || exception == EXEXEC) + popredir(); } unreffunc(cmdentry.u.func); poplocalvars(); localvars = savelocalvars; + funcnest--; handler = savehandler; longjmp(handler->loc, 1); } handler = &jmploc; + funcnest++; + redirect(cmd->ncmd.redirect, REDIR_PUSH); + INTON; for (sp = varlist.list ; sp ; sp = sp->next) mklocal(sp->text); - funcnest++; exitstatus = oexitstatus; if (flags & EV_TESTED) evaltree(getfuncnode(cmdentry.u.func), EV_TESTED); else evaltree(getfuncnode(cmdentry.u.func), 0); - funcnest--; INTOFF; unreffunc(cmdentry.u.func); poplocalvars(); @@ -818,6 +896,7 @@ freeparam(&shellparam); shellparam = saveparam; handler = savehandler; + funcnest--; popredir(); INTON; if (evalskip == SKIPFUNC) { @@ -836,8 +915,10 @@ memout.nextc = memout.buf; memout.bufsize = 64; mode |= REDIR_BACKQ; + cmdentry.special = 0; } savecmdname = commandname; + savetopfile = getcurrentfile(); cmdenviron = varlist.list; e = -1; savehandler = handler; @@ -848,15 +929,25 @@ } handler = &jmploc; redirect(cmd->ncmd.redirect, mode); + /* + * If there is no command word, redirection errors should + * not be fatal but assignment errors should. + */ + if (argc == 0 && !(flags & EV_BACKCMD)) + cmdentry.special = 1; if (cmdentry.special) listsetvar(cmdenviron); + if (argc > 0) + bltinsetlocale(); commandname = argv[0]; argptr = argv + 1; - optptr = NULL; /* initialize nextopt */ + nextopt_optptr = NULL; /* initialize nextopt */ builtin_flags = flags; exitstatus = (*builtinfunc[cmdentry.u.index])(argc, argv); flushall(); cmddone: + if (argc > 0) + bltinunsetlocale(); cmdenviron = NULL; out1 = &output; out2 = &errout; @@ -868,29 +959,31 @@ } } handler = savehandler; + if (flags == EV_BACKCMD) { + backcmd->buf = memout.buf; + backcmd->nleft = memout.nextc - memout.buf; + memout.buf = NULL; + } + if (cmdentry.u.index != EXECCMD && + (e == -1 || e == EXERROR || e == EXEXEC)) + popredir(); if (e != -1) { if ((e != EXERROR && e != EXEXEC) || cmdentry.special) exraise(e); - FORCEINTON; + popfilesupto(savetopfile); + if (flags != EV_BACKCMD) + FORCEINTON; } - if (cmdentry.u.index != EXECCMD) - popredir(); - if (flags == EV_BACKCMD) { - backcmd->buf = memout.buf; - backcmd->nleft = memout.nextc - memout.buf; - memout.buf = NULL; - } } else { #ifdef DEBUG trputs("normal command: "); trargs(argv); #endif - clearredir(); redirect(cmd->ncmd.redirect, 0); for (sp = varlist.list ; sp ; sp = sp->next) setvareq(sp->text, VEXPORT|VSTACK); envp = environment(); - shellexec(argv, envp, pathval(), cmdentry.u.index); + shellexec(argv, envp, path, cmdentry.u.index); /*NOTREACHED*/ } goto out; @@ -946,12 +1039,17 @@ */ /* - * No command given, or a bltin command with no arguments. + * No command given, a bltin command with no arguments, or a bltin command + * with an invalid name. */ int -bltincmd(int argc __unused, char **argv __unused) +bltincmd(int argc, char **argv) { + if (argc > 1) { + out2fmt_flush("%s: not found\n", argv[1]); + return 127; + } /* * Preserve exitstatus of a previous possible redirection * as POSIX mandates @@ -991,23 +1089,18 @@ int commandcmd(int argc, char **argv) { - static char stdpath[] = _PATH_STDPATH; - struct jmploc loc, *old; - struct strlist *sp; - char *path; + const char *path; int ch; int cmd = -1; - for (sp = cmdenviron; sp ; sp = sp->next) - setvareq(sp->text, VEXPORT|VSTACK); - path = pathval(); + path = bltinlookup("PATH", 1); optind = optreset = 1; opterr = 0; while ((ch = getopt(argc, argv, "pvV")) != -1) { switch (ch) { case 'p': - path = stdpath; + path = _PATH_STDPATH; break; case 'v': cmd = TYPECMD_SMALLV; @@ -1026,24 +1119,16 @@ if (cmd != -1) { if (argc != 1) error("wrong number of arguments"); - return typecmd_impl(2, argv - 1, cmd); + return typecmd_impl(2, argv - 1, cmd, path); } - if (argc != 0) { - old = handler; - handler = &loc; - if (setjmp(handler->loc) == 0) - shellexec(argv, environment(), path, 0); - handler = old; - if (exception == EXEXEC) - exit(exerrno); - exraise(exception); - } + if (argc != 0) + error("commandcmd() called while it should not be"); /* * Do nothing successfully if no command was specified; * ksh also does this. */ - exit(0); + return 0; } @@ -1085,6 +1170,12 @@ int execcmd(int argc, char **argv) { + /* + * Because we have historically not supported any options, + * only treat "--" specially. + */ + if (argc > 1 && strcmp(argv[1], "--") == 0) + argc--, argv++; if (argc > 1) { struct strlist *sp; Index: bin/sh/var.c =================================================================== --- bin/sh/var.c (revision 209229) +++ bin/sh/var.c (working copy) @@ -73,13 +73,14 @@ struct varinit { struct var *var; int flags; - char *text; + const char *text; void (*func)(const char *); }; #ifndef NO_HISTORY struct var vhistsize; +struct var vterm; #endif struct var vifs; struct var vmail; @@ -94,27 +95,31 @@ STATIC const struct varinit varinit[] = { #ifndef NO_HISTORY - { &vhistsize, VSTRFIXED|VTEXTFIXED|VUNSET, "HISTSIZE=", + { &vhistsize, VUNSET, "HISTSIZE=", sethistsize }, #endif - { &vifs, VSTRFIXED|VTEXTFIXED, "IFS= \t\n", + { &vifs, 0, "IFS= \t\n", NULL }, - { &vmail, VSTRFIXED|VTEXTFIXED|VUNSET, "MAIL=", + { &vmail, VUNSET, "MAIL=", NULL }, - { &vmpath, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH=", + { &vmpath, VUNSET, "MAILPATH=", NULL }, - { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=" _PATH_DEFPATH, + { &vpath, 0, "PATH=" _PATH_DEFPATH, changepath }, - { &vppid, VSTRFIXED|VTEXTFIXED|VUNSET, "PPID=", + { &vppid, VUNSET, "PPID=", NULL }, /* * vps1 depends on uid */ - { &vps2, VSTRFIXED|VTEXTFIXED, "PS2=> ", + { &vps2, 0, "PS2=> ", NULL }, - { &vps4, VSTRFIXED|VTEXTFIXED, "PS4=+ ", + { &vps4, 0, "PS4=+ ", NULL }, - { &voptind, VSTRFIXED|VTEXTFIXED, "OPTIND=1", +#ifndef NO_HISTORY + { &vterm, VUNSET, "TERM=", + setterm }, +#endif + { &voptind, 0, "OPTIND=1", getoptsreset }, { NULL, 0, NULL, NULL } @@ -122,19 +127,27 @@ STATIC struct var *vartab[VTABSIZE]; -STATIC struct var **hashvar(char *); -STATIC int varequal(char *, char *); -STATIC int localevar(char *); +STATIC const char *const locale_names[7] = { + "LC_COLLATE", "LC_CTYPE", "LC_MONETARY", + "LC_NUMERIC", "LC_TIME", "LC_MESSAGES", NULL +}; +STATIC const int locale_categories[7] = { + LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, LC_TIME, LC_MESSAGES, 0 +}; +STATIC struct var **hashvar(const char *); +STATIC int varequal(const char *, const char *); +STATIC int localevar(const char *); + /* * Initialize the variable symbol tables and import the environment. */ #ifdef mkinit INCLUDE "var.h" +MKINIT char **environ; INIT { char **envp; - extern char **environ; initvar(); for (envp = environ ; *envp ; envp++) { @@ -164,8 +177,8 @@ vpp = hashvar(ip->text); vp->next = *vpp; *vpp = vp; - vp->text = ip->text; - vp->flags = ip->flags; + vp->text = __DECONST(char *, ip->text); + vp->flags = ip->flags | VSTRFIXED | VTEXTFIXED; vp->func = ip->func; } } @@ -176,7 +189,7 @@ vpp = hashvar("PS1="); vps1.next = *vpp; *vpp = &vps1; - vps1.text = geteuid() ? "PS1=$ " : "PS1=# "; + vps1.text = __DECONST(char *, geteuid() ? "PS1=$ " : "PS1=# "); vps1.flags = VSTRFIXED|VTEXTFIXED; } if ((vppid.flags & VEXPORT) == 0) { @@ -190,12 +203,14 @@ */ int -setvarsafe(char *name, char *val, int flags) +setvarsafe(const char *name, const char *val, int flags) { struct jmploc jmploc; struct jmploc *const savehandler = handler; int err = 0; + int inton; + inton = is_int_on(); if (setjmp(jmploc.loc)) err = 1; else { @@ -203,6 +218,7 @@ setvar(name, val, flags); } handler = savehandler; + SETINTON(inton); return err; } @@ -212,9 +228,9 @@ */ void -setvar(char *name, char *val, int flags) +setvar(const char *name, const char *val, int flags) { - char *p, *q; + const char *p; int len; int namelen; char *nameeq; @@ -242,25 +258,20 @@ } else { len += strlen(val); } - p = nameeq = ckmalloc(len); - q = name; - while (--namelen >= 0) - *p++ = *q++; - *p++ = '='; - *p = '\0'; + nameeq = ckmalloc(len); + memcpy(nameeq, name, namelen); + nameeq[namelen] = '='; if (val) - scopy(val, p); + scopy(val, nameeq + namelen + 1); + else + nameeq[namelen + 1] = '\0'; setvareq(nameeq, flags); } STATIC int -localevar(char *s) +localevar(const char *s) { - static char *lnames[7] = { - "ALL", "COLLATE", "CTYPE", "MONETARY", - "NUMERIC", "TIME", NULL - }; - char **ss; + const char *const *ss; if (*s != 'L') return 0; @@ -268,8 +279,10 @@ return 1; if (strncmp(s + 1, "C_", 2) != 0) return 0; - for (ss = lnames; *ss ; ss++) - if (varequal(s + 3, *ss)) + if (varequal(s + 3, "ALL")) + return 1; + for (ss = locale_names; *ss ; ss++) + if (varequal(s + 3, *ss + 3)) return 1; return 0; } @@ -280,7 +293,7 @@ * pointer into environ where the string should not be manipulated. */ static void -change_env(char *s, int set) +change_env(const char *s, int set) { char *eqp; char *ss; @@ -391,7 +404,7 @@ */ char * -lookupvar(char *name) +lookupvar(const char *name) { struct var *v; @@ -414,7 +427,7 @@ */ char * -bltinlookup(char *name, int doall) +bltinlookup(const char *name, int doall) { struct strlist *sp; struct var *v; @@ -435,8 +448,63 @@ } +/* + * Set up locale for a builtin (LANG/LC_* assignments). + */ +void +bltinsetlocale(void) +{ + struct strlist *lp; + int act = 0; + char *loc, *locdef; + int i; + for (lp = cmdenviron ; lp ; lp = lp->next) { + if (localevar(lp->text)) { + act = 1; + break; + } + } + if (!act) + return; + loc = bltinlookup("LC_ALL", 0); + INTOFF; + if (loc != NULL) { + setlocale(LC_ALL, loc); + INTON; + return; + } + locdef = bltinlookup("LANG", 0); + for (i = 0; locale_names[i] != NULL; i++) { + loc = bltinlookup(locale_names[i], 0); + if (loc == NULL) + loc = locdef; + if (loc != NULL) + setlocale(locale_categories[i], loc); + } + INTON; +} + /* + * Undo the effect of bltinlocaleset(). + */ +void +bltinunsetlocale(void) +{ + struct strlist *lp; + + INTOFF; + for (lp = cmdenviron ; lp ; lp = lp->next) { + if (localevar(lp->text)) { + setlocale(LC_ALL, ""); + return; + } + } + INTON; +} + + +/* * Generate a list of exported variables. This routine is used to construct * the third argument to execve when executing a program. */ @@ -472,9 +540,9 @@ * VSTACK set since these are currently allocated on the stack. */ -#ifdef mkinit MKINIT void shprocvar(void); +#ifdef mkinit SHELLPROC { shprocvar(); } @@ -798,7 +866,7 @@ */ int -unsetvar(char *s) +unsetvar(const char *s) { struct var **vpp; struct var *vp; @@ -838,7 +906,7 @@ */ STATIC struct var ** -hashvar(char *p) +hashvar(const char *p) { unsigned int hashval; @@ -857,7 +925,7 @@ */ STATIC int -varequal(char *p, char *q) +varequal(const char *p, const char *q) { while (*p == *q++) { if (*p++ == '=') Index: bin/sh/memalloc.c =================================================================== --- bin/sh/memalloc.c (revision 209229) +++ bin/sh/memalloc.c (working copy) @@ -95,7 +95,7 @@ */ char * -savestr(char *s) +savestr(const char *s) { char *p; Index: bin/sh/main.h =================================================================== --- bin/sh/main.h (revision 209229) +++ bin/sh/main.h (working copy) @@ -35,8 +35,9 @@ extern int rootpid; /* pid of main shell */ extern int rootshell; /* true if we aren't a child of the main shell */ +extern struct jmploc main_handler; /* top level exception handler */ -void readcmdfile(char *); +void readcmdfile(const char *); void cmdloop(int); int dotcmd(int, char **); int exitcmd(int, char **); Index: bin/sh/exec.h =================================================================== --- bin/sh/exec.h (revision 209229) +++ bin/sh/exec.h (working copy) @@ -57,20 +57,24 @@ }; -extern char *pathopt; /* set by padvance */ +/* action to find_command() */ +#define DO_ERR 0x01 /* prints errors */ +#define DO_NOFUNC 0x02 /* don't return shell functions, for command */ + +extern const char *pathopt; /* set by padvance */ extern int exerrno; /* last exec error */ -void shellexec(char **, char **, char *, int); -char *padvance(char **, char *); +void shellexec(char **, char **, const char *, int) __dead2; +char *padvance(const char **, const char *); int hashcmd(int, char **); -void find_command(char *, struct cmdentry *, int, char *); -int find_builtin(char *, int *); +void find_command(const char *, struct cmdentry *, int, const char *); +int find_builtin(const char *, int *); void hashcd(void); void changepath(const char *); void deletefuncs(void); -void addcmdentry(char *, struct cmdentry *); -void defun(char *, union node *); -int unsetfunc(char *); -int typecmd_impl(int, char **, int); +void addcmdentry(const char *, struct cmdentry *); +void defun(const char *, union node *); +int unsetfunc(const char *); +int typecmd_impl(int, char **, int, const char *); int typecmd(int, char **); void clearcmdentry(int); Index: bin/sh/alias.c =================================================================== --- bin/sh/alias.c (revision 209229) +++ bin/sh/alias.c (working copy) @@ -52,13 +52,13 @@ STATIC struct alias *atab[ATABSIZE]; STATIC int aliases; -STATIC void setalias(char *, char *); +STATIC void setalias(const char *, const char *); STATIC int unalias(const char *); STATIC struct alias **hashalias(const char *); STATIC void -setalias(char *name, char *val) +setalias(const char *name, const char *val) { struct alias *ap, **app; @@ -176,7 +176,7 @@ } struct alias * -lookupalias(char *name, int check) +lookupalias(const char *name, int check) { struct alias *ap = *hashalias(name); Index: bin/sh/cd.h =================================================================== --- bin/sh/cd.h (revision 209229) +++ bin/sh/cd.h (working copy) @@ -29,6 +29,6 @@ * $FreeBSD$ */ -char *getpwd(void); +void pwd_init(int); int cdcmd (int, char **); int pwdcmd(int, char **); Index: bin/sh/mkinit.c =================================================================== --- bin/sh/mkinit.c (revision 209229) +++ bin/sh/mkinit.c (working copy) @@ -102,9 +102,9 @@ */ struct event { - char *name; /* name of event (e.g. INIT) */ - char *routine; /* name of routine called on event */ - char *comment; /* comment describing routine */ + const char *name; /* name of event (e.g. INIT) */ + const char *routine; /* name of routine called on event */ + const char *comment; /* comment describing routine */ struct text code; /* code for handling event */ }; @@ -140,7 +140,7 @@ }; -char *curfile; /* current file */ +const char *curfile; /* current file */ int linno; /* current line */ char *header_files[200]; /* list of header files */ struct text defines; /* #define statements */ @@ -148,20 +148,20 @@ int amiddecls; /* for formatting */ -void readfile(char *); -int match(char *, char *); -int gooddefine(char *); -void doevent(struct event *, FILE *, char *); +void readfile(const char *); +int match(const char *, const char *); +int gooddefine(const char *); +void doevent(struct event *, FILE *, const char *); void doinclude(char *); void dodecl(char *, FILE *); void output(void); -void addstr(char *, struct text *); +void addstr(const char *, struct text *); void addchar(int, struct text *); void writetext(struct text *, FILE *); -FILE *ckfopen(char *, char *); +FILE *ckfopen(const char *, const char *); void *ckmalloc(size_t); -char *savestr(char *); -void error(char *); +char *savestr(const char *); +void error(const char *); #define equal(s1, s2) (strcmp(s1, s2) == 0) @@ -170,9 +170,9 @@ { char **ap; - header_files[0] = "\"shell.h\""; - header_files[1] = "\"mystring.h\""; - header_files[2] = "\"init.h\""; + header_files[0] = savestr("\"shell.h\""); + header_files[1] = savestr("\"mystring.h\""); + header_files[2] = savestr("\"init.h\""); for (ap = argv + 1 ; *ap ; ap++) readfile(*ap); output(); @@ -186,7 +186,7 @@ */ void -readfile(char *fname) +readfile(const char *fname) { FILE *fp; char line[1024]; @@ -230,9 +230,9 @@ int -match(char *name, char *line) +match(const char *name, const char *line) { - char *p, *q; + const char *p, *q; p = name, q = line; while (*p) { @@ -246,9 +246,9 @@ int -gooddefine(char *line) +gooddefine(const char *line) { - char *p; + const char *p; if (! match("#define", line)) return 0; /* not a define */ @@ -269,11 +269,11 @@ void -doevent(struct event *ep, FILE *fp, char *fname) +doevent(struct event *ep, FILE *fp, const char *fname) { char line[1024]; int indent; - char *p; + const char *p; sprintf(line, "\n /* from %s: */\n", fname); addstr(line, &ep->code); @@ -407,7 +407,7 @@ */ void -addstr(char *s, struct text *text) +addstr(const char *s, struct text *text) { while (*s) { if (--text->nleft < 0) @@ -452,7 +452,7 @@ } FILE * -ckfopen(char *file, char *mode) +ckfopen(const char *file, const char *mode) { FILE *fp; @@ -474,7 +474,7 @@ } char * -savestr(char *s) +savestr(const char *s) { char *p; @@ -484,7 +484,7 @@ } void -error(char *msg) +error(const char *msg) { if (curfile != NULL) fprintf(stderr, "%s:%d: ", curfile, linno); Index: bin/sh/options.c =================================================================== --- bin/sh/options.c (revision 209229) +++ bin/sh/options.c (working copy) @@ -64,7 +64,7 @@ struct shparam shellparam; /* current positional parameters */ char **argptr; /* argument list for builtin commands */ char *shoptarg; /* set by nextopt (like getopt) */ -char *optptr; /* used by nextopt */ +char *nextopt_optptr; /* used by nextopt */ char *minusc; /* argument to -c option */ @@ -93,8 +93,11 @@ options(1); if (*argptr == NULL && minusc == NULL) sflag = 1; - if (iflag == 2 && sflag == 1 && isatty(0) && isatty(1)) + if (iflag != 0 && sflag == 1 && isatty(0) && isatty(1)) { iflag = 1; + if (Eflag == 2) + Eflag = 1; + } if (mflag == 2) mflag = iflag; for (i = 0; i < NOPTS; i++) @@ -554,12 +557,13 @@ */ int -nextopt(char *optstring) +nextopt(const char *optstring) { - char *p, *q; + char *p; + const char *q; char c; - if ((p = optptr) == NULL || *p == '\0') { + if ((p = nextopt_optptr) == NULL || *p == '\0') { p = *argptr; if (p == NULL || *p != '-' || *++p == '\0') return '\0'; @@ -580,6 +584,6 @@ shoptarg = p; p = NULL; } - optptr = p; + nextopt_optptr = p; return c; } Index: bin/sh/eval.h =================================================================== --- bin/sh/eval.h (revision 209229) +++ bin/sh/eval.h (working copy) @@ -35,6 +35,7 @@ extern char *commandname; /* currently executing command */ extern int exitstatus; /* exit status of last command */ +extern int oexitstatus; /* saved exit status */ extern struct strlist *cmdenviron; /* environment for builtin command */ Index: bin/sh/parser.c =================================================================== --- bin/sh/parser.c (revision 209229) +++ bin/sh/parser.c (working copy) @@ -79,10 +79,13 @@ int striptabs; /* if set, strip leading tabs */ }; +struct parser_temp { + struct parser_temp *next; + void *data; +}; STATIC struct heredoc *heredoclist; /* list of here documents to read */ -STATIC int parsebackquote; /* nonzero if we are inside backquotes */ STATIC int doprompt; /* if set, prompt the user */ STATIC int needprompt; /* true if interactive and at start of line */ STATIC int lasttoken; /* last token read */ @@ -95,6 +98,7 @@ STATIC int quoteflag; /* set if (part of) last token was quoted */ STATIC int startlinno; /* line # where last token started */ STATIC int funclinno; /* line # where the current function started */ +STATIC struct parser_temp *parser_temp; /* XXX When 'noaliases' is set to one, no alias expansion takes place. */ static int noaliases = 0; @@ -114,10 +118,77 @@ STATIC int readtoken1(int, char const *, char *, int); STATIC int noexpand(char *); STATIC void synexpect(int); -STATIC void synerror(char *); +STATIC void synerror(const char *); STATIC void setprompt(int); +STATIC void * +parser_temp_alloc(size_t len) +{ + struct parser_temp *t; + + INTOFF; + t = ckmalloc(sizeof(*t)); + t->data = NULL; + t->next = parser_temp; + parser_temp = t; + t->data = ckmalloc(len); + INTON; + return t->data; +} + + +STATIC void * +parser_temp_realloc(void *ptr, size_t len) +{ + struct parser_temp *t; + + INTOFF; + t = parser_temp; + if (ptr != t->data) + error("bug: parser_temp_realloc misused"); + t->data = ckrealloc(t->data, len); + INTON; + return t->data; +} + + +STATIC void +parser_temp_free_upto(void *ptr) +{ + struct parser_temp *t; + int done = 0; + + INTOFF; + while (parser_temp != NULL && !done) { + t = parser_temp; + parser_temp = t->next; + done = t->data == ptr; + ckfree(t->data); + ckfree(t); + } + INTON; + if (!done) + error("bug: parser_temp_free_upto misused"); +} + + +STATIC void +parser_temp_free_all(void) +{ + struct parser_temp *t; + + INTOFF; + while (parser_temp != NULL) { + t = parser_temp; + parser_temp = t->next; + ckfree(t->data); + ckfree(t); + } + INTON; +} + + /* * Read and parse a command. Returns NEOF on end of file. (NULL is a * valid parse tree indicating a blank line.) @@ -128,6 +199,12 @@ { int t; + /* This assumes the parser is not re-entered, + * which could happen if we add command substitution on PS1/PS2. + */ + parser_temp_free_all(); + heredoclist = NULL; + tokpushback = 0; doprompt = interact; if (doprompt) @@ -864,8 +941,190 @@ } +#define MAXNEST_STATIC 8 +struct tokenstate +{ + const char *syntax; /* *SYNTAX */ + int parenlevel; /* levels of parentheses in arithmetic */ + enum tokenstate_category + { + TSTATE_TOP, + TSTATE_VAR_OLD, /* ${var+-=?}, inherits dquotes */ + TSTATE_VAR_NEW, /* other ${var...}, own dquote state */ + TSTATE_ARITH + } category; +}; + /* + * Called to parse command substitutions. + */ + +STATIC char * +parsebackq(char *out, struct nodelist **pbqlist, + int oldstyle, int dblquote, int quoted) +{ + struct nodelist **nlpp; + union node *n; + char *volatile str; + struct jmploc jmploc; + struct jmploc *const savehandler = handler; + int savelen; + int saveprompt; + const int bq_startlinno = plinno; + char *volatile ostr = NULL; + struct parsefile *const savetopfile = getcurrentfile(); + struct heredoc *const saveheredoclist = heredoclist; + struct heredoc *here; + + str = NULL; + if (setjmp(jmploc.loc)) { + popfilesupto(savetopfile); + if (str) + ckfree(str); + if (ostr) + ckfree(ostr); + heredoclist = saveheredoclist; + handler = savehandler; + if (exception == EXERROR) { + startlinno = bq_startlinno; + synerror("Error in command substitution"); + } + longjmp(handler->loc, 1); + } + INTOFF; + savelen = out - stackblock(); + if (savelen > 0) { + str = ckmalloc(savelen); + memcpy(str, stackblock(), savelen); + } + handler = &jmploc; + heredoclist = NULL; + INTON; + if (oldstyle) { + /* We must read until the closing backquote, giving special + treatment to some slashes, and then push the string and + reread it as input, interpreting it normally. */ + char *oout; + int c; + int olen; + + + STARTSTACKSTR(oout); + for (;;) { + if (needprompt) { + setprompt(2); + needprompt = 0; + } + switch (c = pgetc()) { + case '`': + goto done; + + case '\\': + if ((c = pgetc()) == '\n') { + plinno++; + if (doprompt) + setprompt(2); + else + setprompt(0); + /* + * If eating a newline, avoid putting + * the newline into the new character + * stream (via the STPUTC after the + * switch). + */ + continue; + } + if (c != '\\' && c != '`' && c != '$' + && (!dblquote || c != '"')) + STPUTC('\\', oout); + break; + + case '\n': + plinno++; + needprompt = doprompt; + break; + + case PEOF: + startlinno = plinno; + synerror("EOF in backquote substitution"); + break; + + default: + break; + } + STPUTC(c, oout); + } +done: + STPUTC('\0', oout); + olen = oout - stackblock(); + INTOFF; + ostr = ckmalloc(olen); + memcpy(ostr, stackblock(), olen); + setinputstring(ostr, 1); + INTON; + } + nlpp = pbqlist; + while (*nlpp) + nlpp = &(*nlpp)->next; + *nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist)); + (*nlpp)->next = NULL; + + if (oldstyle) { + saveprompt = doprompt; + doprompt = 0; + } + + n = list(0); + + if (oldstyle) + doprompt = saveprompt; + else { + if (readtoken() != TRP) + synexpect(TRP); + } + + (*nlpp)->n = n; + if (oldstyle) { + /* + * Start reading from old file again, ignoring any pushed back + * tokens left from the backquote parsing + */ + popfile(); + tokpushback = 0; + } + while (stackblocksize() <= savelen) + growstackblock(); + STARTSTACKSTR(out); + INTOFF; + if (str) { + memcpy(out, str, savelen); + STADJUST(savelen, out); + ckfree(str); + str = NULL; + } + if (ostr) { + ckfree(ostr); + ostr = NULL; + } + here = saveheredoclist; + if (here != NULL) { + while (here->next != NULL) + here = here->next; + here->next = heredoclist; + heredoclist = saveheredoclist; + } + handler = savehandler; + INTON; + if (quoted) + USTPUTC(CTLBACKQ | CTLQUOTE, out); + else + USTPUTC(CTLBACKQ, out); + return out; +} + + +/* * If eofmark is NULL, read a word or a redirection symbol. If eofmark * is not NULL, read a here document. In the latter case, eofmark is the * word which marks the end of the document and striptabs is true if @@ -880,12 +1139,10 @@ #define CHECKEND() {goto checkend; checkend_return:;} #define PARSEREDIR() {goto parseredir; parseredir_return:;} #define PARSESUB() {goto parsesub; parsesub_return:;} -#define PARSEBACKQOLD() {oldstyle = 1; goto parsebackq; parsebackq_oldreturn:;} -#define PARSEBACKQNEW() {oldstyle = 0; goto parsebackq; parsebackq_newreturn:;} #define PARSEARITH() {goto parsearith; parsearith_return:;} STATIC int -readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs) +readtoken1(int firstc, char const *initialsyntax, char *eofmark, int striptabs) { int c = firstc; char *out; @@ -893,23 +1150,21 @@ char line[EOFMARKLEN + 1]; struct nodelist *bqlist; int quotef; - int dblquote; - int varnest; /* levels of variables expansion */ - int arinest; /* levels of arithmetic expansion */ - int parenlevel; /* levels of parens in arithmetic */ - int oldstyle; - char const *prevsyntax; /* syntax before arithmetic */ + int newvarnest; + int level; int synentry; + struct tokenstate state_static[MAXNEST_STATIC]; + int maxnest = MAXNEST_STATIC; + struct tokenstate *state = state_static; startlinno = plinno; - dblquote = 0; - if (syntax == DQSYNTAX) - dblquote = 1; quotef = 0; bqlist = NULL; - varnest = 0; - arinest = 0; - parenlevel = 0; + newvarnest = 0; + level = 0; + state[level].syntax = initialsyntax; + state[level].parenlevel = 0; + state[level].category = TSTATE_TOP; STARTSTACKSTR(out); loop: { /* for each line, until end of word */ @@ -917,11 +1172,11 @@ for (;;) { /* until end of line or end of word */ CHECKSTRSPACE(3, out); /* permit 3 calls to USTPUTC */ - synentry = syntax[c]; + synentry = state[level].syntax[c]; switch(synentry) { case CNL: /* '\n' */ - if (syntax == BASESYNTAX) + if (state[level].syntax == BASESYNTAX) goto endword; /* exit outer loop */ USTPUTC(c, out); plinno++; @@ -935,7 +1190,7 @@ USTPUTC(c, out); break; case CCTL: - if (eofmark == NULL || dblquote) + if (eofmark == NULL || initialsyntax != SQSYNTAX) USTPUTC(CTLESC, out); USTPUTC(c, out); break; @@ -951,41 +1206,37 @@ else setprompt(0); } else { - if (dblquote && c != '\\' && - c != '`' && c != '$' && - (c != '"' || eofmark != NULL)) + if (state[level].syntax == DQSYNTAX && + c != '\\' && c != '`' && c != '$' && + (c != '"' || (eofmark != NULL && + newvarnest == 0)) && + (c != '}' || state[level].category != TSTATE_VAR_OLD)) USTPUTC('\\', out); if (SQSYNTAX[c] == CCTL) USTPUTC(CTLESC, out); - else if (eofmark == NULL) + else if (eofmark == NULL || + newvarnest > 0) USTPUTC(CTLQUOTEMARK, out); USTPUTC(c, out); quotef++; } break; case CSQUOTE: - if (eofmark == NULL) - USTPUTC(CTLQUOTEMARK, out); - syntax = SQSYNTAX; + USTPUTC(CTLQUOTEMARK, out); + state[level].syntax = SQSYNTAX; break; case CDQUOTE: - if (eofmark == NULL) - USTPUTC(CTLQUOTEMARK, out); - syntax = DQSYNTAX; - dblquote = 1; + USTPUTC(CTLQUOTEMARK, out); + state[level].syntax = DQSYNTAX; break; case CENDQUOTE: - if (eofmark != NULL && arinest == 0 && - varnest == 0) { + if (eofmark != NULL && newvarnest == 0) USTPUTC(c, out); - } else { - if (arinest) { - syntax = ARISYNTAX; - dblquote = 0; - } else if (eofmark == NULL) { - syntax = BASESYNTAX; - dblquote = 0; - } + else { + if (state[level].category == TSTATE_ARITH) + state[level].syntax = ARISYNTAX; + else + state[level].syntax = BASESYNTAX; quotef++; } break; @@ -993,30 +1244,33 @@ PARSESUB(); /* parse substitution */ break; case CENDVAR: /* '}' */ - if (varnest > 0) { - varnest--; + if (level > 0 && + (state[level].category == TSTATE_VAR_OLD || + state[level].category == TSTATE_VAR_NEW)) { + if (state[level].category == TSTATE_VAR_OLD) + state[level - 1].syntax = state[level].syntax; + else + newvarnest--; + level--; USTPUTC(CTLENDVAR, out); } else { USTPUTC(c, out); } break; case CLP: /* '(' in arithmetic */ - parenlevel++; + state[level].parenlevel++; USTPUTC(c, out); break; case CRP: /* ')' in arithmetic */ - if (parenlevel > 0) { + if (state[level].parenlevel > 0) { USTPUTC(c, out); - --parenlevel; + --state[level].parenlevel; } else { if (pgetc() == ')') { - if (--arinest == 0) { + if (level > 0 && + state[level].category == TSTATE_ARITH) { + level--; USTPUTC(CTLENDARI, out); - syntax = prevsyntax; - if (syntax == DQSYNTAX) - dblquote = 1; - else - dblquote = 0; } else USTPUTC(')', out); } else { @@ -1030,12 +1284,15 @@ } break; case CBQUOTE: /* '`' */ - PARSEBACKQOLD(); + out = parsebackq(out, &bqlist, 1, + state[level].syntax == DQSYNTAX && + (eofmark == NULL || newvarnest > 0), + state[level].syntax == DQSYNTAX || state[level].syntax == ARISYNTAX); break; case CEOF: goto endword; /* exit outer loop */ default: - if (varnest == 0) + if (level == 0) goto endword; /* exit outer loop */ USTPUTC(c, out); } @@ -1043,14 +1300,17 @@ } } endword: - if (syntax == ARISYNTAX) + if (state[level].syntax == ARISYNTAX) synerror("Missing '))'"); - if (syntax != BASESYNTAX && ! parsebackquote && eofmark == NULL) + if (state[level].syntax != BASESYNTAX && eofmark == NULL) synerror("Unterminated quoted string"); - if (varnest != 0) { + if (state[level].category == TSTATE_VAR_OLD || + state[level].category == TSTATE_VAR_NEW) { startlinno = plinno; synerror("Missing '}'"); } + if (state != state_static) + parser_temp_free_upto(state); USTPUTC('\0', out); len = out - stackblock(); out = stackblock(); @@ -1073,7 +1333,6 @@ /* end of readtoken routine */ - /* * Check to see whether we are at the end of the here document. When this * is called, c is set to the first character of the next input line. If @@ -1190,7 +1449,11 @@ PARSEARITH(); } else { pungetc(); - PARSEBACKQNEW(); + out = parsebackq(out, &bqlist, 0, + state[level].syntax == DQSYNTAX && + (eofmark == NULL || newvarnest > 0), + state[level].syntax == DQSYNTAX || + state[level].syntax == ARISYNTAX); } } else { USTPUTC(CTLVAR, out); @@ -1245,6 +1508,8 @@ subtype = VSERROR; if (c == '}') pungetc(); + else if (c == '\n' || c == PEOF) + synerror("Unexpected end of line in substitution"); else USTPUTC(c, out); } else { @@ -1261,6 +1526,8 @@ default: p = strchr(types, c); if (p == NULL) { + if (c == '\n' || c == PEOF) + synerror("Unexpected end of line in substitution"); if (flags == VSNUL) STPUTC(':', out); STPUTC(c, out); @@ -1286,192 +1553,74 @@ pungetc(); } STPUTC('=', out); - if (subtype != VSLENGTH && (dblquote || arinest)) + if (subtype != VSLENGTH && (state[level].syntax == DQSYNTAX || + state[level].syntax == ARISYNTAX)) flags |= VSQUOTE; *(stackblock() + typeloc) = subtype | flags; - if (subtype != VSNORMAL) - varnest++; + if (subtype != VSNORMAL) { + if (level + 1 >= maxnest) { + maxnest *= 2; + if (state == state_static) { + state = parser_temp_alloc( + maxnest * sizeof(*state)); + memcpy(state, state_static, + MAXNEST_STATIC * sizeof(*state)); + } else + state = parser_temp_realloc(state, + maxnest * sizeof(*state)); + } + level++; + state[level].parenlevel = 0; + if (subtype == VSMINUS || subtype == VSPLUS || + subtype == VSQUESTION || subtype == VSASSIGN) { + /* + * For operators that were in the Bourne shell, + * inherit the double-quote state. + */ + state[level].syntax = state[level - 1].syntax; + state[level].category = TSTATE_VAR_OLD; + } else { + /* + * The other operators take a pattern, + * so go to BASESYNTAX. + * Also, ' and " are now special, even + * in here documents. + */ + state[level].syntax = BASESYNTAX; + state[level].category = TSTATE_VAR_NEW; + newvarnest++; + } + } } goto parsesub_return; } /* - * Called to parse command substitutions. Newstyle is set if the command - * is enclosed inside $(...); nlpp is a pointer to the head of the linked - * list of commands (passed by reference), and savelen is the number of - * characters on the top of the stack which must be preserved. - */ - -parsebackq: { - struct nodelist **nlpp; - int savepbq; - union node *n; - char *volatile str; - struct jmploc jmploc; - struct jmploc *const savehandler = handler; - int savelen; - int saveprompt; - const int bq_startlinno = plinno; - - savepbq = parsebackquote; - if (setjmp(jmploc.loc)) { - if (str) - ckfree(str); - parsebackquote = 0; - handler = savehandler; - if (exception == EXERROR) { - startlinno = bq_startlinno; - synerror("Error in command substitution"); - } - longjmp(handler->loc, 1); - } - INTOFF; - str = NULL; - savelen = out - stackblock(); - if (savelen > 0) { - str = ckmalloc(savelen); - memcpy(str, stackblock(), savelen); - } - handler = &jmploc; - INTON; - if (oldstyle) { - /* We must read until the closing backquote, giving special - treatment to some slashes, and then push the string and - reread it as input, interpreting it normally. */ - char *out; - int c; - int savelen; - char *str; - - - STARTSTACKSTR(out); - for (;;) { - if (needprompt) { - setprompt(2); - needprompt = 0; - } - switch (c = pgetc()) { - case '`': - goto done; - - case '\\': - if ((c = pgetc()) == '\n') { - plinno++; - if (doprompt) - setprompt(2); - else - setprompt(0); - /* - * If eating a newline, avoid putting - * the newline into the new character - * stream (via the STPUTC after the - * switch). - */ - continue; - } - if (c != '\\' && c != '`' && c != '$' - && (!dblquote || c != '"')) - STPUTC('\\', out); - break; - - case '\n': - plinno++; - needprompt = doprompt; - break; - - case PEOF: - startlinno = plinno; - synerror("EOF in backquote substitution"); - break; - - default: - break; - } - STPUTC(c, out); - } -done: - STPUTC('\0', out); - savelen = out - stackblock(); - if (savelen > 0) { - str = ckmalloc(savelen); - memcpy(str, stackblock(), savelen); - setinputstring(str, 1); - } - } - nlpp = &bqlist; - while (*nlpp) - nlpp = &(*nlpp)->next; - *nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist)); - (*nlpp)->next = NULL; - parsebackquote = oldstyle; - - if (oldstyle) { - saveprompt = doprompt; - doprompt = 0; - } - - n = list(0); - - if (oldstyle) - doprompt = saveprompt; - else { - if (readtoken() != TRP) - synexpect(TRP); - } - - (*nlpp)->n = n; - if (oldstyle) { - /* - * Start reading from old file again, ignoring any pushed back - * tokens left from the backquote parsing - */ - popfile(); - tokpushback = 0; - } - while (stackblocksize() <= savelen) - growstackblock(); - STARTSTACKSTR(out); - if (str) { - memcpy(out, str, savelen); - STADJUST(savelen, out); - INTOFF; - ckfree(str); - str = NULL; - INTON; - } - parsebackquote = savepbq; - handler = savehandler; - if (arinest || dblquote) - USTPUTC(CTLBACKQ | CTLQUOTE, out); - else - USTPUTC(CTLBACKQ, out); - if (oldstyle) - goto parsebackq_oldreturn; - else - goto parsebackq_newreturn; -} - -/* * Parse an arithmetic expansion (indicate start of one and set state) */ parsearith: { - if (++arinest == 1) { - prevsyntax = syntax; - syntax = ARISYNTAX; - USTPUTC(CTLARI, out); - if (dblquote) - USTPUTC('"',out); - else - USTPUTC(' ',out); - } else { - /* - * we collapse embedded arithmetic expansion to - * parenthesis, which should be equivalent - */ - USTPUTC('(', out); + if (level + 1 >= maxnest) { + maxnest *= 2; + if (state == state_static) { + state = parser_temp_alloc( + maxnest * sizeof(*state)); + memcpy(state, state_static, + MAXNEST_STATIC * sizeof(*state)); + } else + state = parser_temp_realloc(state, + maxnest * sizeof(*state)); } + level++; + state[level].syntax = ARISYNTAX; + state[level].parenlevel = 0; + state[level].category = TSTATE_ARITH; + USTPUTC(CTLARI, out); + if (state[level - 1].syntax == DQSYNTAX) + USTPUTC('"',out); + else + USTPUTC(' ',out); goto parsearith_return; } @@ -1516,9 +1665,9 @@ */ int -goodname(char *name) +goodname(const char *name) { - char *p; + const char *p; p = name; if (! is_name(*p)) @@ -1553,11 +1702,11 @@ STATIC void -synerror(char *msg) +synerror(const char *msg) { if (commandname) - outfmt(&errout, "%s: %d: ", commandname, startlinno); - outfmt(&errout, "Syntax error: %s\n", msg); + outfmt(out2, "%s: %d: ", commandname, startlinno); + outfmt(out2, "Syntax error: %s\n", msg); error((char *)NULL); } @@ -1569,7 +1718,10 @@ #ifndef NO_HISTORY if (!el) #endif + { out2str(getprompt(NULL)); + flushout(out2); + } } /* @@ -1582,13 +1734,14 @@ static char ps[PROMPTLEN]; char *fmt; int i, j, trim; + static char internal_error[] = ""; /* * Select prompt format. */ switch (whichprompt) { case 0: - fmt = ""; + fmt = nullstr; break; case 1: fmt = ps1val(); @@ -1597,7 +1750,7 @@ fmt = ps2val(); break; default: - return ""; + return internal_error; } /* Index: bin/sh/jobs.c =================================================================== --- bin/sh/jobs.c (revision 209229) +++ bin/sh/jobs.c (working copy) @@ -91,8 +91,9 @@ STATIC struct job *getjob(char *); STATIC pid_t dowait(int, struct job *); STATIC pid_t waitproc(int, int *); +STATIC void checkzombies(void); STATIC void cmdtxt(union node *); -STATIC void cmdputs(char *); +STATIC void cmdputs(const char *); #if JOBS STATIC void setcurjob(struct job *); STATIC void deljob(struct job *); @@ -146,7 +147,7 @@ do { /* while we are in the background */ initialpgrp = tcgetpgrp(ttyfd); if (initialpgrp < 0) { -out: out2str("sh: can't access tty; job control turned off\n"); +out: out2fmt_flush("sh: can't access tty; job control turned off\n"); mflag = 0; return; } @@ -400,7 +401,7 @@ struct job *jp; TRACE(("showjobs(%d) called\n", change)); - while (dowait(0, (struct job *)NULL) > 0); + checkzombies(); for (jobno = 1, jp = jobtab ; jobno <= njobs ; jobno++, jp++) { if (! jp->used) continue; @@ -742,6 +743,8 @@ TRACE(("forkshell(%%%d, %p, %d) called\n", jp - jobtab, (void *)n, mode)); INTOFF; + if (mode == FORK_BG) + checkzombies(); flushall(); pid = fork(); if (pid == -1) { @@ -757,6 +760,7 @@ TRACE(("Child shell %d\n", (int)getpid())); wasroot = rootshell; rootshell = 0; + handler = &main_handler; closescript(); INTON; clear_traps(); @@ -862,6 +866,7 @@ { #if JOBS pid_t mypgrp = getpgrp(); + int propagate_int = jp->jobctl && jp->foreground; #endif int status; int st; @@ -899,6 +904,11 @@ else CLEAR_PENDING_INT; } +#if JOBS + else if (rootshell && iflag && propagate_int && + WIFSIGNALED(status) && WTERMSIG(status) == SIGINT) + kill(getpid(), SIGINT); +#endif INTON; return st; } @@ -1046,7 +1056,7 @@ if (jp->used == 0) continue; if (jp->state == JOBSTOPPED) { - out2str("You have stopped jobs.\n"); + out2fmt_flush("You have stopped jobs.\n"); job_warning = 2; return (1); } @@ -1055,6 +1065,15 @@ return (0); } + +STATIC void +checkzombies(void) +{ + while (njobs > 0 && dowait(0, NULL) > 0) + ; +} + + /* * Return a string identifying a command (to be printed by the * jobs command. @@ -1082,7 +1101,7 @@ { union node *np; struct nodelist *lp; - char *p; + const char *p; int i; char s[2]; @@ -1211,9 +1230,10 @@ STATIC void -cmdputs(char *s) +cmdputs(const char *s) { - char *p, *q; + const char *p; + char *q; char c; int subtype = 0; Index: bin/sh/arith.y =================================================================== --- bin/sh/arith.y (revision 209229) +++ bin/sh/arith.y (working copy) @@ -85,9 +85,9 @@ ARITH_LPAREN expr ARITH_RPAREN { $$ = $2; } | expr ARITH_OR expr - { $$ = $1 ? $1 : $3 ? $3 : 0; } | + { $$ = $1 || $3; } | expr ARITH_AND expr - { $$ = $1 ? ( $3 ? $3 : 0 ) : 0; } | + { $$ = $1 && $3; } | expr ARITH_BOR expr { $$ = $1 | $3; } | expr ARITH_BXOR expr @@ -265,7 +265,7 @@ #define YYPARSE_PARAM_TYPE arith_t * #define YYPARSE_PARAM result -char *arith_buf, *arith_startbuf; +const char *arith_buf, *arith_startbuf; int yylex(void); int yyparse(YYPARSE_PARAM_TYPE); @@ -284,10 +284,12 @@ } arith_t -arith(char *s) +arith(const char *s) { arith_t result; + struct stackmark smark; + setstackmark(&smark); arith_buf = arith_startbuf = s; INTOFF; @@ -295,11 +297,13 @@ arith_lex_reset(); /* Reprime lex. */ INTON; + popstackmark(&smark); + return result; } static void -yyerror(char *s) +yyerror(const char *s) { yyerrok; @@ -314,7 +318,7 @@ int expcmd(int argc, char **argv) { - char *p; + const char *p; char *concat; char **ap; arith_t i; @@ -354,7 +358,7 @@ printf("%d\n", exp(argv[1])); } -error(char *s) +error(const char *s) { fprintf(stderr, "exp: %s\n", s); exit(1); Index: bin/sh/var.h =================================================================== --- bin/sh/var.h (revision 209229) +++ bin/sh/var.h (working copy) @@ -77,6 +77,7 @@ extern struct var vps4; #ifndef NO_HISTORY extern struct var vhistsize; +extern struct var vterm; #endif /* @@ -96,19 +97,21 @@ #define optindval() (voptind.text + 7) #ifndef NO_HISTORY #define histsizeval() (vhistsize.text + 9) +#define termval() (vterm.text + 5) #endif #define mpathset() ((vmpath.flags & VUNSET) == 0) void initvar(void); -void setvar(char *, char *, int); +void setvar(const char *, const char *, int); void setvareq(char *, int); struct strlist; void listsetvar(struct strlist *); -char *lookupvar(char *); -char *bltinlookup(char *, int); +char *lookupvar(const char *); +char *bltinlookup(const char *, int); +void bltinsetlocale(void); +void bltinunsetlocale(void); char **environment(void); -void shprocvar(void); int showvarscmd(int, char **); int exportcmd(int, char **); int localcmd(int, char **); @@ -116,5 +119,5 @@ void poplocalvars(void); int setvarcmd(int, char **); int unsetcmd(int, char **); -int unsetvar(char *); -int setvarsafe(char *, char *, int); +int unsetvar(const char *); +int setvarsafe(const char *, const char *, int); --=-=-=-- From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 10:43:37 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EF5FB1065677 for ; Wed, 16 Jun 2010 10:43:37 +0000 (UTC) (envelope-from moonlightakkiy@yahoo.ca) Received: from web51805.mail.re2.yahoo.com (web51805.mail.re2.yahoo.com [206.190.38.236]) by mx1.freebsd.org (Postfix) with SMTP id 905F38FC1A for ; Wed, 16 Jun 2010 10:43:37 +0000 (UTC) Received: (qmail 41568 invoked by uid 60001); 16 Jun 2010 10:43:36 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.ca; s=s1024; t=1276685016; bh=/oK2oWVI6Ac7DukYdH0WaqnOGmF3cJcv7DOoGPUH6dY=; h=Message-ID:X-YMail-OSG:Received:X-Mailer:References:Date:From:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type; b=MrGxRf4dXcUnni38WhB05jc57P7VHoPwf24W1BYK8PF88N8lCn84UafbwMhUoCppduRA+9b9BuRZMxKDY2Tn0Vh5D5VqjMSTYe4CgujKICYRIfzsnyf3UYk6AysghhdeboSLMNYW7TAG9KtVHktDtmZEdmRJmOXwvnC5sNx+a6Y= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.ca; h=Message-ID:X-YMail-OSG:Received:X-Mailer:References:Date:From:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type; b=Jw5MkFKKqqHA5sjpCoZM8EI1PU76rd6DEB2v66Iru5uXNu6QEO5YpFC4vI6trRDVUYhUTwBtFOACRJmGQ9DZ7gh6BU2oO9RnyI/xtGxULlYFtEZDxipZZEgVplC1KmObDaveH7aa6Hk3EMTeLPnUk6ZVidu2l8X3dvJ6lI+IJJw=; Message-ID: <819523.41498.qm@web51805.mail.re2.yahoo.com> X-YMail-OSG: gWNWZscVM1k7FifCXNUDjCa.lvRDZeyQ0BMteCF4PXx_KRA 4XxAdFoIVjU148415scPdwQRAq_TPM9TLRgxHWdpxjF.UeGV9WJyfwFAd3ef HTxYv59NSplToXUYOitEbcYV61.O87gwmQk_skaluJxF5Mk_IoH4iM4ZzmmI 3jxmyEViBi6ybEk3twvH2C4RjWFqaKATsfTVH7JnAjIFpo.g.4Z_SWghWMkb GntPm4KGBgd497mW4HG2wmmn0irDmpR8xUs4EBEhfatCa8U8nZ9Cdbe0.evs s85aPcGQuJ6UppgfWOQqlPnESd9A1g403dJhYwnQmK1H0W9.PwQ-- Received: from [173.183.132.20] by web51805.mail.re2.yahoo.com via HTTP; Wed, 16 Jun 2010 03:43:36 PDT X-Mailer: YahooMailRC/397.8 YahooMailWebService/0.8.104.274457 References: <16641.96608.qm@web51806.mail.re2.yahoo.com> <4BA38B26.6050208@micom.mng.net> <989377.89740.qm@web51802.mail.re2.yahoo.com> <4BAE01AC.7000509@gmail.com> <623907.37074.qm@web51803.mail.re2.yahoo.com> <4BB3575D.4040506@gmail.com> <87836.79143.qm@web51804.mail.re2.yahoo.com> <4BBB372C.1060302@gmail.com> <665283.95271.qm@web51802.mail.re2.yahoo.com> <4BBDEC8F.9050803@gmail.com> <490521.32714.qm@web51804.mail.re2.yahoo.com> <4BD307DE.5080507@gmail.com> <332448.8676.qm@web51801.mail.re2.yahoo.com> <4BD3F2D4.8000007@gmail.com> <702632.81988.qm@web51803.mail.re2.yahoo.com> <4BDEE393.4080206@gmail.com> <660085.11669.qm@web51802.mail.re2.yahoo.com> <4BFD4806.8070001@gmail.com> <618770.37649.qm@web51807.mail.re2.yahoo.com> <4C0FAEA2.7010204@gmail.com> <94007.38072.qm@web51807.mail.re2.yahoo.com> <4C11188A.1040002@gmail.com> <447555.80295.qm@web51803.mail.re2.yahoo.com> <4C16499A.3050808@gmail.com> <337427.44900.qm@web51804.mail.re2.yahoo.com> <4C1787DA.2070308@gmail.com> Date: Wed, 16 Jun 2010 03:43:36 -0700 (PDT) From: PseudoCylon To: Ganbold In-Reply-To: <4C1787DA.2070308@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Ganbold Tsagaankhuu , freebsd-current@freebsd.org Subject: Re: CALL for TEST [HOSTAP] run(4) ralink usb wireless X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 10:43:38 -0000 ----- Original Message ---- > From: Ganbold > To: PseudoCylon > Cc: freebsd-current@freebsd.org; Ganbold Tsagaankhuu > Sent: Tue, June 15, 2010 8:02:02 AM > Subject: Re: CALL for TEST [HOSTAP] run(4) ralink usb wireless > > AK-san, >PseudoCylon wrote: >>>>> From: Ganbold >>>>> To: PseudoCylon >>>>> Cc: freebsd-current@freebsd.org; Ganbold Tsagaankhuu >>>>> Sent: Thu, June 10, 2010 10:53:30 AM >>>>> Subject: Re: CALL for TEST [HOSTAP] run(4) ralink usb wireless >>>>> >>>>> It seems like it is running without any problem so far, no more adsl >>>>> modem problem. >>>>> I can see arp packets in wlan0 interface as well as in macbook. >>>>> I will continue testing and let you know if there comes any problem. >>>>> >>>>> thanks again, >>>>> >>>>> Ganbold >>>>> >>>>> >>>> Hello, >>>> >>>> Glad to hear. It was an encryption problem. A client was dropping packets.. >>>> >>>> Please let me know if you find another bug. (Hope there won't be) >>>> >>>> >>> Well, looks like I was too fast :( >>> >>> It seems like client is not receiving any arp packets when rspro doesn't >>> first initiate ping (maybe arp request) to client. >>> If I first ping to client from rspro, later on arp packets can be seen >>> on client. >>> When I ping from rspro to client, response is very different: >>> >>> # arp -a >>> ? (192.168.1.43) at 8e:fd:59:d6:3a:50 on bridge0 permanent [bridge] >>> ? (192.168.1.42) at 00:22:cf:03:e0:30 on wlan0 permanent [ethernet] >>> ? (192.168.1.41) at 00:15:6d:c1:c7:77 on arge0 permanent [ethernet] >>> ? (192.168.1.1) at 00:30:54:62:3d:24 on arge0 expires in 1200 seconds >>> [ethernet] >>> ? (192.168.1.7) at 00:1c:25:9d:36:1d on arge0 expires in 824 seconds >>> [ethernet] >>> # ping 192.168.1.50 >>> PING 192.168.1.50 (192.168.1.50): 56 data bytes >>> 64 bytes from 192.168.1.50: icmp_seq=0 ttl=64 time=2.694 ms >>> 64 bytes from 192.168.1.50: icmp_seq=1 ttl=64 time=302.177 ms >>> 64 bytes from 192.168.1.50: icmp_seq=2 ttl=64 time=1.041 ms >>> 64 bytes from 192.168.1.50: icmp_seq=4 ttl=64 time=5234.417 ms >>> 64 bytes from 192.168.1.50: icmp_seq=5 ttl=64 time=4225.060 ms >>> 64 bytes from 192.168.1.50: icmp_seq=6 ttl=64 time=3214.908 ms >>> 64 bytes from 192.168.1.50: icmp_seq=7 ttl=64 time=2207.241 ms >>> 64 bytes from 192.168.1.50: icmp_seq=8 ttl=64 time=1197.061 ms >>> 64 bytes from 192.168.1.50: icmp_seq=9 ttl=64 time=186.833 ms >>> ^C >>> --- 192.168.1.50 ping statistics --- >>> 11 packets transmitted, 9 packets received, 18.2% packet loss >>> round-trip min/avg/max/stddev = 1.041/1841.270/5234.417/1870.962 ms >>> # arp -a >>> ? (192.168.1.43) at 8e:fd:59:d6:3a:50 on bridge0 permanent [bridge] >>> ? (192.168.1.42) at 00:22:cf:03:e0:30 on wlan0 permanent [ethernet] >>> ? (192.168.1.41) at 00:15:6d:c1:c7:77 on arge0 permanent [ethernet] >>> ? (192.168.1.1) at 00:30:54:62:3d:24 on arge0 expires in 1183 seconds >>> [ethernet] >>> ? (192.168.1.7) at 00:1c:25:9d:36:1d on arge0 expires in 805 seconds >>> [ethernet] >>> ? (192.168.1.50) at 00:26:bb:17:f6:61 on arge0 expires in 1186 seconds >>> [ethernet] >>> # ping 192.168.1.50 >>> PING 192.168.1.50 (192.168.1.50): 56 data bytes >>> 64 bytes from 192.168.1.50: icmp_seq=2 ttl=64 time=1590.035 ms >>> 64 bytes from 192.168.1.50: icmp_seq=3 ttl=64 time=580.201 ms >>> 64 bytes from 192.168.1.50: icmp_seq=4 ttl=64 time=528.019 ms >>> ^C >>> --- 192.168.1.50 ping statistics --- >>> 5 packets transmitted, 3 packets received, 40.0% packet loss >>> round-trip min/avg/max/stddev = 528.019/899.418/1590.035/488.804 ms >>> >>> >> >> Well, the patch is working (sort of). Old driver wouldn't let you ping anywhere. >> >> Replies are taking awfully long. One of them took 5 sec. This could be a different issue. >> >> Can you try a few thing? (Unfortunately, everything is working on my side.) >> * Before ping from rspro, does ping from macbook to 192.168.1.42 (wlan0) work? >> > >No. I will check again and let you know. > >> * If you give IP address to only bridge0, does it make any difference? >> > >I will let you know after testing. > >> * Does it make any difference if use rspro without 192.168.1.7 (if possible)? >> > >192.168.1.7 is just my freebsd laptop. > Hello, More questions. Is freebsd laptop working fine with wlan, or is it connected to ethernet port? Does adsl modem still freeze? Normally, when you ping from macbook to modem, there will be arp pakets 'who-has modem tell macbook' and 'modem is-at xx:xx...' Do you see these at wlan0 on rspro? If rspro can ping patch should be working, but let's make sure it is. Please before starting hostapd, sysctl hw.usb.run.debug=1 (If the driver is not compiled with kernel, please apply a patch attached.) When hostapd is started, it will print out Starting hostapd. Configuration file: /etc/hostapd.conf Using interface wlan0 with hwaddr 00:22:cf:03:e0:30 and ssid 'bsd' run_key_set: cmdq_store=0 run_key_set_cb: associd=0, keyix=1, mode=3, type=group, tx=on, rx=off run_stop: All Tx cleared run_newstate: INIT -> INIT run_newstate: INIT -> SCAN ... omit some lines ... Please confirm there is run_key_set_cb: associd=0, mode=3, ... And, associd is '0' (This was the problem before. So, encryption with group key failed.) When macbook associates with AP, it will print run_newassoc: cmdq_store=2 run_newassoc: new assoc isnew=1 associd=c001 addr=00:26:bb:17:f6:61 run_newassoc: rate=0x82 ridx=0 ctl_ridx=0 ... omit some lines ... run_newassoc: rate=0x6c ridx=11 ctl_ridx=8 run_newassoc: rate=2, mgmt_ridx=0 run_key_set: cmdq_store=3 run_key_set_cb: associd=c001, keyix=0, mode=4, type=pairwise, tx=on, rx=on Please confirm there is run_key_set_cb: associd=c001, mode=4, ... And associd isn't '0'. If not, I need to fix the driver. If things go accordingly, please compare the mode. With your config, group key uses TKIP (mode 3) and pairwise key uses CCMP (mode 4). And very first arp who-has packet uses group key and other use pairwise key. Maybe, macbook doesn't like mixing the mode. So, please tcpdump -vvv -xxx -i wlan0 'arp' and check if any packet with address of all 'ff'. is sent/received alright. All 'ff 'means using group key. Others use pairwise key. All 'ff is easy to see in output of tcpdump. Or, you can chose one of them, CCMP or TKIP for 'wpa_pairwise=' and see if it makes any difference. Sorry for too many questions. It is working fine here, again. AK --patch Only needed if the driver is not compiled with the kernel-- diff --git a/dev/usb/wlan/if_run.c b/dev/usb/wlan/if_run.c index e4fc8d2..65c1dab 100644 --- a/dev/usb/wlan/if_run.c +++ b/dev/usb/wlan/if_run.c @@ -69,6 +69,7 @@ __FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_run.c,v 1.11 2010/06/14 23:01:50 jki #include "usbdevs.h" #define USB_DEBUG_VAR run_debug +#define USB_DEBUG #include #include "if_runreg.h" --end patch-- only one line to add From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 11:05:25 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8EDBF1065676 for ; Wed, 16 Jun 2010 11:05:25 +0000 (UTC) (envelope-from ganbold@gmail.com) Received: from mail-pv0-f182.google.com (mail-pv0-f182.google.com [74.125.83.182]) by mx1.freebsd.org (Postfix) with ESMTP id 510628FC12 for ; Wed, 16 Jun 2010 11:05:25 +0000 (UTC) Received: by pvg2 with SMTP id 2so744384pvg.13 for ; Wed, 16 Jun 2010 04:05:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; bh=k2KqUpyqIvPwUeJN12CrlY/C/6MFuIglxf5x8JcRqGs=; b=n/qdpGFOppYjfjQzAGJNb/sBVDBRGSXgLNL7Ac2+pGkpJe7Kze78fDozLKF+8t4S0W WEfRHjgNVeyauqaY4/4THpNVNhm/V0qP2I4z5Fb3Cw9bErDwthAhEXa8rqGT22h0qXSX ssQRJcGnISziZjW1PNSFp/jGNRV3h146uAq2A= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=bht6T4wMImSzhntbcf+g7UBYN8SRR7RZsgYYNos4yt9K3n52Smbfo7R017pa5AK8Rr 0J9TnEPJhxs5CXEwE41Rzai5DMoTeGUsnHxQW/g2Ngli3mdKbVZJCpVPI+GlW6aQSNR7 ZeSHPJ9f4ONVgOsmarK16rXmEheJEyq2Rd3as= Received: by 10.114.187.18 with SMTP id k18mr6923770waf.101.1276686324666; Wed, 16 Jun 2010 04:05:24 -0700 (PDT) Received: from beastie.micom.mng.net ([202.179.21.128]) by mx.google.com with ESMTPS id c14sm80593208waa.1.2010.06.16.04.05.20 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 16 Jun 2010 04:05:23 -0700 (PDT) Message-ID: <4C18AFE8.6050803@gmail.com> Date: Wed, 16 Jun 2010 19:05:12 +0800 From: Ganbold User-Agent: Thunderbird 2.0.0.23 (X11/20091011) MIME-Version: 1.0 To: PseudoCylon References: <16641.96608.qm@web51806.mail.re2.yahoo.com> <4BAE01AC.7000509@gmail.com> <623907.37074.qm@web51803.mail.re2.yahoo.com> <4BB3575D.4040506@gmail.com> <87836.79143.qm@web51804.mail.re2.yahoo.com> <4BBB372C.1060302@gmail.com> <665283.95271.qm@web51802.mail.re2.yahoo.com> <4BBDEC8F.9050803@gmail.com> <490521.32714.qm@web51804.mail.re2.yahoo.com> <4BD307DE.5080507@gmail.com> <332448.8676.qm@web51801.mail.re2.yahoo.com> <4BD3F2D4.8000007@gmail.com> <702632.81988.qm@web51803.mail.re2.yahoo.com> <4BDEE393.4080206@gmail.com> <660085.11669.qm@web51802.mail.re2.yahoo.com> <4BFD4806.8070001@gmail.com> <618770.37649.qm@web51807.mail.re2.yahoo.com> <4C0FAEA2.7010204@gmail.com> <94007.38072.qm@web51807.mail.re2.yahoo.com> <4C11188A.1040002@gmail.com> <447555.80295.qm@web51803.mail.re2.yahoo.com> <4C16499A.3050808@gmail.com> <337427.44900.qm@web51804.mail.re2.yahoo.com> <4C1787DA.2070308@gmail.com> <819523.41498.qm@web51805.mail.re2.yahoo.com> In-Reply-To: <819523.41498.qm@web51805.mail.re2.yahoo.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Ganbold Tsagaankhuu , freebsd-current@freebsd.org Subject: Re: CALL for TEST [HOSTAP] run(4) ralink usb wireless X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 11:05:25 -0000 PseudoCylon wrote: > ----- Original Message ---- > >>>> >>>> >>> Well, the patch is working (sort of). Old driver wouldn't let you ping anywhere. >>> >>> Replies are taking awfully long. One of them took 5 sec. This could be a different issue. >>> >>> Can you try a few thing? (Unfortunately, everything is working on my side.) >>> * Before ping from rspro, does ping from macbook to 192.168.1.42 (wlan0) work? >>> >>> >> No. I will check again and let you know. >> >> >>> * If you give IP address to only bridge0, does it make any difference? >>> >>> >> I will let you know after testing. >> >> >>> * Does it make any difference if use rspro without 192.168.1.7 (if possible)? >>> >>> >> 192.168.1.7 is just my freebsd laptop. >> >> > > Hello, > > More questions. > > Is freebsd laptop working fine with wlan, or is it connected to ethernet port? > Connected to ethernet port. > Does adsl modem still freeze? > Yes. > Normally, when you ping from macbook to modem, there will be arp pakets > 'who-has modem tell macbook' and > 'modem is-at xx:xx...' > Do you see these at wlan0 on rspro? > I see it. ... 19:02:52.519830 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.50, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 c0a8 0132 0x0020: 0000 0000 0000 c0a8 0101 19:02:52.520118 ARP, Ethernet (len 6), IPv4 (len 4), Reply 192.168.1.1 is-at 00:30:54:62:3d:24 (oui Unknown), length 46 0x0000: 0026 bb17 f661 0030 5462 3d24 0806 0001 0x0010: 0800 0604 0002 0030 5462 3d24 c0a8 0101 0x0020: 0026 bb17 f661 c0a8 0132 0000 0000 0000 0x0030: 0000 0000 0000 0000 0000 0000 I will test the rest and let you know. Ganbold > If rspro can ping patch should be working, but let's make sure it is. Please before starting hostapd, > sysctl hw.usb.run.debug=1 > (If the driver is not compiled with kernel, please apply a patch attached.) > When hostapd is started, it will print out > > Starting hostapd. > Configuration file: /etc/hostapd.conf > Using interface wlan0 with hwaddr 00:22:cf:03:e0:30 and ssid 'bsd' > run_key_set: cmdq_store=0 > run_key_set_cb: associd=0, keyix=1, mode=3, type=group, tx=on, rx=off > run_stop: All Tx cleared > run_newstate: INIT -> INIT > run_newstate: INIT -> SCAN > ... omit some lines ... > > Please confirm there is > run_key_set_cb: associd=0, mode=3, ... > And, associd is '0' (This was the problem before. So, encryption with group key failed.) > > When macbook associates with AP, it will print > > run_newassoc: cmdq_store=2 > run_newassoc: new assoc isnew=1 associd=c001 addr=00:26:bb:17:f6:61 > run_newassoc: rate=0x82 ridx=0 ctl_ridx=0 > ... omit some lines ... > run_newassoc: rate=0x6c ridx=11 ctl_ridx=8 > run_newassoc: rate=2, mgmt_ridx=0 > run_key_set: cmdq_store=3 > run_key_set_cb: associd=c001, keyix=0, mode=4, type=pairwise, tx=on, rx=on > > Please confirm there is > run_key_set_cb: associd=c001, mode=4, ... > And associd isn't '0'. > > If not, I need to fix the driver. If things go accordingly, please compare the mode. With your config, group key uses TKIP (mode 3) and pairwise key uses CCMP (mode 4). And very first arp who-has packet uses group key and other use pairwise key. Maybe, macbook doesn't like mixing the mode. So, please > tcpdump -vvv -xxx -i wlan0 'arp' > and check if any packet with address of all 'ff'. is sent/received alright. All 'ff 'means using group key. Others use pairwise key. All 'ff is easy to see in output of tcpdump. Or, you can chose one of them, CCMP or TKIP for 'wpa_pairwise=' and see if it makes any difference. > > > Sorry for too many questions. It is working fine here, again. > AK > > --patch Only needed if the driver is not compiled with the kernel-- > > diff --git a/dev/usb/wlan/if_run.c b/dev/usb/wlan/if_run.c > index e4fc8d2..65c1dab 100644 > --- a/dev/usb/wlan/if_run.c > +++ b/dev/usb/wlan/if_run.c > @@ -69,6 +69,7 @@ __FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_run.c,v 1.11 2010/06/14 23:01:50 jki > #include "usbdevs.h" > > #define USB_DEBUG_VAR run_debug > +#define USB_DEBUG > #include > > #include "if_runreg.h" > > --end patch-- > only one line to add > > > > > -- I disagree with what you say, but will defend to the death your right to tell such LIES! From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 11:29:07 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C6A21065676 for ; Wed, 16 Jun 2010 11:29:07 +0000 (UTC) (envelope-from jhellenthal@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id D9E9A8FC15 for ; Wed, 16 Jun 2010 11:29:06 +0000 (UTC) Received: by iwn7 with SMTP id 7so7760091iwn.13 for ; Wed, 16 Jun 2010 04:29:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :x-enigmail-version:openpgp:content-type:content-transfer-encoding; bh=pWGczBb/2OPHNj6xUn/tt/v5XJJbcfWDPlDzZFNA9ck=; b=dzkcoRnzSqZV4cxCTN8jttfS4942mJtsLel3FvYAeezR1yHSxQNDeL1AnOxeqR1Wlg AdA5Mdah7tgRl5nKovSULgldgmTOsvwdg4UjJyUP/Fg2OkX15ixwZiVeb3JYYQ6grycg rWkTm+pJZv4aE43rl7BdrKrEEkpUaNkcZh/Mw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:openpgp:content-type :content-transfer-encoding; b=e1Zmoe5xAs25BUb7kNEBgThGER86NrerN0mY+jv0Bd4pC7RAITkgyaUkcPv1KpEwbl /wAohQhiIA91OGqthjfo5GKaj0xGQO/bt7+QxVAH/c7HOQc8xOsBuNhfhrNPE2NmBAzU EneMJRz8rEbWppFP2TqPJwTzSttmU/rdwlXvg= Received: by 10.231.149.12 with SMTP id r12mr9669754ibv.57.1276687746199; Wed, 16 Jun 2010 04:29:06 -0700 (PDT) Received: from centel.dataix.local (adsl-99-181-128-180.dsl.klmzmi.sbcglobal.net [99.181.128.180]) by mx.google.com with ESMTPS id t28sm30723208ibg.12.2010.06.16.04.29.04 (version=SSLv3 cipher=RC4-MD5); Wed, 16 Jun 2010 04:29:04 -0700 (PDT) Sender: "J. Hellenthal" Message-ID: <4C18B57F.1060308@dataix.net> Date: Wed, 16 Jun 2010 07:29:03 -0400 From: jhell User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100515 Thunderbird MIME-Version: 1.0 To: "Sam Fourman Jr." References: <4C18304A.1080601@dataix.net> <4C18322A.6050007@dataix.net> In-Reply-To: X-Enigmail-Version: 1.0.1 OpenPGP: id=89D8547E Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Brandon Gooch , FreeBSD Current , jilles@stack.nl Subject: Re: [MFC REQUEST] Filename completion in sh(1) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 11:29:07 -0000 On 06/16/2010 02:20, Sam Fourman Jr. wrote: >>> -Brandon >> >> Oh, I see. The diff doesn't include the change(s) to histedit.h >> > > I would be very interested in a diff for FreeBSD 8.1 > > > Sam Fourman Jr. > http://www.fourmannetworks.com/ Just got home, So Ill be working on getting this put together over the next few minutes and replying to this thread with a go or no go depending on the outcome and posting the patch. Regards, -- jhell From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 11:54:03 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ED2941065687 for ; Wed, 16 Jun 2010 11:54:03 +0000 (UTC) (envelope-from jhellenthal@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 8F2B88FC12 for ; Wed, 16 Jun 2010 11:54:03 +0000 (UTC) Received: by iwn7 with SMTP id 7so7783482iwn.13 for ; Wed, 16 Jun 2010 04:54:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :x-enigmail-version:openpgp:content-type; bh=Z00TpOQSBwJMO3lxVvpy5LimogH4AkCMDJzEWg/mDW8=; b=pMmGngA+TSy94h3Ip/zGlxvGNGj7ocRI3Kn+N2Jl3Wsq5fy3UO8DwQ/0CQpSFnIXZy l8VB/xs/f+MzPysTFdxhyHXmSe21k4AWzav9PdTl+z95LcFS3RlCYaBQGik84VZheu6w NKyymE+g5IVrH2jeLs5O5N3Hr5o+rn2aMCMyM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:openpgp:content-type; b=R5P79J7/gStX02Rx7BulOjDXLaz2HgsaKmOC6GXQXXCPrUxj7tMEwI60nGVH9S3En2 09oeQzuYTLKDmwJyDFmpgjn+j/tIu9r+Or5SgOmpViL5KIUNIXtF5Ajg9Z/MD+t8JFnh fZPAzld6k8I5zaUhzByPrZbm8MHB7W5V0dh+A= Received: by 10.231.150.18 with SMTP id w18mr9639310ibv.43.1276689242535; Wed, 16 Jun 2010 04:54:02 -0700 (PDT) Received: from centel.dataix.local (adsl-99-181-128-180.dsl.klmzmi.sbcglobal.net [99.181.128.180]) by mx.google.com with ESMTPS id t28sm30819824ibg.6.2010.06.16.04.53.58 (version=SSLv3 cipher=RC4-MD5); Wed, 16 Jun 2010 04:54:00 -0700 (PDT) Sender: "J. Hellenthal" Message-ID: <4C18BB55.1050202@dataix.net> Date: Wed, 16 Jun 2010 07:53:57 -0400 From: jhell User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100515 Thunderbird MIME-Version: 1.0 To: "Sam Fourman Jr." References: <4C18304A.1080601@dataix.net> <4C18322A.6050007@dataix.net> <4C18B57F.1060308@dataix.net> In-Reply-To: <4C18B57F.1060308@dataix.net> X-Enigmail-Version: 1.0.1 OpenPGP: id=89D8547E Content-Type: multipart/mixed; boundary="------------090303010205030705070302" Cc: Brandon Gooch , FreeBSD Current , jilles@stack.nl Subject: Re: [MFC REQUEST] Filename completion in sh(1) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 11:54:04 -0000 This is a multi-part message in MIME format. --------------090303010205030705070302 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 06/16/2010 07:29, jhell wrote: > Just got home, So Ill be working on getting this put together over the > next few minutes and replying to this thread with a go or no go > depending on the outcome and posting the patch. Here it is: cd /usr/src patch &1, otherwise + &errout */ -void open_mem(char *, int, struct output *); void out1str(const char *); void out1qstr(const char *); void out2str(const char *); @@ -65,10 +65,10 @@ void freestdout(void); void outfmt(struct output *, const char *, ...) __printflike(2, 3); void out1fmt(const char *, ...) __printflike(1, 2); -void dprintf(const char *, ...) __printflike(1, 2); +void out2fmt_flush(const char *, ...) __printflike(1, 2); void fmtstr(char *, int, const char *, ...) __printflike(3, 4); void doformat(struct output *, const char *, va_list) __printflike(2, 0); -int xwrite(int, char *, int); +int xwrite(int, const char *, int); #define outc(c, file) (--(file)->nleft < 0? (emptyoutbuf(file), *(file)->nextc++ = (c)) : (*(file)->nextc++ = (c))) #define out1c(c) outc(c, out1); Index: bin/sh/mystring.c =================================================================== --- bin/sh/mystring.c (revision 209146) +++ bin/sh/mystring.c (working copy) @@ -108,7 +108,7 @@ number(const char *s) { if (! is_number(s)) - error("Illegal number: %s", (char *)s); + error("Illegal number: %s", s); return atoi(s); } Index: bin/sh/histedit.c =================================================================== --- bin/sh/histedit.c (revision 209146) +++ bin/sh/histedit.c (working copy) @@ -92,12 +92,14 @@ if (hist != NULL) sethistsize(histsizeval()); else - out2str("sh: can't initialize history\n"); + out2fmt_flush("sh: can't initialize history\n"); } if (editing && !el && isatty(0)) { /* && isatty(2) ??? */ /* * turn editing on */ + char *term; + INTOFF; if (el_in == NULL) el_in = fdopen(0, "r"); @@ -107,14 +109,22 @@ el_out = fdopen(2, "w"); if (el_in == NULL || el_err == NULL || el_out == NULL) goto bad; + term = lookupvar("TERM"); + if (term) + setenv("TERM", term, 1); + else + unsetenv("TERM"); el = el_init(arg0, el_in, el_out, el_err); if (el != NULL) { if (hist) el_set(el, EL_HIST, history, hist); el_set(el, EL_PROMPT, getprompt); + el_set(el, EL_ADDFN, "sh-complete", + "Filename completion", + _el_fn_sh_complete); } else { bad: - out2str("sh: can't initialize editing\n"); + out2fmt_flush("sh: can't initialize editing\n"); } INTON; } else if (!editing && el) { @@ -128,6 +138,7 @@ el_set(el, EL_EDITOR, "vi"); else if (Eflag) el_set(el, EL_EDITOR, "emacs"); + el_set(el, EL_BIND, "^I", "sh-complete", NULL); el_source(el, NULL); } } else { @@ -160,23 +171,30 @@ } } +void +setterm(const char *term) +{ + if (rootshell && el != NULL && term != NULL) + el_set(el, EL_TERMINAL, term); +} + int histcmd(int argc, char **argv) { int ch; - char *editor = NULL; + const char *editor = NULL; HistEvent he; int lflg = 0, nflg = 0, rflg = 0, sflg = 0; int i, retval; - char *firststr, *laststr; + const char *firststr, *laststr; int first, last, direction; - char *pat = NULL, *repl; + char *pat = NULL, *repl = NULL; static int active = 0; struct jmploc jmploc; struct jmploc *savehandler; char editfilestr[PATH_MAX]; char *volatile editfile; - FILE *efp; + FILE *efp = NULL; int oldhistnum; if (hist == NULL) @@ -336,6 +354,7 @@ if (sflg) { if (displayhist) { out2str(s); + flushout(out2); } evalstring(s, 0); if (displayhist && hist) { @@ -405,7 +424,7 @@ } int -not_fcnumber(char *s) +not_fcnumber(const char *s) { if (s == NULL) return (0); @@ -415,10 +434,10 @@ } int -str_to_event(char *str, int last) +str_to_event(const char *str, int last) { HistEvent he; - char *s = str; + const char *s = str; int relative = 0; int i, retval; Index: bin/sh/show.c =================================================================== --- bin/sh/show.c (revision 209146) +++ bin/sh/show.c (working copy) @@ -307,7 +307,7 @@ void -trputs(char *s) +trputs(const char *s) { if (tracefile == NULL) return; Index: bin/sh/show.h =================================================================== --- bin/sh/show.h (revision 209146) +++ bin/sh/show.h (working copy) @@ -35,6 +35,6 @@ void sh_trace(const char *, ...) __printflike(1, 2); void trargs(char **); void trputc(int); -void trputs(char *); +void trputs(const char *); void opentrace(void); #endif Index: bin/sh/arith_lex.l =================================================================== --- bin/sh/arith_lex.l (revision 209146) +++ bin/sh/arith_lex.l (working copy) @@ -51,13 +51,6 @@ int yylex(void); -struct varname -{ - struct varname *next; - char name[1]; -}; -static struct varname *varnames; - #undef YY_INPUT #define YY_INPUT(buf,result,max) \ result = (*buf = *arith_buf++) ? 1 : YY_NULL; @@ -87,14 +80,11 @@ * If variable doesn't exist, we should initialize * it to zero. */ - struct varname *temp; + char *temp; if (lookupvar(yytext) == NULL) setvarsafe(yytext, "0", 0); - temp = ckmalloc(sizeof(struct varname) + - strlen(yytext)); - temp->next = varnames; - varnames = temp; - yylval.s_value = strcpy(temp->name, yytext); + temp = stalloc(strlen(yytext) + 1); + yylval.s_value = strcpy(temp, yytext); return ARITH_VAR; } @@ -140,15 +130,5 @@ void arith_lex_reset(void) { - struct varname *name, *next; - YY_NEW_FILE; - - name = varnames; - while (name != NULL) { - next = name->next; - ckfree(name); - name = next; - } - varnames = NULL; } Index: bin/sh/myhistedit.h =================================================================== --- bin/sh/myhistedit.h (revision 209146) +++ bin/sh/myhistedit.h (working copy) @@ -38,8 +38,9 @@ void histedit(void); void sethistsize(const char *); +void setterm(const char *); int histcmd(int, char **); -int not_fcnumber(char *); -int str_to_event(char *, int); +int not_fcnumber(const char *); +int str_to_event(const char *, int); int bindcmd(int, char **); Index: bin/sh/sh.1 =================================================================== --- bin/sh/sh.1 (revision 209146) +++ bin/sh/sh.1 (working copy) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd January 8, 2010 +.Dd May 24, 2010 .Dt SH 1 .Os .Sh NAME @@ -210,7 +210,8 @@ .Xr emacs 1 command line editor (disables the .Fl V -option if it has been set). +option if it has been set; +set automatically when interactive on terminals). .It Fl e Li errexit Exit immediately if any untested command fails in non-interactive mode. The exit status of a command is considered to be @@ -296,7 +297,10 @@ .Ed .It Fl u Li nounset Write a message to standard error when attempting -to expand a variable that is not set, and if the +to expand a variable, a positional parameter or +the special parameter +.Va \&! +that is not set, and if the shell is not interactive, exit immediately. .It Fl V Li vi Enable the built-in @@ -411,11 +415,11 @@ .Pq Ql \en . A backslash preceding a newline is treated as a line continuation. .El -.Ss Reserved Words -Reserved words are words that have special meaning to the +.Ss Keywords +Keywords or reserved words are words that have special meaning to the shell and are recognized at the beginning of a line and after a control operator. -The following are reserved words: +The following are keywords: .Bl -column "doneXX" "elifXX" "elseXX" "untilXX" "whileX" -offset center .It Li \&! Ta { Ta } Ta Ic case Ta Ic do .It Ic done Ta Ic elif Ta Ic else Ta Ic esac Ta Ic fi @@ -425,8 +429,8 @@ An alias is a name and corresponding value set using the .Ic alias built-in command. -Whenever a reserved word may occur (see above), -and after checking for reserved words, the shell +Whenever a keyword may occur (see above), +and after checking for keywords, the shell checks the word to see if it matches an alias. If it does, it replaces it in the input stream with its value. For example, if there is an alias called @@ -465,7 +469,7 @@ document). Essentially though, a line is read and if the first word of the line (or after a control operator) -is not a reserved word, then the shell has recognized a +is not a keyword, then the shell has recognized a simple command. Otherwise, a complex command or some other special construct may have been recognized. @@ -661,11 +665,11 @@ performing any searches. .It The shell searches each entry in the -.Ev PATH -environment variable +.Va PATH +variable in turn for the command. The value of the -.Ev PATH +.Va PATH variable should be a series of entries separated by colons. Each entry consists of a @@ -691,7 +695,7 @@ .In sys/signal.h . .Ss Complex Commands Complex commands are combinations of simple commands -with control operators or reserved words, together creating a larger complex +with control operators or keywords, together creating a larger complex command. More generally, a command is one of the following: .Bl -item -offset indent @@ -735,7 +739,7 @@ If the pipeline is not in the background (discussed later), the shell waits for all commands to complete. .Pp -If the reserved word +If the keyword .Ic !\& does not precede the pipeline, the exit status is the exit status of the last command specified @@ -1036,13 +1040,9 @@ .Ic set built-in command can also be used to set or reset them. .Ss Special Parameters -A special parameter is a parameter denoted by a special one-character -name. -The special parameters recognized by the -.Nm -shell of -.Fx -are shown in the following list, exactly as they would appear in input +Special parameters are parameters denoted by a single special character +or the digit zero. +They are shown in the following list, exactly as they would appear in input typed by the user or in the source of a shell script. .Bl -hang .It Li $* @@ -1109,6 +1109,84 @@ .It Li $0 (zero) Expands to the name of the shell or shell script. .El +.Ss Special Variables +The following variables are set by the shell or +have special meaning to it: +.Bl -tag -width ".Va HISTSIZE" +.It Va CDPATH +The search path used with the +.Ic cd +built-in. +.It Va EDITOR +The fallback editor used with the +.Ic fc +built-in. +If not set, the default editor is +.Xr ed 1 . +.It Va FCEDIT +The default editor used with the +.Ic fc +built-in. +.It Va HISTSIZE +The number of previous commands that are accessible. +.It Va HOME +The user's home directory, +used in tilde expansion and as a default directory for the +.Ic cd +built-in. +.It Va IFS +Input Field Separators. +This is normally set to +.Aq space , +.Aq tab , +and +.Aq newline . +See the +.Sx White Space Splitting +section for more details. +.It Va LINENO +The current line number in the script or function. +.It Va MAIL +The name of a mail file, that will be checked for the arrival of new +mail. +Overridden by +.Va MAILPATH . +.It Va MAILPATH +A colon +.Pq Ql \&: +separated list of file names, for the shell to check for incoming +mail. +This variable overrides the +.Va MAIL +setting. +There is a maximum of 10 mailboxes that can be monitored at once. +.It Va PATH +The default search path for executables. +See the +.Sx Path Search +section for details. +.It Va PPID +The parent process ID of the invoked shell. +This is set at startup +unless this variable is in the environment. +A later change of parent process ID is not reflected. +A subshell retains the same value of +.Va PPID . +.It Va PS1 +The primary prompt string, which defaults to +.Dq Li "$ " , +unless you are the superuser, in which case it defaults to +.Dq Li "# " . +.It Va PS2 +The secondary prompt string, which defaults to +.Dq Li "> " . +.It Va PS4 +The prefix for the trace output (if +.Fl x +is active). +The default is +.Dq Li "+ " . +.El .Ss Word Expansions This clause describes the various expansions that are performed on words. @@ -1162,7 +1240,7 @@ username is missing (as in .Pa ~/foobar ) , the tilde is replaced with the value of the -.Ev HOME +.Va HOME variable (the current user's home directory). .Ss Parameter Expansion The format for parameter expansion is as follows: @@ -1175,10 +1253,20 @@ .Ql } . Any .Ql } -escaped by a backslash or within a quoted string, and characters in +escaped by a backslash or within a single-quoted string, and characters in embedded arithmetic expansions, command substitutions, and variable expansions, are not examined in determining the matching .Ql } . +Except for the variants with +.Ql + , +.Ql - , +.Ql = +or +.Ql ?\& , +any +.Ql } +within a double-quoted string is also not examined in determining the matching +.Ql } . .Pp The simplest form for parameter expansion is: .Pp @@ -1262,6 +1350,14 @@ In the parameter expansions shown previously, use of the colon in the format results in a test for a parameter that is unset or null; omission of the colon results in a test for a parameter that is only unset. +.Pp +The +.Ar word +inherits the type of quoting +(unquoted, double-quoted or here-document) +from the surroundings, +with the exception that a backslash that quotes a closing brace is removed +during quote removal. .Bl -tag -width indent .It Li ${# Ns Ar parameter Ns Li } String Length. @@ -1469,10 +1565,10 @@ .Ql / characters, it is used as is. Otherwise, the shell searches the -.Ev PATH +.Va PATH for the file. If it is not found in the -.Ev PATH , +.Va PATH , it is sought in the current working directory. .It Ic \&[ A built-in equivalent of @@ -1516,7 +1612,7 @@ Switch to the specified .Ar directory , or to the directory specified in the -.Ev HOME +.Va HOME environment variable if no .Ar directory is specified. @@ -1527,17 +1623,17 @@ or .Pa .. , then the directories listed in the -.Ev CDPATH +.Va CDPATH variable will be searched for the specified .Ar directory . If -.Ev CDPATH +.Va CDPATH is unset, the current directory is searched. The format of -.Ev CDPATH +.Va CDPATH is the same as that of -.Ev PATH . +.Va PATH . In an interactive shell, the .Ic cd @@ -1545,7 +1641,7 @@ that it actually switched to if this is different from the name that the user gave. These may be different either because the -.Ev CDPATH +.Va CDPATH mechanism was used or because a symbolic link was crossed. .Pp If the @@ -1568,16 +1664,18 @@ .It Ic command Oo Fl p Oc Op Ar utility Op Ar argument ... .It Ic command Oo Fl v | V Oc Op Ar utility The first form of invocation executes the specified +.Ar utility , +ignoring shell functions in the search. +If .Ar utility -as a simple command (see the -.Sx Simple Commands -section). +is a special builtin, +it is executed as if it were a regular builtin. .Pp If the .Fl p option is specified, the command search is performed using a default value of -.Ev PATH +.Va PATH that is guaranteed to find all of the standard utilities. .Pp If the @@ -1736,20 +1834,20 @@ .Ar editor string is a command name, subject to search via the -.Ev PATH +.Va PATH variable. The value in the -.Ev FCEDIT +.Va FCEDIT variable is used as a default when .Fl e is not specified. If -.Ev FCEDIT +.Va FCEDIT is null or unset, the value of the -.Ev EDITOR +.Va EDITOR variable is used. If -.Ev EDITOR +.Va EDITOR is null or unset, .Xr ed 1 is used as the editor. @@ -1783,7 +1881,7 @@ Select the commands to list or edit. The number of previous commands that can be accessed are determined by the value of the -.Ev HISTSIZE +.Va HISTSIZE variable. The value of .Ar first @@ -1814,12 +1912,12 @@ .El .El .Pp -The following environment variables affect the execution of +The following variables affect the execution of .Ic fc : -.Bl -tag -width ".Ev HISTSIZE" -.It Ev FCEDIT +.Bl -tag -width ".Va HISTSIZE" +.It Va FCEDIT Name of the editor to use for history editing. -.It Ev HISTSIZE +.It Va HISTSIZE The number of previous commands that are accessible. .El .It Ic fg Op Ar job @@ -2285,74 +2383,27 @@ .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : -.Bl -tag -width ".Ev HISTSIZE" -.It Ev CDPATH -The search path used with the -.Ic cd -built-in. -.It Ev EDITOR -The fallback editor used with the -.Ic fc -built-in. -If not set, the default editor is -.Xr ed 1 . -.It Ev FCEDIT -The default editor used with the -.Ic fc -built-in. -.It Ev HISTSIZE -The number of previous commands that are accessible. -.It Ev HOME -The starting directory of -.Nm . -.It Ev IFS -Input Field Separators. -This is normally set to -.Aq space , -.Aq tab , -and -.Aq newline . -See the -.Sx White Space Splitting -section for more details. -.It Ev MAIL -The name of a mail file, that will be checked for the arrival of new -mail. -Overridden by -.Ev MAILPATH . -.It Ev MAILPATH -A colon -.Pq Ql \&: -separated list of file names, for the shell to check for incoming -mail. -This environment setting overrides the -.Ev MAIL -setting. -There is a maximum of 10 mailboxes that can be monitored at once. -.It Ev PATH -The default search path for executables. -See the -.Sx Path Search -section for details. -.It Ev PS1 -The primary prompt string, which defaults to -.Dq Li "$ " , -unless you are the superuser, in which case it defaults to -.Dq Li "# " . -.It Ev PS2 -The secondary prompt string, which defaults to -.Dq Li "> " . -.It Ev PS4 -The prefix for the trace output (if -.Fl x -is active). -The default is -.Dq Li "+ " . +.Bl -tag -width ".Ev LANGXXXXXX" +.It Ev ENV +Initialization file for interactive shells. +.It Ev LANG , Ev LC_* +Locale settings. +These are inherited by children of the shell, +and is used in a limited manner by the shell itself. +.It Ev PWD +An absolute pathname for the current directory, +possibly containing symbolic links. +This is used and updated by the shell. .It Ev TERM The default terminal setting for the shell. This is inherited by children of the shell, and is used in the history editing modes. .El +.Pp +Additionally, all environment variables are turned into shell variables +at startup, +which may affect the shell as described under +.Sx Special Variables . .Sh EXIT STATUS Errors that are detected by the shell, such as a syntax error, will cause the shell to exit with a non-zero exit status. Index: bin/sh/error.c =================================================================== --- bin/sh/error.c (revision 209146) +++ bin/sh/error.c (working copy) @@ -67,17 +67,21 @@ char *commandname; -static void exverror(int, const char *, va_list) __printf0like(2, 0); +static void exverror(int, const char *, va_list) __printf0like(2, 0) __dead2; /* * Called to raise an exception. Since C doesn't include exceptions, we * just do a longjmp to the exception handler. The type of exception is * stored in the global variable "exception". + * + * Interrupts are disabled; they should be reenabled when the exception is + * caught. */ void exraise(int e) { + INTOFF; if (handler == NULL) abort(); exception = e; @@ -138,8 +142,15 @@ static void exverror(int cond, const char *msg, va_list ap) { - CLEAR_PENDING_INT; - INTOFF; + /* + * An interrupt trumps an error. Certain places catch error + * exceptions or transform them to a plain nonzero exit code + * in child processes, and if an error exception can be handled, + * an interrupt can be handled as well. + * + * exraise() will disable interrupts for the exception handler. + */ + FORCEINTON; #ifdef DEBUG if (msg) @@ -149,8 +160,8 @@ #endif if (msg) { if (commandname) - outfmt(&errout, "%s: ", commandname); - doformat(&errout, msg, ap); + outfmt(out2, "%s: ", commandname); + doformat(out2, msg, ap); out2c('\n'); } flushall(); Index: bin/sh/error.h =================================================================== --- bin/sh/error.h (revision 209146) +++ bin/sh/error.h (working copy) @@ -72,14 +72,16 @@ #define INTOFF suppressint++ #define INTON { if (--suppressint == 0 && intpending) onint(); } +#define is_int_on() suppressint +#define SETINTON(s) suppressint = (s) #define FORCEINTON {suppressint = 0; if (intpending) onint();} #define CLEAR_PENDING_INT intpending = 0 #define int_pending() intpending -void exraise(int); +void exraise(int) __dead2; void onint(void); -void error(const char *, ...) __printf0like(1, 2); -void exerror(int, const char *, ...) __printf0like(2, 3); +void error(const char *, ...) __printf0like(1, 2) __dead2; +void exerror(int, const char *, ...) __printf0like(2, 3) __dead2; /* Index: bin/sh/input.c =================================================================== --- bin/sh/input.c (revision 209146) +++ bin/sh/input.c (working copy) @@ -93,7 +93,7 @@ int plinno = 1; /* input line number */ -MKINIT int parsenleft; /* copy of parsefile->nleft */ +int parsenleft; /* copy of parsefile->nleft */ MKINIT int parselleft; /* copy of parsefile->lleft */ char *parsenextc; /* copy of parsefile->nextc */ MKINIT struct parsefile basepf; /* top level input file */ @@ -111,9 +111,9 @@ INCLUDE "input.h" INCLUDE "error.h" -INIT { - extern char basebuf[]; +MKINIT char basebuf[]; +INIT { basepf.nextc = basepf.buf = basebuf; } @@ -215,7 +215,7 @@ if (flags >= 0 && flags & O_NONBLOCK) { flags &=~ O_NONBLOCK; if (fcntl(0, F_SETFL, flags) >= 0) { - out2str("sh: turning off NDELAY mode\n"); + out2fmt_flush("sh: turning off NDELAY mode\n"); goto retry; } } @@ -359,7 +359,7 @@ struct strpush *sp; INTOFF; -/*dprintf("*** calling pushstring: %s, %d\n", s, len);*/ +/*out2fmt_flush("*** calling pushstring: %s, %d\n", s, len);*/ if (parsefile->strpush) { sp = ckmalloc(sizeof (struct strpush)); sp->prev = parsefile->strpush; @@ -386,7 +386,7 @@ parsenextc = sp->prevstring; parsenleft = sp->prevnleft; parselleft = sp->prevlleft; -/*dprintf("*** calling popstring: restoring to '%s'\n", parsenextc);*/ +/*out2fmt_flush("*** calling popstring: restoring to '%s'\n", parsenextc);*/ if (sp->ap) sp->ap->flag &= ~ALIASINUSE; parsefile->strpush = sp->prev; @@ -401,7 +401,7 @@ */ void -setinputfile(char *fname, int push) +setinputfile(const char *fname, int push) { int fd; int fd2; @@ -509,6 +509,32 @@ /* + * Return current file (to go back to it later using popfilesupto()). + */ + +struct parsefile * +getcurrentfile(void) +{ + return parsefile; +} + + +/* + * Pop files until the given file is on top again. Useful for regular + * builtins that read shell commands from files or strings. + * If the given file is not an active file, an error is raised. + */ + +void +popfilesupto(struct parsefile *file) +{ + while (parsefile != file && parsefile != &basepf) + popfile(); + if (parsefile != file) + error("popfilesupto() misused"); +} + +/* * Return to top level. */ Index: bin/sh/input.h =================================================================== --- bin/sh/input.h (revision 209146) +++ bin/sh/input.h (working copy) @@ -45,6 +45,8 @@ extern char *parsenextc; /* next character in input buffer */ extern int init_editline; /* 0 == not setup, 1 == OK, -1 == failed */ +struct parsefile; + char *pfgets(char *, int); int pgetc(void); int preadbuffer(void); @@ -52,10 +54,12 @@ void pungetc(void); void pushstring(char *, int, void *); void popstring(void); -void setinputfile(char *, int); +void setinputfile(const char *, int); void setinputfd(int, int); void setinputstring(char *, int); void popfile(void); +struct parsefile *getcurrentfile(void); +void popfilesupto(struct parsefile *); void popallfiles(void); void closescript(void); Index: bin/sh/redir.c =================================================================== --- bin/sh/redir.c (revision 209146) +++ bin/sh/redir.c (working copy) @@ -63,6 +63,7 @@ #define EMPTY -2 /* marks an unused slot in redirtab */ +#define CLOSED -1 /* fd was not open before redir */ #define PIPESIZE 4096 /* amount of buffering in a pipe */ @@ -101,7 +102,6 @@ struct redirtab *sv = NULL; int i; int fd; - int try; char memory[10]; /* file descriptors to write to memory */ for (i = 10 ; --i >= 0 ; ) @@ -116,38 +116,30 @@ } for (n = redir ; n ; n = n->nfile.next) { fd = n->nfile.fd; - try = 0; if ((n->nfile.type == NTOFD || n->nfile.type == NFROMFD) && n->ndup.dupfd == fd) continue; /* redirect from/to same file descriptor */ if ((flags & REDIR_PUSH) && sv->renamed[fd] == EMPTY) { INTOFF; -again: if ((i = fcntl(fd, F_DUPFD, 10)) == -1) { switch (errno) { case EBADF: - if (!try) { - openredirect(n, memory); - try++; - goto again; - } - /* FALLTHROUGH*/ + i = CLOSED; + break; default: INTON; error("%d: %s", fd, strerror(errno)); break; } - } - if (!try) { - sv->renamed[fd] = i; - } + } else + (void)fcntl(i, F_SETFD, FD_CLOEXEC); + sv->renamed[fd] = i; INTON; } if (fd == 0) fd0_redirected++; - if (!try) - openredirect(n, memory); + openredirect(n, memory); } if (memory[1]) out1 = &memout; @@ -166,8 +158,11 @@ /* * We suppress interrupts so that we won't leave open file - * descriptors around. This may not be such a good idea because - * an open of a device or a fifo can block indefinitely. + * descriptors around. Because the signal handler remains + * installed and we do not use system call restart, interrupts + * will still abort blocking opens such as fifos (they will fail + * with EINTR). There is, however, a race condition if an interrupt + * arrives after INTOFF and before open blocks. */ INTOFF; memory[fd] = 0; Index: bin/sh/trap.c =================================================================== --- bin/sh/trap.c (revision 209146) +++ bin/sh/trap.c (working copy) @@ -149,6 +149,7 @@ { char *action; int signo; + int errors = 0; if (argc <= 1) { for (signo = 0 ; signo < sys_nsig ; signo++) { @@ -183,8 +184,10 @@ } } while (*argv) { - if ((signo = sigstring_to_signum(*argv)) == -1) - error("bad signal %s", *argv); + if ((signo = sigstring_to_signum(*argv)) == -1) { + out2fmt_flush("trap: bad signal %s\n", *argv); + errors = 1; + } INTOFF; if (action) action = savestr(action); @@ -196,7 +199,7 @@ INTON; argv++; } - return 0; + return errors; } @@ -244,7 +247,8 @@ setsignal(int signo) { int action; - sig_t sig, sigact = SIG_DFL; + sig_t sigact = SIG_DFL; + struct sigaction sa; char *t; if ((t = trap[signo]) == NULL) @@ -320,9 +324,10 @@ case S_IGN: sigact = SIG_IGN; break; } *t = action; - sig = signal(signo, sigact); - if (sig != SIG_ERR && action == S_CATCH) - siginterrupt(signo, 1); + sa.sa_handler = sigact; + sa.sa_flags = 0; + sigemptyset(&sa.sa_mask); + sigaction(signo, &sa, NULL); } Index: bin/sh/trap.h =================================================================== --- bin/sh/trap.h (revision 209146) +++ bin/sh/trap.h (working copy) @@ -45,4 +45,4 @@ void onsig(int); void dotrap(void); void setinteractive(int); -void exitshell(int); +void exitshell(int) __dead2; Index: bin/sh/arith.h =================================================================== --- bin/sh/arith.h (revision 209146) +++ bin/sh/arith.h (working copy) @@ -34,8 +34,8 @@ #define DIGITS(var) (3 + (2 + CHAR_BIT * sizeof((var))) / 3) -extern char *arith_buf, *arith_startbuf; +extern const char *arith_buf, *arith_startbuf; -arith_t arith(char *); +arith_t arith(const char *); void arith_lex_reset(void); int expcmd(int, char **); Index: bin/sh/mksyntax.c =================================================================== --- bin/sh/mksyntax.c (revision 209146) +++ bin/sh/mksyntax.c (working copy) @@ -55,8 +55,8 @@ struct synclass { - char *name; - char *comment; + const char *name; + const char *comment; }; /* Syntax classes */ @@ -101,16 +101,16 @@ static FILE *cfile; static FILE *hfile; -static char *syntax[513]; +static const char *syntax[513]; static int base; static int size; /* number of values which a char variable can have */ static int nbits; /* number of bits in a character */ static int digit_contig;/* true if digits are contiguous */ -static void filltable(char *); +static void filltable(const char *); static void init(void); -static void add(char *, char *); -static void print(char *); +static void add(const char *, const char *); +static void print(const char *); static void output_type_macros(void); static void digit_convert(void); @@ -232,7 +232,6 @@ add("\n", "CNL"); add("\\", "CBACK"); add("`", "CBQUOTE"); - add("'", "CSQUOTE"); add("\"", "CDQUOTE"); add("$", "CVAR"); add("}", "CENDVAR"); @@ -259,7 +258,7 @@ */ static void -filltable(char *dftval) +filltable(const char *dftval) { int i; @@ -293,7 +292,7 @@ */ static void -add(char *p, char *type) +add(const char *p, const char *type) { while (*p) syntax[*p++ + base] = type; @@ -306,7 +305,7 @@ */ static void -print(char *name) +print(const char *name) { int i; int col; @@ -338,7 +337,7 @@ * contiguous, we can test for them quickly. */ -static char *macro[] = { +static const char *macro[] = { "#define is_digit(c)\t((is_type+SYNBASE)[c] & ISDIGIT)", "#define is_eof(c)\t((c) == PEOF)", "#define is_alpha(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && isalpha((unsigned char) (c)))", @@ -351,7 +350,7 @@ static void output_type_macros(void) { - char **pp; + const char **pp; if (digit_contig) macro[0] = "#define is_digit(c)\t((unsigned int)((c) - '0') <= 9)"; Index: bin/sh/expand.c =================================================================== --- bin/sh/expand.c (revision 209146) +++ bin/sh/expand.c (working copy) @@ -109,7 +109,7 @@ STATIC void addfname(char *); STATIC struct strlist *expsort(struct strlist *); STATIC struct strlist *msort(struct strlist *, int); -STATIC int pmatch(char *, char *, int); +STATIC int pmatch(const char *, const char *, int); STATIC char *cvtnum(int, char *); STATIC int collate_range_cmp(int, int); @@ -273,8 +273,12 @@ while ((c = *p) != '\0') { switch(c) { - case CTLESC: - return (startp); + case CTLESC: /* This means CTL* are always considered quoted. */ + case CTLVAR: + case CTLBACKQ: + case CTLBACKQ | CTLQUOTE: + case CTLARI: + case CTLENDARI: case CTLQUOTEMARK: return (startp); case ':': @@ -282,6 +286,7 @@ goto done; break; case '/': + case CTLENDVAR: goto done; } p++; @@ -357,7 +362,7 @@ void expari(int flag) { - char *p, *start; + char *p, *q, *start; arith_t result; int begoff; int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); @@ -395,7 +400,9 @@ removerecordregions(begoff); if (quotes) rmescapes(p+2); + q = grabstackstr(expdest); result = arith(p+2); + ungrabstackstr(q, expdest); fmtstr(p, DIGITS(result), ARITH_FORMAT_STR, result); while (*p++) ; @@ -503,7 +510,9 @@ int amount; herefd = -1; - argstr(p, 0); + argstr(p, (subtype == VSTRIMLEFT || subtype == VSTRIMLEFTMAX || + subtype == VSTRIMRIGHT || subtype == VSTRIMRIGHTMAX ? + EXP_CASE : 0) | EXP_TILDE); STACKSTRNUL(expdest); herefd = saveherefd; argbackq = saveargbackq; @@ -523,7 +532,7 @@ case VSQUESTION: if (*p != CTLENDVAR) { - outfmt(&errout, "%s\n", startp); + outfmt(out2, "%s\n", startp); error((char *)NULL); } error("%.*s: parameter %snot set", (int)(p - str - 1), @@ -659,7 +668,7 @@ } varlen = 0; startloc = expdest - stackblock(); - if (!set && uflag) { + if (!set && uflag && *var != '@' && *var != '*') { switch (subtype) { case VSNORMAL: case VSTRIMLEFT: @@ -852,7 +861,6 @@ int num; char *p; int i; - extern int oexitstatus; char sep; char **ap; char const *syntax; @@ -976,7 +984,7 @@ char *start; char *p; char *q; - char *ifs; + const char *ifs; const char *ifsspc; int had_param_ch = 0; @@ -1344,7 +1352,7 @@ */ int -patmatch(char *pattern, char *string, int squoted) +patmatch(const char *pattern, const char *string, int squoted) { #ifdef notdef if (pattern[0] == '!' && pattern[1] == '!') @@ -1356,9 +1364,9 @@ STATIC int -pmatch(char *pattern, char *string, int squoted) +pmatch(const char *pattern, const char *string, int squoted) { - char *p, *q; + const char *p, *q; char c; p = pattern; @@ -1406,7 +1414,7 @@ } while (*q++ != '\0'); return 0; case '[': { - char *endp; + const char *endp; int invert, found; char chr; @@ -1510,7 +1518,7 @@ */ int -casematch(union node *pattern, char *val) +casematch(union node *pattern, const char *val) { struct stackmark smark; int result; Index: bin/sh/mail.c =================================================================== --- bin/sh/mail.c (revision 209146) +++ bin/sh/mail.c (working copy) @@ -72,7 +72,7 @@ chkmail(int silent) { int i; - char *mpath; + const char *mpath; char *p; char *q; struct stackmark smark; Index: bin/sh/main.c =================================================================== --- bin/sh/main.c (revision 209146) +++ bin/sh/main.c (working copy) @@ -75,8 +75,9 @@ int rootpid; int rootshell; +struct jmploc main_handler; -STATIC void read_profile(char *); +STATIC void read_profile(const char *); STATIC char *find_dot_file(char *); /* @@ -90,14 +91,13 @@ int main(int argc, char *argv[]) { - struct jmploc jmploc; struct stackmark smark; volatile int state; char *shinit; (void) setlocale(LC_ALL, ""); state = 0; - if (setjmp(jmploc.loc)) { + if (setjmp(main_handler.loc)) { /* * When a shell procedure is executed, we raise the * exception EXSHELLPROC to clean up before executing @@ -143,7 +143,7 @@ else goto state4; } - handler = &jmploc; + handler = &main_handler; #ifdef DEBUG opentrace(); trputs("Shell args: "); trargs(argv); @@ -153,10 +153,7 @@ init(); setstackmark(&smark); procargs(argc, argv); - if (getpwd() == NULL && iflag) - out2str("sh: cannot determine working directory\n"); - if (getpwd() != NULL) - setvar ("PWD", getpwd(), VEXPORT); + pwd_init(iflag); if (iflag) chkmail(1); if (argv[0] && argv[0][0] == '-') { @@ -225,7 +222,7 @@ if (!stoppedjobs()) { if (!Iflag) break; - out2str("\nUse \"exit\" to leave shell.\n"); + out2fmt_flush("\nUse \"exit\" to leave shell.\n"); } numeof++; } else if (n != NULL && nflag == 0) { @@ -250,7 +247,7 @@ */ STATIC void -read_profile(char *name) +read_profile(const char *name) { int fd; @@ -271,7 +268,7 @@ */ void -readcmdfile(char *name) +readcmdfile(const char *name) { int fd; @@ -298,7 +295,7 @@ { static char localname[FILENAME_MAX+1]; char *fullname; - char *path = pathval(); + const char *path = pathval(); struct stat statb; /* don't try this for absolute or relative paths */ @@ -317,14 +314,20 @@ int dotcmd(int argc, char **argv) { - char *fullname; + char *filename, *fullname; if (argc < 2) error("missing filename"); exitstatus = 0; - fullname = find_dot_file(argv[1]); + /* + * Because we have historically not supported any options, + * only treat "--" specially. + */ + filename = argc > 2 && strcmp(argv[1], "--") == 0 ? argv[2] : argv[1]; + + fullname = find_dot_file(filename); setinputfile(fullname, 1); commandname = fullname; cmdloop(0); @@ -336,8 +339,6 @@ int exitcmd(int argc, char **argv) { - extern int oexitstatus; - if (stoppedjobs()) return 0; if (argc > 1) Index: bin/sh/expand.h =================================================================== --- bin/sh/expand.h (revision 209146) +++ bin/sh/expand.h (working copy) @@ -58,7 +58,7 @@ void expandhere(union node *, int); void expandarg(union node *, struct arglist *, int); void expari(int); -int patmatch(char *, char *, int); +int patmatch(const char *, const char *, int); void rmescapes(char *); -int casematch(union node *, char *); +int casematch(union node *, const char *); int wordexpcmd(int, char **); Index: bin/sh/exec.c =================================================================== --- bin/sh/exec.c (revision 209146) +++ bin/sh/exec.c (working copy) @@ -98,7 +98,7 @@ STATIC void tryexec(char *, char **, char **); STATIC void printentry(struct tblentry *, int); -STATIC struct tblentry *cmdlookup(char *, int); +STATIC struct tblentry *cmdlookup(const char *, int); STATIC void delete_cmd_entry(void); @@ -109,7 +109,7 @@ */ void -shellexec(char **argv, char **envp, char *path, int index) +shellexec(char **argv, char **envp, const char *path, int idx) { char *cmdname; int e; @@ -120,7 +120,7 @@ } else { e = ENOENT; while ((cmdname = padvance(&path, argv[0])) != NULL) { - if (--index < 0 && pathopt == NULL) { + if (--idx < 0 && pathopt == NULL) { tryexec(cmdname, argv, envp); if (errno != ENOENT && errno != ENOTDIR) e = errno; @@ -175,13 +175,13 @@ * NULL. */ -char *pathopt; +const char *pathopt; char * -padvance(char **path, char *name) +padvance(const char **path, const char *name) { - char *p, *q; - char *start; + const char *p, *start; + char *q; int len; if (*path == NULL) @@ -248,14 +248,14 @@ && (cmdp->cmdtype == CMDNORMAL || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0))) delete_cmd_entry(); - find_command(name, &entry, 1, pathval()); + find_command(name, &entry, DO_ERR, pathval()); if (verbose) { if (entry.cmdtype != CMDUNKNOWN) { /* if no error msg */ cmdp = cmdlookup(name, 0); if (cmdp != NULL) printentry(cmdp, verbose); else - outfmt(&errout, "%s: not found\n", name); + outfmt(out2, "%s: not found\n", name); } flushall(); } @@ -268,17 +268,17 @@ STATIC void printentry(struct tblentry *cmdp, int verbose) { - int index; - char *path; + int idx; + const char *path; char *name; if (cmdp->cmdtype == CMDNORMAL) { - index = cmdp->param.index; + idx = cmdp->param.index; path = pathval(); do { name = padvance(&path, cmdp->cmdname); stunalloc(name); - } while (--index >= 0); + } while (--idx >= 0); out1str(name); } else if (cmdp->cmdtype == CMDBUILTIN) { out1fmt("builtin %s", cmdp->cmdname); @@ -310,10 +310,11 @@ */ void -find_command(char *name, struct cmdentry *entry, int printerr, char *path) +find_command(const char *name, struct cmdentry *entry, int act, + const char *path) { - struct tblentry *cmdp; - int index; + struct tblentry *cmdp, loc_cmd; + int idx; int prev; char *fullname; struct stat statb; @@ -329,13 +330,19 @@ } /* If name is in the table, and not invalidated by cd, we're done */ - if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->rehash == 0) - goto success; + if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->rehash == 0) { + if (cmdp->cmdtype == CMDFUNCTION && act & DO_NOFUNC) + cmdp = NULL; + else + goto success; + } /* If %builtin not in path, check for builtin next */ if (builtinloc < 0 && (i = find_builtin(name, &spec)) >= 0) { INTOFF; cmdp = cmdlookup(name, 1); + if (cmdp->cmdtype == CMDFUNCTION) + cmdp = &loc_cmd; cmdp->cmdtype = CMDBUILTIN; cmdp->param.index = i; cmdp->special = spec; @@ -353,17 +360,19 @@ } e = ENOENT; - index = -1; + idx = -1; loop: while ((fullname = padvance(&path, name)) != NULL) { stunalloc(fullname); - index++; + idx++; if (pathopt) { if (prefix("builtin", pathopt)) { if ((i = find_builtin(name, &spec)) < 0) goto loop; INTOFF; cmdp = cmdlookup(name, 1); + if (cmdp->cmdtype == CMDFUNCTION) + cmdp = &loc_cmd; cmdp->cmdtype = CMDBUILTIN; cmdp->param.index = i; cmdp->special = spec; @@ -376,8 +385,8 @@ } } /* if rehash, don't redo absolute path names */ - if (fullname[0] == '/' && index <= prev) { - if (index < prev) + if (fullname[0] == '/' && idx <= prev) { + if (idx < prev) goto loop; TRACE(("searchexec \"%s\": no change\n", name)); goto success; @@ -413,22 +422,25 @@ TRACE(("searchexec \"%s\" returns \"%s\"\n", name, fullname)); INTOFF; cmdp = cmdlookup(name, 1); + if (cmdp->cmdtype == CMDFUNCTION) + cmdp = &loc_cmd; cmdp->cmdtype = CMDNORMAL; - cmdp->param.index = index; + cmdp->param.index = idx; INTON; goto success; } /* We failed. If there was an entry for this command, delete it */ - if (cmdp) + if (cmdp && cmdp->cmdtype != CMDFUNCTION) delete_cmd_entry(); - if (printerr) { + if (act & DO_ERR) { if (e == ENOENT || e == ENOTDIR) outfmt(out2, "%s: not found\n", name); else outfmt(out2, "%s: %s\n", name, strerror(e)); } entry->cmdtype = CMDUNKNOWN; + entry->u.index = 0; return; success: @@ -445,7 +457,7 @@ */ int -find_builtin(char *name, int *special) +find_builtin(const char *name, int *special) { const struct builtincmd *bp; @@ -492,18 +504,18 @@ changepath(const char *newval) { const char *old, *new; - int index; + int idx; int firstchange; int bltin; old = pathval(); new = newval; firstchange = 9999; /* assume no change */ - index = 0; + idx = 0; bltin = -1; for (;;) { if (*old != *new) { - firstchange = index; + firstchange = idx; if ((*old == '\0' && *new == ':') || (*old == ':' && *new == '\0')) firstchange++; @@ -512,9 +524,9 @@ if (*new == '\0') break; if (*new == '%' && bltin < 0 && prefix("builtin", new + 1)) - bltin = index; + bltin = idx; if (*new == ':') { - index++; + idx++; } new++, old++; } @@ -607,10 +619,10 @@ STATIC struct tblentry * -cmdlookup(char *name, int add) +cmdlookup(const char *name, int add) { int hashval; - char *p; + const char *p; struct tblentry *cmdp; struct tblentry **pp; @@ -663,7 +675,7 @@ */ void -addcmdentry(char *name, struct cmdentry *entry) +addcmdentry(const char *name, struct cmdentry *entry) { struct tblentry *cmdp; @@ -683,7 +695,7 @@ */ void -defun(char *name, union node *func) +defun(const char *name, union node *func) { struct cmdentry entry; @@ -700,7 +712,7 @@ */ int -unsetfunc(char *name) +unsetfunc(const char *name) { struct tblentry *cmdp; @@ -718,19 +730,21 @@ */ int -typecmd_impl(int argc, char **argv, int cmd) +typecmd_impl(int argc, char **argv, int cmd, const char *path) { struct cmdentry entry; struct tblentry *cmdp; - char **pp; + const char *const *pp; struct alias *ap; int i; - int error = 0; - extern char *const parsekwd[]; + int error1 = 0; + + if (path != pathval()) + clearcmdentry(0); for (i = 1; i < argc; i++) { /* First look at the keywords */ - for (pp = (char **)parsekwd; *pp; pp++) + for (pp = parsekwd; *pp; pp++) if (**pp == *argv[i] && equal(*pp, argv[i])) break; @@ -760,16 +774,17 @@ } else { /* Finally use brute force */ - find_command(argv[i], &entry, 0, pathval()); + find_command(argv[i], &entry, 0, path); } switch (entry.cmdtype) { case CMDNORMAL: { if (strchr(argv[i], '/') == NULL) { - char *path = pathval(), *name; + const char *path2 = path; + char *name; int j = entry.u.index; do { - name = padvance(&path, argv[i]); + name = padvance(&path2, argv[i]); stunalloc(name); } while (--j >= 0); if (cmd == TYPECMD_SMALLV) @@ -790,7 +805,7 @@ if (cmd != TYPECMD_SMALLV) outfmt(out2, "%s: %s\n", argv[i], strerror(errno)); - error |= 127; + error1 |= 127; } } break; @@ -815,11 +830,15 @@ default: if (cmd != TYPECMD_SMALLV) outfmt(out2, "%s: not found\n", argv[i]); - error |= 127; + error1 |= 127; break; } } - return error; + + if (path != pathval()) + clearcmdentry(0); + + return error1; } /* @@ -829,5 +848,5 @@ int typecmd(int argc, char **argv) { - return typecmd_impl(argc, argv, TYPECMD_TYPE); + return typecmd_impl(argc, argv, TYPECMD_TYPE, bltinlookup("PATH", 1)); } Index: bin/sh/miscbltin.c =================================================================== --- bin/sh/miscbltin.c (revision 209146) +++ bin/sh/miscbltin.c (working copy) @@ -93,7 +93,7 @@ char c; int rflag; char *prompt; - char *ifs; + const char *ifs; char *p; int startword; int status; @@ -254,7 +254,7 @@ int -umaskcmd(int argc __unused, char **argv) +umaskcmd(int argc __unused, char **argv __unused) { char *ap; int mask; Index: bin/sh/cd.c =================================================================== --- bin/sh/cd.c (revision 209146) +++ bin/sh/cd.c (working copy) @@ -70,6 +70,7 @@ STATIC char *getcomponent(void); STATIC char *findcwd(char *); STATIC void updatepwd(char *); +STATIC char *getpwd(void); STATIC char *getpwd2(void); STATIC char *curdir = NULL; /* current working directory */ @@ -79,8 +80,8 @@ int cdcmd(int argc, char **argv) { - char *dest; - char *path; + const char *dest; + const char *path; char *p; struct stat statb; int ch, phys, print = 0; @@ -351,7 +352,7 @@ /* * Get the current directory and cache the result in curdir. */ -char * +STATIC char * getpwd(void) { char *p; @@ -374,7 +375,6 @@ STATIC char * getpwd2(void) { - struct stat stdot, stpwd; char *pwd; int i; @@ -387,12 +387,29 @@ break; } - pwd = getenv("PWD"); + return NULL; +} + +/* + * Initialize PWD in a new shell. + * If the shell is interactive, we need to warn if this fails. + */ +void +pwd_init(int warn) +{ + char *pwd; + struct stat stdot, stpwd; + + pwd = lookupvar("PWD"); if (pwd && *pwd == '/' && stat(".", &stdot) != -1 && stat(pwd, &stpwd) != -1 && stdot.st_dev == stpwd.st_dev && stdot.st_ino == stpwd.st_ino) { - return pwd; + if (curdir) + ckfree(curdir); + curdir = savestr(pwd); } - return NULL; + if (getpwd() == NULL && warn) + out2fmt_flush("sh: cannot determine working directory\n"); + setvar("PWD", curdir, VEXPORT); } Index: bin/sh/eval.c =================================================================== --- bin/sh/eval.c (revision 209146) +++ bin/sh/eval.c (working copy) @@ -74,7 +74,7 @@ #endif -MKINIT int evalskip; /* set if we are skipping commands */ +int evalskip; /* set if we are skipping commands */ STATIC int skipcount; /* number of levels to skip */ MKINIT int loopnest; /* current loop nesting level */ int funcnest; /* depth of function calls */ @@ -91,6 +91,7 @@ STATIC void evalfor(union node *, int); STATIC void evalcase(union node *, int); STATIC void evalsubshell(union node *, int); +STATIC void evalredir(union node *, int); STATIC void expredir(union node *); STATIC void evalpipe(union node *); STATIC void evalcommand(union node *, int, struct backcmd *); @@ -221,10 +222,7 @@ evaltree(n->nbinary.ch2, flags); break; case NREDIR: - expredir(n->nredir.redirect); - redirect(n->nredir.redirect, REDIR_PUSH); - evaltree(n->nredir.n, flags); - popredir(); + evalredir(n, flags); break; case NSUBSHELL: evalsubshell(n, flags); @@ -407,8 +405,7 @@ flags &=~ EV_TESTED; redirect(n->nredir.redirect, 0); evaltree(n->nredir.n, flags | EV_EXIT); /* never returns */ - } - if (! backgnd) { + } else if (! backgnd) { INTOFF; exitstatus = waitforjob(jp, (int *)NULL); INTON; @@ -416,6 +413,46 @@ } +/* + * Evaluate a redirected compound command. + */ + +STATIC void +evalredir(union node *n, int flags) +{ + struct jmploc jmploc; + struct jmploc *savehandler; + volatile int in_redirect = 1; + + expredir(n->nredir.redirect); + savehandler = handler; + if (setjmp(jmploc.loc)) { + int e; + + handler = savehandler; + e = exception; + if (e == EXERROR || e == EXEXEC) { + popredir(); + if (in_redirect) { + exitstatus = 2; + return; + } + } + longjmp(handler->loc, 1); + } else { + INTOFF; + handler = &jmploc; + redirect(n->nredir.redirect, REDIR_PUSH); + in_redirect = 0; + INTON; + evaltree(n->nredir.n, flags); + } + INTOFF; + handler = savehandler; + popredir(); + INTON; +} + /* * Compute the names of the files in a redirection list. @@ -593,10 +630,12 @@ char *savecmdname; struct shparam saveparam; struct localvar *savelocalvars; + struct parsefile *savetopfile; volatile int e; char *lastarg; int realstatus; int do_clearcmdentry; + char *path = pathval(); /* First expand the arguments. */ TRACE(("evalcommand(%p, %d) called\n", (void *)cmd, flags)); @@ -646,7 +685,7 @@ out2str(ps4val()); for (sp = varlist.list ; sp ; sp = sp->next) { if (sep != 0) - outc(' ', &errout); + out2c(' '); p = sp->text; while (*p != '=' && *p != '\0') out2c(*p++); @@ -658,7 +697,7 @@ } for (sp = arglist.list ; sp ; sp = sp->next) { if (sep != 0) - outc(' ', &errout); + out2c(' '); /* Disambiguate command looking like assignment. */ if (sp == arglist.list && strchr(sp->text, '=') != NULL && @@ -670,7 +709,7 @@ out2qstr(sp->text); sep = ' '; } - outc('\n', &errout); + out2c('\n'); flushout(&errout); } @@ -679,10 +718,10 @@ /* Variable assignment(s) without command */ cmdentry.cmdtype = CMDBUILTIN; cmdentry.u.index = BLTINCMD; - cmdentry.special = 1; + cmdentry.special = 0; } else { static const char PATH[] = "PATH="; - char *path = pathval(); + int cmd_flags = 0, bltinonly = 0; /* * Modify the command lookup path, if a PATH= assignment @@ -713,42 +752,79 @@ do_clearcmdentry = 1; } - find_command(argv[0], &cmdentry, 1, path); - if (cmdentry.cmdtype == CMDUNKNOWN) { /* command not found */ - exitstatus = 127; - flushout(&errout); - return; - } - /* implement the bltin builtin here */ - if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == BLTINCMD) { - for (;;) { - argv++; - if (--argc == 0) + for (;;) { + if (bltinonly) { + cmdentry.u.index = find_builtin(*argv, &cmdentry.special); + if (cmdentry.u.index < 0) { + cmdentry.u.index = BLTINCMD; + argv--; + argc++; break; - if ((cmdentry.u.index = find_builtin(*argv, - &cmdentry.special)) < 0) { - outfmt(&errout, "%s: not found\n", *argv); - exitstatus = 127; - flushout(&errout); - return; } - if (cmdentry.u.index != BLTINCMD) + } else + find_command(argv[0], &cmdentry, cmd_flags, path); + /* implement the bltin and command builtins here */ + if (cmdentry.cmdtype != CMDBUILTIN) + break; + if (cmdentry.u.index == BLTINCMD) { + if (argc == 1) break; - } + argv++; + argc--; + bltinonly = 1; + } else if (cmdentry.u.index == COMMANDCMD) { + if (argc == 1) + break; + if (!strcmp(argv[1], "-p")) { + if (argc == 2) + break; + if (argv[2][0] == '-') { + if (strcmp(argv[2], "--")) + break; + if (argc == 3) + break; + argv += 3; + argc -= 3; + } else { + argv += 2; + argc -= 2; + } + path = _PATH_STDPATH; + clearcmdentry(0); + do_clearcmdentry = 1; + } else if (!strcmp(argv[1], "--")) { + if (argc == 2) + break; + argv += 2; + argc -= 2; + } else if (argv[1][0] == '-') + break; + else { + argv++; + argc--; + } + cmd_flags |= DO_NOFUNC; + bltinonly = 0; + } else + break; } + /* + * Special builtins lose their special properties when + * called via 'command'. + */ + if (cmd_flags & DO_NOFUNC) + cmdentry.special = 0; } /* Fork off a child process if necessary. */ if (cmd->ncmd.backgnd - || (cmdentry.cmdtype == CMDNORMAL + || ((cmdentry.cmdtype == CMDNORMAL || cmdentry.cmdtype == CMDUNKNOWN) && ((flags & EV_EXIT) == 0 || have_traps())) || ((flags & EV_BACKCMD) != 0 && (cmdentry.cmdtype != CMDBUILTIN || cmdentry.u.index == CDCMD || cmdentry.u.index == DOTCMD - || cmdentry.u.index == EVALCMD)) - || (cmdentry.cmdtype == CMDBUILTIN && - cmdentry.u.index == COMMANDCMD)) { + || cmdentry.u.index == EVALCMD))) { jp = makejob(cmd, 1); mode = cmd->ncmd.backgnd; if (flags & EV_BACKCMD) { @@ -775,7 +851,6 @@ #ifdef DEBUG trputs("Shell function: "); trargs(argv); #endif - redirect(cmd->ncmd.redirect, REDIR_PUSH); saveparam = shellparam; shellparam.malloc = 0; shellparam.reset = 1; @@ -786,7 +861,6 @@ savelocalvars = localvars; localvars = NULL; reffunc(cmdentry.u.func); - INTON; savehandler = handler; if (setjmp(jmploc.loc)) { if (exception == EXSHELLPROC) @@ -794,23 +868,27 @@ else { freeparam(&shellparam); shellparam = saveparam; + if (exception == EXERROR || exception == EXEXEC) + popredir(); } unreffunc(cmdentry.u.func); poplocalvars(); localvars = savelocalvars; + funcnest--; handler = savehandler; longjmp(handler->loc, 1); } handler = &jmploc; + funcnest++; + redirect(cmd->ncmd.redirect, REDIR_PUSH); + INTON; for (sp = varlist.list ; sp ; sp = sp->next) mklocal(sp->text); - funcnest++; exitstatus = oexitstatus; if (flags & EV_TESTED) evaltree(getfuncnode(cmdentry.u.func), EV_TESTED); else evaltree(getfuncnode(cmdentry.u.func), 0); - funcnest--; INTOFF; unreffunc(cmdentry.u.func); poplocalvars(); @@ -818,6 +896,7 @@ freeparam(&shellparam); shellparam = saveparam; handler = savehandler; + funcnest--; popredir(); INTON; if (evalskip == SKIPFUNC) { @@ -836,8 +915,10 @@ memout.nextc = memout.buf; memout.bufsize = 64; mode |= REDIR_BACKQ; + cmdentry.special = 0; } savecmdname = commandname; + savetopfile = getcurrentfile(); cmdenviron = varlist.list; e = -1; savehandler = handler; @@ -848,15 +929,25 @@ } handler = &jmploc; redirect(cmd->ncmd.redirect, mode); + /* + * If there is no command word, redirection errors should + * not be fatal but assignment errors should. + */ + if (argc == 0 && !(flags & EV_BACKCMD)) + cmdentry.special = 1; if (cmdentry.special) listsetvar(cmdenviron); + if (argc > 0) + bltinsetlocale(); commandname = argv[0]; argptr = argv + 1; - optptr = NULL; /* initialize nextopt */ + nextopt_optptr = NULL; /* initialize nextopt */ builtin_flags = flags; exitstatus = (*builtinfunc[cmdentry.u.index])(argc, argv); flushall(); cmddone: + if (argc > 0) + bltinunsetlocale(); cmdenviron = NULL; out1 = &output; out2 = &errout; @@ -868,29 +959,31 @@ } } handler = savehandler; - if (e != -1) { - if ((e != EXERROR && e != EXEXEC) - || cmdentry.special) - exraise(e); - FORCEINTON; - } - if (cmdentry.u.index != EXECCMD) - popredir(); if (flags == EV_BACKCMD) { backcmd->buf = memout.buf; backcmd->nleft = memout.nextc - memout.buf; memout.buf = NULL; } + if (cmdentry.u.index != EXECCMD && + (e == -1 || e == EXERROR || e == EXEXEC)) + popredir(); + if (e != -1) { + if ((e != EXERROR && e != EXEXEC) + || cmdentry.special) + exraise(e); + popfilesupto(savetopfile); + if (flags != EV_BACKCMD) + FORCEINTON; + } } else { #ifdef DEBUG trputs("normal command: "); trargs(argv); #endif - clearredir(); redirect(cmd->ncmd.redirect, 0); for (sp = varlist.list ; sp ; sp = sp->next) setvareq(sp->text, VEXPORT|VSTACK); envp = environment(); - shellexec(argv, envp, pathval(), cmdentry.u.index); + shellexec(argv, envp, path, cmdentry.u.index); /*NOTREACHED*/ } goto out; @@ -946,12 +1039,17 @@ */ /* - * No command given, or a bltin command with no arguments. + * No command given, a bltin command with no arguments, or a bltin command + * with an invalid name. */ int -bltincmd(int argc __unused, char **argv __unused) +bltincmd(int argc, char **argv) { + if (argc > 1) { + out2fmt_flush("%s: not found\n", argv[1]); + return 127; + } /* * Preserve exitstatus of a previous possible redirection * as POSIX mandates @@ -991,23 +1089,18 @@ int commandcmd(int argc, char **argv) { - static char stdpath[] = _PATH_STDPATH; - struct jmploc loc, *old; - struct strlist *sp; - char *path; + const char *path; int ch; int cmd = -1; - for (sp = cmdenviron; sp ; sp = sp->next) - setvareq(sp->text, VEXPORT|VSTACK); - path = pathval(); + path = bltinlookup("PATH", 1); optind = optreset = 1; opterr = 0; while ((ch = getopt(argc, argv, "pvV")) != -1) { switch (ch) { case 'p': - path = stdpath; + path = _PATH_STDPATH; break; case 'v': cmd = TYPECMD_SMALLV; @@ -1026,24 +1119,16 @@ if (cmd != -1) { if (argc != 1) error("wrong number of arguments"); - return typecmd_impl(2, argv - 1, cmd); - } - if (argc != 0) { - old = handler; - handler = &loc; - if (setjmp(handler->loc) == 0) - shellexec(argv, environment(), path, 0); - handler = old; - if (exception == EXEXEC) - exit(exerrno); - exraise(exception); + return typecmd_impl(2, argv - 1, cmd, path); } + if (argc != 0) + error("commandcmd() called while it should not be"); /* * Do nothing successfully if no command was specified; * ksh also does this. */ - exit(0); + return 0; } @@ -1085,6 +1170,12 @@ int execcmd(int argc, char **argv) { + /* + * Because we have historically not supported any options, + * only treat "--" specially. + */ + if (argc > 1 && strcmp(argv[1], "--") == 0) + argc--, argv++; if (argc > 1) { struct strlist *sp; Index: bin/sh/var.c =================================================================== --- bin/sh/var.c (revision 209146) +++ bin/sh/var.c (working copy) @@ -73,13 +73,14 @@ struct varinit { struct var *var; int flags; - char *text; + const char *text; void (*func)(const char *); }; #ifndef NO_HISTORY struct var vhistsize; +struct var vterm; #endif struct var vifs; struct var vmail; @@ -94,27 +95,31 @@ STATIC const struct varinit varinit[] = { #ifndef NO_HISTORY - { &vhistsize, VSTRFIXED|VTEXTFIXED|VUNSET, "HISTSIZE=", + { &vhistsize, VUNSET, "HISTSIZE=", sethistsize }, #endif - { &vifs, VSTRFIXED|VTEXTFIXED, "IFS= \t\n", + { &vifs, 0, "IFS= \t\n", NULL }, - { &vmail, VSTRFIXED|VTEXTFIXED|VUNSET, "MAIL=", + { &vmail, VUNSET, "MAIL=", NULL }, - { &vmpath, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH=", + { &vmpath, VUNSET, "MAILPATH=", NULL }, - { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=" _PATH_DEFPATH, + { &vpath, 0, "PATH=" _PATH_DEFPATH, changepath }, - { &vppid, VSTRFIXED|VTEXTFIXED|VUNSET, "PPID=", + { &vppid, VUNSET, "PPID=", NULL }, /* * vps1 depends on uid */ - { &vps2, VSTRFIXED|VTEXTFIXED, "PS2=> ", + { &vps2, 0, "PS2=> ", NULL }, - { &vps4, VSTRFIXED|VTEXTFIXED, "PS4=+ ", + { &vps4, 0, "PS4=+ ", NULL }, - { &voptind, VSTRFIXED|VTEXTFIXED, "OPTIND=1", +#ifndef NO_HISTORY + { &vterm, VUNSET, "TERM=", + setterm }, +#endif + { &voptind, 0, "OPTIND=1", getoptsreset }, { NULL, 0, NULL, NULL } @@ -122,9 +127,17 @@ STATIC struct var *vartab[VTABSIZE]; -STATIC struct var **hashvar(char *); -STATIC int varequal(char *, char *); -STATIC int localevar(char *); +STATIC const char *const locale_names[7] = { + "LC_COLLATE", "LC_CTYPE", "LC_MONETARY", + "LC_NUMERIC", "LC_TIME", "LC_MESSAGES", NULL +}; +STATIC const int locale_categories[7] = { + LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, LC_TIME, LC_MESSAGES, 0 +}; + +STATIC struct var **hashvar(const char *); +STATIC int varequal(const char *, const char *); +STATIC int localevar(const char *); /* * Initialize the variable symbol tables and import the environment. @@ -132,9 +145,9 @@ #ifdef mkinit INCLUDE "var.h" +MKINIT char **environ; INIT { char **envp; - extern char **environ; initvar(); for (envp = environ ; *envp ; envp++) { @@ -164,8 +177,8 @@ vpp = hashvar(ip->text); vp->next = *vpp; *vpp = vp; - vp->text = ip->text; - vp->flags = ip->flags; + vp->text = __DECONST(char *, ip->text); + vp->flags = ip->flags | VSTRFIXED | VTEXTFIXED; vp->func = ip->func; } } @@ -176,7 +189,7 @@ vpp = hashvar("PS1="); vps1.next = *vpp; *vpp = &vps1; - vps1.text = geteuid() ? "PS1=$ " : "PS1=# "; + vps1.text = __DECONST(char *, geteuid() ? "PS1=$ " : "PS1=# "); vps1.flags = VSTRFIXED|VTEXTFIXED; } if ((vppid.flags & VEXPORT) == 0) { @@ -190,12 +203,14 @@ */ int -setvarsafe(char *name, char *val, int flags) +setvarsafe(const char *name, const char *val, int flags) { struct jmploc jmploc; struct jmploc *const savehandler = handler; int err = 0; + int inton; + inton = is_int_on(); if (setjmp(jmploc.loc)) err = 1; else { @@ -203,6 +218,7 @@ setvar(name, val, flags); } handler = savehandler; + SETINTON(inton); return err; } @@ -212,9 +228,9 @@ */ void -setvar(char *name, char *val, int flags) +setvar(const char *name, const char *val, int flags) { - char *p, *q; + const char *p; int len; int namelen; char *nameeq; @@ -242,25 +258,20 @@ } else { len += strlen(val); } - p = nameeq = ckmalloc(len); - q = name; - while (--namelen >= 0) - *p++ = *q++; - *p++ = '='; - *p = '\0'; + nameeq = ckmalloc(len); + memcpy(nameeq, name, namelen); + nameeq[namelen] = '='; if (val) - scopy(val, p); + scopy(val, nameeq + namelen + 1); + else + nameeq[namelen + 1] = '\0'; setvareq(nameeq, flags); } STATIC int -localevar(char *s) +localevar(const char *s) { - static char *lnames[7] = { - "ALL", "COLLATE", "CTYPE", "MONETARY", - "NUMERIC", "TIME", NULL - }; - char **ss; + const char *const *ss; if (*s != 'L') return 0; @@ -268,8 +279,10 @@ return 1; if (strncmp(s + 1, "C_", 2) != 0) return 0; - for (ss = lnames; *ss ; ss++) - if (varequal(s + 3, *ss)) + if (varequal(s + 3, "ALL")) + return 1; + for (ss = locale_names; *ss ; ss++) + if (varequal(s + 3, *ss + 3)) return 1; return 0; } @@ -280,7 +293,7 @@ * pointer into environ where the string should not be manipulated. */ static void -change_env(char *s, int set) +change_env(const char *s, int set) { char *eqp; char *ss; @@ -391,7 +404,7 @@ */ char * -lookupvar(char *name) +lookupvar(const char *name) { struct var *v; @@ -414,7 +427,7 @@ */ char * -bltinlookup(char *name, int doall) +bltinlookup(const char *name, int doall) { struct strlist *sp; struct var *v; @@ -435,6 +448,61 @@ } +/* + * Set up locale for a builtin (LANG/LC_* assignments). + */ +void +bltinsetlocale(void) +{ + struct strlist *lp; + int act = 0; + char *loc, *locdef; + int i; + + for (lp = cmdenviron ; lp ; lp = lp->next) { + if (localevar(lp->text)) { + act = 1; + break; + } + } + if (!act) + return; + loc = bltinlookup("LC_ALL", 0); + INTOFF; + if (loc != NULL) { + setlocale(LC_ALL, loc); + INTON; + return; + } + locdef = bltinlookup("LANG", 0); + for (i = 0; locale_names[i] != NULL; i++) { + loc = bltinlookup(locale_names[i], 0); + if (loc == NULL) + loc = locdef; + if (loc != NULL) + setlocale(locale_categories[i], loc); + } + INTON; +} + +/* + * Undo the effect of bltinlocaleset(). + */ +void +bltinunsetlocale(void) +{ + struct strlist *lp; + + INTOFF; + for (lp = cmdenviron ; lp ; lp = lp->next) { + if (localevar(lp->text)) { + setlocale(LC_ALL, ""); + return; + } + } + INTON; +} + /* * Generate a list of exported variables. This routine is used to construct @@ -472,9 +540,9 @@ * VSTACK set since these are currently allocated on the stack. */ -#ifdef mkinit MKINIT void shprocvar(void); +#ifdef mkinit SHELLPROC { shprocvar(); } @@ -798,7 +866,7 @@ */ int -unsetvar(char *s) +unsetvar(const char *s) { struct var **vpp; struct var *vp; @@ -838,7 +906,7 @@ */ STATIC struct var ** -hashvar(char *p) +hashvar(const char *p) { unsigned int hashval; @@ -857,7 +925,7 @@ */ STATIC int -varequal(char *p, char *q) +varequal(const char *p, const char *q) { while (*p == *q++) { if (*p++ == '=') Index: bin/sh/memalloc.c =================================================================== --- bin/sh/memalloc.c (revision 209146) +++ bin/sh/memalloc.c (working copy) @@ -95,7 +95,7 @@ */ char * -savestr(char *s) +savestr(const char *s) { char *p; Index: bin/sh/main.h =================================================================== --- bin/sh/main.h (revision 209146) +++ bin/sh/main.h (working copy) @@ -35,8 +35,9 @@ extern int rootpid; /* pid of main shell */ extern int rootshell; /* true if we aren't a child of the main shell */ +extern struct jmploc main_handler; /* top level exception handler */ -void readcmdfile(char *); +void readcmdfile(const char *); void cmdloop(int); int dotcmd(int, char **); int exitcmd(int, char **); Index: bin/sh/exec.h =================================================================== --- bin/sh/exec.h (revision 209146) +++ bin/sh/exec.h (working copy) @@ -57,20 +57,24 @@ }; -extern char *pathopt; /* set by padvance */ +/* action to find_command() */ +#define DO_ERR 0x01 /* prints errors */ +#define DO_NOFUNC 0x02 /* don't return shell functions, for command */ + +extern const char *pathopt; /* set by padvance */ extern int exerrno; /* last exec error */ -void shellexec(char **, char **, char *, int); -char *padvance(char **, char *); +void shellexec(char **, char **, const char *, int) __dead2; +char *padvance(const char **, const char *); int hashcmd(int, char **); -void find_command(char *, struct cmdentry *, int, char *); -int find_builtin(char *, int *); +void find_command(const char *, struct cmdentry *, int, const char *); +int find_builtin(const char *, int *); void hashcd(void); void changepath(const char *); void deletefuncs(void); -void addcmdentry(char *, struct cmdentry *); -void defun(char *, union node *); -int unsetfunc(char *); -int typecmd_impl(int, char **, int); +void addcmdentry(const char *, struct cmdentry *); +void defun(const char *, union node *); +int unsetfunc(const char *); +int typecmd_impl(int, char **, int, const char *); int typecmd(int, char **); void clearcmdentry(int); Index: bin/sh/alias.c =================================================================== --- bin/sh/alias.c (revision 209146) +++ bin/sh/alias.c (working copy) @@ -52,13 +52,13 @@ STATIC struct alias *atab[ATABSIZE]; STATIC int aliases; -STATIC void setalias(char *, char *); +STATIC void setalias(const char *, const char *); STATIC int unalias(const char *); STATIC struct alias **hashalias(const char *); STATIC void -setalias(char *name, char *val) +setalias(const char *name, const char *val) { struct alias *ap, **app; @@ -176,7 +176,7 @@ } struct alias * -lookupalias(char *name, int check) +lookupalias(const char *name, int check) { struct alias *ap = *hashalias(name); Index: bin/sh/cd.h =================================================================== --- bin/sh/cd.h (revision 209146) +++ bin/sh/cd.h (working copy) @@ -29,6 +29,6 @@ * $FreeBSD$ */ -char *getpwd(void); +void pwd_init(int); int cdcmd (int, char **); int pwdcmd(int, char **); Index: bin/sh/mkinit.c =================================================================== --- bin/sh/mkinit.c (revision 209146) +++ bin/sh/mkinit.c (working copy) @@ -102,9 +102,9 @@ */ struct event { - char *name; /* name of event (e.g. INIT) */ - char *routine; /* name of routine called on event */ - char *comment; /* comment describing routine */ + const char *name; /* name of event (e.g. INIT) */ + const char *routine; /* name of routine called on event */ + const char *comment; /* comment describing routine */ struct text code; /* code for handling event */ }; @@ -140,7 +140,7 @@ }; -char *curfile; /* current file */ +const char *curfile; /* current file */ int linno; /* current line */ char *header_files[200]; /* list of header files */ struct text defines; /* #define statements */ @@ -148,20 +148,20 @@ int amiddecls; /* for formatting */ -void readfile(char *); -int match(char *, char *); -int gooddefine(char *); -void doevent(struct event *, FILE *, char *); +void readfile(const char *); +int match(const char *, const char *); +int gooddefine(const char *); +void doevent(struct event *, FILE *, const char *); void doinclude(char *); void dodecl(char *, FILE *); void output(void); -void addstr(char *, struct text *); +void addstr(const char *, struct text *); void addchar(int, struct text *); void writetext(struct text *, FILE *); -FILE *ckfopen(char *, char *); +FILE *ckfopen(const char *, const char *); void *ckmalloc(size_t); -char *savestr(char *); -void error(char *); +char *savestr(const char *); +void error(const char *); #define equal(s1, s2) (strcmp(s1, s2) == 0) @@ -170,9 +170,9 @@ { char **ap; - header_files[0] = "\"shell.h\""; - header_files[1] = "\"mystring.h\""; - header_files[2] = "\"init.h\""; + header_files[0] = savestr("\"shell.h\""); + header_files[1] = savestr("\"mystring.h\""); + header_files[2] = savestr("\"init.h\""); for (ap = argv + 1 ; *ap ; ap++) readfile(*ap); output(); @@ -186,7 +186,7 @@ */ void -readfile(char *fname) +readfile(const char *fname) { FILE *fp; char line[1024]; @@ -230,9 +230,9 @@ int -match(char *name, char *line) +match(const char *name, const char *line) { - char *p, *q; + const char *p, *q; p = name, q = line; while (*p) { @@ -246,9 +246,9 @@ int -gooddefine(char *line) +gooddefine(const char *line) { - char *p; + const char *p; if (! match("#define", line)) return 0; /* not a define */ @@ -269,11 +269,11 @@ void -doevent(struct event *ep, FILE *fp, char *fname) +doevent(struct event *ep, FILE *fp, const char *fname) { char line[1024]; int indent; - char *p; + const char *p; sprintf(line, "\n /* from %s: */\n", fname); addstr(line, &ep->code); @@ -407,7 +407,7 @@ */ void -addstr(char *s, struct text *text) +addstr(const char *s, struct text *text) { while (*s) { if (--text->nleft < 0) @@ -452,7 +452,7 @@ } FILE * -ckfopen(char *file, char *mode) +ckfopen(const char *file, const char *mode) { FILE *fp; @@ -474,7 +474,7 @@ } char * -savestr(char *s) +savestr(const char *s) { char *p; @@ -484,7 +484,7 @@ } void -error(char *msg) +error(const char *msg) { if (curfile != NULL) fprintf(stderr, "%s:%d: ", curfile, linno); Index: bin/sh/options.c =================================================================== --- bin/sh/options.c (revision 209146) +++ bin/sh/options.c (working copy) @@ -64,7 +64,7 @@ struct shparam shellparam; /* current positional parameters */ char **argptr; /* argument list for builtin commands */ char *shoptarg; /* set by nextopt (like getopt) */ -char *optptr; /* used by nextopt */ +char *nextopt_optptr; /* used by nextopt */ char *minusc; /* argument to -c option */ @@ -93,8 +93,11 @@ options(1); if (*argptr == NULL && minusc == NULL) sflag = 1; - if (iflag == 2 && sflag == 1 && isatty(0) && isatty(1)) + if (iflag != 0 && sflag == 1 && isatty(0) && isatty(1)) { iflag = 1; + if (Eflag == 2) + Eflag = 1; + } if (mflag == 2) mflag = iflag; for (i = 0; i < NOPTS; i++) @@ -554,12 +557,13 @@ */ int -nextopt(char *optstring) +nextopt(const char *optstring) { - char *p, *q; + char *p; + const char *q; char c; - if ((p = optptr) == NULL || *p == '\0') { + if ((p = nextopt_optptr) == NULL || *p == '\0') { p = *argptr; if (p == NULL || *p != '-' || *++p == '\0') return '\0'; @@ -580,6 +584,6 @@ shoptarg = p; p = NULL; } - optptr = p; + nextopt_optptr = p; return c; } Index: bin/sh/eval.h =================================================================== --- bin/sh/eval.h (revision 209146) +++ bin/sh/eval.h (working copy) @@ -35,6 +35,7 @@ extern char *commandname; /* currently executing command */ extern int exitstatus; /* exit status of last command */ +extern int oexitstatus; /* saved exit status */ extern struct strlist *cmdenviron; /* environment for builtin command */ Index: bin/sh/parser.c =================================================================== --- bin/sh/parser.c (revision 209146) +++ bin/sh/parser.c (working copy) @@ -79,10 +79,13 @@ int striptabs; /* if set, strip leading tabs */ }; +struct parser_temp { + struct parser_temp *next; + void *data; +}; STATIC struct heredoc *heredoclist; /* list of here documents to read */ -STATIC int parsebackquote; /* nonzero if we are inside backquotes */ STATIC int doprompt; /* if set, prompt the user */ STATIC int needprompt; /* true if interactive and at start of line */ STATIC int lasttoken; /* last token read */ @@ -95,6 +98,7 @@ STATIC int quoteflag; /* set if (part of) last token was quoted */ STATIC int startlinno; /* line # where last token started */ STATIC int funclinno; /* line # where the current function started */ +STATIC struct parser_temp *parser_temp; /* XXX When 'noaliases' is set to one, no alias expansion takes place. */ static int noaliases = 0; @@ -114,10 +118,77 @@ STATIC int readtoken1(int, char const *, char *, int); STATIC int noexpand(char *); STATIC void synexpect(int); -STATIC void synerror(char *); +STATIC void synerror(const char *); STATIC void setprompt(int); +STATIC void * +parser_temp_alloc(size_t len) +{ + struct parser_temp *t; + + INTOFF; + t = ckmalloc(sizeof(*t)); + t->data = NULL; + t->next = parser_temp; + parser_temp = t; + t->data = ckmalloc(len); + INTON; + return t->data; +} + + +STATIC void * +parser_temp_realloc(void *ptr, size_t len) +{ + struct parser_temp *t; + + INTOFF; + t = parser_temp; + if (ptr != t->data) + error("bug: parser_temp_realloc misused"); + t->data = ckrealloc(t->data, len); + INTON; + return t->data; +} + + +STATIC void +parser_temp_free_upto(void *ptr) +{ + struct parser_temp *t; + int done = 0; + + INTOFF; + while (parser_temp != NULL && !done) { + t = parser_temp; + parser_temp = t->next; + done = t->data == ptr; + ckfree(t->data); + ckfree(t); + } + INTON; + if (!done) + error("bug: parser_temp_free_upto misused"); +} + + +STATIC void +parser_temp_free_all(void) +{ + struct parser_temp *t; + + INTOFF; + while (parser_temp != NULL) { + t = parser_temp; + parser_temp = t->next; + ckfree(t->data); + ckfree(t); + } + INTON; +} + + /* * Read and parse a command. Returns NEOF on end of file. (NULL is a * valid parse tree indicating a blank line.) @@ -128,6 +199,12 @@ { int t; + /* This assumes the parser is not re-entered, + * which could happen if we add command substitution on PS1/PS2. + */ + parser_temp_free_all(); + heredoclist = NULL; + tokpushback = 0; doprompt = interact; if (doprompt) @@ -864,6 +941,188 @@ } +#define MAXNEST_STATIC 8 +struct tokenstate +{ + const char *syntax; /* *SYNTAX */ + int parenlevel; /* levels of parentheses in arithmetic */ + enum tokenstate_category + { + TSTATE_TOP, + TSTATE_VAR_OLD, /* ${var+-=?}, inherits dquotes */ + TSTATE_VAR_NEW, /* other ${var...}, own dquote state */ + TSTATE_ARITH + } category; +}; + + +/* + * Called to parse command substitutions. + */ + +STATIC char * +parsebackq(char *out, struct nodelist **pbqlist, + int oldstyle, int dblquote, int quoted) +{ + struct nodelist **nlpp; + union node *n; + char *volatile str; + struct jmploc jmploc; + struct jmploc *const savehandler = handler; + int savelen; + int saveprompt; + const int bq_startlinno = plinno; + char *volatile ostr = NULL; + struct parsefile *const savetopfile = getcurrentfile(); + struct heredoc *const saveheredoclist = heredoclist; + struct heredoc *here; + + str = NULL; + if (setjmp(jmploc.loc)) { + popfilesupto(savetopfile); + if (str) + ckfree(str); + if (ostr) + ckfree(ostr); + heredoclist = saveheredoclist; + handler = savehandler; + if (exception == EXERROR) { + startlinno = bq_startlinno; + synerror("Error in command substitution"); + } + longjmp(handler->loc, 1); + } + INTOFF; + savelen = out - stackblock(); + if (savelen > 0) { + str = ckmalloc(savelen); + memcpy(str, stackblock(), savelen); + } + handler = &jmploc; + heredoclist = NULL; + INTON; + if (oldstyle) { + /* We must read until the closing backquote, giving special + treatment to some slashes, and then push the string and + reread it as input, interpreting it normally. */ + char *oout; + int c; + int olen; + + + STARTSTACKSTR(oout); + for (;;) { + if (needprompt) { + setprompt(2); + needprompt = 0; + } + switch (c = pgetc()) { + case '`': + goto done; + + case '\\': + if ((c = pgetc()) == '\n') { + plinno++; + if (doprompt) + setprompt(2); + else + setprompt(0); + /* + * If eating a newline, avoid putting + * the newline into the new character + * stream (via the STPUTC after the + * switch). + */ + continue; + } + if (c != '\\' && c != '`' && c != '$' + && (!dblquote || c != '"')) + STPUTC('\\', oout); + break; + + case '\n': + plinno++; + needprompt = doprompt; + break; + + case PEOF: + startlinno = plinno; + synerror("EOF in backquote substitution"); + break; + + default: + break; + } + STPUTC(c, oout); + } +done: + STPUTC('\0', oout); + olen = oout - stackblock(); + INTOFF; + ostr = ckmalloc(olen); + memcpy(ostr, stackblock(), olen); + setinputstring(ostr, 1); + INTON; + } + nlpp = pbqlist; + while (*nlpp) + nlpp = &(*nlpp)->next; + *nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist)); + (*nlpp)->next = NULL; + + if (oldstyle) { + saveprompt = doprompt; + doprompt = 0; + } + + n = list(0); + + if (oldstyle) + doprompt = saveprompt; + else { + if (readtoken() != TRP) + synexpect(TRP); + } + + (*nlpp)->n = n; + if (oldstyle) { + /* + * Start reading from old file again, ignoring any pushed back + * tokens left from the backquote parsing + */ + popfile(); + tokpushback = 0; + } + while (stackblocksize() <= savelen) + growstackblock(); + STARTSTACKSTR(out); + INTOFF; + if (str) { + memcpy(out, str, savelen); + STADJUST(savelen, out); + ckfree(str); + str = NULL; + } + if (ostr) { + ckfree(ostr); + ostr = NULL; + } + here = saveheredoclist; + if (here != NULL) { + while (here->next != NULL) + here = here->next; + here->next = heredoclist; + heredoclist = saveheredoclist; + } + handler = savehandler; + INTON; + if (quoted) + USTPUTC(CTLBACKQ | CTLQUOTE, out); + else + USTPUTC(CTLBACKQ, out); + return out; +} + /* * If eofmark is NULL, read a word or a redirection symbol. If eofmark @@ -880,12 +1139,10 @@ #define CHECKEND() {goto checkend; checkend_return:;} #define PARSEREDIR() {goto parseredir; parseredir_return:;} #define PARSESUB() {goto parsesub; parsesub_return:;} -#define PARSEBACKQOLD() {oldstyle = 1; goto parsebackq; parsebackq_oldreturn:;} -#define PARSEBACKQNEW() {oldstyle = 0; goto parsebackq; parsebackq_newreturn:;} #define PARSEARITH() {goto parsearith; parsearith_return:;} STATIC int -readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs) +readtoken1(int firstc, char const *initialsyntax, char *eofmark, int striptabs) { int c = firstc; char *out; @@ -893,23 +1150,21 @@ char line[EOFMARKLEN + 1]; struct nodelist *bqlist; int quotef; - int dblquote; - int varnest; /* levels of variables expansion */ - int arinest; /* levels of arithmetic expansion */ - int parenlevel; /* levels of parens in arithmetic */ - int oldstyle; - char const *prevsyntax; /* syntax before arithmetic */ + int newvarnest; + int level; int synentry; + struct tokenstate state_static[MAXNEST_STATIC]; + int maxnest = MAXNEST_STATIC; + struct tokenstate *state = state_static; startlinno = plinno; - dblquote = 0; - if (syntax == DQSYNTAX) - dblquote = 1; quotef = 0; bqlist = NULL; - varnest = 0; - arinest = 0; - parenlevel = 0; + newvarnest = 0; + level = 0; + state[level].syntax = initialsyntax; + state[level].parenlevel = 0; + state[level].category = TSTATE_TOP; STARTSTACKSTR(out); loop: { /* for each line, until end of word */ @@ -917,11 +1172,11 @@ for (;;) { /* until end of line or end of word */ CHECKSTRSPACE(3, out); /* permit 3 calls to USTPUTC */ - synentry = syntax[c]; + synentry = state[level].syntax[c]; switch(synentry) { case CNL: /* '\n' */ - if (syntax == BASESYNTAX) + if (state[level].syntax == BASESYNTAX) goto endword; /* exit outer loop */ USTPUTC(c, out); plinno++; @@ -935,7 +1190,7 @@ USTPUTC(c, out); break; case CCTL: - if (eofmark == NULL || dblquote) + if (eofmark == NULL || initialsyntax != SQSYNTAX) USTPUTC(CTLESC, out); USTPUTC(c, out); break; @@ -951,41 +1206,37 @@ else setprompt(0); } else { - if (dblquote && c != '\\' && - c != '`' && c != '$' && - (c != '"' || eofmark != NULL)) + if (state[level].syntax == DQSYNTAX && + c != '\\' && c != '`' && c != '$' && + (c != '"' || (eofmark != NULL && + newvarnest == 0)) && + (c != '}' || state[level].category != TSTATE_VAR_OLD)) USTPUTC('\\', out); if (SQSYNTAX[c] == CCTL) USTPUTC(CTLESC, out); - else if (eofmark == NULL) + else if (eofmark == NULL || + newvarnest > 0) USTPUTC(CTLQUOTEMARK, out); USTPUTC(c, out); quotef++; } break; case CSQUOTE: - if (eofmark == NULL) - USTPUTC(CTLQUOTEMARK, out); - syntax = SQSYNTAX; + USTPUTC(CTLQUOTEMARK, out); + state[level].syntax = SQSYNTAX; break; case CDQUOTE: - if (eofmark == NULL) - USTPUTC(CTLQUOTEMARK, out); - syntax = DQSYNTAX; - dblquote = 1; + USTPUTC(CTLQUOTEMARK, out); + state[level].syntax = DQSYNTAX; break; case CENDQUOTE: - if (eofmark != NULL && arinest == 0 && - varnest == 0) { + if (eofmark != NULL && newvarnest == 0) USTPUTC(c, out); - } else { - if (arinest) { - syntax = ARISYNTAX; - dblquote = 0; - } else if (eofmark == NULL) { - syntax = BASESYNTAX; - dblquote = 0; - } + else { + if (state[level].category == TSTATE_ARITH) + state[level].syntax = ARISYNTAX; + else + state[level].syntax = BASESYNTAX; quotef++; } break; @@ -993,30 +1244,33 @@ PARSESUB(); /* parse substitution */ break; case CENDVAR: /* '}' */ - if (varnest > 0) { - varnest--; + if (level > 0 && + (state[level].category == TSTATE_VAR_OLD || + state[level].category == TSTATE_VAR_NEW)) { + if (state[level].category == TSTATE_VAR_OLD) + state[level - 1].syntax = state[level].syntax; + else + newvarnest--; + level--; USTPUTC(CTLENDVAR, out); } else { USTPUTC(c, out); } break; case CLP: /* '(' in arithmetic */ - parenlevel++; + state[level].parenlevel++; USTPUTC(c, out); break; case CRP: /* ')' in arithmetic */ - if (parenlevel > 0) { + if (state[level].parenlevel > 0) { USTPUTC(c, out); - --parenlevel; + --state[level].parenlevel; } else { if (pgetc() == ')') { - if (--arinest == 0) { + if (level > 0 && + state[level].category == TSTATE_ARITH) { + level--; USTPUTC(CTLENDARI, out); - syntax = prevsyntax; - if (syntax == DQSYNTAX) - dblquote = 1; - else - dblquote = 0; } else USTPUTC(')', out); } else { @@ -1030,12 +1284,15 @@ } break; case CBQUOTE: /* '`' */ - PARSEBACKQOLD(); + out = parsebackq(out, &bqlist, 1, + state[level].syntax == DQSYNTAX && + (eofmark == NULL || newvarnest > 0), + state[level].syntax == DQSYNTAX || state[level].syntax == ARISYNTAX); break; case CEOF: goto endword; /* exit outer loop */ default: - if (varnest == 0) + if (level == 0) goto endword; /* exit outer loop */ USTPUTC(c, out); } @@ -1043,14 +1300,17 @@ } } endword: - if (syntax == ARISYNTAX) + if (state[level].syntax == ARISYNTAX) synerror("Missing '))'"); - if (syntax != BASESYNTAX && ! parsebackquote && eofmark == NULL) + if (state[level].syntax != BASESYNTAX && eofmark == NULL) synerror("Unterminated quoted string"); - if (varnest != 0) { + if (state[level].category == TSTATE_VAR_OLD || + state[level].category == TSTATE_VAR_NEW) { startlinno = plinno; synerror("Missing '}'"); } + if (state != state_static) + parser_temp_free_upto(state); USTPUTC('\0', out); len = out - stackblock(); out = stackblock(); @@ -1073,7 +1333,6 @@ /* end of readtoken routine */ - /* * Check to see whether we are at the end of the here document. When this * is called, c is set to the first character of the next input line. If @@ -1190,7 +1449,11 @@ PARSEARITH(); } else { pungetc(); - PARSEBACKQNEW(); + out = parsebackq(out, &bqlist, 0, + state[level].syntax == DQSYNTAX && + (eofmark == NULL || newvarnest > 0), + state[level].syntax == DQSYNTAX || + state[level].syntax == ARISYNTAX); } } else { USTPUTC(CTLVAR, out); @@ -1245,6 +1508,8 @@ subtype = VSERROR; if (c == '}') pungetc(); + else if (c == '\n' || c == PEOF) + synerror("Unexpected end of line in substitution"); else USTPUTC(c, out); } else { @@ -1261,6 +1526,8 @@ default: p = strchr(types, c); if (p == NULL) { + if (c == '\n' || c == PEOF) + synerror("Unexpected end of line in substitution"); if (flags == VSNUL) STPUTC(':', out); STPUTC(c, out); @@ -1286,192 +1553,74 @@ pungetc(); } STPUTC('=', out); - if (subtype != VSLENGTH && (dblquote || arinest)) + if (subtype != VSLENGTH && (state[level].syntax == DQSYNTAX || + state[level].syntax == ARISYNTAX)) flags |= VSQUOTE; *(stackblock() + typeloc) = subtype | flags; - if (subtype != VSNORMAL) - varnest++; - } - goto parsesub_return; -} - - -/* - * Called to parse command substitutions. Newstyle is set if the command - * is enclosed inside $(...); nlpp is a pointer to the head of the linked - * list of commands (passed by reference), and savelen is the number of - * characters on the top of the stack which must be preserved. - */ - -parsebackq: { - struct nodelist **nlpp; - int savepbq; - union node *n; - char *volatile str; - struct jmploc jmploc; - struct jmploc *const savehandler = handler; - int savelen; - int saveprompt; - const int bq_startlinno = plinno; - - savepbq = parsebackquote; - if (setjmp(jmploc.loc)) { - if (str) - ckfree(str); - parsebackquote = 0; - handler = savehandler; - if (exception == EXERROR) { - startlinno = bq_startlinno; - synerror("Error in command substitution"); - } - longjmp(handler->loc, 1); - } - INTOFF; - str = NULL; - savelen = out - stackblock(); - if (savelen > 0) { - str = ckmalloc(savelen); - memcpy(str, stackblock(), savelen); - } - handler = &jmploc; - INTON; - if (oldstyle) { - /* We must read until the closing backquote, giving special - treatment to some slashes, and then push the string and - reread it as input, interpreting it normally. */ - char *out; - int c; - int savelen; - char *str; - - - STARTSTACKSTR(out); - for (;;) { - if (needprompt) { - setprompt(2); - needprompt = 0; + if (subtype != VSNORMAL) { + if (level + 1 >= maxnest) { + maxnest *= 2; + if (state == state_static) { + state = parser_temp_alloc( + maxnest * sizeof(*state)); + memcpy(state, state_static, + MAXNEST_STATIC * sizeof(*state)); + } else + state = parser_temp_realloc(state, + maxnest * sizeof(*state)); } - switch (c = pgetc()) { - case '`': - goto done; - - case '\\': - if ((c = pgetc()) == '\n') { - plinno++; - if (doprompt) - setprompt(2); - else - setprompt(0); - /* - * If eating a newline, avoid putting - * the newline into the new character - * stream (via the STPUTC after the - * switch). - */ - continue; - } - if (c != '\\' && c != '`' && c != '$' - && (!dblquote || c != '"')) - STPUTC('\\', out); - break; - - case '\n': - plinno++; - needprompt = doprompt; - break; - - case PEOF: - startlinno = plinno; - synerror("EOF in backquote substitution"); - break; - - default: - break; + level++; + state[level].parenlevel = 0; + if (subtype == VSMINUS || subtype == VSPLUS || + subtype == VSQUESTION || subtype == VSASSIGN) { + /* + * For operators that were in the Bourne shell, + * inherit the double-quote state. + */ + state[level].syntax = state[level - 1].syntax; + state[level].category = TSTATE_VAR_OLD; + } else { + /* + * The other operators take a pattern, + * so go to BASESYNTAX. + * Also, ' and " are now special, even + * in here documents. + */ + state[level].syntax = BASESYNTAX; + state[level].category = TSTATE_VAR_NEW; + newvarnest++; } - STPUTC(c, out); - } -done: - STPUTC('\0', out); - savelen = out - stackblock(); - if (savelen > 0) { - str = ckmalloc(savelen); - memcpy(str, stackblock(), savelen); - setinputstring(str, 1); - } - } - nlpp = &bqlist; - while (*nlpp) - nlpp = &(*nlpp)->next; - *nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist)); - (*nlpp)->next = NULL; - parsebackquote = oldstyle; - - if (oldstyle) { - saveprompt = doprompt; - doprompt = 0; - } - - n = list(0); - - if (oldstyle) - doprompt = saveprompt; - else { - if (readtoken() != TRP) - synexpect(TRP); - } - - (*nlpp)->n = n; - if (oldstyle) { - /* - * Start reading from old file again, ignoring any pushed back - * tokens left from the backquote parsing - */ - popfile(); - tokpushback = 0; - } - while (stackblocksize() <= savelen) - growstackblock(); - STARTSTACKSTR(out); - if (str) { - memcpy(out, str, savelen); - STADJUST(savelen, out); - INTOFF; - ckfree(str); - str = NULL; - INTON; + } } - parsebackquote = savepbq; - handler = savehandler; - if (arinest || dblquote) - USTPUTC(CTLBACKQ | CTLQUOTE, out); - else - USTPUTC(CTLBACKQ, out); - if (oldstyle) - goto parsebackq_oldreturn; - else - goto parsebackq_newreturn; + goto parsesub_return; } + /* * Parse an arithmetic expansion (indicate start of one and set state) */ parsearith: { - if (++arinest == 1) { - prevsyntax = syntax; - syntax = ARISYNTAX; - USTPUTC(CTLARI, out); - if (dblquote) - USTPUTC('"',out); - else - USTPUTC(' ',out); - } else { - /* - * we collapse embedded arithmetic expansion to - * parenthesis, which should be equivalent - */ - USTPUTC('(', out); + if (level + 1 >= maxnest) { + maxnest *= 2; + if (state == state_static) { + state = parser_temp_alloc( + maxnest * sizeof(*state)); + memcpy(state, state_static, + MAXNEST_STATIC * sizeof(*state)); + } else + state = parser_temp_realloc(state, + maxnest * sizeof(*state)); } + level++; + state[level].syntax = ARISYNTAX; + state[level].parenlevel = 0; + state[level].category = TSTATE_ARITH; + USTPUTC(CTLARI, out); + if (state[level - 1].syntax == DQSYNTAX) + USTPUTC('"',out); + else + USTPUTC(' ',out); goto parsearith_return; } @@ -1516,9 +1665,9 @@ */ int -goodname(char *name) +goodname(const char *name) { - char *p; + const char *p; p = name; if (! is_name(*p)) @@ -1553,11 +1702,11 @@ STATIC void -synerror(char *msg) +synerror(const char *msg) { if (commandname) - outfmt(&errout, "%s: %d: ", commandname, startlinno); - outfmt(&errout, "Syntax error: %s\n", msg); + outfmt(out2, "%s: %d: ", commandname, startlinno); + outfmt(out2, "Syntax error: %s\n", msg); error((char *)NULL); } @@ -1569,7 +1718,10 @@ #ifndef NO_HISTORY if (!el) #endif + { out2str(getprompt(NULL)); + flushout(out2); + } } /* @@ -1582,13 +1734,14 @@ static char ps[PROMPTLEN]; char *fmt; int i, j, trim; + static char internal_error[] = ""; /* * Select prompt format. */ switch (whichprompt) { case 0: - fmt = ""; + fmt = nullstr; break; case 1: fmt = ps1val(); @@ -1597,7 +1750,7 @@ fmt = ps2val(); break; default: - return ""; + return internal_error; } /* Index: bin/sh/jobs.c =================================================================== --- bin/sh/jobs.c (revision 209146) +++ bin/sh/jobs.c (working copy) @@ -91,8 +91,9 @@ STATIC struct job *getjob(char *); STATIC pid_t dowait(int, struct job *); STATIC pid_t waitproc(int, int *); +STATIC void checkzombies(void); STATIC void cmdtxt(union node *); -STATIC void cmdputs(char *); +STATIC void cmdputs(const char *); #if JOBS STATIC void setcurjob(struct job *); STATIC void deljob(struct job *); @@ -146,7 +147,7 @@ do { /* while we are in the background */ initialpgrp = tcgetpgrp(ttyfd); if (initialpgrp < 0) { -out: out2str("sh: can't access tty; job control turned off\n"); +out: out2fmt_flush("sh: can't access tty; job control turned off\n"); mflag = 0; return; } @@ -400,7 +401,7 @@ struct job *jp; TRACE(("showjobs(%d) called\n", change)); - while (dowait(0, (struct job *)NULL) > 0); + checkzombies(); for (jobno = 1, jp = jobtab ; jobno <= njobs ; jobno++, jp++) { if (! jp->used) continue; @@ -742,6 +743,8 @@ TRACE(("forkshell(%%%d, %p, %d) called\n", jp - jobtab, (void *)n, mode)); INTOFF; + if (mode == FORK_BG) + checkzombies(); flushall(); pid = fork(); if (pid == -1) { @@ -757,6 +760,7 @@ TRACE(("Child shell %d\n", (int)getpid())); wasroot = rootshell; rootshell = 0; + handler = &main_handler; closescript(); INTON; clear_traps(); @@ -862,6 +866,7 @@ { #if JOBS pid_t mypgrp = getpgrp(); + int propagate_int = jp->jobctl && jp->foreground; #endif int status; int st; @@ -899,6 +904,11 @@ else CLEAR_PENDING_INT; } +#if JOBS + else if (rootshell && iflag && propagate_int && + WIFSIGNALED(status) && WTERMSIG(status) == SIGINT) + kill(getpid(), SIGINT); +#endif INTON; return st; } @@ -1046,7 +1056,7 @@ if (jp->used == 0) continue; if (jp->state == JOBSTOPPED) { - out2str("You have stopped jobs.\n"); + out2fmt_flush("You have stopped jobs.\n"); job_warning = 2; return (1); } @@ -1055,6 +1065,15 @@ return (0); } + +STATIC void +checkzombies(void) +{ + while (njobs > 0 && dowait(0, NULL) > 0) + ; +} + + /* * Return a string identifying a command (to be printed by the * jobs command. @@ -1082,7 +1101,7 @@ { union node *np; struct nodelist *lp; - char *p; + const char *p; int i; char s[2]; @@ -1211,9 +1230,10 @@ STATIC void -cmdputs(char *s) +cmdputs(const char *s) { - char *p, *q; + const char *p; + char *q; char c; int subtype = 0; Index: bin/sh/arith.y =================================================================== --- bin/sh/arith.y (revision 209146) +++ bin/sh/arith.y (working copy) @@ -85,9 +85,9 @@ ARITH_LPAREN expr ARITH_RPAREN { $$ = $2; } | expr ARITH_OR expr - { $$ = $1 ? $1 : $3 ? $3 : 0; } | + { $$ = $1 || $3; } | expr ARITH_AND expr - { $$ = $1 ? ( $3 ? $3 : 0 ) : 0; } | + { $$ = $1 && $3; } | expr ARITH_BOR expr { $$ = $1 | $3; } | expr ARITH_BXOR expr @@ -265,7 +265,7 @@ #define YYPARSE_PARAM_TYPE arith_t * #define YYPARSE_PARAM result -char *arith_buf, *arith_startbuf; +const char *arith_buf, *arith_startbuf; int yylex(void); int yyparse(YYPARSE_PARAM_TYPE); @@ -284,10 +284,12 @@ } arith_t -arith(char *s) +arith(const char *s) { arith_t result; + struct stackmark smark; + setstackmark(&smark); arith_buf = arith_startbuf = s; INTOFF; @@ -295,11 +297,13 @@ arith_lex_reset(); /* Reprime lex. */ INTON; + popstackmark(&smark); + return result; } static void -yyerror(char *s) +yyerror(const char *s) { yyerrok; @@ -314,7 +318,7 @@ int expcmd(int argc, char **argv) { - char *p; + const char *p; char *concat; char **ap; arith_t i; @@ -354,7 +358,7 @@ printf("%d\n", exp(argv[1])); } -error(char *s) +error(const char *s) { fprintf(stderr, "exp: %s\n", s); exit(1); Index: bin/sh/var.h =================================================================== --- bin/sh/var.h (revision 209146) +++ bin/sh/var.h (working copy) @@ -77,6 +77,7 @@ extern struct var vps4; #ifndef NO_HISTORY extern struct var vhistsize; +extern struct var vterm; #endif /* @@ -96,19 +97,21 @@ #define optindval() (voptind.text + 7) #ifndef NO_HISTORY #define histsizeval() (vhistsize.text + 9) +#define termval() (vterm.text + 5) #endif #define mpathset() ((vmpath.flags & VUNSET) == 0) void initvar(void); -void setvar(char *, char *, int); +void setvar(const char *, const char *, int); void setvareq(char *, int); struct strlist; void listsetvar(struct strlist *); -char *lookupvar(char *); -char *bltinlookup(char *, int); +char *lookupvar(const char *); +char *bltinlookup(const char *, int); +void bltinsetlocale(void); +void bltinunsetlocale(void); char **environment(void); -void shprocvar(void); int showvarscmd(int, char **); int exportcmd(int, char **); int localcmd(int, char **); @@ -116,5 +119,5 @@ void poplocalvars(void); int setvarcmd(int, char **); int unsetcmd(int, char **); -int unsetvar(char *); -int setvarsafe(char *, char *, int); +int unsetvar(const char *); +int setvarsafe(const char *, const char *, int); --------------090303010205030705070302 Content-Type: application/octet-stream; name="sh-libedit-include-stable8-r209146.diff.sig" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="sh-libedit-include-stable8-r209146.diff.sig" iQEcBAABAgAGBQJMGLtUAAoJEJBXh4mJ2FR+tmoH/0vIWZ6U1UUzAQcf8/acMq+WMRePnf4a zE1LImSuJFQSQbFsS8IV3mO6oOw49Pi/wHH+lfqNiIPS4hEXQ+AkfLEXYeqmd5uwpcTrpkkX yMew4cBuOIEZ/yA6UIGezV9WcIupwELE1H7zBSl1QcdcCEaIgGEIFi2vv9cootrWBkHnmTT6 HJNVfsnnZP+2pAlA+s+ylNko5hE/gQd8tYRSoMCbfX9vho0WHJqsTM7mh4CnPLLor9XybLUo u7oVqgnZkhRmf5bcKxlLUSh2W2OX6hlYnNLImB/3eWHh6LC22V+94qlK6hUG/ea1DYeOUv4l Sf7xi4lO5/pWEaEB0hKvTtc= --------------090303010205030705070302-- From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 12:00:48 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD77A1065703 for ; Wed, 16 Jun 2010 12:00:48 +0000 (UTC) (envelope-from jhellenthal@gmail.com) Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com [209.85.161.182]) by mx1.freebsd.org (Postfix) with ESMTP id 5B60D8FC16 for ; Wed, 16 Jun 2010 12:00:48 +0000 (UTC) Received: by gxk27 with SMTP id 27so1519901gxk.13 for ; Wed, 16 Jun 2010 05:00:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :x-enigmail-version:openpgp:content-type:content-transfer-encoding; bh=xBcyWEyphD61KE3Ag0Zxv0g8Z7weFC4SMpIx02xO4CY=; b=jmE1Ys8BSnqPalA4digfyWleYcnNTzqstlS2CNlFz2I67R4PFq+Y0QwsJbCD+hJL/s C61kTEnG1oZKdMuNaQnMJwIRZGrUq7x8ET3bp0SvFK6tCDHnpaGPeniCIM7AGhOR3caZ W7JOb5kMNWYR048g9PCckVwkbKXSD8v5+BAXM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:openpgp:content-type :content-transfer-encoding; b=KHEdfjpxWeG1GCP9aF9GHb7JHoQXME15XFSv6hIeRyh8DshZK6EmHnDQBi2vhQqkEC F0QzNhUc1YQMxrSi8W3Je/5Wzr3GKdh4BhI3AS4G9blQv6dyDw5bgNfC5/8eOZQT2jNF RYu2DMTlq9Wtzr/WVCOqsXR1kp/M0o49O14/I= Received: by 10.101.135.35 with SMTP id m35mr7467161ann.51.1276689647523; Wed, 16 Jun 2010 05:00:47 -0700 (PDT) Received: from centel.dataix.local (adsl-99-181-128-180.dsl.klmzmi.sbcglobal.net [99.181.128.180]) by mx.google.com with ESMTPS id d9sm30835824ibl.10.2010.06.16.05.00.46 (version=SSLv3 cipher=RC4-MD5); Wed, 16 Jun 2010 05:00:46 -0700 (PDT) Sender: "J. Hellenthal" Message-ID: <4C18BCED.8060202@dataix.net> Date: Wed, 16 Jun 2010 08:00:45 -0400 From: jhell User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100515 Thunderbird MIME-Version: 1.0 To: "Sam Fourman Jr." References: <4C18304A.1080601@dataix.net> <4C18322A.6050007@dataix.net> <4C18B57F.1060308@dataix.net> <4C18BB55.1050202@dataix.net> In-Reply-To: <4C18BB55.1050202@dataix.net> X-Enigmail-Version: 1.0.1 OpenPGP: id=89D8547E Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Brandon Gooch , FreeBSD Current , jilles@stack.nl Subject: Re: [MFC REQUEST] Filename completion in sh(1) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 12:00:48 -0000 On 06/16/2010 07:53, jhell wrote: > On 06/16/2010 07:29, jhell wrote: >> Just got home, So Ill be working on getting this put together over the >> next few minutes and replying to this thread with a go or no go >> depending on the outcome and posting the patch. > > Here it is: > > cd /usr/src > patch > cd /usr/src/include > make obj && make depend && make includes && make && make install > > cd /usr/src/lib/libedit > make obj && make depend && make includes && make && make install > > cd /usr/src/bin/sh > make obj && make depend && make includes && make && make install > > exec /bin/sh > cd /[TAB][TAB] > > Report any inconsistencies to this thread please. > > Good Luck & Regards, > In case the patch did not make it, I have uploaded it here: http://bit.ly/a9i7x9 Regards, -- jhell From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 12:08:11 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E53501065675 for ; Wed, 16 Jun 2010 12:08:11 +0000 (UTC) (envelope-from jhellenthal@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 904298FC1C for ; Wed, 16 Jun 2010 12:08:11 +0000 (UTC) Received: by iwn7 with SMTP id 7so7796995iwn.13 for ; Wed, 16 Jun 2010 05:08:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :x-enigmail-version:openpgp:content-type:content-transfer-encoding; bh=MQX+w2NzxsJFq63y77iSBYkYi5t+XE+4mZHExhaV6S0=; b=Y3C40XjXWyqGlnJzsM7B+wHbcKgVGWOcMlA+dVY7kkh1tWcmUBt7VBCihChjUt35Sq j76wz3Pf2zDRKLWa7ueYiL/2xDeAee7QvhQTlhEy6mbpgSRqYFMfYkQDI4McGVuw2UfM rQoGuLKCjTz7Ho+fjuJCEIehw6X2KVLd0l970= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:openpgp:content-type :content-transfer-encoding; b=i3OyjeZD8+Sg++R4ObhNu9w6g4r/9PZN3YUUkoUPtEQ42rBY46duTX9dL3vCi0tpD3 hwUStnE95Rwf1GT5bXEDkjg97+ngj30tPulBoBqz4roR8JzpKQ8yKCqq0H90Qmmk80A2 GEke0k2MAuxJ+H0YZTlT3UJ9hkENCX2adET58= Received: by 10.231.180.166 with SMTP id bu38mr9000394ibb.193.1276690090043; Wed, 16 Jun 2010 05:08:10 -0700 (PDT) Received: from centel.dataix.local (adsl-99-181-128-180.dsl.klmzmi.sbcglobal.net [99.181.128.180]) by mx.google.com with ESMTPS id t28sm30870589ibg.6.2010.06.16.05.08.08 (version=SSLv3 cipher=RC4-MD5); Wed, 16 Jun 2010 05:08:08 -0700 (PDT) Sender: "J. Hellenthal" Message-ID: <4C18BEA6.8070100@dataix.net> Date: Wed, 16 Jun 2010 08:08:06 -0400 From: jhell User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100515 Thunderbird MIME-Version: 1.0 To: "Sam Fourman Jr." References: <4C18304A.1080601@dataix.net> <4C18322A.6050007@dataix.net> <4C18B57F.1060308@dataix.net> <4C18BB55.1050202@dataix.net> <4C18BCED.8060202@dataix.net> In-Reply-To: <4C18BCED.8060202@dataix.net> X-Enigmail-Version: 1.0.1 OpenPGP: id=89D8547E Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Brandon Gooch , FreeBSD Current , jilles@stack.nl Subject: Re: [MFC REQUEST] Filename completion in sh(1) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 12:08:12 -0000 I should probably also mention that it does not have "username" completion the the following form ~userna[TAB][TAB] But does complete ~/[TAB][TAB] from your own home directory. And if you spell out the username as ~username/[TAB][TAB] that will also work. So do not be surprised. -- jhell From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 12:33:55 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D57C81065680 for ; Wed, 16 Jun 2010 12:33:55 +0000 (UTC) (envelope-from ganbold@gmail.com) Received: from mail-pw0-f54.google.com (mail-pw0-f54.google.com [209.85.160.54]) by mx1.freebsd.org (Postfix) with ESMTP id 969418FC1E for ; Wed, 16 Jun 2010 12:33:55 +0000 (UTC) Received: by pwj10 with SMTP id 10so1213281pwj.13 for ; Wed, 16 Jun 2010 05:33:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; bh=gPAU7LP33OOico0nNrXV3UWaLMW8DhStN+d5xMRn3ck=; b=cho5DlVAFmDbkRIF4UfJSW4VzOVw9MuZ5D0UN6OGmWqyjExBcOdGh/ute78GPy5ZhH JoWMurYlB26wbCuwUeTg5G7AT3QN/tOA4xBI9BaAHtvHiqys/sxU0LLIOq1yk87RUkgY NdbVzZrlSGhDCweIBjYwvq+d6CnrsQ6TlSSgk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=sasHo7MUaErpOjPHZ7d/o6ZVgiJ4ODpvRk1C+ATDXnuUPyzB1hPvbzCHE07oBuqVwE DIIFXkPKk+RfCXa+lJDJCwjW+lyU0xSoDuG9Z56P4LNGy453E/Yw+7SjXOYViGiuKuyk BbNfyaTW/jLdmv56XNihR/mnyf26tnrOcShKk= Received: by 10.114.189.6 with SMTP id m6mr7011274waf.57.1276691634701; Wed, 16 Jun 2010 05:33:54 -0700 (PDT) Received: from beastie.micom.mng.net ([202.179.21.129]) by mx.google.com with ESMTPS id c14sm81379943waa.13.2010.06.16.05.33.50 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 16 Jun 2010 05:33:53 -0700 (PDT) Message-ID: <4C18C4AB.6040205@gmail.com> Date: Wed, 16 Jun 2010 20:33:47 +0800 From: Ganbold User-Agent: Thunderbird 2.0.0.23 (X11/20091011) MIME-Version: 1.0 To: PseudoCylon References: <16641.96608.qm@web51806.mail.re2.yahoo.com> <4BAE01AC.7000509@gmail.com> <623907.37074.qm@web51803.mail.re2.yahoo.com> <4BB3575D.4040506@gmail.com> <87836.79143.qm@web51804.mail.re2.yahoo.com> <4BBB372C.1060302@gmail.com> <665283.95271.qm@web51802.mail.re2.yahoo.com> <4BBDEC8F.9050803@gmail.com> <490521.32714.qm@web51804.mail.re2.yahoo.com> <4BD307DE.5080507@gmail.com> <332448.8676.qm@web51801.mail.re2.yahoo.com> <4BD3F2D4.8000007@gmail.com> <702632.81988.qm@web51803.mail.re2.yahoo.com> <4BDEE393.4080206@gmail.com> <660085.11669.qm@web51802.mail.re2.yahoo.com> <4BFD4806.8070001@gmail.com> <618770.37649.qm@web51807.mail.re2.yahoo.com> <4C0FAEA2.7010204@gmail.com> <94007.38072.qm@web51807.mail.re2.yahoo.com> <4C11188A.1040002@gmail.com> <447555.80295.qm@web51803.mail.re2.yahoo.com> <4C16499A.3050808@gmail.com> <337427.44900.qm@web51804.mail.re2.yahoo.com> <4C1787DA.2070308@gmail.com> <819523.41498.qm@web51805.mail.re2.yahoo.com> In-Reply-To: <819523.41498.qm@web51805.mail.re2.yahoo.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Ganbold Tsagaankhuu , freebsd-current@freebsd.org Subject: Re: CALL for TEST [HOSTAP] run(4) ralink usb wireless X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 12:33:55 -0000 AK-san, PseudoCylon wrote: >>> >> > > Hello, > > More questions. > > Is freebsd laptop working fine with wlan, or is it connected to ethernet port? > > Does adsl modem still freeze? > > Normally, when you ping from macbook to modem, there will be arp pakets > 'who-has modem tell macbook' and > 'modem is-at xx:xx...' > Do you see these at wlan0 on rspro? > > If rspro can ping patch should be working, but let's make sure it is. Please before starting hostapd, > sysctl hw.usb.run.debug=1 > (If the driver is not compiled with kernel, please apply a patch attached.) > When hostapd is started, it will print out > > Starting hostapd. > Configuration file: /etc/hostapd.conf > Using interface wlan0 with hwaddr 00:22:cf:03:e0:30 and ssid 'bsd' > run_key_set: cmdq_store=0 > run_key_set_cb: associd=0, keyix=1, mode=3, type=group, tx=on, rx=off > run_stop: All Tx cleared > run_newstate: INIT -> INIT > run_newstate: INIT -> SCAN > ... omit some lines ... > > Please confirm there is > run_key_set_cb: associd=0, mode=3, ... > And, associd is '0' (This was the problem before. So, encryption with group key failed.) > It prints: ... run_key_set_cb: associd=0, keyix=1, mode=3, type=group, tx=on, rx=off ... > When macbook associates with AP, it will print > > run_newassoc: cmdq_store=2 > run_newassoc: new assoc isnew=1 associd=c001 addr=00:26:bb:17:f6:61 > run_newassoc: rate=0x82 ridx=0 ctl_ridx=0 > ... omit some lines ... > run_newassoc: rate=0x6c ridx=11 ctl_ridx=8 > run_newassoc: rate=2, mgmt_ridx=0 > run_key_set: cmdq_store=3 > run_key_set_cb: associd=c001, keyix=0, mode=4, type=pairwise, tx=on, rx=on > > Please confirm there is > run_key_set_cb: associd=c001, mode=4, ... > And associd isn't '0'. > It prints: run_newassoc: cmdq_store=3 run_newassoc: new assoc isnew=1 associd=c001 addr=00:26:bb:17:f6:61 ... run_newassoc: rate=2, mgmt_ridx=0 wlan0: STA 00:26:bb:17:f6:61 IEEE 802.11: associated run_key_set: cmdq_store=5 run_key_set_cb: associd=c001, keyix=0, mode=4, type=pairwise, tx=on, rx=on wlan0: STA 00:26:bb:17:f6:61 RADIUS: starting accounting session 4C18B4C8-00000000 wlan0: STA 00:26:bb:17:f6:61 WPA: pairwise key handshake completed (RSN) > If not, I need to fix the driver. If things go accordingly, please compare the mode. With your config, group key uses TKIP (mode 3) and pairwise key uses CCMP (mode 4). And very first arp who-has packet uses group key and other use pairwise key. Maybe, macbook doesn't like mixing the mode. So, please > tcpdump -vvv -xxx -i wlan0 'arp' > 19:34:27.188281 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.50 tell 0.0.0.0, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 0000 0000 0x0020: 0000 0000 0000 c0a8 0132 19:34:27.188326 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.50 tell 0.0.0.0, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 0000 0000 0x0020: 0000 0000 0000 c0a8 0132 19:34:27.586863 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.50 tell 0.0.0.0, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 0000 0000 0x0020: 0000 0000 0000 c0a8 0132 19:34:27.586903 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.50 tell 0.0.0.0, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 0000 0000 0x0020: 0000 0000 0000 c0a8 0132 19:34:27.989517 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.50 tell 192.168.1.50, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 c0a8 0132 0x0020: 0000 0000 0000 c0a8 0132 19:34:27.989561 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.50 tell 192.168.1.50, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 c0a8 0132 0x0020: 0000 0000 0000 c0a8 0132 19:34:28.389609 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.50 tell 192.168.1.50, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 c0a8 0132 0x0020: 0000 0000 0000 c0a8 0132 19:34:28.389638 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.50 tell 192.168.1.50, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 c0a8 0132 0x0020: 0000 0000 0000 c0a8 0132 19:34:28.389761 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.50, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 c0a8 0132 0x0020: 0000 0000 0000 c0a8 0101 19:34:28.389790 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.50, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 c0a8 0132 0x0020: 0000 0000 0000 c0a8 0101 19:34:28.390061 ARP, Ethernet (len 6), IPv4 (len 4), Reply 192.168.1.1 is-at 00:30:54:62:3d:24 (oui Unknown), length 46 0x0000: 0026 bb17 f661 0030 5462 3d24 0806 0001 0x0010: 0800 0604 0002 0030 5462 3d24 c0a8 0101 0x0020: 0026 bb17 f661 c0a8 0132 0000 0000 0000 0x0030: 0000 0000 0000 0000 0000 0000 19:34:28.393300 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 169.254.255.255 tell 192.168.1.50, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 c0a8 0132 0x0020: 0000 0000 0000 a9fe ffff 19:34:28.393341 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 169.254.255.255 tell 192.168.1.50, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 c0a8 0132 0x0020: 0000 0000 0000 a9fe ffff 19:34:28.793323 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 169.254.255.255 tell 192.168.1.50, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 c0a8 0132 0x0020: 0000 0000 0000 a9fe ffff 19:34:28.793367 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 169.254.255.255 tell 192.168.1.50, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 c0a8 0132 0x0020: 0000 0000 0000 a9fe ffff 19:34:29.193817 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 169.254.255.255 tell 192.168.1.50, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 c0a8 0132 0x0020: 0000 0000 0000 a9fe ffff 19:34:29.193861 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 169.254.255.255 tell 192.168.1.50, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 c0a8 0132 0x0020: 0000 0000 0000 a9fe ffff 19:34:29.592363 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 169.254.255.255 tell 192.168.1.50, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 c0a8 0132 0x0020: 0000 0000 0000 a9fe ffff 19:34:29.592402 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 169.254.255.255 tell 192.168.1.50, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 c0a8 0132 0x0020: 0000 0000 0000 a9fe ffff 19:34:30.421577 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.50, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 c0a8 0132 0x0020: 0000 0000 0000 c0a8 0101 19:34:30.421620 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.1 tell 192.168.1.50, length 28 0x0000: ffff ffff ffff 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0001 0026 bb17 f661 c0a8 0132 0x0020: 0000 0000 0000 c0a8 0101 19:34:30.421909 ARP, Ethernet (len 6), IPv4 (len 4), Reply 192.168.1.1 is-at 00:30:54:62:3d:24 (oui Unknown), length 46 0x0000: 0026 bb17 f661 0030 5462 3d24 0806 0001 0x0010: 0800 0604 0002 0030 5462 3d24 c0a8 0101 0x0020: 0026 bb17 f661 c0a8 0132 0000 0000 0000 0x0030: 0000 0000 0000 0000 0000 0000 19:34:30.469720 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.50 tell 192.168.1.1, length 46 0x0000: ffff ffff ffff 0030 5462 3d24 0806 0001 0x0010: 0800 0604 0001 0030 5462 3d24 c0a8 0101 0x0020: 0000 0000 0000 c0a8 0132 0000 0000 0000 0x0030: 0000 0000 0000 0000 0000 0000 19:34:30.471838 ARP, Ethernet (len 6), IPv4 (len 4), Reply 192.168.1.50 is-at 00:26:bb:17:f6:61 (oui Unknown), length 28 0x0000: 0030 5462 3d24 0026 bb17 f661 0806 0001 0x0010: 0800 0604 0002 0026 bb17 f661 c0a8 0132 0x0020: 0030 5462 3d24 c0a8 0101 Strange, looks like this time works as expected, but sometimes it doesn't work. In some cases it doesn't work and you can find complete tcpdump output from very beginning to the modem hang: http://pastebin.com/1ALmV7mA > and check if any packet with address of all 'ff'. is sent/received alright. All 'ff 'means using group key. Others use pairwise key. All 'ff is easy to see in output of tcpdump. Or, you can chose one of them, CCMP or TKIP for 'wpa_pairwise=' and see if it makes any difference. > Will test it and let you know. thanks, Ganbold > > Sorry for too many questions. It is working fine here, again. > AK > > --patch Only needed if the driver is not compiled with the kernel-- > > diff --git a/dev/usb/wlan/if_run.c b/dev/usb/wlan/if_run.c > index e4fc8d2..65c1dab 100644 > --- a/dev/usb/wlan/if_run.c > +++ b/dev/usb/wlan/if_run.c > @@ -69,6 +69,7 @@ __FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_run.c,v 1.11 2010/06/14 23:01:50 jki > #include "usbdevs.h" > > #define USB_DEBUG_VAR run_debug > +#define USB_DEBUG > #include > > #include "if_runreg.h" > > --end patch-- > only one line to add > > > > > -- To err is humor. From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 13:15:08 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 601881065672 for ; Wed, 16 Jun 2010 13:15:08 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from dirj.bris.ac.uk (dirj.bris.ac.uk [137.222.10.78]) by mx1.freebsd.org (Postfix) with ESMTP id 208C88FC1C for ; Wed, 16 Jun 2010 13:15:07 +0000 (UTC) Received: from ncsc.bris.ac.uk ([137.222.10.41]) by dirj.bris.ac.uk with esmtp (Exim 4.69) (envelope-from ) id 1OOsSP-0005U2-RN for freebsd-current@freebsd.org; Wed, 16 Jun 2010 14:15:06 +0100 Received: from mech-cluster241.men.bris.ac.uk ([137.222.187.241]) by ncsc.bris.ac.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.67) (envelope-from ) id 1OOsSP-00076n-Oa for freebsd-current@freebsd.org; Wed, 16 Jun 2010 14:15:05 +0100 Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.4/8.14.4) with ESMTP id o5GDF4cV003217 for ; Wed, 16 Jun 2010 14:15:05 +0100 (BST) (envelope-from mexas@bristol.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.4/8.14.4/Submit) id o5GDF4rC003208 for freebsd-current@freebsd.org; Wed, 16 Jun 2010 14:15:04 +0100 (BST) (envelope-from mexas@bristol.ac.uk) X-Authentication-Warning: mech-cluster241.men.bris.ac.uk: mexas set sender to mexas@bristol.ac.uk using -f Date: Wed, 16 Jun 2010 14:15:04 +0100 From: Anton Shterenlikht To: freebsd-current@freebsd.org Message-ID: <20100616131503.GA77642@mech-cluster241.men.bris.ac.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Subject: how to set up UTF8 russian in -current? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 13:15:08 -0000 My system is amd64 r209195. I was wondering if the user localisation section of the handbook is a bit out of date: http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/using-localization.html The handbook suggests using cons25r, whereas the default console type in /etc/ttys is now xterm. And keeping cons25r together with relevant fonts, screenmap and keymap in /etc/rc.conf doesn't seem to work anymore. Also, the latest I can find on UTF8 in FreeBSD is this thread: http://lists.freebsd.org/pipermail/freebsd-current/2009-July/009349.html I tried to follow the advice given in this thread, namely I've rebuilt the kernel with TEKEN_UTF8 (it seems the other option mentioned, TEKEN_XTERM, is no longer valid), and set LC_CTYPE=ru_RU.UTF-8 in my shell. This didn't seem to have any effect. Please advise many thanks -- Anton Shterenlikht Room 2.6, Queen's Building Mech Eng Dept Bristol University University Walk, Bristol BS8 1TR, UK Tel: +44 (0)117 331 5944 Fax: +44 (0)117 929 4423 From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 13:45:32 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5FB0F106566B for ; Wed, 16 Jun 2010 13:45:32 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: from mx0.hoeg.nl (mx0.hoeg.nl [IPv6:2001:4dd0:ff41::b23f:aa]) by mx1.freebsd.org (Postfix) with ESMTP id 1F6E38FC14 for ; Wed, 16 Jun 2010 13:45:32 +0000 (UTC) Received: by mx0.hoeg.nl (Postfix, from userid 1000) id 2806B2A29245; Wed, 16 Jun 2010 15:45:30 +0200 (CEST) Date: Wed, 16 Jun 2010 15:45:30 +0200 From: Ed Schouten To: Anton Shterenlikht Message-ID: <20100616134530.GX1797@hoeg.nl> References: <20100616131503.GA77642@mech-cluster241.men.bris.ac.uk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="szlDyXxWT551m6yh" Content-Disposition: inline In-Reply-To: <20100616131503.GA77642@mech-cluster241.men.bris.ac.uk> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: freebsd-current@freebsd.org Subject: Re: how to set up UTF8 russian in -current? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 13:45:32 -0000 --szlDyXxWT551m6yh Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Anton Shterenlikht wrote: > My system is amd64 r209195. >=20 > I was wondering if the user localisation > section of the handbook is a bit out of date: > http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/using-localizat= ion.html >=20 > The handbook suggests using cons25r, whereas > the default console type in /etc/ttys is now xterm. > And keeping cons25r together with relevant fonts, > screenmap and keymap in /etc/rc.conf doesn't seem > to work anymore. >=20 > Also, the latest I can find on UTF8 in FreeBSD > is this thread: > http://lists.freebsd.org/pipermail/freebsd-current/2009-July/009349.html >=20 > I tried to follow the advice given in this thread, > namely I've rebuilt the kernel with TEKEN_UTF8 > (it seems the other option mentioned, TEKEN_XTERM, is no > longer valid), and set LC_CTYPE=3Dru_RU.UTF-8 > in my shell. This didn't seem to have any effect. Even though UTF-8 support for the console is closer than it used to be, it's still not useful in practice, since syscons won't display it. I guess if you want to get Russian working on HEAD, you should do the following: - Don't set TEKEN_* in your kernel configuration file. - Just use the xterm terminal type in /etc/ttys. - Set LC_CTYPE=3Dru_RU.{CP1251,CP866,ISO8859-5,KOI8-R}. - Load a font for Syscons which uses the same character as the one you chose above. So this means 8-bit character sets is the best thing we can do right now. --=20 Ed Schouten WWW: http://80386.nl/ --szlDyXxWT551m6yh Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAkwY1XoACgkQ52SDGA2eCwX07ACcCWbz9Lnwj0+9eKiLwkjcc+q/ 4+YAn3Z0O5u06JFTHiDceohFqNx+j0bl =LRpL -----END PGP SIGNATURE----- --szlDyXxWT551m6yh-- From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 13:51:00 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F086C1065670; Wed, 16 Jun 2010 13:51:00 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id AC00D8FC19; Wed, 16 Jun 2010 13:51:00 +0000 (UTC) Received: from mail-gw0-f54.google.com (mail-gw0-f54.google.com [74.125.83.54]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id AEBEDBF417; Wed, 16 Jun 2010 15:50:58 +0200 (CEST) Received: by gwj20 with SMTP id 20so5125912gwj.13 for ; Wed, 16 Jun 2010 06:50:57 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.182.16 with SMTP id ca16mr3947079qcb.88.1276696252548; Wed, 16 Jun 2010 06:50:52 -0700 (PDT) Received: by 10.229.247.142 with HTTP; Wed, 16 Jun 2010 06:50:52 -0700 (PDT) In-Reply-To: <4C17E287.8060703@FreeBSD.org> References: <4C17BB76.6020702@FreeBSD.org> <4C17E287.8060703@FreeBSD.org> Date: Wed, 16 Jun 2010 15:50:52 +0200 Message-ID: From: Alexander Best To: Gabor Kovesdan Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 13:51:01 -0000 On Tue, Jun 15, 2010 at 10:28 PM, Gabor Kovesdan wrote: > >> >> cc1: warnings being treated as errors >> >> /usr/src/lib/libiconv_modules/BIG5/../../libc/iconv/citrus_stdenc_templa= te.h: >> In function '_citrus_BIG5_stdenc_cstomb': >> >> /usr/src/lib/libiconv_modules/BIG5/../../libc/iconv/citrus_stdenc_templa= te.h:138: >> warning: 'ret' may be used uninitialized in this function >> > > Eeh. I'm sorry, I'll look at it tomorrow. For now you can use WERROR=3D""= and > CWARNFLAGS=3D"" to test, actually it was what I used that's why I couldn'= t > catch this. I had the same problem with some code that was not mine so I > just set it. I don't know why I'm having that, tohugh, I also have that w= ith > a clean unpatched src tree and I'm not using any CFLAGS tweak or such. > If you haven't done make clean yet, you can resume the build with: make buildworld -DNO_CLEAN WERROR=3D"" CWARNFLAGS=3D"" thanks. that worked. :) > > -- > Gabor Kovesdan > FreeBSD Volunteer > > EMAIL: gabor@FreeBSD.org .:|:. gabor@kovesdan.org > WEB: =A0 http://people.FreeBSD.org/~gabor .:|:. http://kovesdan.org > > --=20 Alexander Best From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 14:50:48 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AFFF41065672; Wed, 16 Jun 2010 14:50:48 +0000 (UTC) (envelope-from lichave@gmail.com) Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.153]) by mx1.freebsd.org (Postfix) with ESMTP id CCE938FC15; Wed, 16 Jun 2010 14:50:47 +0000 (UTC) Received: by fg-out-1718.google.com with SMTP id d23so1181965fga.13 for ; Wed, 16 Jun 2010 07:50:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:reply-to :in-reply-to:references:date:message-id:subject:from:to:cc :content-type; bh=j/HqinKM1k8Z3NWeX+Rm2HnbC0UdR9PhljzBj0H8tdU=; b=LB5lBmgJGnyZ09ykpa0JtdD8V9+hdaxfI+mnyjpL0ng3gRAcqtYj6lGeN2i1cfAhug rEg3eCMwa0clf6Fe/tS7SDa2JbFiy7K2ALCVvePPzxFHne9IJGhcGF8/w1mpxRBDy+j5 h/AQM8jpGCXloCfCMy8+d5ht1y8WvlHNlwTGY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:reply-to:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; b=QUSxqH9SPuP9SOgttn07yQVbJRUVTy/cc97CkhOW2cF1SpyYBO6w3reKf+7VMfWDdX U8dlRoLT43WlmwiEZIo2R52c/annhIdyjWzqCDiDonrdhxc+cqXYdpFdshar+9zxjj5k uPARN5fzN4aHsJE/CWmz0sc1cLTT6NY7sdoP4= MIME-Version: 1.0 Received: by 10.204.3.65 with SMTP id 1mr6630272bkm.210.1276697954576; Wed, 16 Jun 2010 07:19:14 -0700 (PDT) Received: by 10.204.139.28 with HTTP; Wed, 16 Jun 2010 07:19:14 -0700 (PDT) In-Reply-To: <20100615170158.GA2131@tops> References: <4C16C5B5.1070308@FreeBSD.org> <20100615170158.GA2131@tops> Date: Wed, 16 Jun 2010 16:19:14 +0200 Message-ID: From: Konrad Jankowski To: Gleb Kurtsou Content-Type: text/plain; charset=UTF-8 Cc: Edwin Groothuis , FreeBSD Current , Xin LI , Gabor Kovesdan , i18n@freebsd.org Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: konrad@freebsd.org List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 14:50:48 -0000 On Tue, Jun 15, 2010 at 7:01 PM, Gleb Kurtsou wrote: > On (15/06/2010 02:13), Gabor Kovesdan wrote: >> Hello Folks, >> >> during the last summer, Google generously founded my Summer of Code >> project, which was providing a BSD-licensed iconv implementation for >> FreeBSD. I'm proud to announce that the work has been completed and a >> patch is available to add it to the base system. >> >> The results of this work are: >> - The Citrus implementation has been ported from NetBSD. >> - Some utilities have been added. There is a conversion table generator, >> which can compare conversion tables to reference data generated by GNU >> libiconv. This helps ensuring conversion compatibility. >> - UTF-16 surrogate support and some endianness issues have been fixed. >> - The rather chaotic Makefiles to build metadata have been refactored >> and cleaned up, now it is easy to read and it is also easier to add >> support for new encodings. >> - A bunch of new encodings and encoding aliases have been added. >> - Support for 1->2, 1->3 and 1->4 mappings, which is needed for >> transliterating with flying accents as GNU does, like "u. >> - Lots of warnings have been fixed, the major part of the code is now >> WARNS=6 clean. >> - New section 1 and section 5 manual pages have been added. >> - Some GNU-specific calls have been implemented: iconvlist(), >> iconvctl(), iconv_canonicalize(), iconv_open_into() >> - Support for GNU's //IGNORE suffix has been added. >> - The "-" argument for stdin is now recognized in iconv(1) as per POSIX. >> - The Big5 conversion module has been fixed. >> - The iconv.h header files is supposed to be compatible with the GNU >> version, i.e. sources should build with base iconv.h and GNU libiconv. >> I've just did a very quick test and it seems ports can safely link to >> GNU libiconv, there's no conflict. >> - Various cleanups and style(9) fixes. >> - A bachelor thesis written in Hungarian language: >> http://www.kovesdan.org/files/bsc_iconv.pdf >> >> The rather big patch (42,5M) is available here: >> http://www.kovesdan.org/patches/iconv_base_integrate.diff >> >> Any comments, suggestions or bugreports are very welcome. > > Awesome! Thanks for working on it. > > Are there any plans to resurrect/finish multibyte collation support > GSoC'2008 project: > http://wiki.freebsd.org/KonradJankowski/Collation Hi. The project is not dead. I've resumed actively working on it. Expect some patches/commits soon. -- Konrad From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 15:25:25 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0AC101065784; Wed, 16 Jun 2010 15:25:25 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id D272E8FC13; Wed, 16 Jun 2010 15:25:24 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 8346746C0B; Wed, 16 Jun 2010 11:25:24 -0400 (EDT) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 7E6568A04F; Wed, 16 Jun 2010 11:25:23 -0400 (EDT) From: John Baldwin To: freebsd-current@freebsd.org Date: Wed, 16 Jun 2010 08:05:09 -0400 User-Agent: KMail/1.12.1 (FreeBSD/7.3-CBSD-20100217; KDE/4.3.1; amd64; ; ) References: <4C187778.9060909@FreeBSD.org> In-Reply-To: <4C187778.9060909@FreeBSD.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201006160805.09706.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Wed, 16 Jun 2010 11:25:23 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.5 required=4.2 tests=AWL,BAYES_00, DATE_IN_PAST_03_06 autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: Doug Barton Subject: Re: devd and/or ACPI not reporting a heat problem X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 15:25:25 -0000 On Wednesday 16 June 2010 3:04:24 am Doug Barton wrote: > Howdy, > > I thought my heat problems were over with this laptop thanks to all the > great suggestions I've received about powerd, no stepping, etc. (I also > propped up both the back and the front to make a nice big air pocket.) > I've always been pretty religious about blowing the dust off the fans > and heat sinks, but I guess it's been dustier than I thought lately > because I finally "caught" my laptop doing what it's been doing for the > last 2 weeks, which is (occasionally) powering down when it was > unattended; and the problem was heat. > > Of course I've been running devd all along, and so I initially ruled out > the heat problem due to this entry in devd.conf: > > # Notify all users before beginning emergency shutdown when we get > # a _CRT or _HOT thermal event and we're going to power down the system > # very soon. > notify 10 { > match "system" "ACPI"; > match "subsystem" "Thermal"; > match "notify" "0xcc"; > action "logger -p kern.emerg 'WARNING: system temperature too > high, shutting down soon!'"; > }; > > I'm not getting any of those notices in the logs, so I was looking other > places. (I do get other ACPI-related activity from devd, such as the > notice that it's going on and off AC power.) > > So, 2-part question, how can I make sure that devd gets the message, and > how do I make sure that the notice comes _before_ the BIOS forces the > system to power off. I.e., I'd like to have some sort of devd notice > that comes in time to do a clean shutdown, or perhaps some other > mitigation strategy prior to the BIOS taking over. Hmm, so the system just polls the temperature every 10 seconds (sys/dev/acpica/acpi_thermal.c has the details) and if it sees a high temperature twice in a row, it sends this event to devd. If it sees it a third time it initiates a shutdown. It may be that the BIOS takes over before those 20 seconds have passed. You can reduce the polling interval by changing hw.acpi.thermal.polling_rate (it is in seconds it seems) to a lower value. -- John Baldwin From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 16:07:48 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA0721065678 for ; Wed, 16 Jun 2010 16:07:48 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-ww0-f54.google.com (mail-ww0-f54.google.com [74.125.82.54]) by mx1.freebsd.org (Postfix) with ESMTP id 592FB8FC1E for ; Wed, 16 Jun 2010 16:07:47 +0000 (UTC) Received: by wwa36 with SMTP id 36so2190841wwa.13 for ; Wed, 16 Jun 2010 09:07:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:references :date:in-reply-to:message-id:user-agent:mime-version:content-type; bh=3G4PKYgftTmfCoin7L82f2i83Rrik00UZDMY6b7uDEw=; b=LacWxXl+XCBOKAvghSOyhDAwOT8ona5hF1DRu19xhJraGC7C54TYOxeVhfWe5kzEaY DHl0gwN1AN77WoLi8iQZxLYJVkP65ZNkEZEK/X+CwD8ypAcgMh6h2pe2vPR3TKrXt4JH +veV3pFewu4GCkFu6GvNrod7M0+NgYn8ssOxU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; b=sZRFnnka8RwQRakwfwc4PA/22ChrPm6n9dRJUwifpn7NZZ5VLaLocqxtZIVv5SIxqD r3VkhBK5FgB8CTr1MhgGNU5xz++SMe0FqnAihzooDhKVFaUYSpZygAChfwN2hX6Vf+/4 3F+fNO4ovfC1b24tMMF7a4R8LDvV9FpREcLLg= Received: by 10.216.160.145 with SMTP id u17mr911698wek.18.1276704460402; Wed, 16 Jun 2010 09:07:40 -0700 (PDT) Received: from localhost (hd5b906df.selukra.dyn.perspektivbredband.net [213.185.6.223]) by mx.google.com with ESMTPS id o13sm2359245wej.16.2010.06.16.09.07.35 (version=SSLv3 cipher=RC4-MD5); Wed, 16 Jun 2010 09:07:38 -0700 (PDT) From: Anonymous To: Gabor Kovesdan References: <4C16C5B5.1070308@FreeBSD.org> <867hlzq4lb.fsf@gmail.com> Date: Wed, 16 Jun 2010 20:06:45 +0400 In-Reply-To: <867hlzq4lb.fsf@gmail.com> (Anonymous's message of "Wed, 16 Jun 2010 03:05:36 +0400") Message-ID: <867hlzufl6.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: FreeBSD Current Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 16:07:48 -0000 Anonymous writes: > Gabor Kovesdan writes: > > [...] >> Any comments, suggestions or bugreports are very welcome. > > Does it respect lib32? > > $ iconv -f ascii > iconv: iconv_open(UTF-8, ascii): Invalid argument > /usr/lib/i18n/libiconv_std.so.4: unsupported file layoutzsh: exit 1 iconv -f ascii > > $ file /usr/lib/i18n/libiconv_std.so.4 > /usr/lib/i18n/libiconv_std.so.4: ELF 32-bit LSB shared object, Intel 80386, version 1 (FreeBSD), dynamically linked, stripped > > $ uname -vm > FreeBSD 9.0-CURRENT #0 r209191=1463b20-dirty: Tue Jun 15 04:59:40 UTC 2010 holo@raphael.local:/a/objdir/a/dirty_build/sys/PHOENIX amd64 BTW, I tried to crosscompile i386 and got error on installing usr.bin/{mkesdb,mkcsmapper}. $ make installworld TARGET=i386 DESTDIR=/b/bbb ... ===> usr.bin/mkcsmapper (install) install -s -o root -g wheel -m 555 mkcsmapper /b/bbb/usr/bin strip: /b/bbb/usr/bin/mkcsmapper: File format not recognized install: wait: No such file or directory *** Error code 70 From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 16:18:59 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A52A10657C9; Wed, 16 Jun 2010 16:18:59 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id 091BE8FC1E; Wed, 16 Jun 2010 16:18:58 +0000 (UTC) Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com [209.85.161.182]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id A513EBF40E; Wed, 16 Jun 2010 18:18:55 +0200 (CEST) Received: by gxk27 with SMTP id 27so1658710gxk.13 for ; Wed, 16 Jun 2010 09:18:54 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.190.209 with SMTP id dj17mr4037387qcb.202.1276705134233; Wed, 16 Jun 2010 09:18:54 -0700 (PDT) Received: by 10.229.247.142 with HTTP; Wed, 16 Jun 2010 09:18:54 -0700 (PDT) In-Reply-To: References: <4C17BB76.6020702@FreeBSD.org> <4C17E287.8060703@FreeBSD.org> Date: Wed, 16 Jun 2010 18:18:54 +0200 Message-ID: From: Alexander Best To: Gabor Kovesdan Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 16:18:59 -0000 On Wed, Jun 16, 2010 at 3:50 PM, Alexander Best wrote: > On Tue, Jun 15, 2010 at 10:28 PM, Gabor Kovesdan wrot= e: >> >>> >>> cc1: warnings being treated as errors >>> >>> /usr/src/lib/libiconv_modules/BIG5/../../libc/iconv/citrus_stdenc_templ= ate.h: >>> In function '_citrus_BIG5_stdenc_cstomb': >>> >>> /usr/src/lib/libiconv_modules/BIG5/../../libc/iconv/citrus_stdenc_templ= ate.h:138: >>> warning: 'ret' may be used uninitialized in this function >>> >> >> Eeh. I'm sorry, I'll look at it tomorrow. For now you can use WERROR=3D"= " and >> CWARNFLAGS=3D"" to test, actually it was what I used that's why I couldn= 't >> catch this. I had the same problem with some code that was not mine so I >> just set it. I don't know why I'm having that, tohugh, I also have that = with >> a clean unpatched src tree and I'm not using any CFLAGS tweak or such. >> If you haven't done make clean yet, you can resume the build with: > > make buildworld -DNO_CLEAN WERROR=3D"" CWARNFLAGS=3D"" > > thanks. that worked. :) ok. after installing world i get this when bootingt up: Starting powerd. Starting musicpd. path: invalid filesystem charset: ISO-8859-15 /usr/lib/i18n/libiconv_std.so.4: unsupported file layout/usr/lib/i18n/libiconv_std.so.4: unsupported file layout/usr/lib/i18n/libiconv_std.so.4: unsupported file layout/usr/lib/i18n/libiconv_std.so.4: unsupported file layout/usr/lib/i18n/libiconv_std.so.4: unsupported file layout pid 1078 (mpd), uid 1001: exited on signal 6 Abort trap /etc/rc: WARNING: failed to start musicpd Starting mpdscribble. GLib: Cannot convert message: Conversion from character set 'UTF-8' to 'ASCII' is not supported /usr/lib/i18n/libiconv_std.so.4: unsupported file layout/usr/lib/i18n/libiconv_std.so.4: unsupported file layout/usr/lib/i18n/libiconv_std.so.4: unsupported file layout/usr/lib/i18n/libiconv_std.so.4: unsupported file layoutoption parsing failed: Conversion from character set 'ASCII' to 'UTF-8' is not supported /etc/rc: WARNING: failed to start mpdscribble cheers. alex > >> >> -- >> Gabor Kovesdan >> FreeBSD Volunteer >> >> EMAIL: gabor@FreeBSD.org .:|:. gabor@kovesdan.org >> WEB: =A0 http://people.FreeBSD.org/~gabor .:|:. http://kovesdan.org >> >> > > > > -- > Alexander Best > --=20 Alexander Best From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 16:22:14 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E6BB410656CC for ; Wed, 16 Jun 2010 16:22:14 +0000 (UTC) (envelope-from ganbold@gmail.com) Received: from mail-pz0-f54.google.com (mail-pz0-f54.google.com [209.85.210.54]) by mx1.freebsd.org (Postfix) with ESMTP id AA6A48FC15 for ; Wed, 16 Jun 2010 16:22:14 +0000 (UTC) Received: by pzk12 with SMTP id 12so14655pzk.13 for ; Wed, 16 Jun 2010 09:22:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; bh=qgGZwmX4BXdEfS+y9Uf5UUAnaVbUvhFnKpzdFhLLzuU=; b=XHXxE+wRdPDltAUtI2514WbusVY2Z3pYOMPwlFpb2gfusslbVpzaL1VRMY3FqjfGQZ yhs9Cn4Wj1ZobsIOiOyJISpKUa8VoBN2R1kRYiixI3dVMgJ/Ls9hzQUurIbUYCVbRN87 3ZGLLGVnAg8YF19TTNCFO2jogdzwOHvAlKzqs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=D17ooIphiyXPrbHZTwEPPLdQKD9IHAquYhwslbVCmemZWaxIM/Klq9wXWZDjxi2hij F6YDN705gfsZVTP+dOS3iZmX5ylVZXCKebkMvPjc4kGmCCm8svzTr01TTY4L19KD1DeV CqhRYzQGQgjZyQQRnzuCzp7eLm42NDBrRiQoQ= Received: by 10.114.18.36 with SMTP id 36mr1455144war.98.1276705334112; Wed, 16 Jun 2010 09:22:14 -0700 (PDT) Received: from beastie.micom.mng.net ([202.179.21.129]) by mx.google.com with ESMTPS id 33sm83525411wad.8.2010.06.16.09.22.11 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 16 Jun 2010 09:22:13 -0700 (PDT) Message-ID: <4C18FA2F.9040405@gmail.com> Date: Thu, 17 Jun 2010 00:22:07 +0800 From: Ganbold User-Agent: Thunderbird 2.0.0.23 (X11/20091011) MIME-Version: 1.0 To: PseudoCylon References: <16641.96608.qm@web51806.mail.re2.yahoo.com> <4BAE01AC.7000509@gmail.com> <623907.37074.qm@web51803.mail.re2.yahoo.com> <4BB3575D.4040506@gmail.com> <87836.79143.qm@web51804.mail.re2.yahoo.com> <4BBB372C.1060302@gmail.com> <665283.95271.qm@web51802.mail.re2.yahoo.com> <4BBDEC8F.9050803@gmail.com> <490521.32714.qm@web51804.mail.re2.yahoo.com> <4BD307DE.5080507@gmail.com> <332448.8676.qm@web51801.mail.re2.yahoo.com> <4BD3F2D4.8000007@gmail.com> <702632.81988.qm@web51803.mail.re2.yahoo.com> <4BDEE393.4080206@gmail.com> <660085.11669.qm@web51802.mail.re2.yahoo.com> <4BFD4806.8070001@gmail.com> <618770.37649.qm@web51807.mail.re2.yahoo.com> <4C0FAEA2.7010204@gmail.com> <94007.38072.qm@web51807.mail.re2.yahoo.com> <4C11188A.1040002@gmail.com> <447555.80295.qm@web51803.mail.re2.yahoo.com> <4C16499A.3050808@gmail.com> <337427.44900.qm@web51804.mail.re2.yahoo.com> <4C1787DA.2070308@gmail.com> <819523.41498.qm@web51805.mail.re2.yahoo.com> In-Reply-To: <819523.41498.qm@web51805.mail.re2.yahoo.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Ganbold Tsagaankhuu , freebsd-current@freebsd.org Subject: Re: CALL for TEST [HOSTAP] run(4) ralink usb wireless X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 16:22:15 -0000 AK-san, PseudoCylon wrote: > Hello, > > More questions. > > Is freebsd laptop working fine with wlan, or is it connected to ethernet port? > > Does adsl modem still freeze? > > Normally, when you ping from macbook to modem, there will be arp pakets > 'who-has modem tell macbook' and > 'modem is-at xx:xx...' > Do you see these at wlan0 on rspro? > > If rspro can ping patch should be working, but let's make sure it is. Please before starting hostapd, > sysctl hw.usb.run.debug=1 > (If the driver is not compiled with kernel, please apply a patch attached.) > When hostapd is started, it will print out > > Starting hostapd. > Configuration file: /etc/hostapd.conf > Using interface wlan0 with hwaddr 00:22:cf:03:e0:30 and ssid 'bsd' > run_key_set: cmdq_store=0 > run_key_set_cb: associd=0, keyix=1, mode=3, type=group, tx=on, rx=off > run_stop: All Tx cleared > run_newstate: INIT -> INIT > run_newstate: INIT -> SCAN > ... omit some lines ... > > Please confirm there is > run_key_set_cb: associd=0, mode=3, ... > And, associd is '0' (This was the problem before. So, encryption with group key failed.) > > When macbook associates with AP, it will print > > run_newassoc: cmdq_store=2 > run_newassoc: new assoc isnew=1 associd=c001 addr=00:26:bb:17:f6:61 > run_newassoc: rate=0x82 ridx=0 ctl_ridx=0 > ... omit some lines ... > run_newassoc: rate=0x6c ridx=11 ctl_ridx=8 > run_newassoc: rate=2, mgmt_ridx=0 > run_key_set: cmdq_store=3 > run_key_set_cb: associd=c001, keyix=0, mode=4, type=pairwise, tx=on, rx=on > > Please confirm there is > run_key_set_cb: associd=c001, mode=4, ... > And associd isn't '0'. > > If not, I need to fix the driver. If things go accordingly, please compare the mode. With your config, group key uses TKIP (mode 3) and pairwise key uses CCMP (mode 4). And very first arp who-has packet uses group key and other use pairwise key. Maybe, macbook doesn't like mixing the mode. So, please > tcpdump -vvv -xxx -i wlan0 'arp' > and check if any packet with address of all 'ff'. is sent/received alright. All 'ff 'means using group key. Others use pairwise key. All 'ff is easy to see in output of tcpdump. Or, you can chose one of them, CCMP or TKIP for 'wpa_pairwise=' and see if it makes any difference. > I tried both wpa_pairwise=CCMP and wpa_pairwise=TKIP, and it is same as before, modem hangs. Ganbold > > Sorry for too many questions. It is working fine here, again. > AK > > --patch Only needed if the driver is not compiled with the kernel-- > > diff --git a/dev/usb/wlan/if_run.c b/dev/usb/wlan/if_run.c > index e4fc8d2..65c1dab 100644 > --- a/dev/usb/wlan/if_run.c > +++ b/dev/usb/wlan/if_run.c > @@ -69,6 +69,7 @@ __FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_run.c,v 1.11 2010/06/14 23:01:50 jki > #include "usbdevs.h" > > #define USB_DEBUG_VAR run_debug > +#define USB_DEBUG > #include > > #include "if_runreg.h" > > --end patch-- > only one line to add > > > > > -- I never killed a man that didn't deserve it. -- Mickey Cohen From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 16:23:16 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D5D41065674; Wed, 16 Jun 2010 16:23:16 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id A05928FC08; Wed, 16 Jun 2010 16:23:15 +0000 (UTC) Received: by wyb34 with SMTP id 34so2724648wyb.13 for ; Wed, 16 Jun 2010 09:23:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:references :date:in-reply-to:message-id:user-agent:mime-version:content-type; bh=YFmCTl0REl+zR0JGXFH95L5m+zdMLKcRvaDcwe3FwLY=; b=bmgc/cxV8pbDnM8CfBklQgZR0osKii1mRMJAhpIerqgskOqNXIUuhaNt4j6rDVfI0E NxH1kzIdpX0TNSNgBspyzaIpxaHISDuTFJcKFTV42RHQ9GFQGD3IKkLv/+4XjFqEJlTr AM0e2c4y1504le89OxrDqajnBVRgJ9miOtaWE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; b=Q6w8kQC7H988FZtlJixlDlkbzjJTvVl7Nww572K9mD5+BJlbJ1cxTIhAFmFIMO//J/ FkzThkxqmJWtFT1teAaCduMKDrTTGzCI/AlX2Z9WZh7Gb0ljppPmktVic0FrFL8HB/L9 cptEk8OeJA1Pf7qp6y1x5gt4jj3Z2zoOdHmIg= Received: by 10.216.177.85 with SMTP id c63mr5218184wem.14.1276705394242; Wed, 16 Jun 2010 09:23:14 -0700 (PDT) Received: from localhost ([78.142.140.194]) by mx.google.com with ESMTPS id l60sm2368446wej.15.2010.06.16.09.23.09 (version=SSLv3 cipher=RC4-MD5); Wed, 16 Jun 2010 09:23:12 -0700 (PDT) From: Anonymous To: Alexander Best References: <4C17BB76.6020702@FreeBSD.org> <4C17E287.8060703@FreeBSD.org> Date: Wed, 16 Jun 2010 20:22:32 +0400 In-Reply-To: (Alexander Best's message of "Wed, 16 Jun 2010 18:18:54 +0200") Message-ID: <86typ3t0af.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: freebsd-current@freebsd.org, Gabor Kovesdan Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 16:23:16 -0000 Alexander Best writes: > On Wed, Jun 16, 2010 at 3:50 PM, Alexander Best > wrote: >> On Tue, Jun 15, 2010 at 10:28 PM, Gabor Kovesdan wrote: >>> >>>> >>>> cc1: warnings being treated as errors >>>> >>>> /usr/src/lib/libiconv_modules/BIG5/../../libc/iconv/citrus_stdenc_template.h: >>>> In function '_citrus_BIG5_stdenc_cstomb': >>>> >>>> /usr/src/lib/libiconv_modules/BIG5/../../libc/iconv/citrus_stdenc_template.h:138: >>>> warning: 'ret' may be used uninitialized in this function >>>> >>> >>> Eeh. I'm sorry, I'll look at it tomorrow. For now you can use WERROR="" and >>> CWARNFLAGS="" to test, actually it was what I used that's why I couldn't >>> catch this. I had the same problem with some code that was not mine so I >>> just set it. I don't know why I'm having that, tohugh, I also have that with >>> a clean unpatched src tree and I'm not using any CFLAGS tweak or such. >>> If you haven't done make clean yet, you can resume the build with: >> >> make buildworld -DNO_CLEAN WERROR="" CWARNFLAGS="" >> >> thanks. that worked. :) > > ok. after installing world i get this when bootingt up: > > Starting powerd. > Starting musicpd. > path: invalid filesystem charset: ISO-8859-15 > /usr/lib/i18n/libiconv_std.so.4: unsupported file > layout/usr/lib/i18n/libiconv_std.so.4: unsupported file > layout/usr/lib/i18n/libiconv_std.so.4: unsupported file > layout/usr/lib/i18n/libiconv_std.so.4: unsupported file > layout/usr/lib/i18n/libiconv_std.so.4: unsupported file layout > pid 1078 (mpd), uid 1001: exited on signal 6 > Abort trap > /etc/rc: WARNING: failed to start musicpd > Starting mpdscribble. > GLib: Cannot convert message: Conversion from character set 'UTF-8' to > 'ASCII' is not supported > /usr/lib/i18n/libiconv_std.so.4: unsupported file > layout/usr/lib/i18n/libiconv_std.so.4: unsupported file > layout/usr/lib/i18n/libiconv_std.so.4: unsupported file > layout/usr/lib/i18n/libiconv_std.so.4: unsupported file layoutoption > parsing failed: Conversion from character set 'ASCII' to 'UTF-8' is > not supported > /etc/rc: WARNING: failed to start mpdscribble Can you try? $ cd /usr/src/lib/libiconv_modules $ make install From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 16:30:37 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B835A106566C for ; Wed, 16 Jun 2010 16:30:37 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from dirg.bris.ac.uk (dirg.bris.ac.uk [137.222.10.102]) by mx1.freebsd.org (Postfix) with ESMTP id 76DD58FC18 for ; Wed, 16 Jun 2010 16:30:37 +0000 (UTC) Received: from ncsd.bris.ac.uk ([137.222.10.59] helo=ncs.bris.ac.uk) by dirg.bris.ac.uk with esmtp (Exim 4.69) (envelope-from ) id 1OOvVb-0003Q1-VL; Wed, 16 Jun 2010 17:30:36 +0100 Received: from mech-cluster241.men.bris.ac.uk ([137.222.187.241]) by ncs.bris.ac.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.67) (envelope-from ) id 1OOvVb-0005jQ-L4; Wed, 16 Jun 2010 17:30:35 +0100 Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.4/8.14.4) with ESMTP id o5GGUZPI045211; Wed, 16 Jun 2010 17:30:35 +0100 (BST) (envelope-from mexas@bristol.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.4/8.14.4/Submit) id o5GGUZ0f045207; Wed, 16 Jun 2010 17:30:35 +0100 (BST) (envelope-from mexas@bristol.ac.uk) X-Authentication-Warning: mech-cluster241.men.bris.ac.uk: mexas set sender to mexas@bristol.ac.uk using -f Date: Wed, 16 Jun 2010 17:30:35 +0100 From: Anton Shterenlikht To: Ed Schouten Message-ID: <20100616163035.GA42606@mech-cluster241.men.bris.ac.uk> References: <20100616131503.GA77642@mech-cluster241.men.bris.ac.uk> <20100616134530.GX1797@hoeg.nl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100616134530.GX1797@hoeg.nl> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: freebsd-current@freebsd.org, Anton Shterenlikht Subject: Re: how to set up UTF8 russian in -current? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 16:30:37 -0000 On Wed, Jun 16, 2010 at 03:45:30PM +0200, Ed Schouten wrote: > * Anton Shterenlikht wrote: > > My system is amd64 r209195. > > > > I was wondering if the user localisation > > section of the handbook is a bit out of date: > > http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/using-localization.html > > > > The handbook suggests using cons25r, whereas > > the default console type in /etc/ttys is now xterm. > > And keeping cons25r together with relevant fonts, > > screenmap and keymap in /etc/rc.conf doesn't seem > > to work anymore. > > > > Also, the latest I can find on UTF8 in FreeBSD > > is this thread: > > http://lists.freebsd.org/pipermail/freebsd-current/2009-July/009349.html > > > > I tried to follow the advice given in this thread, > > namely I've rebuilt the kernel with TEKEN_UTF8 > > (it seems the other option mentioned, TEKEN_XTERM, is no > > longer valid), and set LC_CTYPE=ru_RU.UTF-8 > > in my shell. This didn't seem to have any effect. > > Even though UTF-8 support for the console is closer than it used to be, > it's still not useful in practice, since syscons won't display it. I > guess if you want to get Russian working on HEAD, you should do the > following: > > - Don't set TEKEN_* in your kernel configuration file. > - Just use the xterm terminal type in /etc/ttys. > - Set LC_CTYPE=ru_RU.{CP1251,CP866,ISO8859-5,KOI8-R}. > - Load a font for Syscons which uses the same character as the one you > chose above. > > So this means 8-bit character sets is the best thing we can do right > now. Yes, this works fine. I guess TEKEN_* in the kernel broke it. However, russian in xterm is still not working. This is probably my misconfiguration.. many thanks for your help anton -- Anton Shterenlikht Room 2.6, Queen's Building Mech Eng Dept Bristol University University Walk, Bristol BS8 1TR, UK Tel: +44 (0)117 331 5944 Fax: +44 (0)117 929 4423 From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 16:35:42 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3CC91065676; Wed, 16 Jun 2010 16:35:42 +0000 (UTC) (envelope-from danger@FreeBSD.org) Received: from services.syscare.sk (services.syscare.sk [188.40.39.36]) by mx1.freebsd.org (Postfix) with ESMTP id 5B5CC8FC22; Wed, 16 Jun 2010 16:35:42 +0000 (UTC) Received: from services.syscare.sk (services [188.40.39.36]) by services.syscare.sk (Postfix) with ESMTP id CB0162C839; Wed, 16 Jun 2010 18:15:58 +0200 (CEST) X-Virus-Scanned: amavisd-new at rulez.sk Received: from services.syscare.sk ([188.40.39.36]) by services.syscare.sk (services.rulez.sk [188.40.39.36]) (amavisd-new, port 10024) with ESMTP id w7m+4RZtbzeW; Wed, 16 Jun 2010 18:15:56 +0200 (CEST) Received: from danger-mbp.local (bband-dyn49.178-40-157.t-com.sk [178.40.157.49]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: danger@rulez.sk) by services.syscare.sk (Postfix) with ESMTPSA id 57AB12C825; Wed, 16 Jun 2010 18:15:56 +0200 (CEST) Message-ID: <4C18F8BB.4040006@FreeBSD.org> Date: Wed, 16 Jun 2010 18:15:55 +0200 From: Daniel Gerzo Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.4) Gecko/20100616 Lanikai/3.1.1pre MIME-Version: 1.0 To: current@freebsd.org, hackers@freebsd.org, questions@freebsd.org Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: Subject: HEADSUP: Call for FreeBSD Status Reports - 2Q/2010 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 16:35:42 -0000 Dear all, I would like to remind you that the next round of status reports covering the second quarter of 2010 is due on July 15th, 2010. This initiative is very welcome in our community. Therefore, I would like to ask you to submit your status reports soon, so that we can compile the report on time. Do not hesitate and write us a few lines - a short description about what you are working on, what are your plans and goals, so we can inform our community about your great work! Check out the reports from past to get some inspiration of what your submission should look like. If you know about a project that should be included in the status report, please let us know as well, so we can poke the responsible people to provide us with something useful. Updates to submissions from the last report are welcome too. Note that the submissions are accepted from anyone involved with the FreeBSD community, you do not have to be a FreeBSD committer. Submissions about anything related to FreeBSD are very welcome! Please email us the filled-in XML template to be found at http://www.freebsd.org/news/status/report-sample.xml to monthly@FreeBSD.org, or alternatively use our web based form located at http://www.freebsd.org/cgi/monthly.cgi. For more information, please visit http://www.freebsd.org/news/status/. We are looking forward to see your submissions! -- S pozdravom / Best regards Daniel Gerzo, FreeBSD committer From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 18:12:40 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E9F15106566C for ; Wed, 16 Jun 2010 18:12:40 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id 70F0D8FC0A for ; Wed, 16 Jun 2010 18:12:40 +0000 (UTC) Received: (qmail 13207 invoked by uid 399); 16 Jun 2010 18:12:39 -0000 Received: from localhost (HELO ?192.168.0.145?) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 16 Jun 2010 18:12:39 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4C191414.7060102@FreeBSD.org> Date: Wed, 16 Jun 2010 11:12:36 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: John Baldwin References: <4C187778.9060909@FreeBSD.org> <201006160805.09706.jhb@freebsd.org> In-Reply-To: <201006160805.09706.jhb@freebsd.org> X-Enigmail-Version: 1.1 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-current@freebsd.org Subject: Re: devd and/or ACPI not reporting a heat problem X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 18:12:41 -0000 On 6/16/2010 5:05 AM, John Baldwin wrote: > You can reduce the polling interval by changing > hw.acpi.thermal.polling_rate (it is in seconds it seems) to a lower value. Thanks, I'll give that a try, although with the cleaning I gave it yesterday I'm hoping to avoid heat problems for a while. :) Doug -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/ From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 19:04:27 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 48A601065672 for ; Wed, 16 Jun 2010 19:04:27 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from gw03.mail.saunalahti.fi (gw03.mail.saunalahti.fi [195.197.172.111]) by mx1.freebsd.org (Postfix) with ESMTP id EF9C98FC1E for ; Wed, 16 Jun 2010 19:04:26 +0000 (UTC) Received: from a91-153-117-195.elisa-laajakaista.fi (a91-153-117-195.elisa-laajakaista.fi [91.153.117.195]) by gw03.mail.saunalahti.fi (Postfix) with SMTP id 57C6B2167FE; Wed, 16 Jun 2010 22:04:16 +0300 (EEST) Date: Wed, 16 Jun 2010 22:04:16 +0300 From: Jaakko Heinonen To: Gabor Kovesdan Message-ID: <20100616190416.GA3896@a91-153-117-195.elisa-laajakaista.fi> References: <4C16C5B5.1070308@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4C16C5B5.1070308@FreeBSD.org> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: Edwin Groothuis , FreeBSD Current , Xin LI , i18n@FreeBSD.org Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 19:04:27 -0000 Hi, On 2010-06-15, Gabor Kovesdan wrote: > - The iconv.h header files is supposed to be compatible with the GNU > version, i.e. sources should build with base iconv.h and GNU libiconv. > I've just did a very quick test and it seems ports can safely link to > GNU libiconv, there's no conflict. > The rather big patch (42,5M) is available here: > http://www.kovesdan.org/patches/iconv_base_integrate.diff iconv(3) prototype doesn't conform to POSIX.1-2008. Is it a well-considered decision? -- Jaakko From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 20:02:31 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 442F71065675; Wed, 16 Jun 2010 20:02:31 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from server.mypc.hu (server.mypc.hu [87.229.73.95]) by mx1.freebsd.org (Postfix) with ESMTP id ECE118FC12; Wed, 16 Jun 2010 20:02:30 +0000 (UTC) Received: from server.mypc.hu (localhost [127.0.0.1]) by server.mypc.hu (Postfix) with ESMTP id E4F3914DBBBE; Wed, 16 Jun 2010 22:02:29 +0200 (CEST) X-Virus-Scanned: amavisd-new at server.mypc.hu Received: from server.mypc.hu ([127.0.0.1]) by server.mypc.hu (server.mypc.hu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id FBsdIGH-b48B; Wed, 16 Jun 2010 22:02:27 +0200 (CEST) Received: from [192.168.1.105] (catv-80-99-92-167.catv.broadband.hu [80.99.92.167]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by server.mypc.hu (Postfix) with ESMTPSA id A60E114DBBB4; Wed, 16 Jun 2010 22:02:27 +0200 (CEST) Message-ID: <4C192DD1.5070401@FreeBSD.org> Date: Wed, 16 Jun 2010 22:02:25 +0200 From: Gabor Kovesdan User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.2; es-ES; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: Jaakko Heinonen References: <4C16C5B5.1070308@FreeBSD.org> <20100616190416.GA3896@a91-153-117-195.elisa-laajakaista.fi> In-Reply-To: <20100616190416.GA3896@a91-153-117-195.elisa-laajakaista.fi> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Edwin Groothuis , FreeBSD Current , Xin LI , i18n@FreeBSD.org Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 20:02:31 -0000 > iconv(3) prototype doesn't conform to POSIX.1-2008. Is it a > well-considered decision? > No, it was just like that in the Citrus version and I didn't notice the const qualifier. Fixed in my working copy, will be available soon with some minor modifications. Thanks for reporting this. -- Gabor Kovesdan FreeBSD Volunteer EMAIL: gabor@FreeBSD.org .:|:. gabor@kovesdan.org WEB: http://people.FreeBSD.org/~gabor .:|:. http://kovesdan.org From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 20:09:37 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C792C106566B; Wed, 16 Jun 2010 20:09:37 +0000 (UTC) (envelope-from jilles@stack.nl) Received: from mx1.stack.nl (relay04.stack.nl [IPv6:2001:610:1108:5010::107]) by mx1.freebsd.org (Postfix) with ESMTP id 8A4F48FC1C; Wed, 16 Jun 2010 20:09:37 +0000 (UTC) Received: from turtle.stack.nl (turtle.stack.nl [IPv6:2001:610:1108:5010::132]) by mx1.stack.nl (Postfix) with ESMTP id 255901DD68B; Wed, 16 Jun 2010 22:09:36 +0200 (CEST) Received: by turtle.stack.nl (Postfix, from userid 1677) id 10D9F1729C; Wed, 16 Jun 2010 22:09:36 +0200 (CEST) Date: Wed, 16 Jun 2010 22:09:36 +0200 From: Jilles Tjoelker To: Jaakko Heinonen Message-ID: <20100616200935.GA26321@stack.nl> References: <4C16C5B5.1070308@FreeBSD.org> <20100616190416.GA3896@a91-153-117-195.elisa-laajakaista.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100616190416.GA3896@a91-153-117-195.elisa-laajakaista.fi> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: FreeBSD Current , Gabor Kovesdan , i18n@FreeBSD.org Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 20:09:37 -0000 On Wed, Jun 16, 2010 at 10:04:16PM +0300, Jaakko Heinonen wrote: > On 2010-06-15, Gabor Kovesdan wrote: > > - The iconv.h header files is supposed to be compatible with the GNU > > version, i.e. sources should build with base iconv.h and GNU libiconv. > > I've just did a very quick test and it seems ports can safely link to > > GNU libiconv, there's no conflict. > > The rather big patch (42,5M) is available here: > > http://www.kovesdan.org/patches/iconv_base_integrate.diff > iconv(3) prototype doesn't conform to POSIX.1-2008. Is it a > well-considered decision? I think the difference from POSIX.1-2008 is pretty common and may therefore cause less compilation problems. NetBSD's Citrus iconv and GNU iconv have the extra 'const', and so does the default Solaris iconv (Solaris has a separate iconv for standards-conforming applications with the POSIX prototype.) -- Jilles Tjoelker From owner-freebsd-current@FreeBSD.ORG Wed Jun 16 20:10:10 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF3301065673; Wed, 16 Jun 2010 20:10:10 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 5D5868FC19; Wed, 16 Jun 2010 20:10:10 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 42B5B1FFC34; Wed, 16 Jun 2010 20:10:09 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id F2EF08444F; Wed, 16 Jun 2010 22:07:58 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Jaakko Heinonen References: <4C16C5B5.1070308@FreeBSD.org> <20100616190416.GA3896@a91-153-117-195.elisa-laajakaista.fi> Date: Wed, 16 Jun 2010 22:07:58 +0200 In-Reply-To: <20100616190416.GA3896@a91-153-117-195.elisa-laajakaista.fi> (Jaakko Heinonen's message of "Wed, 16 Jun 2010 22:04:16 +0300") Message-ID: <86bpba7nc1.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.95 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: Edwin Groothuis , FreeBSD Current , Xin LI , Gabor Kovesdan , i18n@FreeBSD.org Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 20:10:10 -0000 Jaakko Heinonen writes: > iconv(3) prototype doesn't conform to POSIX.1-2008. Is it a > well-considered decision? Probably not, because it breaks the interface. Imagine that inbuf were just a char *, not a char **. It would be perfectly safe to change it to const char *, because you can always assign a char * to a const char *. However, inbuf is a char **, which is a pointer to a pointer to char. Gabor changed it to const char **, which is a pointer to a pointer to const char. Unfortunately, the two types are incompatible. If foo is a char *, you can't pass &foo as inbuf. % cat >/tmp/const.c < void fs(char *s) { puts(++s); } void gs(const char *s) { puts(++s); } void fsp(char **sp) { puts(++*sp); } void gsp(const char **sp) { puts(++*sp); } int main() { char *s =3D "xyzzy", **sp =3D &s; fs(s); gs(s); fsp(sp); gsp(s= p); } EOF % cc -Wall -Wextra -Werror -std=3Dc99 -o/dev/null /tmp/const.c cc1: warnings being treated as errors /tmp/const.c: In function =E2=80=98main=E2=80=99: /tmp/const.c:6: error: passing argument 1 of =E2=80=98gsp=E2=80=99 from inc= ompatible pointer type /tmp/const.c:5: note: expected =E2=80=98const char **=E2=80=99 but argument= is of type =E2=80=98char **=E2=80=99 This means you can't, say, read data from a file into a buffer and then pass that buffer to iconv, because the buffer is not const (otherwise you couldn't have read data into it). That seems like a pretty fundamental flaw. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 02:10:14 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B21441065675 for ; Thu, 17 Jun 2010 02:10:14 +0000 (UTC) (envelope-from gaijin.k@ovi.com) Received: from outbound2.messaging.lotuslive.com (outbound2.messaging.lotuslive.com [8.12.152.118]) by mx1.freebsd.org (Postfix) with ESMTP id 8C92D8FC12 for ; Thu, 17 Jun 2010 02:10:14 +0000 (UTC) Received: from outbound2.messaging.lotuslive.com (44.32.6.10.in-addr.arpa [10.6.32.44]) by c-in3ofal02-02.sv2.lotusliveops.com (Postfix) with ESMTP id CE33811B0BB8 for ; Thu, 17 Jun 2010 01:58:15 +0000 (GMT) Received: from c-in3ofil02-02.sv2.lotusliveops.com (49.32.6.10.in-addr.arpa [10.6.32.49]) by c-in3obnd02-02.sv2.lotusliveops.com (Postfix) with ESMTP id D1D6F2FEB5 for ; Thu, 17 Jun 2010 01:58:14 +0000 (GMT) Received: from 80.32.6.10.in-addr.arpa (c-in3ws--02-05.sv2.lotusliveops.com [10.6.32.80]) (sender gaijin.k@ovi.com) by c-in3ofil02-02.sv2.lotusliveops.com (LotusLive iNotes outfilter/0.91) with SMTP; Thu, 17 Jun 2010 01:58:14 +0000 Received: (qmail 23235 invoked from network); 17 Jun 2010 01:58:14 -0000 Received: from unknown (HELO c-in3play02-02.sv2.lotusliveops.com) (gaijin.k@ovi.com@74.105.210.169) by 80.32.5.10.in-addr.arpa with SMTP; 17 Jun 2010 01:58:14 -0000 From: "Alexandre \"Sunny\" Kovalenko" To: Anton Shterenlikht In-Reply-To: <20100616163035.GA42606@mech-cluster241.men.bris.ac.uk> References: <20100616131503.GA77642@mech-cluster241.men.bris.ac.uk> <20100616134530.GX1797@hoeg.nl> <20100616163035.GA42606@mech-cluster241.men.bris.ac.uk> Content-Type: multipart/mixed; boundary="=-RZXOaD/MUq/1qj/00m7C" Date: Wed, 16 Jun 2010 21:57:22 -0400 Message-ID: <1276739842.66339.15.camel@RabbitsDen> MIME-Version: 1.0 X-Mailer: Evolution 2.30.1.2 FreeBSD GNOME Team Port X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: freebsd-current@freebsd.org Subject: Re: how to set up UTF8 russian in -current? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 02:10:14 -0000 --=-RZXOaD/MUq/1qj/00m7C Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Wed, 2010-06-16 at 17:30 +0100, Anton Shterenlikht wrote: > On Wed, Jun 16, 2010 at 03:45:30PM +0200, Ed Schouten wrote: > > * Anton Shterenlikht wrote: > > > My system is amd64 r209195. > > >=20 > > > I was wondering if the user localisation > > > section of the handbook is a bit out of date: > > > http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/using-local= ization.html > > >=20 > > > The handbook suggests using cons25r, whereas > > > the default console type in /etc/ttys is now xterm. > > > And keeping cons25r together with relevant fonts, > > > screenmap and keymap in /etc/rc.conf doesn't seem > > > to work anymore. > > >=20 > > > Also, the latest I can find on UTF8 in FreeBSD > > > is this thread: > > > http://lists.freebsd.org/pipermail/freebsd-current/2009-July/009349.h= tml > > >=20 > > > I tried to follow the advice given in this thread, > > > namely I've rebuilt the kernel with TEKEN_UTF8 > > > (it seems the other option mentioned, TEKEN_XTERM, is no > > > longer valid), and set LC_CTYPE=3Dru_RU.UTF-8 > > > in my shell. This didn't seem to have any effect. > >=20 > > Even though UTF-8 support for the console is closer than it used to be, > > it's still not useful in practice, since syscons won't display it. I > > guess if you want to get Russian working on HEAD, you should do the > > following: > >=20 > > - Don't set TEKEN_* in your kernel configuration file. > > - Just use the xterm terminal type in /etc/ttys. > > - Set LC_CTYPE=3Dru_RU.{CP1251,CP866,ISO8859-5,KOI8-R}. > > - Load a font for Syscons which uses the same character as the one you > > chose above. > >=20 > > So this means 8-bit character sets is the best thing we can do right > > now. >=20 > Yes, this works fine. > I guess TEKEN_* in the kernel broke it. >=20 > However, russian in xterm is still not working. > This is probably my misconfiguration.. Can you specifically point out things that do not work for you in the xterm window? I am able to create files and directories with Cyrillic names, use Cyrillic strings as the command parameters, etc. It has been working for me for quite a long time, so I could not really remember what, if anything, I had to do, but we can compare settings if you'd like to. I do use Gnome, though, so some of its pixie dust could have been spilled onto xterm. I have attached small screenshot as an illustration -- if this is not what you are talking about, please, accept my apology for the noise. >=20 > many thanks for your help > anton >=20 >=20 --=20 Alexandre Kovalenko (=D0=9E=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80= =D0=9A=D0=BE=D0=B2=D0=B0=D0=BB=D0=B5=D0=BD=D0=BA=D0=BE) -------------------------------------------------------------- Ovi Store: Fresh apps and more http://store.ovi.com/?cid=3Dovistore-fw-bac-na-acq-na-ovimail-g0-na-4 --=-RZXOaD/MUq/1qj/00m7C-- From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 04:20:08 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2D1EB1065674 for ; Thu, 17 Jun 2010 04:20:08 +0000 (UTC) (envelope-from bu7cher@yandex.ru) Received: from forward5.mail.yandex.net (forward5.mail.yandex.net [77.88.46.21]) by mx1.freebsd.org (Postfix) with ESMTP id C77D38FC0A for ; Thu, 17 Jun 2010 04:20:07 +0000 (UTC) Received: from smtp1.mail.yandex.net (smtp1.mail.yandex.net [77.88.46.101]) by forward5.mail.yandex.net (Yandex) with ESMTP id 037EE14D06F1; Thu, 17 Jun 2010 08:20:06 +0400 (MSD) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1276748406; bh=XzEylKvDaV/4tu3BWELAo34DGtweMF/WLadwfyuDOSo=; h=Message-ID:Date:From:MIME-Version:To:CC:Subject:References: In-Reply-To:Content-Type; b=ViUj3Rkx5CvcouucHR9JtgDqtMkaa2TyxJUOIEA3apOMZ+vTesb31cnwd8XdibVMD 04yXXXN+gBKN9lJCd4gxLodhks6vu9WE3uupxW0pAAWcYqtoqmffsv1j3UqGRPW226 qea0QFVMLnp8N3IZ18pAGdKjBu3JdE/TNeLzIKuM= Received: from [127.0.0.1] (ns.kirov.so-ups.ru [77.72.136.145]) by smtp1.mail.yandex.net (Yandex) with ESMTPSA id A993829009C; Thu, 17 Jun 2010 08:20:05 +0400 (MSD) Message-ID: <4C19A270.4060901@yandex.ru> Date: Thu, 17 Jun 2010 08:20:00 +0400 From: "Andrey V. Elsukov" User-Agent: Mozilla Thunderbird 1.5 (FreeBSD/20051231) MIME-Version: 1.0 To: "Alexandre \"Sunny\" Kovalenko" References: <20100616131503.GA77642@mech-cluster241.men.bris.ac.uk> <20100616134530.GX1797@hoeg.nl> <20100616163035.GA42606@mech-cluster241.men.bris.ac.uk> <1276739842.66339.15.camel@RabbitsDen> In-Reply-To: <1276739842.66339.15.camel@RabbitsDen> X-Enigmail-Version: 1.0.1 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigFB391EC251E16B4C9D7B6450" X-Yandex-TimeMark: 1276748405 X-Yandex-Spam: 1 X-Yandex-Front: smtp1.mail.yandex.net Cc: freebsd-current@freebsd.org, Anton Shterenlikht Subject: Re: how to set up UTF8 russian in -current? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 04:20:08 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigFB391EC251E16B4C9D7B6450 Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: quoted-printable On 17.06.2010 5:57, Alexandre "Sunny" Kovalenko wrote: > Can you specifically point out things that do not work for you in the > xterm window? I am able to create files and directories with Cyrillic > names, use Cyrillic strings as the command parameters, etc. It has been= > working for me for quite a long time, so I could not really remember > what, if anything, I had to do, but we can compare settings if you'd > like to. I do use Gnome, though, so some of its pixie dust could have > been spilled onto xterm. >=20 > I have attached small screenshot as an illustration -- if this is not > what you are talking about, please, accept my apology for the noise. I think Anton said about console localization (not X Window). --=20 WBR, Andrey V. Elsukov --------------enigFB391EC251E16B4C9D7B6450 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) iQEcBAEBAgAGBQJMGaJzAAoJEAHF6gQQyKF69e0H/i3lBjSCLAOSfc/QFDSwYL2d plTitrmEIOo8VLh007LTKsRq5o1oWcpYRW9u+iaHhoJHrOADHRlsCSQ6nqlBe8ky 44vQZ3jemMN0+uycDXjpdRaExQLIvb1YxgvU+rDv04cyGpVsWIw6pmmZydEPDxwg wfS8LmBSdSKjzi1G1c6fEOZSoZt+rzuDm5qyXkjzxzDApX/QmtA64x0hNa6WnCbF HWNMHGAIHVU7n3rBWAWTXfH+HBZKUJZ403oWBgeQWhdgteG+4joFDW9/9Zf6kgqX Y4GbsU8Vm1wQaRBDW+HmLYz5ut2O+xCBUseZ4/yfwWCy10h+h54LR+DHSYpowNs= =6/I2 -----END PGP SIGNATURE----- --------------enigFB391EC251E16B4C9D7B6450-- From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 05:05:58 2010 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B7FDF1065677 for ; Thu, 17 Jun 2010 05:05:58 +0000 (UTC) (envelope-from admin@lissyara.su) Received: from hosting.lissyara.su (hosting.lissyara.su [77.221.149.162]) by mx1.freebsd.org (Postfix) with ESMTP id 1BB5A8FC1C for ; Thu, 17 Jun 2010 05:05:57 +0000 (UTC) Received: from [195.93.240.106] (port=43802 helo=lissyara.moskb.local) by hosting.lissyara.su with esmtpsa (TLSv1:CAMELLIA256-SHA:256) (Exim 4.71 (FreeBSD)) (envelope-from ) id 1OP7IZ-0008XF-EE for freebsd-current@FreeBSD.org; Thu, 17 Jun 2010 09:05:55 +0400 Message-ID: <4C19AD32.9010806@lissyara.su> Date: Thu, 17 Jun 2010 09:05:54 +0400 From: Alex Keda User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; ru-RU; rv:1.8.1.23) Gecko/20091202 Thunderbird/2.0.0.23 Mnenhy/0.7.6.666 MIME-Version: 1.0 To: freebsd-current@FreeBSD.org Content-Type: text/plain; charset=windows-1251; format=flowed Content-Transfer-Encoding: 7bit X-White-List: YES X-Spam-Description: if spam count > 60 - this is spam X-Spam-Count: 0 X-Descriptions: powered by www.lissyara.su X-Bounce-ID: hosting.lissyara.su Cc: Subject: SUJ problem X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 05:05:58 -0000 after unexpected reboot I have problem Mounting root filesystem rw failed, startup aborted ERROR: ABORTING BOOT (sending SIGTERM to parent)! Jun 17 12:35:49 init: /bin/sh on /etc/rc terminated abnormally, going to single user mode Enter full pathname of shell or RETURN for /bin/sh : # f s c k - y ** /dev/label/rootFS USE JOURNAL?? yes ** SU+J Recovering /dev/label/rootFS ** Reading 33554432 byte journal from inode 10. RECOVER? yes ** Building recovery table. ** Resolving unreferenced inode list. ** Processing journal entries. fsck: /dev/label/rootFS: Abort trap: 6 # fsck -y ** /dev/label/rootFS USE JOURNAL?? yes ** SU+J Recovering /dev/label/rootFS ** Reading 33554432 byte journal from inode 10. RECOVER? yes ** Building recovery table. ** Resolving unreferenced inode list. ** Processing journal entries. fsck: /dev/label/rootFS: Abort trap: 6 # fsck -y \^H\^[[K \^H\^[[K / ** /dev/label/rootFS USE JOURNAL?? [yn] ** Skipping journal, falling through to full fsck ** Last Mounted on / ** Root file system ** Phase 1 - Check Blocks and Sizes 73183545484378114 BAD I=29393063 UNEXPECTED SOFT UPDATE INCONSISTENCY 8589934638 BAD I=29393063 UNEXPECTED SOFT UPDATE INCONSISTENCY 50775137189900 BAD I=29393063 UNEXPECTED SOFT UPDATE INCONSISTENCY 361413938815959043 BAD I=29393063 UNEXPECTED SOFT UPDATE INCONSISTENCY 482670965550 BAD I=29393063 UNEXPECTED SOFT UPDATE INCONSISTENCY 289356344794376192 BAD I=29393063 UNEXPECTED SOFT UPDATE INCONSISTENCY -1097558167694 BAD I=29393063 UNEXPECTED SOFT UPDATE INCONSISTENCY 289356344784931840 BAD I=29393063 UNEXPECTED SOFT UPDATE INCONSISTENCY -1097843379600 BAD I=29393063 UNEXPECTED SOFT UPDATE INCONSISTENCY 361413938827687936 BAD I=29393063 UNEXPECTED SOFT UPDATE INCONSISTENCY -281004955507613 BAD I=29393063 UNEXPECTED SOFT UPDATE INCONSISTENCY EXCESSIVE BAD BLKS I=29393063 CONTINUE? [yn] INCORRECT BLOCK COUNT I=29393063 (2153728 should be 263040) CORRECT? [yn] ** Phase 2 - Check Pathnames DUP/BAD I=29393063 OWNER=lissyara MODE=100644 SIZE=1102141440 MTIME=May 12 16:31 2010 FILE=/tmp/src.tar UNEXPECTED SOFT UPDATE INCONSISTENCY REMOVE? [yn] ** Phase 3 - Check Connectivity ** Phase 4 - Check Reference Counts UNREF FILE I=3085332 OWNER=root MODE=100555 SIZE=362096 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=3085355 OWNER=root MODE=100555 SIZE=137472 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=4922372 OWNER=root MODE=100555 SIZE=9168 MTIME=Jun 15 09:24 2010 CLEAR? [yn] UNREF FILE I=4922398 OWNER=root MODE=100555 SIZE=438280 MTIME=Jun 15 09:24 2010 CLEAR? [yn] UNREF FILE I=4922403 OWNER=root MODE=100555 SIZE=89184 MTIME=Jun 15 09:24 2010 CLEAR? [yn] UNREF FILE I=7561814 OWNER=root MODE=140666 SIZE=0 MTIME=Jun 15 14:45 2010 CLEAR? [yn] UNREF FILE I=13566043 OWNER=root MODE=100644 SIZE=69 MTIME=Jun 15 15:06 2010 CLEAR? [yn] UNREF FILE I=22138926 OWNER=root MODE=100444 SIZE=38016 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139000 OWNER=root MODE=100444 SIZE=20472 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139005 OWNER=root MODE=100444 SIZE=21088 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139052 OWNER=root MODE=100444 SIZE=40600 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139096 OWNER=root MODE=100444 SIZE=38872 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139109 OWNER=root MODE=100444 SIZE=5800 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139118 OWNER=root MODE=100444 SIZE=8160 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139120 OWNER=root MODE=100444 SIZE=9736 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139122 OWNER=root MODE=100444 SIZE=6872 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139124 OWNER=root MODE=100444 SIZE=7080 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139127 OWNER=root MODE=100444 SIZE=6840 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139131 OWNER=root MODE=100444 SIZE=5320 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139139 OWNER=root MODE=100444 SIZE=5352 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139142 OWNER=root MODE=100444 SIZE=5888 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139144 OWNER=root MODE=100444 SIZE=5624 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139151 OWNER=root MODE=100444 SIZE=13752 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139155 OWNER=root MODE=100444 SIZE=35840 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139174 OWNER=root MODE=100444 SIZE=22224 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139214 OWNER=root MODE=100444 SIZE=63128 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139223 OWNER=root MODE=100444 SIZE=35712 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139256 OWNER=root MODE=100444 SIZE=293128 MTIME=Jun 15 09:24 2010 CLEAR? [yn] UNREF FILE I=22139328 OWNER=root MODE=100555 SIZE=151784 MTIME=Jun 15 09:24 2010 CLEAR? [yn] UNREF FILE I=22139335 OWNER=root MODE=100444 SIZE=108320 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139350 OWNER=root MODE=100444 SIZE=7600 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139366 OWNER=root MODE=100444 SIZE=104792 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139455 OWNER=root MODE=100555 SIZE=27760 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139748 OWNER=root MODE=100444 SIZE=72912 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139753 OWNER=root MODE=100555 SIZE=256648 MTIME=Jun 15 09:24 2010 CLEAR? [yn] UNREF FILE I=22139758 OWNER=root MODE=100444 SIZE=337128 MTIME=Jun 15 09:24 2010 CLEAR? [yn] UNREF FILE I=22139805 OWNER=root MODE=100444 SIZE=1019576 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139963 OWNER=root MODE=100444 SIZE=259144 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22139988 OWNER=root MODE=100444 SIZE=449424 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22140104 OWNER=root MODE=100444 SIZE=533968 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22140131 OWNER=root MODE=100444 SIZE=108424 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22140194 OWNER=root MODE=104555 SIZE=25384 MTIME=Jun 15 09:24 2010 CLEAR? [yn] UNREF FILE I=22140223 OWNER=root MODE=104555 SIZE=16864 MTIME=Jun 15 09:24 2010 CLEAR? [yn] UNREF FILE I=22140379 OWNER=root MODE=100555 SIZE=28936 MTIME=Jun 15 09:24 2010 CLEAR? [yn] UNREF FILE I=22140457 OWNER=root MODE=100555 SIZE=39592 MTIME=Jun 15 09:24 2010 CLEAR? [yn] UNREF FILE I=22140508 OWNER=root MODE=100555 SIZE=47832 MTIME=Jun 15 09:25 2010 CLEAR? [yn] UNREF FILE I=22140522 OWNER=root MODE=100555 SIZE=1979568 MTIME=Jun 15 09:25 2010 CLEAR? [yn] UNREF FILE I=22140559 OWNER=root MODE=100555 SIZE=40200 MTIME=Jun 15 09:25 2010 CLEAR? [yn] UNREF FILE I=22140657 OWNER=root MODE=100555 SIZE=39384 MTIME=Jun 15 09:25 2010 CLEAR? [yn] UNREF FILE I=22257314 OWNER=root MODE=100444 SIZE=26688 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22869097 OWNER=root MODE=100444 SIZE=1283152 MTIME=Jun 15 09:22 2010 CLEAR? [yn] UNREF FILE I=22869100 OWNER=root MODE=100444 SIZE=1689248 MTIME=Jun 15 09:24 2010 CLEAR? [yn] UNREF FILE I=22869517 OWNER=root MODE=100444 SIZE=33376 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22869518 OWNER=root MODE=100444 SIZE=38928 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22869519 OWNER=root MODE=100444 SIZE=56056 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22869522 OWNER=root MODE=100444 SIZE=148288 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22869524 OWNER=root MODE=100444 SIZE=315008 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22869525 OWNER=root MODE=100444 SIZE=8304 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22869526 OWNER=root MODE=100444 SIZE=68736 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22869532 OWNER=root MODE=100444 SIZE=114312 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22869534 OWNER=root MODE=100444 SIZE=19672 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22869536 OWNER=root MODE=100444 SIZE=116536 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22869545 OWNER=root MODE=100444 SIZE=29288 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22869549 OWNER=root MODE=100444 SIZE=89616 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22869556 OWNER=root MODE=100444 SIZE=89752 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22869565 OWNER=root MODE=100444 SIZE=56928 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=22869587 OWNER=root MODE=100444 SIZE=9824 MTIME=Jun 15 09:23 2010 CLEAR? [yn] UNREF FILE I=29392909 OWNER=mysql MODE=100600 SIZE=0 MTIME=Jun 15 14:45 2010 CLEAR? [yn] UNREF FILE I=29392910 OWNER=mysql MODE=100600 SIZE=0 MTIME=Jun 15 14:45 2010 CLEAR? [yn] UNREF FILE I=29392912 OWNER=mysql MODE=100600 SIZE=0 MTIME=Jun 15 14:45 2010 CLEAR? [yn] UNREF FILE I=29392913 OWNER=mysql MODE=100600 SIZE=0 MTIME=Jun 15 14:45 2010 CLEAR? [yn] UNREF FILE I=29392914 OWNER=mysql MODE=100600 SIZE=0 MTIME=Jun 15 14:45 2010 CLEAR? [yn] UNREF FILE I=29392985 OWNER=lissyara MODE=100600 SIZE=0 MTIME=Jun 17 07:16 2010 CLEAR? [yn] UNREF FILE I=29392999 OWNER=root MODE=100600 SIZE=221 MTIME=Jun 17 07:04 2010 CLEAR? [yn] UNREF FILE I=29393008 OWNER=root MODE=100600 SIZE=1005 MTIME=Jun 17 07:16 2010 CLEAR? [yn] UNREF FILE I=29393013 OWNER=root MODE=100600 SIZE=165 MTIME=Jun 17 07:16 2010 CLEAR? [yn] BAD/DUP FILE I=29393063 OWNER=lissyara MODE=100644 SIZE=1102141440 MTIME=May 12 16:31 2010 CLEAR? [yn] UNREF FILE I=29393125 OWNER=root MODE=100600 SIZE=271 MTIME=Jun 17 07:21 2010 CLEAR? [yn] UNREF FILE I=29393148 OWNER=root MODE=100600 SIZE=685 MTIME=Jun 17 07:21 2010 CLEAR? [yn] ** Phase 5 - Check Cyl groups FREE BLK COUNT(S) WRONG IN SUPERBLK SALVAGE? [yn] SUMMARY INFORMATION BAD SALVAGE? [yn] BLK(S) MISSING IN BIT MAPS SALVAGE? [yn] 603808 files, 16139573 used, 101664952 free (149904 frags, 12689381 blocks, 0.1% fragmentation) ***** FILE SYSTEM MARKED CLEAN ***** ***** FILE SYSTEM WAS MODIFIED ***** # ^D Setting hostuuid: 1f34df80-d995-dc11-bbda-c49877a8001c. lissyara$ uname -a FreeBSD lissyara.moskb.local 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r209227: Wed Jun 16 09:47:55 MSD 2010 root@lissyara.moskb.local:/usr/obj/usr/src/sys/GENERIC amd64 From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 09:21:04 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AC7EA106566C for ; Thu, 17 Jun 2010 09:21:04 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from dirj.bris.ac.uk (dirj.bris.ac.uk [137.222.10.78]) by mx1.freebsd.org (Postfix) with ESMTP id 62D0A8FC15 for ; Thu, 17 Jun 2010 09:21:04 +0000 (UTC) Received: from ncsc.bris.ac.uk ([137.222.10.41]) by dirj.bris.ac.uk with esmtp (Exim 4.69) (envelope-from ) id 1OPBHT-0005y1-C9; Thu, 17 Jun 2010 10:21:03 +0100 Received: from mech-cluster241.men.bris.ac.uk ([137.222.187.241]) by ncsc.bris.ac.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.67) (envelope-from ) id 1OPBHT-0003ZG-6G; Thu, 17 Jun 2010 10:21:03 +0100 Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.4/8.14.4) with ESMTP id o5H9L2Rj090299; Thu, 17 Jun 2010 10:21:02 +0100 (BST) (envelope-from mexas@bristol.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.4/8.14.4/Submit) id o5H9L2MU090298; Thu, 17 Jun 2010 10:21:02 +0100 (BST) (envelope-from mexas@bristol.ac.uk) X-Authentication-Warning: mech-cluster241.men.bris.ac.uk: mexas set sender to mexas@bristol.ac.uk using -f Date: Thu, 17 Jun 2010 10:21:02 +0100 From: Anton Shterenlikht To: Matthew Seaman , freebsd-current@freebsd.org Message-ID: <20100617092102.GA90168@mech-cluster241.men.bris.ac.uk> References: <20100616165909.GA55995@mech-cluster241.men.bris.ac.uk> <4C190513.20309@infracaninophile.co.uk> <20100616171531.GA56202@mech-cluster241.men.bris.ac.uk> <4C1912CB.9000609@infracaninophile.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4C1912CB.9000609@infracaninophile.co.uk> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: Subject: Re: ntpq: write to localhost failed: Network is unreachable X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 09:21:04 -0000 On Wed, Jun 16, 2010 at 07:07:07PM +0100, Matthew Seaman wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > On 16/06/2010 18:15:32, Anton Shterenlikht wrote: > > On Wed, Jun 16, 2010 at 06:08:35PM +0100, Matthew Seaman wrote: > >> -----BEGIN PGP SIGNED MESSAGE----- > >> Hash: SHA1 > >> > >> On 16/06/2010 17:59:10, Anton Shterenlikht wrote: > >>> After a recent upgrade to r209156 I get this error: > >>> > >>> $ ntpq -p > >>> ntpq: write to localhost failed: Network is unreachable > >>> > >>> Please advise > >> > >> What does 'ifconfig -a' and 'netstat -rn' say? > > > > $ ifconfig -a > > em0: flags=8843 metric 0 mtu 1500 > > options=209b > > ether 00:13:21:5b:05:1c > > inet 137.222.187.28 netmask 0xffffff00 broadcast 137.222.187.255 > > inet6 fe80::213:21ff:fe5b:51c%em0 prefixlen 64 scopeid 0x1 > > nd6 options=29 > > media: Ethernet autoselect (1000baseT ) > > status: active > > em1: flags=8802 metric 0 mtu 1500 > > options=209b > > ether 00:13:21:5b:05:1d > > media: Ethernet autoselect (100baseTX ) > > status: active > > lo0: flags=8049 metric 0 mtu 16384 > > options=3 > > inet 127.0.0.1 netmask 0xff000000 > > inet6 ::1 prefixlen 128 > > inet6 fe80::1%lo0 prefixlen 64 scopeid 0x3 > > nd6 options=21 > > > > $ netstat -rn > > Routing tables > > > > Internet: > > Destination Gateway Flags Refs Use Netif Expire > > default 137.222.187.250 UGS 0 65512 em0 > > 127.0.0.1 link#3 UH 0 293 lo0 > > 137.222.187.0/24 link#1 U 0 10861 em0 > > 137.222.187.28 link#1 UHS 0 0 lo0 > > > > Internet6: > > Destination Gateway Flags Netif Expire > > ::/96 ::1 UGRS lo0 > > ::1 ::1 UH lo0 > > ::ffff:0.0.0.0/96 ::1 UGRS lo0 > > fe80::/10 ::1 UGRS lo0 > > fe80::%em0/64 link#1 U em0 > > fe80::213:21ff:fe5b:51c%em0 link#1 UHS lo0 > > fe80::%lo0/64 link#3 U lo0 > > fe80::1%lo0 link#3 UHS lo0 > > ff01:1::/32 fe80::213:21ff:fe5b:51c%em0 U em0 > > ff01:3::/32 ::1 U lo0 > > ff02::/16 ::1 UGRS lo0 > > ff02::%em0/32 fe80::213:21ff:fe5b:51c%em0 U em0 > > ff02::%lo0/32 ::1 U lo0 > > > > > > > >> What happens if you try and ping localhost? > > > > $ ping -c5 localhost > > PING localhost (127.0.0.1): 56 data bytes > > 64 bytes from 127.0.0.1: icmp_seq=0 ttl=64 time=0.109 ms > > 64 bytes from 127.0.0.1: icmp_seq=1 ttl=64 time=0.103 ms > > 64 bytes from 127.0.0.1: icmp_seq=2 ttl=64 time=0.060 ms > > 64 bytes from 127.0.0.1: icmp_seq=3 ttl=64 time=0.059 ms > > 64 bytes from 127.0.0.1: icmp_seq=4 ttl=64 time=0.059 ms > > > > --- localhost ping statistics --- > > 5 packets transmitted, 5 packets received, 0.0% packet loss > > round-trip min/avg/max/stddev = 0.059/0.078/0.109/0.023 ms > > Nothing obviously wrong there. Perhaps ntpd is not running? > (Not sure quite why that should cause an error message about > reachability of localhost: I suppose it's not completely unreasonable > though.) > > If ntpd is running, then try restarting it. If the problem still > persists, then it looks like you've found a bug. # ps ax | grep ntp 55043 ?? Rs 0:00.02 /usr/sbin/ntpd -c /etc/ntp.conf -p /var/run/ntpd.pid -f /var/db/ntpd.drif 55050 0 R+ 0:00.00 grep ntp # ntpq -p ntpq: write to localhost failed: Network is unreachable # /etc/rc.d/ntpd restart Stopping ntpd. Waiting for PIDS: 55043. Starting ntpd. # ps ax | grep ntp 55113 ?? Ss 0:00.02 /usr/sbin/ntpd -c /etc/ntp.conf -p /var/run/ntpd.pid -f /var/db/ntpd.drif 55127 0 R+ 0:00.00 grep ntp # ntpq -p ntpq: write to localhost failed: Network is unreachable # Matthew, many thanks for your help. I still think it's much more likely the error is due to my misconfiguration than a bug. I think I've seen something like this before, just can't find anything in mail archives. I'll try asking on @current list. thanks again anton -- Anton Shterenlikht Room 2.6, Queen's Building Mech Eng Dept Bristol University University Walk, Bristol BS8 1TR, UK Tel: +44 (0)117 331 5944 Fax: +44 (0)117 929 4423 From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 10:01:49 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BD1091065677 for ; Thu, 17 Jun 2010 10:01:49 +0000 (UTC) (envelope-from moonlightakkiy@yahoo.ca) Received: from web51802.mail.re2.yahoo.com (web51802.mail.re2.yahoo.com [206.190.38.233]) by mx1.freebsd.org (Postfix) with SMTP id 653EB8FC2A for ; Thu, 17 Jun 2010 10:01:48 +0000 (UTC) Received: (qmail 68506 invoked by uid 60001); 17 Jun 2010 10:01:47 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.ca; s=s1024; t=1276768907; bh=hIG9za7LsxUW0/82iCFiMbr1HUeWpNDxa2NtApOqeQA=; h=Message-ID:X-YMail-OSG:Received:X-Mailer:References:Date:From:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type; b=ymIEZFFSwjBGykHZEeciqq5i9RO5kzTZYhuVr3KZocTIgTswKDYTl8fSyKtZ6M94ysuh9ssJjaZ1EEeObDJ2jb6ZiR9zdRWGmQb9kkqUoeYKs04aBmbDQKlbylpc76guC7tZQVSpo+F+IFFZ4wWA1k1V97MvblZajTOTz16EDhs= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.ca; h=Message-ID:X-YMail-OSG:Received:X-Mailer:References:Date:From:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type; b=af7I4FCvrctLjS2v09qcKsfvgJieknHJhIiklxXQ1KxlrsaO76t/xLtdIAuyiUg9hK2YvWYaAG42rz0M9fNgVh2kCTtUog9U3pxyzAV1l2XMcJ4FBVDSOz60GzxTApUvqLNmhm91uWcnXsG8wgPiHEN1NX8OuPHZbvHE2cViB6E=; Message-ID: <726063.68104.qm@web51802.mail.re2.yahoo.com> X-YMail-OSG: RheYRHEVM1nKiX0_awLjFYIKWHjaBll8pedKvT7O9a10jpy ElP51pqy0ZR4FaWgSx2nY4ZVlRnbvRFDQ_Kz9dNCbPZfEpasEJuqAJarrgCN tpIYd5SXNzAS59wQzebx4Hn.Iqqle4LJQWXjwCQLbaDMkFAAEP7gXxsFPeAD gwQOM_5DIXyhpzd2P7Jy3wl0QgwY8eFavZWcdZ0nLQ6F331mspxDxZMdjPHh f8aeuHQDavZ31SHDg.98lNFhgSfg2yfDnpV9Yl6WxqemMA.lWVrL0ducWXQJ peGveK60HijlBMQ1YnDSvdN8_KQezFAFv1ArfeAWMwaGZt47n_ALC5AVZvdU QyD4dAaJ9Hmi_I_La Received: from [173.183.132.20] by web51802.mail.re2.yahoo.com via HTTP; Thu, 17 Jun 2010 03:01:47 PDT X-Mailer: YahooMailRC/397.8 YahooMailWebService/0.8.104.274457 References: <16641.96608.qm@web51806.mail.re2.yahoo.com> <4BAE01AC.7000509@gmail.com> <623907.37074.qm@web51803.mail.re2.yahoo.com> <4BB3575D.4040506@gmail.com> <87836.79143.qm@web51804.mail.re2.yahoo.com> <4BBB372C.1060302@gmail.com> <665283.95271.qm@web51802.mail.re2.yahoo.com> <4BBDEC8F.9050803@gmail.com> <490521.32714.qm@web51804.mail.re2.yahoo.com> <4BD307DE.5080507@gmail.com> <332448.8676.qm@web51801.mail.re2.yahoo.com> <4BD3F2D4.8000007@gmail.com> <702632.81988.qm@web51803.mail.re2.yahoo.com> <4BDEE393.4080206@gmail.com> <660085.11669.qm@web51802.mail.re2.yahoo.com> <4BFD4806.8070001@gmail.com> <618770.37649.qm@web51807.mail.re2.yahoo.com> <4C0FAEA2.7010204@gmail.com> <94007.38072.qm@web51807.mail.re2.yahoo.com> <4C11188A.1040002@gmail.com> <447555.80295.qm@web51803.mail.re2.yahoo.com> <4C16499A.3050808@gmail.com> <337427.44900.qm@web51804.mail.re2.yahoo.com> <4C1787DA.2070308@gmail.com> <819523.41498.qm@web51805.mail.re2.yahoo.com> <4C18C4AB.6040205@gmail.com> Date: Thu, 17 Jun 2010 03:01:47 -0700 (PDT) From: PseudoCylon To: Ganbold In-Reply-To: <4C18C4AB.6040205@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Ganbold Tsagaankhuu , freebsd-current@freebsd.org Subject: Re: CALL for TEST [HOSTAP] run(4) ralink usb wireless X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 10:01:49 -0000 ----- Original Message ---- >> From: Ganbold >> To: PseudoCylon >> Cc: freebsd-current@freebsd.org; Ganbold Tsagaankhuu >> Sent: Wed, June 16, 2010 6:33:47 AM >> Subject: Re: CALL for TEST [HOSTAP] run(4) ralink usb wireless >> >> AK-san, > >PseudoCylon wrote: >>>> >>> > >Strange, looks like this time works as expected, but sometimes it >doesn't work. > >In some cases it doesn't work and you can find complete tcpdump output > from very beginning to the modem hang: > Hello, Are following true? When manually load/reload hostapd, works When loaded by rc.conf, doesn't work If so, please try attached patch. (patch to if_run.c only) Or, here is a patched file. http://gitorious.org/run/run/blobs/raw/cmdq_fix/dev/usb/wlan/if_run.c When auto-loading, the driver is brought up and down a few times. It might be the cause. So, when you test, please reboot rspro and let rc.conf handle init process rather than manually start driver/hostapd. And #arp -d -a on rspro, freebsd laptop. and macbook would help for testing. (If it works on mac) So, that clients have to send arp request. If macbook receives "who-has 192.168.1.50" arp request packets, it should work. If macbook supports # tcpdump -vv -xxx -i wlan0 'arp' and see if macbook gets this. 19:34:30.469720 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.50 tell 192.168.1.1, length 46 0x0000: ffff ffff ffff 0030 5462 3d24 0806 0001 0x0010: 0800 0604 0001 0030 5462 3d24 c0a8 0101 0x0020: 0000 0000 0000 c0a8 0132 0000 0000 0000 0x0030: 0000 0000 0000 0000 0000 0000 AK -- begin patch -- diff --git a/dev/usb/wlan/if_run.c b/dev/usb/wlan/if_run.c index e4fc8d2..f302246 100644 --- a/dev/usb/wlan/if_run.c +++ b/dev/usb/wlan/if_run.c @@ -17,7 +17,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_run.c,v 1.11 2010/06/14 23:01:50 jkim Exp $"); +__FBSDID("$FreeBSD$"); /*- * Ralink Technology RT2700U/RT2800U/RT3000U chipset driver. @@ -830,9 +830,6 @@ run_vap_create(struct ieee80211com *ic, if(sc->rvp_cnt++ == 0) ic->ic_opmode = opmode; -if(opmode == IEEE80211_M_HOSTAP) -sc->cmdq_run = RUN_CMDQ_GO; - DPRINTF("rvp_id=%d bmap=%x rvp_cnt=%d\n", rvp->rvp_id, sc->rvp_bmap, sc->rvp_cnt); @@ -894,7 +891,9 @@ run_cmdq_cb(void *arg, int pending) for(i = sc->cmdq_exec; sc->cmdq[i].func && pending; i = sc->cmdq_exec, pending--){ DPRINTFN(6, "cmdq_exec=%d pending=%d\n", i, pending); -if(sc->cmdq_run == RUN_CMDQ_GO){ +if(sc->cmdq_run == RUN_CMDQ_GO || + (sc->cmdq_key_set == RUN_CMDQ_GO && + sc->cmdq[i].func == run_key_set_cb)){ /* * If arg0 is NULL, callback func needs more * than one arg. So, pass ptr to cmdq struct. @@ -4798,7 +4797,7 @@ run_stop(void *arg) ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); sc->ratectl_run = RUN_RATECTL_OFF; -sc->cmdq_run = sc->cmdq_key_set; +sc->cmdq_run = RUN_CMDQ_ABORT; RUN_UNLOCK(sc); -- end patch -- From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 10:15:48 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5F24E106566B; Thu, 17 Jun 2010 10:15:48 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from dirj.bris.ac.uk (dirj.bris.ac.uk [137.222.10.78]) by mx1.freebsd.org (Postfix) with ESMTP id 137F18FC08; Thu, 17 Jun 2010 10:15:47 +0000 (UTC) Received: from ncsd.bris.ac.uk ([137.222.10.59] helo=ncs.bris.ac.uk) by dirj.bris.ac.uk with esmtp (Exim 4.69) (envelope-from ) id 1OPC8M-0001cT-G1; Thu, 17 Jun 2010 11:15:47 +0100 Received: from mech-cluster241.men.bris.ac.uk ([137.222.187.241]) by ncs.bris.ac.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.67) (envelope-from ) id 1OPC8M-0004fv-BW; Thu, 17 Jun 2010 11:15:42 +0100 Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.4/8.14.4) with ESMTP id o5HAFgbM090666; Thu, 17 Jun 2010 11:15:42 +0100 (BST) (envelope-from mexas@bristol.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.4/8.14.4/Submit) id o5HAFgep090665; Thu, 17 Jun 2010 11:15:42 +0100 (BST) (envelope-from mexas@bristol.ac.uk) X-Authentication-Warning: mech-cluster241.men.bris.ac.uk: mexas set sender to mexas@bristol.ac.uk using -f Date: Thu, 17 Jun 2010 11:15:41 +0100 From: Anton Shterenlikht To: freebsd-current@freebsd.org, freebsd-ia64@freebsd.org Message-ID: <20100617101541.GA90363@mech-cluster241.men.bris.ac.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable User-Agent: Mutt/1.5.20 (2009-06-14) Cc: Subject: r209240 ia64 -> buildworld -> undefined reference to `lzma_physmem' X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 10:15:48 -0000 I've r209203 kernel on ia64 box. Now I'm trying to rebuild world to r209240. I get these errors. Please advise many thanks anton crunchide -k _crunched_vi_stub vi.lo ld -dc -r -o id.lo id_stub.o /usr/obj/usr/src/rescue/rescue//usr/src/usr.bi= n/id/id.o crunchide -k _crunched_id_stub id.lo ld -dc -r -o chroot.lo chroot_stub.o /usr/obj/usr/src/rescue/rescue//usr/sr= c/usr.sbin/chroot/chroot.o crunchide -k _crunched_chroot_stub chroot.lo ld -dc -r -o chown.lo chown_stub.o /usr/obj/usr/src/rescue/rescue//usr/src/= usr.sbin/chown/chown.o crunchide -k _crunched_chown_stub chown.lo cc -static -o rescue rescue.o cat.lo chflags.lo chio.lo chmod.lo cp.lo date= =2Elo dd.lo df.lo echo.lo ed.lo exp .lo getfacl.lo hostname.lo kenv.lo kill= =2Elo ln.lo ls.lo mkdir.lo mv.lo pkill.lo ps.lo pwd.lo realpath.lo rm.l rm= dir.lo setfacl.lo sh.lo stty.lo sync.lo test.lo rcp.lo csh.lo atacontrol.lo= badsect.lo camcontrol.lo ccdc nfig.lo clri.lo devfs.lo dmesg.lo dump.lo du= mpfs.lo dumpon.lo fsck.lo fsck_ffs.lo fsck_msdosfs.lo fsdb.lo fs rand.lo gb= de.lo geom.lo ifconfig.lo init.lo kldconfig.lo kldload.lo kldstat.lo kldunl= oad.lo ldconfig.lo md5. o mdconfig.lo mdmfs.lo mknod.lo mount.lo mount_cd96= 60.lo mount_msdosfs.lo mount_nfs.lo mount_ntfs.lo mount_n llfs.lo mount_udf= =2Elo mount_unionfs.lo newfs.lo newfs_msdos.lo nos-tun.lo ping.lo reboot.lo= restore.lo rcorde .lo route.lo routed.lo rtquery.lo rtsol.lo savecore.lo s= pppcontrol.lo swapon.lo sysctl.lo tunefs.lo umount.l atmconfig.lo ping6.lo= ipf.lo zfs.lo zpool.lo mca.lo dhclient.lo head.lo mt.lo sed.lo tail.lo tee= =2Elo gzip.lo bzip2.lo xz.lo tar.lo vi.lo id.lo chroot.lo chown.lo /usr/obj= /usr/src/rescue/rescue/../librescue/exec.o /usr obj/usr/src/rescue/rescue/.= =2E/librescue/getusershell.o /usr/obj/usr/src/rescue/rescue/../librescue/lo= gin_clas .o /usr/obj/usr/src/rescue/rescue/../librescue/popen.o /usr/obj/us= r/src/rescue/rescue/../librescue/rcmdsh.o usr/obj/usr/src/rescue/rescue/..= /librescue/sysctl.o /usr/obj/usr/src/rescue/rescue/../librescue/system.o -l= c ypt -ledit -lkvm -ll -ltermcap -lutil -lalias -lcam -lcurses -ldevstat -l= ipsec -lipx -lzfs -lnvpair -luutil lavl -lgeom -lbsdxml -ljail -lkiconv -l= md -lreadline -lsbuf -lufs -lz -lbz2 -llzma -larchive -lcrypto -lm xz.lo(.text+0x5672): In function `hardware_init': : undefined reference to `lzma_physmem' xz.lo(.text+0x6a42): In function `list_file': : undefined reference to `lzma_index_memused' xz.lo(.text+0x6c62): In function `list_file': : undefined reference to `lzma_index_stream_flags' xz.lo(.text+0x6c92): In function `list_file': : undefined reference to `lzma_index_stream_padding' xz.lo(.text+0x6e22): In function `list_file': : undefined reference to `lzma_index_stream_count' xz.lo(.text+0x6e52): In function `list_file': : undefined reference to `lzma_index_block_count' xz.lo(.text+0x6ee2): In function `list_file': : undefined reference to `lzma_index_checks' xz.lo(.text+0x6f32): In function `list_file': : undefined reference to `lzma_index_stream_count' xz.lo(.text+0x6f52): In function `list_file': : undefined reference to `lzma_index_block_count' xz.lo(.text+0x6fd2): In function `list_file': : undefined reference to `lzma_index_checks' xz.lo(.text+0x70f2): In function `list_file': : undefined reference to `lzma_index_iter_init' xz.lo(.text+0x7122): In function `list_file': : undefined reference to `lzma_index_iter_next' xz.lo(.text+0x7252): In function `list_file': : undefined reference to `lzma_index_stream_count' xz.lo(.text+0x7292): In function `list_file': : undefined reference to `lzma_index_block_count' xz.lo(.text+0x73d2): In function `list_file': : undefined reference to `lzma_index_checks' xz.lo(.text+0x74b2): In function `list_file': : undefined reference to `lzma_index_stream_count' xz.lo(.text+0x74f2): In function `list_file': : undefined reference to `lzma_index_block_count' xz.lo(.text+0x7632): In function `list_file': : undefined reference to `lzma_index_checks' xz.lo(.text+0x77e2): In function `list_file': : undefined reference to `lzma_index_stream_count' xz.lo(.text+0x7802): In function `list_file': : undefined reference to `lzma_index_block_count' xz.lo(.text+0x7862): In function `list_file': : undefined reference to `lzma_index_checks' xz.lo(.text+0x78a2): In function `list_file': : undefined reference to `lzma_index_stream_count' xz.lo(.text+0x7922): In function `list_file': : undefined reference to `lzma_index_iter_init' xz.lo(.text+0x7962): In function `list_file': : undefined reference to `lzma_index_iter_next' xz.lo(.text+0x7ae2): In function `list_file': : undefined reference to `lzma_index_iter_rewind' xz.lo(.text+0x7b42): In function `list_file': : undefined reference to `lzma_index_iter_next' xz.lo(.text+0x7ec2): In function `list_file': : undefined reference to `lzma_index_stream_count' xz.lo(.text+0x7ee2): In function `list_file': : undefined reference to `lzma_index_block_count' xz.lo(.text+0x7f62): In function `list_file': : undefined reference to `lzma_index_iter_init' xz.lo(.text+0x7fb2): In function `list_file': : undefined reference to `lzma_index_iter_next' xz.lo(.text+0x82b2): In function `list_file': : undefined reference to `lzma_index_iter_init' *** Error code 1 1 error *** Error code 2 1 error *** Error code 2 1 error *** Error code 2 1 error *** Error code 2 1 error *** Error code 2 1 error # svn info Path: . URL: svn://svn.freebsd.org/base/head Repository Root: svn://svn.freebsd.org/base Repository UUID: ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f Revision: 209240 Node Kind: directory Schedule: normal Last Changed Author: raj Last Changed Rev: 209240 Last Changed Date: 2010-06-16 17:52:35 +0100 (Wed, 16 Jun 2010) --=20 Anton Shterenlikht Room 2.6, Queen's Building Mech Eng Dept Bristol University University Walk, Bristol BS8 1TR, UK Tel: +44 (0)117 331 5944 Fax: +44 (0)117 929 4423 From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 10:54:15 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B1D2106567F for ; Thu, 17 Jun 2010 10:54:15 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from dirj.bris.ac.uk (dirj.bris.ac.uk [137.222.10.78]) by mx1.freebsd.org (Postfix) with ESMTP id 363078FC22 for ; Thu, 17 Jun 2010 10:54:14 +0000 (UTC) Received: from ncsd.bris.ac.uk ([137.222.10.59] helo=ncs.bris.ac.uk) by dirj.bris.ac.uk with esmtp (Exim 4.69) (envelope-from ) id 1OPCjc-000401-Ad; Thu, 17 Jun 2010 11:54:13 +0100 Received: from mech-cluster241.men.bris.ac.uk ([137.222.187.241]) by ncs.bris.ac.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.67) (envelope-from ) id 1OPCjb-0006Iu-MI; Thu, 17 Jun 2010 11:54:11 +0100 Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.4/8.14.4) with ESMTP id o5HAsB5e016779; Thu, 17 Jun 2010 11:54:11 +0100 (BST) (envelope-from mexas@bristol.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.4/8.14.4/Submit) id o5HAsBsg016778; Thu, 17 Jun 2010 11:54:11 +0100 (BST) (envelope-from mexas@bristol.ac.uk) X-Authentication-Warning: mech-cluster241.men.bris.ac.uk: mexas set sender to mexas@bristol.ac.uk using -f Date: Thu, 17 Jun 2010 11:54:11 +0100 From: Anton Shterenlikht To: "Andrey V. Elsukov" Message-ID: <20100617105411.GA98964@mech-cluster241.men.bris.ac.uk> References: <20100616131503.GA77642@mech-cluster241.men.bris.ac.uk> <20100616134530.GX1797@hoeg.nl> <20100616163035.GA42606@mech-cluster241.men.bris.ac.uk> <1276739842.66339.15.camel@RabbitsDen> <4C19A270.4060901@yandex.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4C19A270.4060901@yandex.ru> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: Anton Shterenlikht , freebsd-current@freebsd.org, Alexandre Sunny Kovalenko Subject: Re: how to set up UTF8 russian in -current? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 10:54:15 -0000 On Thu, Jun 17, 2010 at 08:20:00AM +0400, Andrey V. Elsukov wrote: > On 17.06.2010 5:57, Alexandre "Sunny" Kovalenko wrote: > > Can you specifically point out things that do not work for you in the > > xterm window? I am able to create files and directories with Cyrillic > > names, use Cyrillic strings as the command parameters, etc. It has been > > working for me for quite a long time, so I could not really remember > > what, if anything, I had to do, but we can compare settings if you'd > > like to. I do use Gnome, though, so some of its pixie dust could have > > been spilled onto xterm. > > > > I have attached small screenshot as an illustration -- if this is not > > what you are talking about, please, accept my apology for the noise. > > I think Anton said about console localization (not X Window). well, after Ed's reply I got console localisation back. It was apparently TEKEN_* option in kernel that broke it. I'm struggling to get console localisation in xterm. Here's a small example of what I get: http://seis.bris.ac.uk/~mexas/xterm-mangled-russian.png I have this in /etc/rc.conf: font8x8="cp866-8x8" font8x14="cp866-8x14" font8x16="cp866b-8x16" keymap="ru.koi8-r" scrnmap="koi8-r2cp866" And these environment variables in shell: LANG=en_US.ISO8859-1 LC_CTYPE=ru_RU.KOI8-R TERM=xterm XTERM_VERSION=XTerm(258) XTERM_LOCALE=ru_RU.KOI8-R XTERM_SHELL=/bin/tcsh many thanks anton -- Anton Shterenlikht Room 2.6, Queen's Building Mech Eng Dept Bristol University University Walk, Bristol BS8 1TR, UK Tel: +44 (0)117 331 5944 Fax: +44 (0)117 929 4423 From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 12:13:50 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C79931065677; Thu, 17 Jun 2010 12:13:50 +0000 (UTC) (envelope-from jhellenthal@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 76D0D8FC1A; Thu, 17 Jun 2010 12:13:49 +0000 (UTC) Received: by iwn7 with SMTP id 7so9127553iwn.13 for ; Thu, 17 Jun 2010 05:13:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :x-enigmail-version:openpgp:content-type:content-transfer-encoding; bh=LlR/RCH3tJHw0PjkD48LxnF3L7ql9A8gR9QJFp2t/+A=; b=h/2J7FzSOpAEsVaRTeE8K69Q0jdesojbtlyii2WTz6qF8CHA9v/+oX9DCs8zRoKteS aCG798xG0TetTocswCSMJnPW05FzH8+ghvTRC2d7KPEhSr7TC4qoh1OgeCPdW+j9Hfse +f/H2aipW6SQ5gOUKzLhdqBXBUeZ15vtJT29c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:openpgp:content-type :content-transfer-encoding; b=AvJil/nh5Bh3O5BWCZBFWnfDUPDfXcNNbkk62OY46HyIJ7GNlPMDSUCAFs8ZjmsMoy 7GK/GWPab9fKSSA1BEmsF2IYmnigajw3euc2ki6U8zlMgdhiVp5gbm2eigiQnnM/QYOY bY/ItyQg1BAmV5BS2G/1uG88JFFRF/YKAR9W8= Received: by 10.231.148.200 with SMTP id q8mr11404231ibv.10.1276776829460; Thu, 17 Jun 2010 05:13:49 -0700 (PDT) Received: from centel.dataix.local (adsl-99-181-128-180.dsl.klmzmi.sbcglobal.net [99.181.128.180]) by mx.google.com with ESMTPS id f1sm36084828ibg.9.2010.06.17.05.13.47 (version=SSLv3 cipher=RC4-MD5); Thu, 17 Jun 2010 05:13:48 -0700 (PDT) Sender: "J. Hellenthal" Message-ID: <4C1A117A.9060608@dataix.net> Date: Thu, 17 Jun 2010 08:13:46 -0400 From: jhell User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100515 Thunderbird MIME-Version: 1.0 To: Anton Shterenlikht References: <20100617101541.GA90363@mech-cluster241.men.bris.ac.uk> In-Reply-To: <20100617101541.GA90363@mech-cluster241.men.bris.ac.uk> X-Enigmail-Version: 1.0.1 OpenPGP: id=89D8547E Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-current@freebsd.org, freebsd-ia64@freebsd.org Subject: Re: r209240 ia64 -> buildworld -> undefined reference to `lzma_physmem' X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 12:13:50 -0000 On 06/17/2010 06:15, Anton Shterenlikht wrote: > I've r209203 kernel on ia64 box. > Now I'm trying to rebuild world to r209240. > I get these errors. > > Please advise > grep -rn lzma_physmem /usr/include ? /usr/include/lzma/hardware.h:51:extern LZMA_API(uint64_t) lzma_physmem(void) lzma_nothrow; I would suggest updating your headers if something similar is not found & try rebuilding world with -DALWAYS_CHECK_MAKE. You should be able to continue your build after this. -DNO_CLEAN will get you through it. Regards, -- jhell From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 16:01:59 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 862FD1065676; Thu, 17 Jun 2010 16:01:59 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 47B1D8FC1B; Thu, 17 Jun 2010 16:01:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id o5HFrEi8069895; Thu, 17 Jun 2010 09:53:14 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Thu, 17 Jun 2010 09:53:17 -0600 (MDT) Message-Id: <20100617.095317.886429907132154868.imp@bsdimp.com> To: dougb@freebsd.org From: "M. Warner Losh" In-Reply-To: <4C187778.9060909@FreeBSD.org> References: <4C187778.9060909@FreeBSD.org> X-Mailer: Mew version 6.3 on Emacs 22.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: freebsd-current@freebsd.org Subject: Re: devd and/or ACPI not reporting a heat problem X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 16:01:59 -0000 In message: <4C187778.9060909@FreeBSD.org> Doug Barton writes: : Howdy, : : I thought my heat problems were over with this laptop thanks to all : the great suggestions I've received about powerd, no stepping, etc. (I : also propped up both the back and the front to make a nice big air : pocket.) I've always been pretty religious about blowing the dust off : the fans and heat sinks, but I guess it's been dustier than I thought : lately because I finally "caught" my laptop doing what it's been doing : for the last 2 weeks, which is (occasionally) powering down when it : was unattended; and the problem was heat. : : Of course I've been running devd all along, and so I initially ruled : out the heat problem due to this entry in devd.conf: : : # Notify all users before beginning emergency shutdown when we get : # a _CRT or _HOT thermal event and we're going to power down the system : # very soon. : notify 10 { : match "system" "ACPI"; : match "subsystem" "Thermal"; : match "notify" "0xcc"; : action "logger -p kern.emerg 'WARNING: system temperature too high, : shutting down soon!'"; : }; : : I'm not getting any of those notices in the logs, so I was looking : other places. (I do get other ACPI-related activity from devd, such as : the notice that it's going on and off AC power.) : : So, 2-part question, how can I make sure that devd gets the message, : and how do I make sure that the notice comes _before_ the BIOS forces : the system to power off. I.e., I'd like to have some sort of devd : notice that comes in time to do a clean shutdown, or perhaps some : other mitigation strategy prior to the BIOS taking over. You may need a simple cron entry that checks the temperature and report when it is getting close. acpi should be reporting thermal events before then that aren't 0xcc, but if not, that's the fallback that people use. Sadly, at least for one of my laptops, I've seen sudden 10-20C spikes which trigger this. I think this laptop is badly broken, and don't use it any more. Warner From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 17:13:53 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 588751065672 for ; Thu, 17 Jun 2010 17:13:53 +0000 (UTC) (envelope-from eculp@encontacto.net) Received: from ns2.bafirst.com (ns2.bafirst.com [97.67.198.91]) by mx1.freebsd.org (Postfix) with ESMTP id E379E8FC1F for ; Thu, 17 Jun 2010 17:13:52 +0000 (UTC) Received: from unixmania.com ([189.251.19.67]) by ns2.bafirst.com with esmtp; Thu, 17 Jun 2010 12:03:49 -0500 id 000D50E1.4C1A5575.0000603F Received: from localhost (localhost [127.0.0.1]) (uid 80) by unixmania.com with local; Thu, 17 Jun 2010 12:03:48 -0500 id 000CF614.4C1A5574.0000CE28 Received: from encontacto.net (encontacto.net [189.251.19.67]) by econet.encontacto.net (Horde Framework) with HTTP; Thu, 17 Jun 2010 12:03:48 -0500 Message-ID: <20100617120348.11101fwnzzqhgxa0@econet.encontacto.net> Date: Thu, 17 Jun 2010 12:03:48 -0500 From: eculp To: current MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; DelSp="Yes"; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: 7bit User-Agent: Internet Messaging Program (IMP) H3 (5.0-cvs) X-Remote-Browser: Opera/9.80 (X11; Linux i686; U; en) Presto/2.2.15 Version/10.10 X-IMP-Server: 189.251.19.67 X-Originating-IP: 189.251.19.67 X-Originating-User: eculp@encontacto.net Cc: Subject: Having a problem with security/libassuan-1 when compiling gnupg. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 17:13:53 -0000 Having a problem with security/libassuan-1 when compiling gnupg. I did the upgrade to libassuan-2.0.0 following the instructions in UPDATING and this is the first problem that I have seen. ===> gnupg-2.0.14_3 depends on package: libassuan-1>=1.0.5 - not found ===> Verifying install for libassuan-1>=1.0.5 in /usr/ports/security/libassua n-1 ===> libassuan-1-1.0.5 conflicts with installed package(s): libassuan-2.0.0 They install files into the same place. Please remove them first with pkg_delete(1). *** Error code 1 Stop in /usr/ports/security/libassuan-1. *** Error code 1 Stop in /usr/ports/security/gnupg. ===>>> make failed for security/gnupg ===>>> Aborting update Any suggestions will be appreciated. TIA, ed Kernel: 9.0-CURRENT FreeBSD 9.0-CURRENT #6: Sun Jun 6 06:23:48 CDT 2010 Today's world. From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 16:31:44 2010 Return-Path: Delivered-To: freebsd-current@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E0830106567C for ; Thu, 17 Jun 2010 16:31:44 +0000 (UTC) (envelope-from snabb@epipe.com) Received: from tiktik.epipe.com (tiktik.epipe.com [IPv6:2001:470:8940:10::1]) by mx1.freebsd.org (Postfix) with ESMTP id 90C7E8FC13 for ; Thu, 17 Jun 2010 16:31:44 +0000 (UTC) Received: from tiktik.epipe.com (tiktik.epipe.com [IPv6:2001:470:8940:10::1]) by tiktik.epipe.com (8.14.3/8.14.3) with ESMTP id o5HGVgW9089557 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 17 Jun 2010 16:31:43 GMT (envelope-from snabb@epipe.com) X-DKIM: Sendmail DKIM Filter v2.8.3 tiktik.epipe.com o5HGVgW9089557 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=epipe.com; s=default; t=1276792303; x=1277397103; bh=V9drrlAWBwejqdFVpFekBPBAnics6HAKHAp4anqCa9M=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References: MIME-Version:Content-Type; b=fSPOfkWANwmka/NFb4dZMN0X81drgSR18ZQKfbTpmlddncUEKi3OCZcsURVP28Lbd htZuWaWU/ED6wgCbH2hvwEZvWgrBRwdRO3664Y2s9Ff1Y6/tdIUHlwuu2UWQ+XScdq j6i+iUaElZ5hkN46utBN06EQ8LdA6LYqdHqgAZ64= Date: Thu, 17 Jun 2010 16:31:37 +0000 (UTC) From: Janne Snabb To: Andy Farkas In-Reply-To: Message-ID: References: User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.2.5 (tiktik.epipe.com [IPv6:2001:470:8940:10::1]); Thu, 17 Jun 2010 16:31:43 +0000 (UTC) X-Mailman-Approved-At: Thu, 17 Jun 2010 17:21:41 +0000 Cc: freebsd-current@FreeBSD.ORG Subject: Re: an addition to top(1) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 16:31:45 -0000 On Sat, 19 Dec 1998, Andy Farkas wrote: > I've always thought that top(1) should display the system > uptime. Here's a patch. The code was cut straight out of > /usr/src/usr.bin/w/w.c My apologies for a late reply :) but that code displays 30 seconds longer uptime than what it really is. See PR bin/147934 at http://www.freebsd.org/cgi/query-pr.cgi?pr=147934 for more details and a patch. Best Regards, -- Janne Snabb / EPIPE Communications snabb@epipe.com - http://epipe.com/ From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 17:32:08 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8FA731065674 for ; Thu, 17 Jun 2010 17:32:08 +0000 (UTC) (envelope-from oberman@es.net) Received: from mailgw.es.net (mail1.es.net [IPv6:2001:400:201:1::2]) by mx1.freebsd.org (Postfix) with ESMTP id 2B9078FC20 for ; Thu, 17 Jun 2010 17:32:08 +0000 (UTC) Received: from ptavv.es.net (ptavv.es.net [IPv6:2001:400:910::29]) by mailgw.es.net (8.14.3/8.14.3) with ESMTP id o5HHW3SS024433 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 17 Jun 2010 10:32:03 -0700 Received: from ptavv.es.net (localhost [127.0.0.1]) by ptavv.es.net (Tachyon Server) with ESMTP id 2477E1CC0D; Thu, 17 Jun 2010 10:32:03 -0700 (PDT) To: eculp In-reply-to: Your message of "Thu, 17 Jun 2010 12:03:48 CDT." <20100617120348.11101fwnzzqhgxa0@econet.encontacto.net> Date: Thu, 17 Jun 2010 10:32:03 -0700 From: "Kevin Oberman" Message-Id: <20100617173203.2477E1CC0D@ptavv.es.net> X-Proofpoint-Virus-Version: vendor=fsecure engine=1.12.8161:2.4.5, 1.2.40, 4.0.166 definitions=2010-06-17_03:2010-02-06, 2010-06-17, 2010-06-17 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx engine=5.0.0-1005130000 definitions=main-1006170093 Cc: current Subject: Re: Having a problem with security/libassuan-1 when compiling gnupg. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 17:32:08 -0000 > Date: Thu, 17 Jun 2010 12:03:48 -0500 > From: eculp > Sender: owner-freebsd-current@freebsd.org > > Having a problem with security/libassuan-1 when compiling gnupg. I > did the upgrade to libassuan-2.0.0 following the instructions in > UPDATING and this is the first problem that I have seen. > > ===> gnupg-2.0.14_3 depends on package: libassuan-1>=1.0.5 - not found > ===> Verifying install for libassuan-1>=1.0.5 in > /usr/ports/security/libassua > n-1 > > ===> libassuan-1-1.0.5 conflicts with installed package(s): > libassuan-2.0.0 > > They install files into the same place. > Please remove them first with pkg_delete(1). > *** Error code 1 > > Stop in /usr/ports/security/libassuan-1. > *** Error code 1 > > Stop in /usr/ports/security/gnupg. > > ===>>> make failed for security/gnupg > ===>>> Aborting update > > Any suggestions will be appreciated. > > TIA, > > ed > > Kernel: > 9.0-CURRENT FreeBSD 9.0-CURRENT #6: Sun Jun 6 06:23:48 CDT 2010 > > Today's world. > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" > Read /usr/ports/UPDATING. Should be the first entry. -- R. Kevin Oberman, Network Engineer Energy Sciences Network (ESnet) Ernest O. Lawrence Berkeley National Laboratory (Berkeley Lab) E-mail: oberman@es.net Phone: +1 510 486-8634 Key fingerprint:059B 2DDF 031C 9BA3 14A4 EADA 927D EBB3 987B 3751 From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 17:35:50 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5D0CC1065672 for ; Thu, 17 Jun 2010 17:35:50 +0000 (UTC) (envelope-from oberman@es.net) Received: from mailgw.es.net (mail1.es.net [IPv6:2001:400:201:1::2]) by mx1.freebsd.org (Postfix) with ESMTP id 061A58FC13 for ; Thu, 17 Jun 2010 17:35:49 +0000 (UTC) Received: from ptavv.es.net (ptavv.es.net [IPv6:2001:400:910::29]) by mailgw.es.net (8.14.3/8.14.3) with ESMTP id o5HHZkrl026940 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 17 Jun 2010 10:35:47 -0700 Received: from ptavv.es.net (localhost [127.0.0.1]) by ptavv.es.net (Tachyon Server) with ESMTP id DBEDD1CC0D; Thu, 17 Jun 2010 10:35:46 -0700 (PDT) To: eculp In-reply-to: Your message of "Thu, 17 Jun 2010 12:03:48 CDT." <20100617120348.11101fwnzzqhgxa0@econet.encontacto.net> Date: Thu, 17 Jun 2010 10:35:46 -0700 From: "Kevin Oberman" Message-Id: <20100617173546.DBEDD1CC0D@ptavv.es.net> X-Proofpoint-Virus-Version: vendor=fsecure engine=1.12.8161:2.4.5, 1.2.40, 4.0.166 definitions=2010-06-17_03:2010-02-06, 2010-06-17, 2010-06-17 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx engine=5.0.0-1005130000 definitions=main-1006170094 Cc: current Subject: Re: Having a problem with security/libassuan-1 when compiling gnupg. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 17:35:50 -0000 > Date: Thu, 17 Jun 2010 12:03:48 -0500 > From: eculp > Sender: owner-freebsd-current@freebsd.org > > Having a problem with security/libassuan-1 when compiling gnupg. I > did the upgrade to libassuan-2.0.0 following the instructions in > UPDATING and this is the first problem that I have seen. > > ===> gnupg-2.0.14_3 depends on package: libassuan-1>=1.0.5 - not found > ===> Verifying install for libassuan-1>=1.0.5 in > /usr/ports/security/libassua > n-1 > > ===> libassuan-1-1.0.5 conflicts with installed package(s): > libassuan-2.0.0 > > They install files into the same place. > Please remove them first with pkg_delete(1). > *** Error code 1 > > Stop in /usr/ports/security/libassuan-1. > *** Error code 1 > > Stop in /usr/ports/security/gnupg. > > ===>>> make failed for security/gnupg > ===>>> Aborting update > > Any suggestions will be appreciated. Sorry. Just re-read the message. Since you already have libassuan-2.0.0 installed, you will probably need to: pkg_delete -f libassuan-2.0.0 portinstall libassuan-1 or portmaster security/libassuan-1 -- R. Kevin Oberman, Network Engineer Energy Sciences Network (ESnet) Ernest O. Lawrence Berkeley National Laboratory (Berkeley Lab) E-mail: oberman@es.net Phone: +1 510 486-8634 Key fingerprint:059B 2DDF 031C 9BA3 14A4 EADA 927D EBB3 987B 3751 From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 18:00:45 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C1CD81065674 for ; Thu, 17 Jun 2010 18:00:45 +0000 (UTC) (envelope-from eculp@encontacto.net) Received: from ns2.bafirst.com (ns2.bafirst.com [97.67.198.91]) by mx1.freebsd.org (Postfix) with ESMTP id 73C648FC14 for ; Thu, 17 Jun 2010 18:00:44 +0000 (UTC) Received: from unixmania.com ([189.251.19.67]) by ns2.bafirst.com with esmtp; Thu, 17 Jun 2010 13:00:43 -0500 id 000D50E1.4C1A62CB.00006240 Received: from localhost (localhost [127.0.0.1]) (uid 80) by unixmania.com with local; Thu, 17 Jun 2010 13:00:42 -0500 id 000CF575.4C1A62CA.0000D59F Received: from encontacto.net (encontacto.net [189.251.19.67]) by econet.encontacto.net (Horde Framework) with HTTP; Thu, 17 Jun 2010 13:00:42 -0500 Message-ID: <20100617130042.128751koi3cptack@econet.encontacto.net> Date: Thu, 17 Jun 2010 13:00:42 -0500 From: eculp To: Kevin Oberman References: <20100617173546.DBEDD1CC0D@ptavv.es.net> In-Reply-To: <20100617173546.DBEDD1CC0D@ptavv.es.net> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; DelSp="Yes"; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable User-Agent: Internet Messaging Program (IMP) H3 (5.0-cvs) X-Remote-Browser: Opera/9.80 (X11; Linux i686; U; en) Presto/2.2.15 Version/10.10 X-IMP-Server: 189.251.19.67 X-Originating-IP: 189.251.19.67 X-Originating-User: eculp@encontacto.net Cc: current Subject: Re: Having a problem with security/libassuan-1 when compiling gnupg. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 18:00:45 -0000 Quoting Kevin Oberman : >> Date: Thu, 17 Jun 2010 12:03:48 -0500 >> From: eculp >> Sender: owner-freebsd-current@freebsd.org >> >> Having a problem with security/libassuan-1 when compiling gnupg. I >> did the upgrade to libassuan-2.0.0 following the instructions in >> UPDATING and this is the first problem that I have seen. >> >> =3D=3D=3D> gnupg-2.0.14_3 depends on package: libassuan-1>=3D1.0.5 - no= t found >> =3D=3D=3D> Verifying install for libassuan-1>=3D1.0.5 in >> /usr/ports/security/libassua >> n-1 >> >> =3D=3D=3D> libassuan-1-1.0.5 conflicts with installed package(s): >> libassuan-2.0.0 >> >> They install files into the same place. >> Please remove them first with pkg_delete(1). >> *** Error code 1 >> >> Stop in /usr/ports/security/libassuan-1. >> *** Error code 1 >> >> Stop in /usr/ports/security/gnupg. >> >> =3D=3D=3D>>> make failed for security/gnupg >> =3D=3D=3D>>> Aborting update >> >> Any suggestions will be appreciated. > > Sorry. Just re-read the message. > > Since you already have libassuan-2.0.0 installed, you will probably need > to: > pkg_delete -f libassuan-2.0.0 > portinstall libassuan-1 > or > portmaster security/libassuan-1 Thanks a lot, Kevin. It is now working fin as far as I can tell. I =20 was confused as to which was the prefered version for Current and was =20 sure that I had seen somewhere that is was 2.x but was probably =20 confused with another port. Thanks again, ed > -- > R. Kevin Oberman, Network Engineer > Energy Sciences Network (ESnet) > Ernest O. Lawrence Berkeley National Laboratory (Berkeley Lab) > E-mail: oberman@es.net=09=09=09Phone: +1 510 486-8634 > Key fingerprint:059B 2DDF 031C 9BA3 14A4 EADA 927D EBB3 987B 3751 > From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 18:20:29 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B9A14106567C for ; Thu, 17 Jun 2010 18:20:29 +0000 (UTC) (envelope-from oberman@es.net) Received: from mailgw.es.net (mail1.es.net [IPv6:2001:400:201:1::2]) by mx1.freebsd.org (Postfix) with ESMTP id 68DFA8FC2C for ; Thu, 17 Jun 2010 18:20:29 +0000 (UTC) Received: from ptavv.es.net (ptavv.es.net [IPv6:2001:400:910::29]) by mailgw.es.net (8.14.3/8.14.3) with ESMTP id o5HIKPim025545 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 17 Jun 2010 11:20:26 -0700 Received: from ptavv.es.net (localhost [127.0.0.1]) by ptavv.es.net (Tachyon Server) with ESMTP id E3C941CC38; Thu, 17 Jun 2010 11:20:24 -0700 (PDT) To: eculp In-reply-to: Your message of "Thu, 17 Jun 2010 13:00:42 CDT." <20100617130042.128751koi3cptack@econet.encontacto.net> Date: Thu, 17 Jun 2010 11:20:24 -0700 From: "Kevin Oberman" Message-Id: <20100617182024.E3C941CC38@ptavv.es.net> X-Proofpoint-Virus-Version: vendor=fsecure engine=1.12.8161:2.4.5, 1.2.40, 4.0.166 definitions=2010-06-17_03:2010-02-06, 2010-06-17, 2010-06-17 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx engine=5.0.0-1005130000 definitions=main-1006170100 Cc: current Subject: Re: Having a problem with security/libassuan-1 when compiling gnupg. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 18:20:29 -0000 > Date: Thu, 17 Jun 2010 13:00:42 -0500 > From: eculp > > Quoting Kevin Oberman : > > >> Date: Thu, 17 Jun 2010 12:03:48 -0500 > >> From: eculp > >> Sender: owner-freebsd-current@freebsd.org > >> > >> Having a problem with security/libassuan-1 when compiling gnupg. I > >> did the upgrade to libassuan-2.0.0 following the instructions in > >> UPDATING and this is the first problem that I have seen. > >> > >> ===> gnupg-2.0.14_3 depends on package: libassuan-1>=1.0.5 - not found > >> ===> Verifying install for libassuan-1>=1.0.5 in > >> /usr/ports/security/libassua > >> n-1 > >> > >> ===> libassuan-1-1.0.5 conflicts with installed package(s): > >> libassuan-2.0.0 > >> > >> They install files into the same place. > >> Please remove them first with pkg_delete(1). > >> *** Error code 1 > >> > >> Stop in /usr/ports/security/libassuan-1. > >> *** Error code 1 > >> > >> Stop in /usr/ports/security/gnupg. > >> > >> ===>>> make failed for security/gnupg > >> ===>>> Aborting update > >> > >> Any suggestions will be appreciated. > > > > Sorry. Just re-read the message. > > > > Since you already have libassuan-2.0.0 installed, you will probably need > > to: > > pkg_delete -f libassuan-2.0.0 > > portinstall libassuan-1 > > or > > portmaster security/libassuan-1 > > > Thanks a lot, Kevin. It is now working fin as far as I can tell. I > was confused as to which was the prefered version for Current and was > sure that I had seen somewhere that is was 2.x but was probably > confused with another port. 2.0.0 should be the preferred version, but its API is incompatible with the old one. Many ports using libassuan (listed in UPDATING) have not been updated to support V2, so the libassuan-1 port was created. As soon as deskutils/kdepim4 and security/{dirmngr|gnupg|gpa|opensc} are updated, there will be a need to move to 2.0.0. I am unsure what happens when some ports want v1 and others want v2. This may not be an issue if the updated ports can be deal with either API, but I have no idea whether that is the case. -- R. Kevin Oberman, Network Engineer Energy Sciences Network (ESnet) Ernest O. Lawrence Berkeley National Laboratory (Berkeley Lab) E-mail: oberman@es.net Phone: +1 510 486-8634 Key fingerprint:059B 2DDF 031C 9BA3 14A4 EADA 927D EBB3 987B 3751 From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 19:41:17 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CEF431065672 for ; Thu, 17 Jun 2010 19:41:17 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from server.mypc.hu (server.mypc.hu [87.229.73.95]) by mx1.freebsd.org (Postfix) with ESMTP id 8795E8FC1C for ; Thu, 17 Jun 2010 19:41:17 +0000 (UTC) Received: from server.mypc.hu (localhost [127.0.0.1]) by server.mypc.hu (Postfix) with ESMTP id 65B2D14DBC0A; Thu, 17 Jun 2010 21:41:15 +0200 (CEST) X-Virus-Scanned: amavisd-new at server.mypc.hu Received: from server.mypc.hu ([127.0.0.1]) by server.mypc.hu (server.mypc.hu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id Pwy+Lb6IsMMi; Thu, 17 Jun 2010 21:41:13 +0200 (CEST) Received: from [192.168.1.105] (catv-80-99-92-167.catv.broadband.hu [80.99.92.167]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by server.mypc.hu (Postfix) with ESMTPSA id 3C60914DBB84; Thu, 17 Jun 2010 21:41:13 +0200 (CEST) Message-ID: <4C1A7A57.3000006@FreeBSD.org> Date: Thu, 17 Jun 2010 21:41:11 +0200 From: Gabor Kovesdan User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.2; es-ES; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: Anonymous References: <4C16C5B5.1070308@FreeBSD.org> <867hlzq4lb.fsf@gmail.com> <867hlzufl6.fsf@gmail.com> In-Reply-To: <867hlzufl6.fsf@gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: FreeBSD Current Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 19:41:17 -0000 >> Does it respect lib32? >> I don't know to much about the ia32 compatibility layer but I used conventional FreeBSD Makefiles to build the stuff. I'll try to figure out what's going wrong but unfortunately I don't have an amd64 test machine to build. >> $ iconv -f ascii >> iconv: iconv_open(UTF-8, ascii): Invalid argument >> /usr/lib/i18n/libiconv_std.so.4: unsupported file layoutzsh: exit 1 iconv -f ascii >> >> $ file /usr/lib/i18n/libiconv_std.so.4 >> /usr/lib/i18n/libiconv_std.so.4: ELF 32-bit LSB shared object, Intel 80386, version 1 (FreeBSD), dynamically linked, stripped >> >> $ uname -vm >> FreeBSD 9.0-CURRENT #0 r209191=1463b20-dirty: Tue Jun 15 04:59:40 UTC 2010 holo@raphael.local:/a/objdir/a/dirty_build/sys/PHOENIX amd64 >> > BTW, I tried to crosscompile i386 and got error on installing usr.bin/{mkesdb,mkcsmapper}. > > $ make installworld TARGET=i386 DESTDIR=/b/bbb > ... > ===> usr.bin/mkcsmapper (install) > install -s -o root -g wheel -m 555 mkcsmapper /b/bbb/usr/bin > strip: /b/bbb/usr/bin/mkcsmapper: File format not recognized > install: wait: No such file or directory > *** Error code 70 > If cross-compiling doesn't work, how did you build the former one that gave you that error? -- Gabor Kovesdan FreeBSD Volunteer EMAIL: gabor@FreeBSD.org .:|:. gabor@kovesdan.org WEB: http://people.FreeBSD.org/~gabor .:|:. http://kovesdan.org From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 19:43:17 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6D0A91065670 for ; Thu, 17 Jun 2010 19:43:17 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from server.mypc.hu (server.mypc.hu [87.229.73.95]) by mx1.freebsd.org (Postfix) with ESMTP id 211358FC0A for ; Thu, 17 Jun 2010 19:43:17 +0000 (UTC) Received: from server.mypc.hu (localhost [127.0.0.1]) by server.mypc.hu (Postfix) with ESMTP id 6A04414DBC0A; Thu, 17 Jun 2010 21:43:16 +0200 (CEST) X-Virus-Scanned: amavisd-new at server.mypc.hu Received: from server.mypc.hu ([127.0.0.1]) by server.mypc.hu (server.mypc.hu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id OgFRf92qQzwy; Thu, 17 Jun 2010 21:43:14 +0200 (CEST) Received: from [192.168.1.105] (catv-80-99-92-167.catv.broadband.hu [80.99.92.167]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by server.mypc.hu (Postfix) with ESMTPSA id 49B8D14DBB84; Thu, 17 Jun 2010 21:43:14 +0200 (CEST) Message-ID: <4C1A7AD0.2000309@FreeBSD.org> Date: Thu, 17 Jun 2010 21:43:12 +0200 From: Gabor Kovesdan User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.2; es-ES; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: Alexander Best References: <4C17BB76.6020702@FreeBSD.org> <4C17E287.8060703@FreeBSD.org> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-current@freebsd.org Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 19:43:17 -0000 > ok. after installing world i get this when bootingt up: > > Starting powerd. > Starting musicpd. > path: invalid filesystem charset: ISO-8859-15 > /usr/lib/i18n/libiconv_std.so.4: unsupported file > layout/usr/lib/i18n/libiconv_std.so.4: unsupported file > layout/usr/lib/i18n/libiconv_std.so.4: unsupported file > layout/usr/lib/i18n/libiconv_std.so.4: unsupported file > layout/usr/lib/i18n/libiconv_std.so.4: unsupported file layout > pid 1078 (mpd), uid 1001: exited on signal 6 > Abort trap > /etc/rc: WARNING: failed to start musicpd > Starting mpdscribble. > GLib: Cannot convert message: Conversion from character set 'UTF-8' to > 'ASCII' is not supported > /usr/lib/i18n/libiconv_std.so.4: unsupported file > layout/usr/lib/i18n/libiconv_std.so.4: unsupported file > layout/usr/lib/i18n/libiconv_std.so.4: unsupported file > layout/usr/lib/i18n/libiconv_std.so.4: unsupported file layoutoption > parsing failed: Conversion from character set 'ASCII' to 'UTF-8' is > not supported > /etc/rc: WARNING: failed to start mpdscribble > Seems like the very same error that was already reported.Was it just a normal build? I never got such a result but will look into the Makefiles to find out how ia32 compatibility works. -- Gabor Kovesdan FreeBSD Volunteer EMAIL: gabor@FreeBSD.org .:|:. gabor@kovesdan.org WEB: http://people.FreeBSD.org/~gabor .:|:. http://kovesdan.org From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 21:24:48 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E95F106564A for ; Thu, 17 Jun 2010 21:24:48 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-ww0-f54.google.com (mail-ww0-f54.google.com [74.125.82.54]) by mx1.freebsd.org (Postfix) with ESMTP id BF9E08FC12 for ; Thu, 17 Jun 2010 21:24:47 +0000 (UTC) Received: by wwg30 with SMTP id 30so463588wwg.13 for ; Thu, 17 Jun 2010 14:24:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:references :date:message-id:user-agent:mime-version:content-type; bh=Hn50DXpGBFDUG42hCb359hpAUJkyJ4s/dBGEHDWRVdg=; b=wVhy98kXTP2c/D9rTl3dlepUGoMXUyvrYL2M2F7pgIY3E79SADiU6Aihwx3Z4Pr6kq /WXHLVriB0JC6wBmmvn0bKBW7ntEjUDgfU6GPcU87WJMc1q42QwkqNZtLFoVLv3UJEtF QAfIpEoRSqi2jablBfIxm0+LtlxxK5uEr4QnY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:message-id:user-agent :mime-version:content-type; b=JCe4/h0eiAkHADIoydMPxSXZzUbcTh6d0sRQxSNH9zTDHBDY+Dc5Jx8tTJ+I7WCpCS Lgr/J+tLWVVXrmmlnY8PXRywIvcra6KkW3cK0gdg3Q30fYk5rsy+oT6VD1/fI1IKcwl7 zQmyak0gyoq6wRTljUln/oEjcg++OYQkSFEr4= Received: by 10.216.160.207 with SMTP id u57mr182737wek.25.1276809886641; Thu, 17 Jun 2010 14:24:46 -0700 (PDT) Received: from localhost (hd5b906df.selukra.dyn.perspektivbredband.net [213.185.6.223]) by mx.google.com with ESMTPS id k13sm2976322wed.35.2010.06.17.14.24.41 (version=SSLv3 cipher=RC4-MD5); Thu, 17 Jun 2010 14:24:43 -0700 (PDT) From: Anonymous To: Gabor Kovesdan References: <4C16C5B5.1070308@FreeBSD.org> <867hlzq4lb.fsf@gmail.com> <867hlzufl6.fsf@gmail.com> <4C1A7A57.3000006@FreeBSD.org> Date: Fri, 18 Jun 2010 01:21:07 +0400 Message-ID: <86bpb9z77g.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: FreeBSD Current Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 21:24:48 -0000 Gabor Kovesdan writes: [...] >> $ make installworld TARGET=i386 DESTDIR=/b/bbb >> ... >> ===> usr.bin/mkcsmapper (install) >> install -s -o root -g wheel -m 555 mkcsmapper /b/bbb/usr/bin >> strip: /b/bbb/usr/bin/mkcsmapper: File format not recognized >> install: wait: No such file or directory >> *** Error code 70 >> > If cross-compiling doesn't work, how did you build the former one that > gave you that error? Here is my guess libiconv_modules compiles fine but installs both normal and lib32 objdir into /usr/lib when lib32 should use /usr/lib32. mkcsmapper/mkesdb are failing to install because they're treated as build-tools for host system and never compiled for target system. However, they're not included in lib32 target and so are not built for i386 arch during normal buildworld on amd64 host where host = target. From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 21:44:14 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2F7821065670 for ; Thu, 17 Jun 2010 21:44:14 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from server.mypc.hu (server.mypc.hu [87.229.73.95]) by mx1.freebsd.org (Postfix) with ESMTP id DBE4E8FC08 for ; Thu, 17 Jun 2010 21:44:13 +0000 (UTC) Received: from server.mypc.hu (localhost [127.0.0.1]) by server.mypc.hu (Postfix) with ESMTP id 0AEE414DBC0F; Thu, 17 Jun 2010 23:44:12 +0200 (CEST) X-Virus-Scanned: amavisd-new at server.mypc.hu Received: from server.mypc.hu ([127.0.0.1]) by server.mypc.hu (server.mypc.hu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 32P6XONsIxym; Thu, 17 Jun 2010 23:44:09 +0200 (CEST) Received: from [192.168.1.105] (catv-80-99-92-167.catv.broadband.hu [80.99.92.167]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by server.mypc.hu (Postfix) with ESMTPSA id BB20114DB9B6; Thu, 17 Jun 2010 23:44:09 +0200 (CEST) Message-ID: <4C1A9728.204@FreeBSD.org> Date: Thu, 17 Jun 2010 23:44:08 +0200 From: Gabor Kovesdan User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.2; es-ES; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: Anonymous References: <4C16C5B5.1070308@FreeBSD.org> <867hlzq4lb.fsf@gmail.com> <867hlzufl6.fsf@gmail.com> <4C1A7A57.3000006@FreeBSD.org> <86bpb9z77g.fsf@gmail.com> In-Reply-To: <86bpb9z77g.fsf@gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit Cc: FreeBSD Current Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 21:44:14 -0000 El 2010. 06. 17. 23:21, Anonymous escribió: > Gabor Kovesdan writes: > > [...] > >>> $ make installworld TARGET=i386 DESTDIR=/b/bbb >>> ... >>> ===> usr.bin/mkcsmapper (install) >>> install -s -o root -g wheel -m 555 mkcsmapper /b/bbb/usr/bin >>> strip: /b/bbb/usr/bin/mkcsmapper: File format not recognized >>> install: wait: No such file or directory >>> *** Error code 70 >>> >>> >> If cross-compiling doesn't work, how did you build the former one that >> gave you that error? >> > Here is my guess > > libiconv_modules compiles fine but installs both normal and lib32 objdir > into /usr/lib when lib32 should use /usr/lib32. > Oh, this seems like a relevant guess. I'll have to handle it in the Makefile then by checking if we are cross-compiling and I'll also have to add an #ifdef or something in the libc part to select the module path conditionally. > mkcsmapper/mkesdb are failing to install because they're treated as > build-tools for host system and never compiled for target > system. However, they're not included in lib32 target and so are not > built for i386 arch during normal buildworld on amd64 host where > host = target. > Yes, another good catch. Thanks a lot for your comments. -- Gabor Kovesdan FreeBSD Volunteer EMAIL: gabor@FreeBSD.org .:|:. gabor@kovesdan.org WEB: http://people.FreeBSD.org/~gabor .:|:. http://kovesdan.org From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 21:56:38 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6343B106566B for ; Thu, 17 Jun 2010 21:56:38 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id 037F88FC0A for ; Thu, 17 Jun 2010 21:56:37 +0000 (UTC) Received: (qmail 8849 invoked by uid 399); 17 Jun 2010 21:56:36 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 17 Jun 2010 21:56:36 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4C1A9A13.7030206@FreeBSD.org> Date: Thu, 17 Jun 2010 14:56:35 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100330 Thunderbird/3.0.4 MIME-Version: 1.0 To: Kevin Oberman References: <20100617182024.E3C941CC38@ptavv.es.net> In-Reply-To: <20100617182024.E3C941CC38@ptavv.es.net> X-Enigmail-Version: 1.0.1 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: current Subject: Re: Having a problem with security/libassuan-1 when compiling gnupg. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 21:56:38 -0000 [ FYI, this message should have gone to freebsd-ports@FreeBSD.org ... ] On 06/17/10 11:20, Kevin Oberman wrote: > 2.0.0 should be the preferred version, but its API is incompatible with > the old one. Many ports using libassuan (listed in UPDATING) have not > been updated to support V2, so the libassuan-1 port was created. > > As soon as deskutils/kdepim4 and security/{dirmngr|gnupg|gpa|opensc} are > updated, there will be a need to move to 2.0.0. Well, I just made it a lot worse. :) As Kevin points out here, the new version of libassuan is not compatible with the old. This decision on the part of the gnupg folks has its merits, but is unarguably inconvenient during the transition. On May 11th I approached the authors of the ports that depend on libassuan asking about their plans for updating (minus ale@ unfortunately, opensc's dependency is conditional, thus I missed it until I grep'ed the tree instead of relying on INDEX). The status of the affected ports is as follows: 1. gnupg Already handled because 2.0.15 required the update 2. dirmngr They had an RC ready to go, which they released after I poked them a bit. :) So these first 2 are now done. 3. kdepim4 My understanding is that the version currently under development has support for libassuan 2.0.0, and will be released in August. The kde@ folks have indicated that if there is a need to update it sooner they can most likely do that based on patches that are currently available. 4. gpa The svn version supports assuan 2.0.0, but the release of this new version has not yet been scheduled. 5. opensc ale@ has indicated that he would prefer to wait to update his port until a new version that supports assuan 2.0.0 is released. > I am unsure what happens when some ports want v1 and others want v2. > This may not be an issue if the updated ports can be deal with either > API, but I have no idea whether that is the case. The current situation is that having both versions installed is incompatible. My preference would be that the maintainers of the affected ports upgrade to depend on assuan 2.0.0 and then we can remove libassuan-1. If it becomes necessary to support having both versions installed then "Plan C" at this point would be to modify libassuan-1 to support this. hth, Doug -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/ From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 22:50:42 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C99C7106566B for ; Thu, 17 Jun 2010 22:50:42 +0000 (UTC) (envelope-from areilly@bigpond.net.au) Received: from nschwmtas02p.mx.bigpond.com (nschwmtas02p.mx.bigpond.com [61.9.189.140]) by mx1.freebsd.org (Postfix) with ESMTP id 636688FC13 for ; Thu, 17 Jun 2010 22:50:42 +0000 (UTC) Received: from nschwotgx01p.mx.bigpond.com ([124.188.161.100]) by nschwmtas02p.mx.bigpond.com with ESMTP id <20100617225040.FNUU12310.nschwmtas02p.mx.bigpond.com@nschwotgx01p.mx.bigpond.com> for ; Thu, 17 Jun 2010 22:50:40 +0000 Received: from duncan.reilly.home ([124.188.161.100]) by nschwotgx01p.mx.bigpond.com with ESMTP id <20100617225040.EVQY12522.nschwotgx01p.mx.bigpond.com@duncan.reilly.home> for ; Thu, 17 Jun 2010 22:50:40 +0000 Date: Fri, 18 Jun 2010 08:50:39 +1000 From: Andrew Reilly To: current@freebsd.org Message-ID: <20100617225039.GA74240@duncan.reilly.home> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.3i X-Authentication-Info: Submitted using SMTP AUTH LOGIN at nschwotgx01p.mx.bigpond.com from [124.188.161.100] using ID areilly@bigpond.net.au at Thu, 17 Jun 2010 22:50:40 +0000 X-RPD-ScanID: Class unknown; VirusThreatLevel unknown, RefID str=0001.0A090209.4C1AA6C0.00E4,ss=1,fgs=0 X-SIH-MSG-ID: rRkwFdb5TAD0zmQs0WyzOwJxyArnqyN48Z4QX81loRIGTUDCp8DeQ9rHK+ZRu8u4xD9LJhiHNGQgaajkTY3Rs9mK Cc: Subject: Anyone running GNOME on 9-CURRENT? How do you convince evolution-data-server to build? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 22:50:42 -0000 I've been trying on-and-off for weeks, and haven't been able to crack it. The configure script goes looking for Kerberos 5 and can't find it, even though it's in the base. Cheers, -- Andrew From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 22:57:58 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 536EF1065670 for ; Thu, 17 Jun 2010 22:57:58 +0000 (UTC) (envelope-from buganini@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 197B58FC1B for ; Thu, 17 Jun 2010 22:57:57 +0000 (UTC) Received: by iwn7 with SMTP id 7so508675iwn.13 for ; Thu, 17 Jun 2010 15:57:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=a71GpSqHCiRAfz0SdBIiHpXaswfl935VM28K68nIYtQ=; b=sSdwT9x/C1uxr9FIDJaV/fy3A1D8i7/x/1BGff0cyDnDn1ROiy2yUCsHU8Gt+UNT9/ UDGSELkDb3IHjg60zOxXagPl9g4sCfCrAKlJDmL0pI+Pi6gyu1pNTQCMaD7/pI9i/c8V Qp/SId0JZnOSkOJ+1XJe4asBXQ5PwN+0yQhGo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=J9Y7AuW5AJcPqoIl8Afhx26brCCSCKTWkYj1igSanl6ikFLStN3FZrtXn2VCymnoC2 IRoN/eTX5SUK8gIqzZsu9lvn/ElVZbD2FV+4N6DqsO38w6KptPRSgdwVQbVFjZrsI+b0 8jhX9B0Zar8BKNZI6wZRqeJcCCv0tQ0dNxgXw= MIME-Version: 1.0 Received: by 10.231.59.9 with SMTP id j9mr268348ibh.31.1276815476282; Thu, 17 Jun 2010 15:57:56 -0700 (PDT) Received: by 10.231.200.209 with HTTP; Thu, 17 Jun 2010 15:57:56 -0700 (PDT) In-Reply-To: <20100617225039.GA74240@duncan.reilly.home> References: <20100617225039.GA74240@duncan.reilly.home> Date: Fri, 18 Jun 2010 06:57:56 +0800 Message-ID: From: Buganini To: Andrew Reilly Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: current@freebsd.org Subject: Re: Anyone running GNOME on 9-CURRENT? How do you convince evolution-data-server to build? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 22:57:58 -0000 I'm using it without problem, do you have any of *_HEIMDAL or *_KERBEROS in make.conf/src.conf? -- Buganini On Fri, Jun 18, 2010 at 6:50 AM, Andrew Reilly wro= te: > I've been trying on-and-off for weeks, and haven't been able to > crack it. =C2=A0The configure script goes looking for Kerberos 5 and > can't find it, even though it's in the base. > > Cheers, > > -- > Andrew > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org= " > From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 23:50:39 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4394106566C for ; Thu, 17 Jun 2010 23:50:39 +0000 (UTC) (envelope-from oizs@freemail.hu) Received: from fep18.mx.upcmail.net (fep18.mx.upcmail.net [62.179.121.38]) by mx1.freebsd.org (Postfix) with ESMTP id 1B9878FC0C for ; Thu, 17 Jun 2010 23:50:38 +0000 (UTC) Received: from edge01.upcmail.net ([192.168.13.236]) by viefep18-int.chello.at (InterMail vM.8.01.02.02 201-2260-120-106-20100312) with ESMTP id <20100617235037.UIPO4042.viefep18-int.chello.at@edge01.upcmail.net> for ; Fri, 18 Jun 2010 01:50:37 +0200 Received: from [192.168.0.6] ([213.222.167.104]) by edge01.upcmail.net with edge id XBqc1e03X2FUr7101BqdNB; Fri, 18 Jun 2010 01:50:37 +0200 X-SourceIP: 213.222.167.104 Message-ID: <4C1AB4C0.4020604@freemail.hu> Date: Fri, 18 Jun 2010 01:50:24 +0200 From: oizs User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: freebsd-current@freebsd.org Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Cloudmark-Analysis: v=1.1 cv=kR1739jI04gsLPPBAx/k25XPeS1fzQof9TaPDYrpM2k= c=1 sm=0 a=mI6YO6ZdSLUA:10 a=8nJEP1OIZ-IA:10 a=6I5d2MoRAAAA:8 a=l9lDu5CEBdhSzQz5EwMA:9 a=EmwdHHSbkhKL0dVi5_0oGti7VDwA:4 a=wPNLvfGTeEIA:10 a=SV7veod9ZcQA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Subject: Dell Perc 5/i Performance issues X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 23:50:39 -0000 Hi, I've bought a Dell Perc 5/i because I couldn't make the onboard marvell 88sx7042 work with 8.0/8.1 or current, but as lucky as I am, the best I can do with 4x1.5tb samsung in raid5 is 60MB/s writes and 90MB/s reads, with bbu/write-back/adaptive-read-ahead. I was expecting at least twice of that, and I'm not sure what can I do to get that speed. (I've read man 7 tuning with no success) As far as I know this controller should be as fast as on other systems. (Freebsd.org mx1 has one of these cards.) I'm hoping somebody on the list reads this and helps because I can't afford to buy another card. Thanks in advance, -zsozso From owner-freebsd-current@FreeBSD.ORG Thu Jun 17 23:55:32 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF89B1065674 for ; Thu, 17 Jun 2010 23:55:32 +0000 (UTC) (envelope-from cswiger@mac.com) Received: from asmtpout024.mac.com (asmtpout024.mac.com [17.148.16.99]) by mx1.freebsd.org (Postfix) with ESMTP id A891F8FC1F for ; Thu, 17 Jun 2010 23:55:32 +0000 (UTC) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; charset=us-ascii Received: from cswiger1.apple.com ([17.209.4.71]) by asmtp024.mac.com (Sun Java(tm) System Messaging Server 6.3-8.01 (built Dec 16 2008; 32bit)) with ESMTPSA id <0L4600C70NSJBU50@asmtp024.mac.com> for freebsd-current@freebsd.org; Thu, 17 Jun 2010 16:55:32 -0700 (PDT) X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx engine=6.0.2-1004200000 definitions=main-1006170150 X-Proofpoint-Virus-Version: vendor=fsecure engine=1.12.8161:2.4.5,1.2.40,4.0.166 definitions=2010-06-17_03:2010-02-06, 2010-06-17, 2010-06-17 signatures=0 From: Chuck Swiger In-reply-to: <4C1AB4C0.4020604@freemail.hu> Date: Thu, 17 Jun 2010 16:55:31 -0700 Message-id: References: <4C1AB4C0.4020604@freemail.hu> To: oizs X-Mailer: Apple Mail (2.1081) Cc: freebsd-current@freebsd.org Subject: Re: Dell Perc 5/i Performance issues X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 23:55:32 -0000 On Jun 17, 2010, at 4:50 PM, oizs wrote: > I've bought a Dell Perc 5/i because I couldn't make the onboard marvell 88sx7042 work with 8.0/8.1 or current, but as lucky as I am, the best I can do with 4x1.5tb samsung in raid5 is 60MB/s writes and 90MB/s reads, with bbu/write-back/adaptive-read-ahead. > > I was expecting at least twice of that, and I'm not sure what can I do to get that speed. (I've read man 7 tuning with no success) Switch to using RAID-10 rather than RAID-5. It's normal for RAID-5 to have worse write performance than that of a single drive. Regards, -- -Chuck From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 00:57:10 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 16663106566B for ; Fri, 18 Jun 2010 00:57:10 +0000 (UTC) (envelope-from areilly@bigpond.net.au) Received: from nschwmtas05p.mx.bigpond.com (nschwmtas05p.mx.bigpond.com [61.9.189.149]) by mx1.freebsd.org (Postfix) with ESMTP id A14E58FC15 for ; Fri, 18 Jun 2010 00:57:09 +0000 (UTC) Received: from nschwotgx03p.mx.bigpond.com ([124.188.161.100]) by nschwmtas05p.mx.bigpond.com with ESMTP id <20100618005707.RTYJ12312.nschwmtas05p.mx.bigpond.com@nschwotgx03p.mx.bigpond.com>; Fri, 18 Jun 2010 00:57:07 +0000 Received: from duncan.reilly.home ([124.188.161.100]) by nschwotgx03p.mx.bigpond.com with ESMTP id <20100618005706.OARL2192.nschwotgx03p.mx.bigpond.com@duncan.reilly.home>; Fri, 18 Jun 2010 00:57:06 +0000 Date: Fri, 18 Jun 2010 10:57:06 +1000 From: Andrew Reilly To: Buganini Message-ID: <20100618005706.GA82168@duncan.reilly.home> References: <20100617225039.GA74240@duncan.reilly.home> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.3i X-Authentication-Info: Submitted using SMTP AUTH LOGIN at nschwotgx03p.mx.bigpond.com from [124.188.161.100] using ID areilly@bigpond.net.au at Fri, 18 Jun 2010 00:57:06 +0000 X-RPD-ScanID: Class unknown; VirusThreatLevel unknown, RefID str=0001.0A090209.4C1AC463.0053,ss=1,fgs=0 X-SIH-MSG-ID: qRs3GdT+TAD0zmQs0WyzOwJxyArnqyN48Z4QX81loRIGTUDCp8DeQ9rVMfpRu8u4xD9EJhqFNGQnaazjTY3Rs9mK Cc: current@freebsd.org Subject: Re: Anyone running GNOME on 9-CURRENT? How do you convince evolution-data-server to build? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 00:57:10 -0000 Hi there, On Fri, Jun 18, 2010 at 06:57:56AM +0800, Buganini wrote: > I'm using it without problem, > do you have any of *_HEIMDAL or *_KERBEROS in make.conf/src.conf? No. The problem, as far as I can tell, is that the search for krb5 in the configure script tests three options, (mit, heimdal and sun) all of which fail. The heimdal test *should* have succeeded, because the linker flags are (correctly) generated by a call to `/usr/bin/krb5-config gssapi --libs` (this is one of the port patches against the up-stream script. The problem is that those flags haven't actually worked for quite a while (on my system, anyway). Vis: configure:16119: cc -o conftest -O2 -pipe -g -DLDAP_DEPRECATED -fno-strict-aliasing -I/usr/local/include -I/usr/local/include/db4 1 -L/usr/local/lib -pthread conftest.c -L/usr/lib -L/usr/lib -lgssapi -lheimntlm -lkrb5 -lhx509 -lcom_err -lcrypto -lasn1 -lro ken -lcrypt >&5 /usr/lib/libhx509.so: undefined reference to `MD2_Init' /usr/lib/libhx509.so: undefined reference to `MD2_Final' /usr/lib/libhx509.so: undefined reference to `MD2_Update' configure:16119: $? = 1 Now what I don't understand is why the linker fails to find those symbols, given that they *are* defined in libcrypto, which is also listed on the linker command line there. I suspect that it has something to do with the way that shared libraries are constructed: they seem to contain their own list of dependencies, and somehow /usr/lib/libhx509.so.10 does *not* know that it depends on /lib/libcrypto.so.6 (ldd shows only a dependency on /lib/libc.so.7). I regret that I don't know enough linker fu or make infrastructure fu to know where to suggest a tweak, but I believe that the necessary tweak is to the base system build of libhx509.so, rather than the ports in question. What I *really* don't understand is why this seems to be working for everyone else... (My system was last re-built from csup'd source on Thursday 17 June, by the way, so it's not out of date.) Cheers, -- Andrew From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 02:49:54 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7DDE3106566B; Fri, 18 Jun 2010 02:49:54 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id 4B77C8FC13; Fri, 18 Jun 2010 02:49:53 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5I2nrWd059153; Thu, 17 Jun 2010 22:49:53 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5I2nrd3059152; Fri, 18 Jun 2010 02:49:53 GMT (envelope-from tinderbox@freebsd.org) Date: Fri, 18 Jun 2010 02:49:53 GMT Message-Id: <201006180249.o5I2nrd3059152@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on ia64/ia64 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 02:49:54 -0000 TB --- 2010-06-18 01:09:11 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-18 01:09:11 - starting HEAD tinderbox run for ia64/ia64 TB --- 2010-06-18 01:09:11 - cleaning the object tree TB --- 2010-06-18 01:09:28 - cvsupping the source tree TB --- 2010-06-18 01:09:28 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/ia64/ia64/supfile TB --- 2010-06-18 01:09:54 - building world TB --- 2010-06-18 01:09:54 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-18 01:09:54 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-18 01:09:54 - TARGET=ia64 TB --- 2010-06-18 01:09:54 - TARGET_ARCH=ia64 TB --- 2010-06-18 01:09:54 - TZ=UTC TB --- 2010-06-18 01:09:54 - __MAKE_CONF=/dev/null TB --- 2010-06-18 01:09:54 - cd /src TB --- 2010-06-18 01:09:54 - /usr/bin/make -B buildworld >>> World build started on Fri Jun 18 01:09:54 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything >>> World build completed on Fri Jun 18 02:32:22 UTC 2010 TB --- 2010-06-18 02:32:22 - generating LINT kernel config TB --- 2010-06-18 02:32:22 - cd /src/sys/ia64/conf TB --- 2010-06-18 02:32:22 - /usr/bin/make -B LINT TB --- 2010-06-18 02:32:22 - building LINT kernel TB --- 2010-06-18 02:32:22 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-18 02:32:22 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-18 02:32:22 - TARGET=ia64 TB --- 2010-06-18 02:32:22 - TARGET_ARCH=ia64 TB --- 2010-06-18 02:32:22 - TZ=UTC TB --- 2010-06-18 02:32:22 - __MAKE_CONF=/dev/null TB --- 2010-06-18 02:32:22 - cd /src TB --- 2010-06-18 02:32:22 - /usr/bin/make -B buildkernel KERNCONF=LINT >>> Kernel build for LINT started on Fri Jun 18 02:32:22 UTC 2010 >>> stage 1: configuring the kernel >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3.1: making dependencies >>> stage 3.2: building everything [...] rm -f hack.c MAKE=/usr/bin/make sh /src/sys/conf/newvers.sh LINT cc -c -O2 -pipe -fno-strict-aliasing -std=c99 -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -nostdinc -I. -I/src/sys -I/src/sys/contrib/altq -I/src/sys/contrib/ia64/libuwx/src -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common -finline-limit=15000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-builtin -mconstant-gp -ffixed-r13 -mfixed-range=f32-f127 -fpic -ffreestanding -Werror vers.c linking kernel subr_trap.o(.text+0x290): In function `syscallenter': : undefined reference to `systrace_probe_func' subr_trap.o(.text+0x291): In function `syscallenter': : undefined reference to `systrace_probe_func' *** Error code 1 Stop in /obj/ia64/src/sys/LINT. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-18 02:49:53 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-18 02:49:53 - ERROR: failed to build lint kernel TB --- 2010-06-18 02:49:53 - 4779.91 user 744.11 system 6041.80 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-ia64-ia64.full From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 04:26:20 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D876E1065680; Fri, 18 Jun 2010 04:26:20 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id 8F1988FC1E; Fri, 18 Jun 2010 04:26:20 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5I4QJjA041289; Fri, 18 Jun 2010 00:26:19 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5I4QJEt041263; Fri, 18 Jun 2010 04:26:19 GMT (envelope-from tinderbox@freebsd.org) Date: Fri, 18 Jun 2010 04:26:19 GMT Message-Id: <201006180426.o5I4QJEt041263@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on sparc64/sparc64 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 04:26:21 -0000 TB --- 2010-06-18 03:09:26 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-18 03:09:26 - starting HEAD tinderbox run for sparc64/sparc64 TB --- 2010-06-18 03:09:26 - cleaning the object tree TB --- 2010-06-18 03:09:46 - cvsupping the source tree TB --- 2010-06-18 03:09:46 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/sparc64/sparc64/supfile TB --- 2010-06-18 03:10:14 - building world TB --- 2010-06-18 03:10:14 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-18 03:10:14 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-18 03:10:14 - TARGET=sparc64 TB --- 2010-06-18 03:10:14 - TARGET_ARCH=sparc64 TB --- 2010-06-18 03:10:14 - TZ=UTC TB --- 2010-06-18 03:10:14 - __MAKE_CONF=/dev/null TB --- 2010-06-18 03:10:14 - cd /src TB --- 2010-06-18 03:10:14 - /usr/bin/make -B buildworld >>> World build started on Fri Jun 18 03:10:14 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything >>> World build completed on Fri Jun 18 04:12:49 UTC 2010 TB --- 2010-06-18 04:12:49 - generating LINT kernel config TB --- 2010-06-18 04:12:49 - cd /src/sys/sparc64/conf TB --- 2010-06-18 04:12:49 - /usr/bin/make -B LINT TB --- 2010-06-18 04:12:49 - building LINT kernel TB --- 2010-06-18 04:12:49 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-18 04:12:49 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-18 04:12:49 - TARGET=sparc64 TB --- 2010-06-18 04:12:49 - TARGET_ARCH=sparc64 TB --- 2010-06-18 04:12:49 - TZ=UTC TB --- 2010-06-18 04:12:49 - __MAKE_CONF=/dev/null TB --- 2010-06-18 04:12:49 - cd /src TB --- 2010-06-18 04:12:49 - /usr/bin/make -B buildkernel KERNCONF=LINT >>> Kernel build for LINT started on Fri Jun 18 04:12:50 UTC 2010 >>> stage 1: configuring the kernel >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3.1: making dependencies >>> stage 3.2: building everything [...] : undefined reference to `systrace_probe_func' subr_trap.o(.text+0x11c): In function `syscallenter': : undefined reference to `systrace_probe_func' subr_trap.o(.text+0x128): In function `syscallenter': : undefined reference to `systrace_probe_func' subr_trap.o(.text+0x198): In function `syscallenter': : undefined reference to `systrace_probe_func' subr_trap.o(.text+0x1a8): more undefined references to `systrace_probe_func' follow *** Error code 1 Stop in /obj/sparc64/src/sys/LINT. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-18 04:26:19 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-18 04:26:19 - ERROR: failed to build lint kernel TB --- 2010-06-18 04:26:19 - 3425.17 user 693.46 system 4613.32 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-sparc64-sparc64.full From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 04:37:33 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8FE69106566B; Fri, 18 Jun 2010 04:37:33 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id 605CC8FC13; Fri, 18 Jun 2010 04:37:33 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5I4bWCs087846; Fri, 18 Jun 2010 00:37:32 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5I4bWMW087845; Fri, 18 Jun 2010 04:37:32 GMT (envelope-from tinderbox@freebsd.org) Date: Fri, 18 Jun 2010 04:37:32 GMT Message-Id: <201006180437.o5I4bWMW087845@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on powerpc/powerpc X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 04:37:33 -0000 TB --- 2010-06-18 02:49:53 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-18 02:49:53 - starting HEAD tinderbox run for powerpc/powerpc TB --- 2010-06-18 02:49:53 - cleaning the object tree TB --- 2010-06-18 02:50:19 - cvsupping the source tree TB --- 2010-06-18 02:50:19 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/powerpc/powerpc/supfile TB --- 2010-06-18 02:50:48 - building world TB --- 2010-06-18 02:50:48 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-18 02:50:48 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-18 02:50:48 - TARGET=powerpc TB --- 2010-06-18 02:50:48 - TARGET_ARCH=powerpc TB --- 2010-06-18 02:50:48 - TZ=UTC TB --- 2010-06-18 02:50:48 - __MAKE_CONF=/dev/null TB --- 2010-06-18 02:50:48 - cd /src TB --- 2010-06-18 02:50:48 - /usr/bin/make -B buildworld >>> World build started on Fri Jun 18 02:50:49 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything >>> World build completed on Fri Jun 18 04:26:19 UTC 2010 TB --- 2010-06-18 04:26:19 - generating LINT kernel config TB --- 2010-06-18 04:26:19 - cd /src/sys/powerpc/conf TB --- 2010-06-18 04:26:19 - /usr/bin/make -B LINT TB --- 2010-06-18 04:26:19 - building LINT kernel TB --- 2010-06-18 04:26:19 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-18 04:26:19 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-18 04:26:19 - TARGET=powerpc TB --- 2010-06-18 04:26:19 - TARGET_ARCH=powerpc TB --- 2010-06-18 04:26:19 - TZ=UTC TB --- 2010-06-18 04:26:19 - __MAKE_CONF=/dev/null TB --- 2010-06-18 04:26:19 - cd /src TB --- 2010-06-18 04:26:19 - /usr/bin/make -B buildkernel KERNCONF=LINT >>> Kernel build for LINT started on Fri Jun 18 04:26:19 UTC 2010 >>> stage 1: configuring the kernel >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3.1: making dependencies >>> stage 3.2: building everything [...] cc -c -O2 -pipe -fno-strict-aliasing -std=c99 -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -nostdinc -I. -I/src/sys -I/src/sys/contrib/altq -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common -finline-limit=15000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-builtin -msoft-float -fno-omit-frame-pointer -msoft-float -mno-altivec -ffreestanding -fstack-protector -Werror vers.c linking kernel subr_trap.o(.text+0x8b6): In function `syscallenter': : undefined reference to `systrace_probe_func' subr_trap.o(.text+0x8be): In function `syscallenter': : undefined reference to `systrace_probe_func' subr_trap.o(.text+0x916): In function `syscallenter': : undefined reference to `systrace_probe_func' *** Error code 1 Stop in /obj/powerpc/src/sys/LINT. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-18 04:37:32 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-18 04:37:32 - ERROR: failed to build lint kernel TB --- 2010-06-18 04:37:32 - 5133.50 user 848.81 system 6458.72 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-powerpc-powerpc.full From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 04:49:32 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 668CD106564A; Fri, 18 Jun 2010 04:49:32 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id 1D5348FC0C; Fri, 18 Jun 2010 04:49:31 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5I4nVXw011001; Fri, 18 Jun 2010 00:49:31 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5I4nVne011000; Fri, 18 Jun 2010 04:49:31 GMT (envelope-from tinderbox@freebsd.org) Date: Fri, 18 Jun 2010 04:49:31 GMT Message-Id: <201006180449.o5I4nVne011000@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on sparc64/sun4v X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 04:49:32 -0000 TB --- 2010-06-18 03:35:58 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-18 03:35:58 - starting HEAD tinderbox run for sparc64/sun4v TB --- 2010-06-18 03:35:58 - cleaning the object tree TB --- 2010-06-18 03:36:14 - cvsupping the source tree TB --- 2010-06-18 03:36:14 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/sparc64/sun4v/supfile TB --- 2010-06-18 03:36:55 - building world TB --- 2010-06-18 03:36:55 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-18 03:36:55 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-18 03:36:55 - TARGET=sun4v TB --- 2010-06-18 03:36:55 - TARGET_ARCH=sparc64 TB --- 2010-06-18 03:36:55 - TZ=UTC TB --- 2010-06-18 03:36:55 - __MAKE_CONF=/dev/null TB --- 2010-06-18 03:36:55 - cd /src TB --- 2010-06-18 03:36:55 - /usr/bin/make -B buildworld >>> World build started on Fri Jun 18 03:36:56 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything >>> World build completed on Fri Jun 18 04:37:38 UTC 2010 TB --- 2010-06-18 04:37:38 - generating LINT kernel config TB --- 2010-06-18 04:37:38 - cd /src/sys/sun4v/conf TB --- 2010-06-18 04:37:38 - /usr/bin/make -B LINT TB --- 2010-06-18 04:37:38 - building LINT kernel TB --- 2010-06-18 04:37:38 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-18 04:37:38 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-18 04:37:38 - TARGET=sun4v TB --- 2010-06-18 04:37:38 - TARGET_ARCH=sparc64 TB --- 2010-06-18 04:37:38 - TZ=UTC TB --- 2010-06-18 04:37:38 - __MAKE_CONF=/dev/null TB --- 2010-06-18 04:37:38 - cd /src TB --- 2010-06-18 04:37:38 - /usr/bin/make -B buildkernel KERNCONF=LINT >>> Kernel build for LINT started on Fri Jun 18 04:37:38 UTC 2010 >>> stage 1: configuring the kernel >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3.1: making dependencies >>> stage 3.2: building everything [...] : undefined reference to `systrace_probe_func' subr_trap.o(.text+0x11c): In function `syscallenter': : undefined reference to `systrace_probe_func' subr_trap.o(.text+0x128): In function `syscallenter': : undefined reference to `systrace_probe_func' subr_trap.o(.text+0x198): In function `syscallenter': : undefined reference to `systrace_probe_func' subr_trap.o(.text+0x1a8): more undefined references to `systrace_probe_func' follow *** Error code 1 Stop in /obj/sun4v/src/sys/LINT. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-18 04:49:31 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-18 04:49:31 - ERROR: failed to build lint kernel TB --- 2010-06-18 04:49:31 - 3392.73 user 656.26 system 4412.91 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-sparc64-sun4v.full From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 08:50:21 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ACDBD1065673; Fri, 18 Jun 2010 08:50:21 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from dirj.bris.ac.uk (dirj.bris.ac.uk [137.222.10.78]) by mx1.freebsd.org (Postfix) with ESMTP id 66D408FC08; Fri, 18 Jun 2010 08:50:21 +0000 (UTC) Received: from ncsd.bris.ac.uk ([137.222.10.59] helo=ncs.bris.ac.uk) by dirj.bris.ac.uk with esmtp (Exim 4.69) (envelope-from ) id 1OPXHH-0006mp-UO; Fri, 18 Jun 2010 09:50:20 +0100 Received: from mech-cluster241.men.bris.ac.uk ([137.222.187.241]) by ncs.bris.ac.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.67) (envelope-from ) id 1OPXHG-0000CE-Ub; Fri, 18 Jun 2010 09:50:18 +0100 Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.4/8.14.4) with ESMTP id o5I8oIOU094452; Fri, 18 Jun 2010 09:50:18 +0100 (BST) (envelope-from mexas@bristol.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.4/8.14.4/Submit) id o5I8oIqj094451; Fri, 18 Jun 2010 09:50:18 +0100 (BST) (envelope-from mexas@bristol.ac.uk) X-Authentication-Warning: mech-cluster241.men.bris.ac.uk: mexas set sender to mexas@bristol.ac.uk using -f Date: Fri, 18 Jun 2010 09:50:18 +0100 From: Anton Shterenlikht To: jhell Message-ID: <20100618085018.GA94427@mech-cluster241.men.bris.ac.uk> References: <20100617101541.GA90363@mech-cluster241.men.bris.ac.uk> <4C1A117A.9060608@dataix.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4C1A117A.9060608@dataix.net> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: freebsd-current@freebsd.org, Anton Shterenlikht , freebsd-ia64@freebsd.org Subject: Re: r209240 ia64 -> buildworld -> undefined reference to `lzma_physmem' X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 08:50:21 -0000 On Thu, Jun 17, 2010 at 08:13:46AM -0400, jhell wrote: > On 06/17/2010 06:15, Anton Shterenlikht wrote: > > I've r209203 kernel on ia64 box. > > Now I'm trying to rebuild world to r209240. > > I get these errors. > > > > Please advise > > > > grep -rn lzma_physmem /usr/include ? > /usr/include/lzma/hardware.h:51:extern LZMA_API(uint64_t) > lzma_physmem(void) lzma_nothrow; > > I would suggest updating your headers if something similar is not found > & try rebuilding world with -DALWAYS_CHECK_MAKE. > > You should be able to continue your build after this. -DNO_CLEAN will > get you through it. > sorry, I probably didn't get you. I tried make -DALWAYS_CHECK_MAKE buildworld and got the same erorr. What do you mean by "updating your headers"? I do "svn up", then "svn diff", just to make sure I'm building from pristine sources. Is there anything else I need to check before proceeding with buildworld? Also, on two other ia64 boxes I don't have this problem, just updated to r209244. So I definitely screwed something up on this node, but what? many thanks anton -- Anton Shterenlikht Room 2.6, Queen's Building Mech Eng Dept Bristol University University Walk, Bristol BS8 1TR, UK Tel: +44 (0)117 331 5944 Fax: +44 (0)117 929 4423 From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 09:08:53 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 679E51065673 for ; Fri, 18 Jun 2010 09:08:53 +0000 (UTC) (envelope-from oizs@freemail.hu) Received: from fep15.mx.upcmail.net (fep15.mx.upcmail.net [62.179.121.35]) by mx1.freebsd.org (Postfix) with ESMTP id 2DEC78FC23 for ; Fri, 18 Jun 2010 09:08:51 +0000 (UTC) Received: from edge01.upcmail.net ([192.168.13.236]) by viefep15-int.chello.at (InterMail vM.8.01.02.02 201-2260-120-106-20100312) with ESMTP id <20100618090850.TFKH21071.viefep15-int.chello.at@edge01.upcmail.net> for ; Fri, 18 Jun 2010 11:08:50 +0200 Received: from [192.168.0.6] ([213.222.167.104]) by edge01.upcmail.net with edge id XM8p1e01A2FUr7101M8qbb; Fri, 18 Jun 2010 11:08:50 +0200 X-SourceIP: 213.222.167.104 Message-ID: <4C1B3792.9000007@freemail.hu> Date: Fri, 18 Jun 2010 11:08:34 +0200 From: oizs User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: freebsd-current@freebsd.org References: <4C1AB4C0.4020604@freemail.hu> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Cloudmark-Analysis: v=1.1 cv=BX1z5e3lS7RAKjOkUI/uDpZ/pP4xz0N/VImyOZX9Sfk= c=1 sm=0 a=q8OS1GolVHwA:10 a=8nJEP1OIZ-IA:10 a=nLCNl_PB9N9lMT3I0kAA:9 a=GV9qfeMS4apeHJQobfZXO6qBcEQA:4 a=wPNLvfGTeEIA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Subject: Re: Dell Perc 5/i Performance issues X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 09:08:53 -0000 I've seen people with the same configuration doing 160MB/s writes and 250MB/s+ reads with raid5 so I still think something isn't right. And using raid10 with 4 disks is a rather large waste of capacity. -zsozso On 2010.06.18. 1:55, Chuck Swiger wrote: > On Jun 17, 2010, at 4:50 PM, oizs wrote: > >> I've bought a Dell Perc 5/i because I couldn't make the onboard marvell 88sx7042 work with 8.0/8.1 or current, but as lucky as I am, the best I can do with 4x1.5tb samsung in raid5 is 60MB/s writes and 90MB/s reads, with bbu/write-back/adaptive-read-ahead. >> >> I was expecting at least twice of that, and I'm not sure what can I do to get that speed. (I've read man 7 tuning with no success) >> > Switch to using RAID-10 rather than RAID-5. It's normal for RAID-5 to have worse write performance than that of a single drive. > > Regards, > From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 07:46:48 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D8A631065672 for ; Fri, 18 Jun 2010 07:46:48 +0000 (UTC) (envelope-from me@janh.de) Received: from mailhost.uni-hamburg.de (mailhost.uni-hamburg.de [134.100.32.155]) by mx1.freebsd.org (Postfix) with ESMTP id 5FF0C8FC18 for ; Fri, 18 Jun 2010 07:46:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mailhost.uni-hamburg.de (Postfix) with ESMTP id 82E4E904AE; Fri, 18 Jun 2010 09:46:46 +0200 (CEST) X-Virus-Scanned: by University of Hamburg (RRZ/mailhost) Received: from mailhost.uni-hamburg.de ([127.0.0.1]) by localhost (mailhost.uni-hamburg.de [127.0.0.1]) (amavisd-new, port 10024) with LMTP id KQ4FuZejqxEs; Fri, 18 Jun 2010 09:46:46 +0200 (CEST) Received: from pc861.math.uni-hamburg.de (pc861.math.uni-hamburg.de [134.100.222.11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: fmjv004) by mailhost.uni-hamburg.de (Postfix) with ESMTPSA id 64348904A4; Fri, 18 Jun 2010 09:46:46 +0200 (CEST) Message-ID: <4C1B2469.1020001@janh.de> Date: Fri, 18 Jun 2010 09:46:49 +0200 From: Jan Henrik Sylvester User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.1.9) Gecko/20100514 Thunderbird/3.0.4 MIME-Version: 1.0 To: Doug Barton , current-list freebsd References: <20100617182024.E3C941CC38@ptavv.es.net> <4C1A9A13.7030206@FreeBSD.org> In-Reply-To: <4C1A9A13.7030206@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Mailman-Approved-At: Fri, 18 Jun 2010 10:48:34 +0000 Cc: Subject: Re: Having a problem with security/libassuan-1 when compiling gnupg. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 07:46:48 -0000 On 01/-10/-28163 20:59, Doug Barton wrote: > 3. kdepim4 My understanding is that the version currently under > development has support for libassuan 2.0.0, and will be released in > August. The kde@ folks have indicated that if there is a need to update > it sooner they can most likely do that based on patches that are > currently available. [...] > > I am unsure what happens when some ports want v1 and others want v2. > > This may not be an issue if the updated ports can be deal with either > > API, but I have no idea whether that is the case. > > The current situation is that having both versions installed is > incompatible. My preference would be that the maintainers of the > affected ports upgrade to depend on assuan 2.0.0 and then we can remove > libassuan-1. If it becomes necessary to support having both versions > installed then "Plan C" at this point would be to modify libassuan-1 to > support this. I thought "Plan C" was a requirement -- and from your first mails, I thought this was planned. deskutils/kdepim4 LIB_DEPENDS on libassuan-1 and gpgme. security/gpgme RUN_DEPENDS on gpg2. security/gnupg LIB_DEPENDS on assuan.0. Hence, building deskutils/kdepim4, I need security/libassuan-1 and security/libassuan installed that list each other in CONFLICTS. I have not actually tried to build deskutils/kdepim4 after the gnupg update, but is it not currently broken? If that is correct, either kde@ has to patch deskutils/kdepim4 (which they do not plan from the discussion at that list) or you have to patch security/libassuan-1 (which you do not plan from your statement above). Will we have a deskutils/kdepim4 with 8.1-RELEASE? Cheers, Jan Henrik From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 11:40:33 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6CA4C106566C; Fri, 18 Jun 2010 11:40:33 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id 035838FC12; Fri, 18 Jun 2010 11:40:32 +0000 (UTC) Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id o5IBeEaf076547 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 18 Jun 2010 14:40:14 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4) with ESMTP id o5IBeEFD008603; Fri, 18 Jun 2010 14:40:14 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4/Submit) id o5IBeEUi008602; Fri, 18 Jun 2010 14:40:14 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 18 Jun 2010 14:40:14 +0300 From: Kostik Belousov To: FreeBSD Tinderbox Message-ID: <20100618114014.GL13238@deviant.kiev.zoral.com.ua> References: <201006180426.o5I4QJEt041263@freebsd-current.sentex.ca> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="UDq0p1ry40hcSP8u" Content-Disposition: inline In-Reply-To: <201006180426.o5I4QJEt041263@freebsd-current.sentex.ca> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.2 at skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-2.3 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_50, DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: rpaulo@freebsd.org, current@freebsd.org, sparc64@freebsd.org Subject: Re: [head tinderbox] failure on sparc64/sparc64 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 11:40:33 -0000 --UDq0p1ry40hcSP8u Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jun 18, 2010 at 04:26:19AM +0000, FreeBSD Tinderbox wrote: > TB --- 2010-06-18 03:09:26 - tinderbox 2.6 running on freebsd-current.sen= tex.ca > TB --- 2010-06-18 03:09:26 - starting HEAD tinderbox run for sparc64/spar= c64 > TB --- 2010-06-18 03:09:26 - cleaning the object tree > TB --- 2010-06-18 03:09:46 - cvsupping the source tree > TB --- 2010-06-18 03:09:46 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sente= x.ca /tinderbox/HEAD/sparc64/sparc64/supfile > TB --- 2010-06-18 03:10:14 - building world > TB --- 2010-06-18 03:10:14 - MAKEOBJDIRPREFIX=3D/obj > TB --- 2010-06-18 03:10:14 - PATH=3D/usr/bin:/usr/sbin:/bin:/sbin > TB --- 2010-06-18 03:10:14 - TARGET=3Dsparc64 > TB --- 2010-06-18 03:10:14 - TARGET_ARCH=3Dsparc64 > TB --- 2010-06-18 03:10:14 - TZ=3DUTC > TB --- 2010-06-18 03:10:14 - __MAKE_CONF=3D/dev/null > TB --- 2010-06-18 03:10:14 - cd /src > TB --- 2010-06-18 03:10:14 - /usr/bin/make -B buildworld > >>> World build started on Fri Jun 18 03:10:14 UTC 2010 > >>> Rebuilding the temporary build tree > >>> stage 1.1: legacy release compatibility shims > >>> stage 1.2: bootstrap tools > >>> stage 2.1: cleaning up the object tree > >>> stage 2.2: rebuilding the object tree > >>> stage 2.3: build tools > >>> stage 3: cross tools > >>> stage 4.1: building includes > >>> stage 4.2: building libraries > >>> stage 4.3: make dependencies > >>> stage 4.4: building everything > >>> World build completed on Fri Jun 18 04:12:49 UTC 2010 > TB --- 2010-06-18 04:12:49 - generating LINT kernel config > TB --- 2010-06-18 04:12:49 - cd /src/sys/sparc64/conf > TB --- 2010-06-18 04:12:49 - /usr/bin/make -B LINT > TB --- 2010-06-18 04:12:49 - building LINT kernel > TB --- 2010-06-18 04:12:49 - MAKEOBJDIRPREFIX=3D/obj > TB --- 2010-06-18 04:12:49 - PATH=3D/usr/bin:/usr/sbin:/bin:/sbin > TB --- 2010-06-18 04:12:49 - TARGET=3Dsparc64 > TB --- 2010-06-18 04:12:49 - TARGET_ARCH=3Dsparc64 > TB --- 2010-06-18 04:12:49 - TZ=3DUTC > TB --- 2010-06-18 04:12:49 - __MAKE_CONF=3D/dev/null > TB --- 2010-06-18 04:12:49 - cd /src > TB --- 2010-06-18 04:12:49 - /usr/bin/make -B buildkernel KERNCONF=3DLINT > >>> Kernel build for LINT started on Fri Jun 18 04:12:50 UTC 2010 > >>> stage 1: configuring the kernel > >>> stage 2.1: cleaning up the object tree > >>> stage 2.2: rebuilding the object tree > >>> stage 2.3: build tools > >>> stage 3.1: making dependencies > >>> stage 3.2: building everything > [...] > : undefined reference to `systrace_probe_func' > subr_trap.o(.text+0x11c): In function `syscallenter': > : undefined reference to `systrace_probe_func' > subr_trap.o(.text+0x128): In function `syscallenter': > : undefined reference to `systrace_probe_func' > subr_trap.o(.text+0x198): In function `syscallenter': > : undefined reference to `systrace_probe_func' > subr_trap.o(.text+0x1a8): more undefined references to `systrace_probe_fu= nc' follow > *** Error code 1 >=20 > Stop in /obj/sparc64/src/sys/LINT. > *** Error code 1 >=20 > Stop in /src. > *** Error code 1 I expect that the following patch would fix the issue, currently run make universe to confirm. diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index b16db62..9412334 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -11,6 +11,12 @@ # We want LINT to cover profiling as well. profile 2 =20 +# +# Enable the kernel DTrace hooks which are required to load the DTrace +# kernel modules. +# +options KDTRACE_HOOKS + =0C ##################################################################### # SMP OPTIONS: diff --git a/sys/conf/NOTES b/sys/conf/NOTES index e3e6079..0a872b2 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -372,12 +372,6 @@ options DDB_NUMSYM options GDB =20 # -# Enable the kernel DTrace hooks which are required to load the DTrace -# kernel modules. -# -options KDTRACE_HOOKS - -# # SYSCTL_DEBUG enables a 'sysctl' debug tree that can be used to dump the # contents of the registered sysctl nodes on the console. It is disabled = by # default because it generates excessively verbose console output that can diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index cc62ed9..a0169c3 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -11,6 +11,12 @@ # We want LINT to cover profiling as well. profile 2 =20 +# +# Enable the kernel DTrace hooks which are required to load the DTrace +# kernel modules. +# +options KDTRACE_HOOKS + =0C ##################################################################### # SMP OPTIONS: --UDq0p1ry40hcSP8u Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (FreeBSD) iEYEARECAAYFAkwbWx4ACgkQC3+MBN1Mb4iNmQCg10rz0ylliQturiaE7LEdj/44 pJkAn2sxm1t/GO8U/CMz7nS+VkqhJLI0 =YFdR -----END PGP SIGNATURE----- --UDq0p1ry40hcSP8u-- From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 11:59:06 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9D3D81065670 for ; Fri, 18 Jun 2010 11:59:06 +0000 (UTC) (envelope-from fluffy@freebsd.org) Received: from ns.ael.RU (ns.ael.ru [62.76.207.226]) by mx1.freebsd.org (Postfix) with ESMTP id DE4B98FC0C for ; Fri, 18 Jun 2010 11:59:05 +0000 (UTC) Received: from Fluffy.Khv.RU (host85.khb.ttkdv.ru [188.168.9.85] (may be forged)) by ns.ael.RU (8.14.3/8.14.3/Fluffy/5.3) with ESMTP id o5IBx0Ds096548 for ; Fri, 18 Jun 2010 22:59:01 +1100 (VLAST) (envelope-from fluffy@freebsd.org) Received: from Fluffy.Khv.RU (fluffy@localhost [127.0.0.1]) by Fluffy.Khv.RU (8.14.4/8.14.4/Fluffy/5.4.1) with ESMTP id o5IBwogs025192 for ; Fri, 18 Jun 2010 22:58:50 +1100 (VLAST) (envelope-from fluffy@freebsd.org) Received: (from fluffy@localhost) by Fluffy.Khv.RU (8.14.4/8.14.4/Submit) id o5IBwngc025191 for freebsd-current@freebsd.org; Fri, 18 Jun 2010 22:58:49 +1100 (VLAST) (envelope-from fluffy@freebsd.org) From: Dima Panov Organization: The FreeBSD Project To: freebsd-current@freebsd.org Date: Fri, 18 Jun 2010 22:58:46 +1100 User-Agent: KMail/1.13.3 (FreeBSD/9.0-900013-CURRENT; KDE/4.4.4; amd64; ; ) References: <20100617182024.E3C941CC38@ptavv.es.net> <4C1A9A13.7030206@FreeBSD.org> <4C1B2469.1020001@janh.de> In-Reply-To: <4C1B2469.1020001@janh.de> X-Face: "RE-2'yS-N:*/7DHOjQ%Az<.+SG>K7B'k(&; qb0K4]Hv>J}"l9,=:m2_]-3S/}`b\]yA-g !y3en*Zl(i-86iM?Q[w@!=rW&JdT>KHW@dri>+qMcy42O, 5#izEqa-K+=B<@A X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (ns.ael.RU [62.76.207.226]); Fri, 18 Jun 2010 22:59:02 +1100 (VLAST) Subject: Re: Having a problem with security/libassuan-1 when compiling gnupg. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 11:59:06 -0000 On Friday 18 June 2010 18:46:49 Jan Henrik Sylvester wrote: > On 01/-10/-28163 20:59, Doug Barton wrote: > > 3. kdepim4 My understanding is that the version currently under > > development has support for libassuan 2.0.0, and will be released in > > August. The kde@ folks have indicated that if there is a need to update > > it sooner they can most likely do that based on patches that are > > currently available. > > [...] > > > > I am unsure what happens when some ports want v1 and others want v2. > > > This may not be an issue if the updated ports can be deal with either > > > API, but I have no idea whether that is the case. > > > > The current situation is that having both versions installed is > > incompatible. My preference would be that the maintainers of the > > affected ports upgrade to depend on assuan 2.0.0 and then we can remove > > libassuan-1. If it becomes necessary to support having both versions > > installed then "Plan C" at this point would be to modify libassuan-1 to > > support this. > > I thought "Plan C" was a requirement -- and from your first mails, I > thought this was planned. > > deskutils/kdepim4 LIB_DEPENDS on libassuan-1 and gpgme. security/gpgme > RUN_DEPENDS on gpg2. security/gnupg LIB_DEPENDS on assuan.0. > > Hence, building deskutils/kdepim4, I need security/libassuan-1 and > security/libassuan installed that list each other in CONFLICTS. > > I have not actually tried to build deskutils/kdepim4 after the gnupg > update, but is it not currently broken? > > If that is correct, either kde@ has to patch deskutils/kdepim4 (which > they do not plan from the discussion at that list) or you have to patch > security/libassuan-1 (which you do not plan from your statement above). > Will we have a deskutils/kdepim4 with 8.1-RELEASE? > kde4 not hardy require libassuan-1. if it absend, kleopatra will use own internal functions ans loss a minimum functionality kde4.5 will have full support for libassuan2 -- Dima "Red Fox" Panov @ Home | C73E 2B72 1FFD 61BD E206 1234 A626 76ED 93E3 B018 Khabarovsk, Russia | 2D30 2CCB 9984 130C 6F87 BAFC FB8B A09D D539 8F29 KDE@FreeBSD Team | FreeBSD committer since 10.08.2009 | FreeBSD since Sept 1995 Twitter: fluffy_khv | Skype: dima.panov | Jabber.[org|ru]/GTalk/QIP: fluffy.khv From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 11:59:37 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7AAD1106566B for ; Fri, 18 Jun 2010 11:59:37 +0000 (UTC) (envelope-from rpaulo@freebsd.org) Received: from karen.lavabit.com (karen.lavabit.com [72.249.41.33]) by mx1.freebsd.org (Postfix) with ESMTP id C0FA88FC14 for ; Fri, 18 Jun 2010 11:59:36 +0000 (UTC) Received: from e.earth.lavabit.com (e.earth.lavabit.com [192.168.111.14]) by karen.lavabit.com (Postfix) with ESMTP id 938C716F5CF; Fri, 18 Jun 2010 06:59:31 -0500 (CDT) Received: from 172.17.14.63 (gw-eduroam-81.fc.up.pt [193.136.24.81]) by lavabit.com with ESMTP id UFRY34IJTFJC; Fri, 18 Jun 2010 06:59:31 -0500 References: <201006180426.o5I4QJEt041263@freebsd-current.sentex.ca> <20100618114014.GL13238@deviant.kiev.zoral.com.ua> In-Reply-To: <20100618114014.GL13238@deviant.kiev.zoral.com.ua> Mime-Version: 1.0 (Apple Message framework v1081) Content-Type: text/plain; charset=us-ascii Message-Id: <7008A11F-9928-4DED-8963-8BC4FD25FAF5@freebsd.org> Content-Transfer-Encoding: quoted-printable From: Rui Paulo Date: Fri, 18 Jun 2010 12:59:27 +0100 To: Kostik Belousov X-Mailer: Apple Mail (2.1081) Cc: sparc64@freebsd.org, FreeBSD Tinderbox , current@freebsd.org Subject: Re: [head tinderbox] failure on sparc64/sparc64 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 11:59:37 -0000 On 18 Jun 2010, at 12:40, Kostik Belousov wrote: > On Fri, Jun 18, 2010 at 04:26:19AM +0000, FreeBSD Tinderbox wrote: >> TB --- 2010-06-18 03:09:26 - tinderbox 2.6 running on = freebsd-current.sentex.ca >> TB --- 2010-06-18 03:09:26 - starting HEAD tinderbox run for = sparc64/sparc64 >> TB --- 2010-06-18 03:09:26 - cleaning the object tree >> TB --- 2010-06-18 03:09:46 - cvsupping the source tree >> TB --- 2010-06-18 03:09:46 - /usr/bin/csup -z -r 3 -g -L 1 -h = cvsup.sentex.ca /tinderbox/HEAD/sparc64/sparc64/supfile >> TB --- 2010-06-18 03:10:14 - building world >> TB --- 2010-06-18 03:10:14 - MAKEOBJDIRPREFIX=3D/obj >> TB --- 2010-06-18 03:10:14 - PATH=3D/usr/bin:/usr/sbin:/bin:/sbin >> TB --- 2010-06-18 03:10:14 - TARGET=3Dsparc64 >> TB --- 2010-06-18 03:10:14 - TARGET_ARCH=3Dsparc64 >> TB --- 2010-06-18 03:10:14 - TZ=3DUTC >> TB --- 2010-06-18 03:10:14 - __MAKE_CONF=3D/dev/null >> TB --- 2010-06-18 03:10:14 - cd /src >> TB --- 2010-06-18 03:10:14 - /usr/bin/make -B buildworld >>>>> World build started on Fri Jun 18 03:10:14 UTC 2010 >>>>> Rebuilding the temporary build tree >>>>> stage 1.1: legacy release compatibility shims >>>>> stage 1.2: bootstrap tools >>>>> stage 2.1: cleaning up the object tree >>>>> stage 2.2: rebuilding the object tree >>>>> stage 2.3: build tools >>>>> stage 3: cross tools >>>>> stage 4.1: building includes >>>>> stage 4.2: building libraries >>>>> stage 4.3: make dependencies >>>>> stage 4.4: building everything >>>>> World build completed on Fri Jun 18 04:12:49 UTC 2010 >> TB --- 2010-06-18 04:12:49 - generating LINT kernel config >> TB --- 2010-06-18 04:12:49 - cd /src/sys/sparc64/conf >> TB --- 2010-06-18 04:12:49 - /usr/bin/make -B LINT >> TB --- 2010-06-18 04:12:49 - building LINT kernel >> TB --- 2010-06-18 04:12:49 - MAKEOBJDIRPREFIX=3D/obj >> TB --- 2010-06-18 04:12:49 - PATH=3D/usr/bin:/usr/sbin:/bin:/sbin >> TB --- 2010-06-18 04:12:49 - TARGET=3Dsparc64 >> TB --- 2010-06-18 04:12:49 - TARGET_ARCH=3Dsparc64 >> TB --- 2010-06-18 04:12:49 - TZ=3DUTC >> TB --- 2010-06-18 04:12:49 - __MAKE_CONF=3D/dev/null >> TB --- 2010-06-18 04:12:49 - cd /src >> TB --- 2010-06-18 04:12:49 - /usr/bin/make -B buildkernel = KERNCONF=3DLINT >>>>> Kernel build for LINT started on Fri Jun 18 04:12:50 UTC 2010 >>>>> stage 1: configuring the kernel >>>>> stage 2.1: cleaning up the object tree >>>>> stage 2.2: rebuilding the object tree >>>>> stage 2.3: build tools >>>>> stage 3.1: making dependencies >>>>> stage 3.2: building everything >> [...] >> : undefined reference to `systrace_probe_func' >> subr_trap.o(.text+0x11c): In function `syscallenter': >> : undefined reference to `systrace_probe_func' >> subr_trap.o(.text+0x128): In function `syscallenter': >> : undefined reference to `systrace_probe_func' >> subr_trap.o(.text+0x198): In function `syscallenter': >> : undefined reference to `systrace_probe_func' >> subr_trap.o(.text+0x1a8): more undefined references to = `systrace_probe_func' follow >> *** Error code 1 >>=20 >> Stop in /obj/sparc64/src/sys/LINT. >> *** Error code 1 >>=20 >> Stop in /src. >> *** Error code 1 >=20 > I expect that the following patch would fix the issue, currently run > make universe to confirm. Yeah, I had this in mind, but not enough time to do it yet. Thanks, -- Rui Paulo From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 12:16:37 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7894A106566B; Fri, 18 Jun 2010 12:16:37 +0000 (UTC) (envelope-from jhellenthal@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 264B08FC16; Fri, 18 Jun 2010 12:16:37 +0000 (UTC) Received: by iwn7 with SMTP id 7so1246468iwn.13 for ; Fri, 18 Jun 2010 05:16:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :x-enigmail-version:openpgp:content-type:content-transfer-encoding; bh=cL6BCAd0K8KIYOBd+UFDltxgCjt76oTFEBvhH/L08+E=; b=lRwZj5vOqu+LX5+Jc+8EOfjFbPgCYaF+uNYokOK1udHytf0tx6RgbXpJaVRhvq6WNV 0oyrxUe/NEH6VPwBIQhFgOzzwJRVPnT2MWPrppCoaRaisWby/czHwofSeTxsFfzPnvt4 6i8xCaZuKfjMQqNXhF8HlW0nxL70cmpOvZ4K4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:openpgp:content-type :content-transfer-encoding; b=CIMqrutKwGqrAyAZZiR5fPfSOELXWEgu2JWep9Kh3okQQaWRK+vSPlsJeSq9nd2vYH EC1u+crgU1/nftN34Q3/AtyPMMibP/9mrPBIPRm9CAa6N5Ogw3SggVPWMbG908Kh/jc2 jgK6RLwj+/5EPsu9FIJzs7LQ1o/ClRqvqGcPI= Received: by 10.42.6.205 with SMTP id b13mr365098icb.16.1276863396628; Fri, 18 Jun 2010 05:16:36 -0700 (PDT) Received: from centel.dataix.local (adsl-99-181-128-180.dsl.klmzmi.sbcglobal.net [99.181.128.180]) by mx.google.com with ESMTPS id u6sm9739285ibu.6.2010.06.18.05.16.34 (version=SSLv3 cipher=RC4-MD5); Fri, 18 Jun 2010 05:16:34 -0700 (PDT) Sender: "J. Hellenthal" Message-ID: <4C1B63A1.3010604@dataix.net> Date: Fri, 18 Jun 2010 08:16:33 -0400 From: jhell User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100515 Thunderbird MIME-Version: 1.0 To: Anton Shterenlikht References: <20100617101541.GA90363@mech-cluster241.men.bris.ac.uk> <4C1A117A.9060608@dataix.net> <20100618085018.GA94427@mech-cluster241.men.bris.ac.uk> In-Reply-To: <20100618085018.GA94427@mech-cluster241.men.bris.ac.uk> X-Enigmail-Version: 1.0.1 OpenPGP: id=89D8547E Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-current@freebsd.org, freebsd-ia64@freebsd.org Subject: Re: r209240 ia64 -> buildworld -> undefined reference to `lzma_physmem' X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 12:16:37 -0000 On 06/18/2010 04:50, Anton Shterenlikht wrote: > > sorry, I probably didn't get you. > > I tried > > make -DALWAYS_CHECK_MAKE buildworld > > and got the same erorr. > > What do you mean by "updating your headers"? cd /usr/src/include && make obj && make depend && make all && make install cd /usr/src && make -DALWAYS_CHECK_MAKE buildworld Good Luck, -- jhell From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 14:28:33 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98B0E1065674 for ; Fri, 18 Jun 2010 14:28:33 +0000 (UTC) (envelope-from ganbold@gmail.com) Received: from mail-px0-f182.google.com (mail-px0-f182.google.com [209.85.212.182]) by mx1.freebsd.org (Postfix) with ESMTP id 5B61D8FC1B for ; Fri, 18 Jun 2010 14:28:33 +0000 (UTC) Received: by pxi7 with SMTP id 7so670967pxi.13 for ; Fri, 18 Jun 2010 07:28:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; bh=AnF4Oadl9xCzm2XsZ5bssDZTl+9baLNO6pPWtdusYbg=; b=ej98tyLRS5goZVKvMnxJTvqSUUtBkGPWQ2BUtbRHKzcb9WgsK0iqBEJewLpWO2MzAO PkrX+SlZIUXWe2B2ycvmiEhRciHQ1w9p2ZqKQRUjBFfnBIfEsDSvfDCEzXKkCfiv8wbV zwnBjy4HEFyprXKMW1USlXry6hEuYg2buEgtk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=UaYrG8Gi85FP2+y1oOsMOZ+uxFVBZy3P80/f2Gv8Cl+ZeKROtMLBpFyWxcIaNS9yuM 3GbKFPxBUMjxP4v/ZGKfB8db3lBD75MZv1se0aJevgy0GCxudd7PmQkVFWDbPnmUkze7 kCmtwsn+A9gMWyY9o8tL9UYhF3TStCQc88SgA= Received: by 10.115.81.33 with SMTP id i33mr950202wal.46.1276871308532; Fri, 18 Jun 2010 07:28:28 -0700 (PDT) Received: from beastie.micom.mng.net ([202.179.21.132]) by mx.google.com with ESMTPS id 33sm109423560wad.20.2010.06.18.07.28.23 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 18 Jun 2010 07:28:26 -0700 (PDT) Message-ID: <4C1B827E.6000109@gmail.com> Date: Fri, 18 Jun 2010 22:28:14 +0800 From: Ganbold User-Agent: Thunderbird 2.0.0.23 (X11/20091011) MIME-Version: 1.0 To: PseudoCylon References: <16641.96608.qm@web51806.mail.re2.yahoo.com> <4BB3575D.4040506@gmail.com> <87836.79143.qm@web51804.mail.re2.yahoo.com> <4BBB372C.1060302@gmail.com> <665283.95271.qm@web51802.mail.re2.yahoo.com> <4BBDEC8F.9050803@gmail.com> <490521.32714.qm@web51804.mail.re2.yahoo.com> <4BD307DE.5080507@gmail.com> <332448.8676.qm@web51801.mail.re2.yahoo.com> <4BD3F2D4.8000007@gmail.com> <702632.81988.qm@web51803.mail.re2.yahoo.com> <4BDEE393.4080206@gmail.com> <660085.11669.qm@web51802.mail.re2.yahoo.com> <4BFD4806.8070001@gmail.com> <618770.37649.qm@web51807.mail.re2.yahoo.com> <4C0FAEA2.7010204@gmail.com> <94007.38072.qm@web51807.mail.re2.yahoo.com> <4C11188A.1040002@gmail.com> <447555.80295.qm@web51803.mail.re2.yahoo.com> <4C16499A.3050808@gmail.com> <337427.44900.qm@web51804.mail.re2.yahoo.com> <4C1787DA.2070308@gmail.com> <819523.41498.qm@web51805.mail.re2.yahoo.com> <4C18C4AB.6040205@gmail.com> <726063.68104.qm@web51802.mail.re2.yahoo.com> In-Reply-To: <726063.68104.qm@web51802.mail.re2.yahoo.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Ganbold Tsagaankhuu , freebsd-current@freebsd.org Subject: Re: CALL for TEST [HOSTAP] run(4) ralink usb wireless X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 14:28:33 -0000 AK-san, PseudoCylon wrote: > ----- Original Message ---- > >>> From: Ganbold >>> To: PseudoCylon >>> Cc: freebsd-current@freebsd.org; Ganbold Tsagaankhuu >>> Sent: Wed, June 16, 2010 6:33:47 AM >>> Subject: Re: CALL for TEST [HOSTAP] run(4) ralink usb wireless >>> >>> AK-san, >>> >> PseudoCylon wrote: >> >> Strange, looks like this time works as expected, but sometimes it >> doesn't work. >> >> In some cases it doesn't work and you can find complete tcpdump output >> from very beginning to the modem hang: >> >> > > Hello, > > Are following true? > When manually load/reload hostapd, works > When loaded by rc.conf, doesn't work > > If so, please try attached patch. (patch to if_run.c only) Or, here is a patched file. > http://gitorious.org/run/run/blobs/raw/cmdq_fix/dev/usb/wlan/if_run.c > > When auto-loading, the driver is brought up and down a few times. It might be the cause. I will test it few more days and let you know. thanks, Ganbold > So, when you test, please reboot rspro and let rc.conf handle init process rather than manually start driver/hostapd. And > #arp -d -a > on rspro, freebsd laptop. and macbook would help for testing. (If it works on mac) So, that clients have to send arp request. If macbook receives "who-has 192.168.1.50" arp request packets, it should work. If macbook supports > # tcpdump -vv -xxx -i wlan0 'arp' > and see if macbook gets this. > 19:34:30.469720 ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 192.168.1.50 tell 192.168.1.1, length 46 > 0x0000: ffff ffff ffff 0030 5462 3d24 0806 0001 > 0x0010: 0800 0604 0001 0030 5462 3d24 c0a8 0101 > 0x0020: 0000 0000 0000 c0a8 0132 0000 0000 0000 > 0x0030: 0000 0000 0000 0000 0000 0000 > > > AK > > -- begin patch -- > > diff --git a/dev/usb/wlan/if_run.c b/dev/usb/wlan/if_run.c > index e4fc8d2..f302246 100644 > --- a/dev/usb/wlan/if_run.c > +++ b/dev/usb/wlan/if_run.c > @@ -17,7 +17,7 @@ > */ > > #include > -__FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_run.c,v 1.11 2010/06/14 23:01:50 jkim Exp $"); > +__FBSDID("$FreeBSD$"); > > /*- > * Ralink Technology RT2700U/RT2800U/RT3000U chipset driver. > @@ -830,9 +830,6 @@ run_vap_create(struct ieee80211com *ic, > if(sc->rvp_cnt++ == 0) > ic->ic_opmode = opmode; > > -if(opmode == IEEE80211_M_HOSTAP) > -sc->cmdq_run = RUN_CMDQ_GO; > - > DPRINTF("rvp_id=%d bmap=%x rvp_cnt=%d\n", > rvp->rvp_id, sc->rvp_bmap, sc->rvp_cnt); > > @@ -894,7 +891,9 @@ run_cmdq_cb(void *arg, int pending) > for(i = sc->cmdq_exec; sc->cmdq[i].func && pending; > i = sc->cmdq_exec, pending--){ > DPRINTFN(6, "cmdq_exec=%d pending=%d\n", i, pending); > -if(sc->cmdq_run == RUN_CMDQ_GO){ > +if(sc->cmdq_run == RUN_CMDQ_GO || > + (sc->cmdq_key_set == RUN_CMDQ_GO && > + sc->cmdq[i].func == run_key_set_cb)){ > /* > * If arg0 is NULL, callback func needs more > * than one arg. So, pass ptr to cmdq struct. > @@ -4798,7 +4797,7 @@ run_stop(void *arg) > ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); > > sc->ratectl_run = RUN_RATECTL_OFF; > -sc->cmdq_run = sc->cmdq_key_set; > +sc->cmdq_run = RUN_CMDQ_ABORT; > > RUN_UNLOCK(sc); > > -- end patch -- > > > > -- She just came in, pounced around this thing with me for a few years, enjoyed herself, gave it a sort of beautiful quality and left. Excited a few men in the meantime. -- Patrick Macnee, reminiscing on Diana Rigg's involvement in "The Avengers". From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 15:05:09 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90C541065670; Fri, 18 Jun 2010 15:05:09 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id E50AE8FC1B; Fri, 18 Jun 2010 15:05:08 +0000 (UTC) Received: from mail-gw0-f54.google.com (mail-gw0-f54.google.com [74.125.83.54]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id 5EB99BF417; Fri, 18 Jun 2010 17:05:06 +0200 (CEST) Received: by gwj20 with SMTP id 20so988788gwj.13 for ; Fri, 18 Jun 2010 08:05:04 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.231.130 with SMTP id jq2mr626123qcb.296.1276873504814; Fri, 18 Jun 2010 08:05:04 -0700 (PDT) Received: by 10.229.215.196 with HTTP; Fri, 18 Jun 2010 08:05:04 -0700 (PDT) In-Reply-To: <4C1A7AD0.2000309@FreeBSD.org> References: <4C17BB76.6020702@FreeBSD.org> <4C17E287.8060703@FreeBSD.org> <4C1A7AD0.2000309@FreeBSD.org> Date: Fri, 18 Jun 2010 17:05:04 +0200 Message-ID: From: Alexander Best To: Gabor Kovesdan Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Anonymous , freebsd-current@freebsd.org Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 15:05:09 -0000 On Thu, Jun 17, 2010 at 9:43 PM, Gabor Kovesdan wrote: > >> ok. after installing world i get this when bootingt up: >> >> Starting powerd. >> Starting musicpd. >> path: invalid filesystem charset: ISO-8859-15 >> /usr/lib/i18n/libiconv_std.so.4: unsupported file >> layout/usr/lib/i18n/libiconv_std.so.4: unsupported file >> layout/usr/lib/i18n/libiconv_std.so.4: unsupported file >> layout/usr/lib/i18n/libiconv_std.so.4: unsupported file >> layout/usr/lib/i18n/libiconv_std.so.4: unsupported file layout >> pid 1078 (mpd), uid 1001: exited on signal 6 >> Abort trap >> /etc/rc: WARNING: failed to start musicpd >> Starting mpdscribble. >> GLib: Cannot convert message: Conversion from character set 'UTF-8' to >> 'ASCII' is not supported >> /usr/lib/i18n/libiconv_std.so.4: unsupported file >> layout/usr/lib/i18n/libiconv_std.so.4: unsupported file >> layout/usr/lib/i18n/libiconv_std.so.4: unsupported file >> layout/usr/lib/i18n/libiconv_std.so.4: unsupported file layoutoption >> parsing failed: Conversion from character set 'ASCII' to 'UTF-8' is >> not supported >> /etc/rc: WARNING: failed to start mpdscribble >> > > Seems like the very same error that was already reported.Was it just a > normal build? I never got such a result but will look into the Makefiles = to > find out how ia32 compatibility works. sorry but right now i don't have the ability to test this. i might be able to try again in a few days. > > -- > Gabor Kovesdan > FreeBSD Volunteer > > EMAIL: gabor@FreeBSD.org .:|:. gabor@kovesdan.org > WEB: =A0 http://people.FreeBSD.org/~gabor .:|:. http://kovesdan.org > > --=20 Alexander Best From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 15:07:23 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0DAD61065670 for ; Fri, 18 Jun 2010 15:07:23 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id BB93D8FC1E for ; Fri, 18 Jun 2010 15:07:22 +0000 (UTC) Received: from mail-gy0-f182.google.com (mail-gy0-f182.google.com [209.85.160.182]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id CD817BF414 for ; Fri, 18 Jun 2010 17:07:21 +0200 (CEST) Received: by gyh20 with SMTP id 20so1209633gyh.13 for ; Fri, 18 Jun 2010 08:07:20 -0700 (PDT) MIME-Version: 1.0 Received: by 10.224.21.200 with SMTP id k8mr758291qab.210.1276873640327; Fri, 18 Jun 2010 08:07:20 -0700 (PDT) Received: by 10.229.215.196 with HTTP; Fri, 18 Jun 2010 08:07:20 -0700 (PDT) In-Reply-To: <864oh42e8v.fsf@ds4.des.no> References: <86mxuxgwgg.fsf@ds4.des.no> <86d3vspr43.fsf@ds4.des.no> <86bpbc5ell.fsf@ds4.des.no> <864oh42e8v.fsf@ds4.des.no> Date: Fri, 18 Jun 2010 17:07:20 +0200 Message-ID: From: Alexander Best To: =?ISO-8859-1?Q?Dag=2DErling_Sm=F8rgrav?= Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 15:07:23 -0000 2010/6/15 Dag-Erling Sm=F8rgrav : > Alexander Best writes: >> Dag-Erling Sm=F8rgrav writes: >> > The problem is that "/usr/src/" is not a prefix of "/usr/src". >> ah i see. would something like >> >> empty(.CURDIR:M/usr/src*) instead of empty(.aCURDIR:M/usr/src/*) work? > > I think so. =A0My hypothesis is that CC, CXX etc. were set in the > top-level Makefile and inherited by sub-makes. indeed it worked. :) thanks a bunch. however it seems that CC/CXX/CPP have to be set in make.conf. setting them in src.conf breaks buildworld. maybe this should go into src.conf(5)? > > DES > -- > Dag-Erling Sm=F8rgrav - des@des.no > --=20 Alexander Best From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 15:11:21 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7445B1065676 for ; Fri, 18 Jun 2010 15:11:21 +0000 (UTC) (envelope-from alexbestms@uni-muenster.de) Received: from SECMAIL.UNI-MUENSTER.DE (SECMAIL.UNI-MUENSTER.DE [128.176.192.141]) by mx1.freebsd.org (Postfix) with ESMTP id 1535A8FC1A for ; Fri, 18 Jun 2010 15:11:20 +0000 (UTC) Received: from mail-gy0-f182.google.com (mail-gy0-f182.google.com [209.85.160.182]) by SECMAIL.UNI-MUENSTER.DE (Postfix) with ESMTP id 7A042BF41A; Fri, 18 Jun 2010 17:11:19 +0200 (CEST) Received: by gyh20 with SMTP id 20so1215061gyh.13 for ; Fri, 18 Jun 2010 08:11:18 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.235.195 with SMTP id kh3mr581347qcb.238.1276873876408; Fri, 18 Jun 2010 08:11:16 -0700 (PDT) Received: by 10.229.215.196 with HTTP; Fri, 18 Jun 2010 08:11:16 -0700 (PDT) In-Reply-To: <201006070957.07376.jhb@freebsd.org> References: <6BEF4925-A058-4EFA-B005-30A01B3132FC@samsco.org> <4C0A9D57.8000900@quis.cx> <201006070957.07376.jhb@freebsd.org> Date: Fri, 18 Jun 2010 17:11:16 +0200 Message-ID: From: Alexander Best To: John Baldwin Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org, Jille Timmermans Subject: Re: strange scsi/CAM related dmesg output X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 15:11:21 -0000 On Mon, Jun 7, 2010 at 3:57 PM, John Baldwin wrote: > On Saturday 05 June 2010 2:54:15 pm Jille Timmermans wrote: >> Scott Long schreef: >> > On Jun 4, 2010, at 4:35 PM, Alexander Best wrote: >> > >> >> hi there. running HEAD, amd64 and r208806 i get this dmesg output >> >> which doesn't look right: >> >> >> >> ada0 at ahcich2 bus 0 scbus3 target 0 lun 0 >> >> ada0: ATA-7 SATA 2.x device >> >> ada0: 300.000MB/s transferscd0 at ata2 bus 0 scbus2 target 0 lun 0 >> >> cd0: Removable CD-ROM SCSI-0 device >> >> cd0: 33.300MB/s transfers (UDMA2, ATAPI 12bytes, PIO 65534bytes) >> >> cd0: cd present [1944656 x 2048 byte records] >> >> (SATA 2.x, UDMA6, PIO 8192bytes) >> >> ada0: Command Queueing enabled >> >> ada0: 238474MB (488395055 512 byte sectors: 16H 63S/T 16383C) >> >> >> >> >> >> my kernel contains: >> >> >> >> options =A0 =A0 =A0 =A0 SC_HISTORY_SIZE=3D1000 >> >> options =A0 =A0 =A0 =A0 MSGBUF_SIZE=3D65536 >> >> options =A0 =A0 =A0 =A0 PRINTF_BUFR_SIZE=3D128 >> >> >> >> might this be caused by one of these lines? >> >> >> >> cheers. >> >> >> > >> > Can you be more specific about what you think is not right? >> > >> > Scott >> I assume he means that 'cd0 at ata2 ...' is on the same line as the >> third ada0 line. After all the cd0-lines, the ada0 line continues. >> That shouldn't happen with PRINTF_BUFR_SIZE set, should it? > > It can happen because the print buffer size thing is not line-buffered, i= t is > printf-invocation buffered. hmmm...can this somehow be fixed? i'm not sure this is specific to scsi/cam. the other day i bootd my system and almost all of the dmesg output was displayed incorrectly. would increasing PRINTF_BUFR_SIZE from 128 to lets say 512 or 1024 solve the issue? cheers. > > -- > John Baldwin > --=20 Alexander Best From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 15:41:48 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A19BC106566C for ; Fri, 18 Jun 2010 15:41:48 +0000 (UTC) (envelope-from mdf356@gmail.com) Received: from mail-gw0-f54.google.com (mail-gw0-f54.google.com [74.125.83.54]) by mx1.freebsd.org (Postfix) with ESMTP id 580188FC13 for ; Fri, 18 Jun 2010 15:41:44 +0000 (UTC) Received: by gwj20 with SMTP id 20so1040785gwj.13 for ; Fri, 18 Jun 2010 08:41:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type; bh=xgINYri5KNFMgXsiZFBod0Jpz1SUQ5aH9e+Zv7B85Nw=; b=HFlZIddWmj2tRmWvK56LngPxEn0eRKZdmMnEFVhVOoA7dBbIkHgECeXIqRUkNSGLp8 m/6WiUINHUvLVCw9HjM6cI1cnj9vsVC1Txea1M3VzXrid9L+lr+iDUbwE8fKfguK+Xbi +eISAfdEV2ZMWV07oTknkn2oZ9XKJnVn6W1l8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; b=XEQJuM96Ox2qlvJMwVTI699tCf0fFoCqlr5Sp7j/ZMTRXm26WETZjqZ5Jbu8fjM4I9 Pd1/BFvj177LQN3UvH/FGZs7nSJuzlrCKhENPFkRuIJh7JrbW4gpz/lOleBt8NB+w7tx 8YS+NEqvaplmccg5zTwiEAGJrn+ypqEXiawFY= MIME-Version: 1.0 Received: by 10.224.99.210 with SMTP id v18mr776265qan.87.1276874332100; Fri, 18 Jun 2010 08:18:52 -0700 (PDT) Sender: mdf356@gmail.com Received: by 10.224.28.79 with HTTP; Fri, 18 Jun 2010 08:18:52 -0700 (PDT) In-Reply-To: References: <6BEF4925-A058-4EFA-B005-30A01B3132FC@samsco.org> <4C0A9D57.8000900@quis.cx> <201006070957.07376.jhb@freebsd.org> Date: Fri, 18 Jun 2010 08:18:52 -0700 X-Google-Sender-Auth: OrI1cg19OAwDKWiqh0vA87ek1Dg Message-ID: From: mdf@FreeBSD.org To: Alexander Best Content-Type: text/plain; charset=ISO-8859-1 Cc: freebsd-current@freebsd.org, Jille Timmermans Subject: Re: strange scsi/CAM related dmesg output X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 15:41:48 -0000 On Fri, Jun 18, 2010 at 8:11 AM, Alexander Best wrote: > On Mon, Jun 7, 2010 at 3:57 PM, John Baldwin wrote: >> It can happen because the print buffer size thing is not line-buffered, it is >> printf-invocation buffered. > > hmmm...can this somehow be fixed? i'm not sure this is specific to > scsi/cam. the other day i bootd my system and almost all of the dmesg > output was displayed incorrectly. would increasing PRINTF_BUFR_SIZE > from 128 to lets say 512 or 1024 solve the issue? I think what jhb meant was that we could look for the '\n' and flush to console there, instead of waiting for the end of the buffer. This would perhaps have more interleaved full lines, but likely fewer interleaved partial lines. Thanks, matthew From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 17:28:52 2010 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3573D106564A for ; Fri, 18 Jun 2010 17:28:52 +0000 (UTC) (envelope-from avg@icyb.net.ua) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 415EB8FC16 for ; Fri, 18 Jun 2010 17:28:51 +0000 (UTC) Received: from odyssey.starpoint.kiev.ua (alpha-e.starpoint.kiev.ua [212.40.38.101]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id UAA23678; Fri, 18 Jun 2010 20:28:49 +0300 (EEST) (envelope-from avg@icyb.net.ua) Message-ID: <4C1BACD0.8050707@icyb.net.ua> Date: Fri, 18 Jun 2010 20:28:48 +0300 From: Andriy Gapon User-Agent: Thunderbird 2.0.0.24 (X11/20100517) MIME-Version: 1.0 To: mdf@FreeBSD.org References: <6BEF4925-A058-4EFA-B005-30A01B3132FC@samsco.org> <4C0A9D57.8000900@quis.cx> <201006070957.07376.jhb@freebsd.org> In-Reply-To: X-Enigmail-Version: 0.95.7 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-current@FreeBSD.org, Jille Timmermans , Alexander Best Subject: Re: strange scsi/CAM related dmesg output X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 17:28:52 -0000 on 18/06/2010 18:18 mdf@FreeBSD.org said the following: > On Fri, Jun 18, 2010 at 8:11 AM, Alexander Best > wrote: >> On Mon, Jun 7, 2010 at 3:57 PM, John Baldwin wrote: >>> It can happen because the print buffer size thing is not line-buffered, it is >>> printf-invocation buffered. >> hmmm...can this somehow be fixed? i'm not sure this is specific to >> scsi/cam. the other day i bootd my system and almost all of the dmesg >> output was displayed incorrectly. would increasing PRINTF_BUFR_SIZE >> from 128 to lets say 512 or 1024 solve the issue? > > I think what jhb meant was that we could look for the '\n' and flush > to console there, instead of waiting for the end of the buffer. This > would perhaps have more interleaved full lines, but likely fewer > interleaved partial lines. Not sure if it's relevant here, but want to point out that writing to kernel msgbuf is char-by-char, so any kind of interleaving is possible there and PRINTF_BUFR_SIZE is irrelevant to that. -- Andriy Gapon From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 18:03:08 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD90A106564A; Fri, 18 Jun 2010 18:03:08 +0000 (UTC) (envelope-from oberman@es.net) Received: from mailgw.es.net (mail1.es.net [IPv6:2001:400:201:1::2]) by mx1.freebsd.org (Postfix) with ESMTP id 7C4838FC18; Fri, 18 Jun 2010 18:03:08 +0000 (UTC) Received: from ptavv.es.net (ptavv.es.net [IPv6:2001:400:910::29]) by mailgw.es.net (8.14.3/8.14.3) with ESMTP id o5II32Ds016434 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 18 Jun 2010 11:03:03 -0700 Received: from ptavv.es.net (localhost [127.0.0.1]) by ptavv.es.net (Tachyon Server) with ESMTP id 99F5D1CC0D; Fri, 18 Jun 2010 11:03:02 -0700 (PDT) To: Doug Barton In-reply-to: Your message of "Thu, 17 Jun 2010 14:56:35 PDT." <4C1A9A13.7030206@FreeBSD.org> Date: Fri, 18 Jun 2010 11:03:02 -0700 From: "Kevin Oberman" Message-Id: <20100618180302.99F5D1CC0D@ptavv.es.net> X-Proofpoint-Virus-Version: vendor=fsecure engine=1.12.8161:2.4.5, 1.2.40, 4.0.166 definitions=2010-06-18_03:2010-02-06, 2010-06-18, 2010-06-18 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx engine=5.0.0-1005130000 definitions=main-1006180107 Cc: current Subject: Re: Having a problem with security/libassuan-1 when compiling gnupg. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 18:03:09 -0000 > Date: Thu, 17 Jun 2010 14:56:35 -0700 > From: Doug Barton > > [ FYI, this message should have gone to freebsd-ports@FreeBSD.org ... ] > > On 06/17/10 11:20, Kevin Oberman wrote: > > 2.0.0 should be the preferred version, but its API is incompatible with > > the old one. Many ports using libassuan (listed in UPDATING) have not > > been updated to support V2, so the libassuan-1 port was created. > > > > As soon as deskutils/kdepim4 and security/{dirmngr|gnupg|gpa|opensc} are > > updated, there will be a need to move to 2.0.0. > > Well, I just made it a lot worse. :) As Kevin points out here, the new > version of libassuan is not compatible with the old. This decision on > the part of the gnupg folks has its merits, but is unarguably > inconvenient during the transition. > > On May 11th I approached the authors of the ports that depend on > libassuan asking about their plans for updating (minus ale@ > unfortunately, opensc's dependency is conditional, thus I missed it > until I grep'ed the tree instead of relying on INDEX). The status of the > affected ports is as follows: > 1. gnupg Already handled because 2.0.15 required the update > 2. dirmngr They had an RC ready to go, which they released after I poked > them a bit. :) > > So these first 2 are now done. > > 3. kdepim4 My understanding is that the version currently under > development has support for libassuan 2.0.0, and will be released in > August. The kde@ folks have indicated that if there is a need to update > it sooner they can most likely do that based on patches that are > currently available. > 4. gpa The svn version supports assuan 2.0.0, but the release of this > new version has not yet been scheduled. > 5. opensc ale@ has indicated that he would prefer to wait to update his > port until a new version that supports assuan 2.0.0 is released. > > > I am unsure what happens when some ports want v1 and others want v2. > > This may not be an issue if the updated ports can be deal with either > > API, but I have no idea whether that is the case. > > The current situation is that having both versions installed is > incompatible. My preference would be that the maintainers of the > affected ports upgrade to depend on assuan 2.0.0 and then we can remove > libassuan-1. If it becomes necessary to support having both versions > installed then "Plan C" at this point would be to modify libassuan-1 to > support this. OK. I see dirmgr and gnupg are now ready for libausaan V2.0.0, but I also have opensc installed and MUST have it working. If I upgrade to libassuan-2.0.0, will that break opensc? I assume, since it was not a shared library, that this will not be a problem, but I wanted to be sure. -- R. Kevin Oberman, Network Engineer Energy Sciences Network (ESnet) Ernest O. Lawrence Berkeley National Laboratory (Berkeley Lab) E-mail: oberman@es.net Phone: +1 510 486-8634 Key fingerprint:059B 2DDF 031C 9BA3 14A4 EADA 927D EBB3 987B 3751 From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 18:10:07 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4CD3E106564A; Fri, 18 Jun 2010 18:10:07 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id 126718FC15; Fri, 18 Jun 2010 18:10:06 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5IIA6Na062104; Fri, 18 Jun 2010 14:10:06 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5IIA6JU062103; Fri, 18 Jun 2010 18:10:06 GMT (envelope-from tinderbox@freebsd.org) Date: Fri, 18 Jun 2010 18:10:06 GMT Message-Id: <201006181810.o5IIA6JU062103@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on ia64/ia64 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 18:10:07 -0000 TB --- 2010-06-18 16:28:53 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-18 16:28:53 - starting HEAD tinderbox run for ia64/ia64 TB --- 2010-06-18 16:28:53 - cleaning the object tree TB --- 2010-06-18 16:29:06 - cvsupping the source tree TB --- 2010-06-18 16:29:06 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/ia64/ia64/supfile TB --- 2010-06-18 16:29:49 - building world TB --- 2010-06-18 16:29:49 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-18 16:29:49 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-18 16:29:49 - TARGET=ia64 TB --- 2010-06-18 16:29:49 - TARGET_ARCH=ia64 TB --- 2010-06-18 16:29:49 - TZ=UTC TB --- 2010-06-18 16:29:49 - __MAKE_CONF=/dev/null TB --- 2010-06-18 16:29:49 - cd /src TB --- 2010-06-18 16:29:49 - /usr/bin/make -B buildworld >>> World build started on Fri Jun 18 16:29:50 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything >>> World build completed on Fri Jun 18 17:52:27 UTC 2010 TB --- 2010-06-18 17:52:27 - generating LINT kernel config TB --- 2010-06-18 17:52:27 - cd /src/sys/ia64/conf TB --- 2010-06-18 17:52:27 - /usr/bin/make -B LINT TB --- 2010-06-18 17:52:27 - building LINT kernel TB --- 2010-06-18 17:52:27 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-18 17:52:27 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-18 17:52:27 - TARGET=ia64 TB --- 2010-06-18 17:52:27 - TARGET_ARCH=ia64 TB --- 2010-06-18 17:52:27 - TZ=UTC TB --- 2010-06-18 17:52:27 - __MAKE_CONF=/dev/null TB --- 2010-06-18 17:52:27 - cd /src TB --- 2010-06-18 17:52:27 - /usr/bin/make -B buildkernel KERNCONF=LINT >>> Kernel build for LINT started on Fri Jun 18 17:52:27 UTC 2010 >>> stage 1: configuring the kernel >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3.1: making dependencies >>> stage 3.2: building everything [...] rm -f hack.c MAKE=/usr/bin/make sh /src/sys/conf/newvers.sh LINT cc -c -O2 -pipe -fno-strict-aliasing -std=c99 -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -nostdinc -I. -I/src/sys -I/src/sys/contrib/altq -I/src/sys/contrib/ia64/libuwx/src -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common -finline-limit=15000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-builtin -mconstant-gp -ffixed-r13 -mfixed-range=f32-f127 -fpic -ffreestanding -Werror vers.c linking kernel subr_trap.o(.text+0x290): In function `syscallenter': : undefined reference to `systrace_probe_func' subr_trap.o(.text+0x291): In function `syscallenter': : undefined reference to `systrace_probe_func' *** Error code 1 Stop in /obj/ia64/src/sys/LINT. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-18 18:10:06 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-18 18:10:06 - ERROR: failed to build lint kernel TB --- 2010-06-18 18:10:06 - 4790.23 user 746.66 system 6072.81 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-ia64-ia64.full From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 18:20:07 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 986B8106567A for ; Fri, 18 Jun 2010 18:20:07 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from lab.alexdupre.com (cl-506.trn-01.it.sixxs.net [IPv6:2001:1418:100:1f9::2]) by mx1.freebsd.org (Postfix) with ESMTP id C70E38FC1B for ; Fri, 18 Jun 2010 18:20:06 +0000 (UTC) Received: (qmail 87401 invoked from network); 18 Jun 2010 18:20:04 -0000 Received: from atom.alexdupre.com (HELO ?192.168.178.12?) (sysadmin@alexdupre.com@192.168.178.12) by lab.alexdupre.com with ESMTPSA; 18 Jun 2010 18:20:04 -0000 Message-ID: <4C1BB8D7.4030909@FreeBSD.org> Date: Fri, 18 Jun 2010 20:20:07 +0200 From: Alex Dupre User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; it; rv:1.9.1.9) Gecko/20100317 SeaMonkey/2.0.4 MIME-Version: 1.0 To: Kevin Oberman References: <20100618180302.99F5D1CC0D@ptavv.es.net> In-Reply-To: <20100618180302.99F5D1CC0D@ptavv.es.net> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Cc: Doug Barton , current Subject: Re: Having a problem with security/libassuan-1 when compiling gnupg. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 18:20:07 -0000 Kevin Oberman ha scritto: >> 5. opensc ale@ has indicated that he would prefer to wait to update his >> port until a new version that supports assuan 2.0.0 is released. Update: the signer plugin (that requires libassuan) will be removed in opensc 0.12 release. > OK. I see dirmgr and gnupg are now ready for libausaan V2.0.0, but I > also have opensc installed and MUST have it working. If I upgrade to > libassuan-2.0.0, will that break opensc? I assume, since it was not a > shared library, that this will not be a problem, but I wanted to be > sure. You are safe. -- Alex Dupre From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 18:34:09 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 92DB8106566B; Fri, 18 Jun 2010 18:34:09 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id 61C018FC1A; Fri, 18 Jun 2010 18:34:08 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5IIY8b1036107; Fri, 18 Jun 2010 14:34:08 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5IIY8jf036098; Fri, 18 Jun 2010 18:34:08 GMT (envelope-from tinderbox@freebsd.org) Date: Fri, 18 Jun 2010 18:34:08 GMT Message-Id: <201006181834.o5IIY8jf036098@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on powerpc/powerpc X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 18:34:09 -0000 TB --- 2010-06-18 18:10:06 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-18 18:10:06 - starting HEAD tinderbox run for powerpc/powerpc TB --- 2010-06-18 18:10:06 - cleaning the object tree TB --- 2010-06-18 18:10:18 - cvsupping the source tree TB --- 2010-06-18 18:10:18 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/powerpc/powerpc/supfile TB --- 2010-06-18 18:10:44 - building world TB --- 2010-06-18 18:10:44 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-18 18:10:44 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-18 18:10:44 - TARGET=powerpc TB --- 2010-06-18 18:10:44 - TARGET_ARCH=powerpc TB --- 2010-06-18 18:10:44 - TZ=UTC TB --- 2010-06-18 18:10:44 - __MAKE_CONF=/dev/null TB --- 2010-06-18 18:10:44 - cd /src TB --- 2010-06-18 18:10:44 - /usr/bin/make -B buildworld >>> World build started on Fri Jun 18 18:10:44 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries [...] cc -O2 -pipe -I/obj/powerpc/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -fstack-protector -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c dt_grammar.c cc -O2 -pipe -I/obj/powerpc/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -fstack-protector -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c cc -O2 -pipe -I/obj/powerpc/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -fstack-protector -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c cc -O2 -pipe -I/obj/powerpc/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -fstack-protector -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_inttab.c cc -O2 -pipe -I/obj/powerpc/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -fstack-protector -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c dt_lex.c cc1: warnings being treated as errors /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l: In function 'yylex': /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l:623: warning: comparison is always true due to limited range of data type *** Error code 1 Stop in /src/cddl/lib/libdtrace. *** Error code 1 Stop in /src/cddl/lib. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-18 18:34:08 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-18 18:34:08 - ERROR: failed to build world TB --- 2010-06-18 18:34:08 - 1040.48 user 240.12 system 1442.06 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-powerpc-powerpc.full From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 18:45:21 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 93235106564A for ; Fri, 18 Jun 2010 18:45:21 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 514738FC16 for ; Fri, 18 Jun 2010 18:45:21 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 14FA41FFC33; Fri, 18 Jun 2010 18:45:20 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id 9D79484490; Fri, 18 Jun 2010 20:43:09 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Alexander Best References: <86mxuxgwgg.fsf@ds4.des.no> <86d3vspr43.fsf@ds4.des.no> <86bpbc5ell.fsf@ds4.des.no> <864oh42e8v.fsf@ds4.des.no> Date: Fri, 18 Jun 2010 20:43:09 +0200 In-Reply-To: (Alexander Best's message of "Fri, 18 Jun 2010 17:07:20 +0200") Message-ID: <86typ0chc2.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.95 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: two buildworld problems X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 18:45:21 -0000 Alexander Best writes: > indeed it worked. :) thanks a bunch. however it seems that CC/CXX/CPP > have to be set in make.conf. setting them in src.conf breaks > buildworld. Yes, I noticed - you can't set CFLAGS in src.conf either. I don't know why. > maybe this should go into src.conf(5)? I'll leave that to someone who knows why it doesn't work :) DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 19:45:23 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5EE59106566B; Fri, 18 Jun 2010 19:45:23 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id 12F838FC13; Fri, 18 Jun 2010 19:45:22 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5IJjM92077743; Fri, 18 Jun 2010 15:45:22 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5IJjM9F077742; Fri, 18 Jun 2010 19:45:22 GMT (envelope-from tinderbox@freebsd.org) Date: Fri, 18 Jun 2010 19:45:22 GMT Message-Id: <201006181945.o5IJjM9F077742@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on sparc64/sparc64 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 19:45:23 -0000 TB --- 2010-06-18 18:34:08 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-18 18:34:08 - starting HEAD tinderbox run for sparc64/sparc64 TB --- 2010-06-18 18:34:08 - cleaning the object tree TB --- 2010-06-18 18:34:20 - cvsupping the source tree TB --- 2010-06-18 18:34:20 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/sparc64/sparc64/supfile TB --- 2010-06-18 18:35:15 - building world TB --- 2010-06-18 18:35:15 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-18 18:35:15 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-18 18:35:15 - TARGET=sparc64 TB --- 2010-06-18 18:35:15 - TARGET_ARCH=sparc64 TB --- 2010-06-18 18:35:15 - TZ=UTC TB --- 2010-06-18 18:35:15 - __MAKE_CONF=/dev/null TB --- 2010-06-18 18:35:15 - cd /src TB --- 2010-06-18 18:35:15 - /usr/bin/make -B buildworld >>> World build started on Fri Jun 18 18:35:15 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything >>> World build completed on Fri Jun 18 19:33:38 UTC 2010 TB --- 2010-06-18 19:33:38 - generating LINT kernel config TB --- 2010-06-18 19:33:38 - cd /src/sys/sparc64/conf TB --- 2010-06-18 19:33:38 - /usr/bin/make -B LINT TB --- 2010-06-18 19:33:38 - building LINT kernel TB --- 2010-06-18 19:33:38 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-18 19:33:38 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-18 19:33:38 - TARGET=sparc64 TB --- 2010-06-18 19:33:38 - TARGET_ARCH=sparc64 TB --- 2010-06-18 19:33:38 - TZ=UTC TB --- 2010-06-18 19:33:38 - __MAKE_CONF=/dev/null TB --- 2010-06-18 19:33:38 - cd /src TB --- 2010-06-18 19:33:38 - /usr/bin/make -B buildkernel KERNCONF=LINT >>> Kernel build for LINT started on Fri Jun 18 19:33:38 UTC 2010 >>> stage 1: configuring the kernel >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3.1: making dependencies >>> stage 3.2: building everything [...] : undefined reference to `systrace_probe_func' subr_trap.o(.text+0x11c): In function `syscallenter': : undefined reference to `systrace_probe_func' subr_trap.o(.text+0x128): In function `syscallenter': : undefined reference to `systrace_probe_func' subr_trap.o(.text+0x198): In function `syscallenter': : undefined reference to `systrace_probe_func' subr_trap.o(.text+0x1a8): more undefined references to `systrace_probe_func' follow *** Error code 1 Stop in /obj/sparc64/src/sys/LINT. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-18 19:45:22 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-18 19:45:22 - ERROR: failed to build lint kernel TB --- 2010-06-18 19:45:22 - 3364.27 user 648.17 system 4273.56 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-sparc64-sparc64.full From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 20:02:06 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B0FB106566B; Fri, 18 Jun 2010 20:02:06 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id 114508FC08; Fri, 18 Jun 2010 20:02:05 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5IK257F009715; Fri, 18 Jun 2010 16:02:05 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5IK25Vg009714; Fri, 18 Jun 2010 20:02:05 GMT (envelope-from tinderbox@freebsd.org) Date: Fri, 18 Jun 2010 20:02:05 GMT Message-Id: <201006182002.o5IK25Vg009714@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on sparc64/sun4v X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 20:02:06 -0000 TB --- 2010-06-18 18:54:21 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-18 18:54:21 - starting HEAD tinderbox run for sparc64/sun4v TB --- 2010-06-18 18:54:21 - cleaning the object tree TB --- 2010-06-18 18:54:32 - cvsupping the source tree TB --- 2010-06-18 18:54:32 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/sparc64/sun4v/supfile TB --- 2010-06-18 18:54:58 - building world TB --- 2010-06-18 18:54:58 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-18 18:54:58 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-18 18:54:58 - TARGET=sun4v TB --- 2010-06-18 18:54:58 - TARGET_ARCH=sparc64 TB --- 2010-06-18 18:54:58 - TZ=UTC TB --- 2010-06-18 18:54:58 - __MAKE_CONF=/dev/null TB --- 2010-06-18 18:54:58 - cd /src TB --- 2010-06-18 18:54:58 - /usr/bin/make -B buildworld >>> World build started on Fri Jun 18 18:54:59 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries >>> stage 4.3: make dependencies >>> stage 4.4: building everything >>> World build completed on Fri Jun 18 19:50:11 UTC 2010 TB --- 2010-06-18 19:50:11 - generating LINT kernel config TB --- 2010-06-18 19:50:11 - cd /src/sys/sun4v/conf TB --- 2010-06-18 19:50:11 - /usr/bin/make -B LINT TB --- 2010-06-18 19:50:11 - building LINT kernel TB --- 2010-06-18 19:50:11 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-18 19:50:11 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-18 19:50:11 - TARGET=sun4v TB --- 2010-06-18 19:50:11 - TARGET_ARCH=sparc64 TB --- 2010-06-18 19:50:11 - TZ=UTC TB --- 2010-06-18 19:50:11 - __MAKE_CONF=/dev/null TB --- 2010-06-18 19:50:11 - cd /src TB --- 2010-06-18 19:50:11 - /usr/bin/make -B buildkernel KERNCONF=LINT >>> Kernel build for LINT started on Fri Jun 18 19:50:11 UTC 2010 >>> stage 1: configuring the kernel >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3.1: making dependencies >>> stage 3.2: building everything [...] : undefined reference to `systrace_probe_func' subr_trap.o(.text+0x11c): In function `syscallenter': : undefined reference to `systrace_probe_func' subr_trap.o(.text+0x128): In function `syscallenter': : undefined reference to `systrace_probe_func' subr_trap.o(.text+0x198): In function `syscallenter': : undefined reference to `systrace_probe_func' subr_trap.o(.text+0x1a8): more undefined references to `systrace_probe_func' follow *** Error code 1 Stop in /obj/sun4v/src/sys/LINT. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-18 20:02:05 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-18 20:02:05 - ERROR: failed to build lint kernel TB --- 2010-06-18 20:02:05 - 3358.16 user 628.20 system 4063.34 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-sparc64-sun4v.full From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 19:55:41 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 61078106566B for ; Fri, 18 Jun 2010 19:55:41 +0000 (UTC) (envelope-from wollman@hergotha.csail.mit.edu) Received: from hergotha.csail.mit.edu (hergotha.csail.mit.edu [66.92.79.170]) by mx1.freebsd.org (Postfix) with ESMTP id 165098FC1C for ; Fri, 18 Jun 2010 19:55:40 +0000 (UTC) Received: from hergotha.csail.mit.edu (localhost [127.0.0.1]) by hergotha.csail.mit.edu (8.14.4/8.14.4) with ESMTP id o5IJtc9j095612; Fri, 18 Jun 2010 15:55:38 -0400 (EDT) (envelope-from wollman@hergotha.csail.mit.edu) Received: (from wollman@localhost) by hergotha.csail.mit.edu (8.14.4/8.14.4/Submit) id o5IJtcVY095611; Fri, 18 Jun 2010 15:55:38 -0400 (EDT) (envelope-from wollman) Date: Fri, 18 Jun 2010 15:55:38 -0400 (EDT) From: Garrett Wollman Message-Id: <201006181955.o5IJtcVY095611@hergotha.csail.mit.edu> To: des@des.no In-Reply-To: <86bpba7nc1.fsf@ds4.des.no> References: <4C16C5B5.1070308@FreeBSD.org> <20100616190416.GA3896@a91-153-117-195.elisa-laajakaista.fi> Organization: X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.3 (hergotha.csail.mit.edu [127.0.0.1]); Fri, 18 Jun 2010 15:55:38 -0400 (EDT) X-Spam-Status: No, score=-1.4 required=5.0 tests=ALL_TRUSTED autolearn=disabled version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on hergotha.csail.mit.edu X-Mailman-Approved-At: Fri, 18 Jun 2010 20:17:08 +0000 Cc: current@freebsd.org Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 19:55:41 -0000 In article <86bpba7nc1.fsf@ds4.des.no>, des@des.no writes: >This means you can't, say, read data from a file into a buffer and then >pass that buffer to iconv, because the buffer is not const (otherwise >you couldn't have read data into it). That seems like a pretty >fundamental flaw. But it's a fundamental flaw in the specification of C that "pointer to pointer to X" and "pointer to pointer to const X" are incompatible in this particular way (which is not required by any machine for which there exist C99 compilers). In general, the addition of "const" to C in 1989 was a bit of a botch: it isn't as strong as people expect it to be, and there are these weird corners. (Another thing the committee left out was any way to declare a "conforming" function, in which the return type has the same qualifiers as one of its arguments -- see strchr() for example.) That's water under the bridge now, of course. -GAWollman From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 20:19:19 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29E5C106566B for ; Fri, 18 Jun 2010 20:19:19 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id B02978FC12 for ; Fri, 18 Jun 2010 20:19:18 +0000 (UTC) Received: (qmail 27324 invoked by uid 399); 18 Jun 2010 20:19:18 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 18 Jun 2010 20:19:18 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4C1BD4C4.9040402@FreeBSD.org> Date: Fri, 18 Jun 2010 13:19:16 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100330 Thunderbird/3.0.4 MIME-Version: 1.0 To: Alex Dupre References: <20100618180302.99F5D1CC0D@ptavv.es.net> <4C1BB8D7.4030909@FreeBSD.org> In-Reply-To: <4C1BB8D7.4030909@FreeBSD.org> X-Enigmail-Version: 1.0.1 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Cc: current Subject: Re: Having a problem with security/libassuan-1 when compiling gnupg. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 20:19:19 -0000 On 06/18/10 11:20, Alex Dupre wrote: > Update: the signer plugin (that requires libassuan) will be removed in > opensc 0.12 release. Thanks for this update, and thanks to Dima too for clarifying the kdepim situation. I'm not just making changes willy-nilly. :) Doug -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/ From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 20:19:40 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EB4F010656C9 for ; Fri, 18 Jun 2010 20:19:40 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Received: from phk.freebsd.dk (phk.freebsd.dk [130.225.244.222]) by mx1.freebsd.org (Postfix) with ESMTP id B0BCC8FC18 for ; Fri, 18 Jun 2010 20:19:40 +0000 (UTC) Received: from critter.freebsd.dk (critter.freebsd.dk [192.168.61.3]) by phk.freebsd.dk (Postfix) with ESMTP id 7E06D901A8; Fri, 18 Jun 2010 20:19:39 +0000 (UTC) Received: from critter.freebsd.dk (localhost [127.0.0.1]) by critter.freebsd.dk (8.14.4/8.14.4) with ESMTP id o5IKJcoL028257; Fri, 18 Jun 2010 20:19:39 GMT (envelope-from phk@critter.freebsd.dk) To: Garrett Wollman From: "Poul-Henning Kamp" In-Reply-To: Your message of "Fri, 18 Jun 2010 15:55:38 -0400." <201006181955.o5IJtcVY095611@hergotha.csail.mit.edu> Date: Fri, 18 Jun 2010 20:19:38 +0000 Message-ID: <28256.1276892378@critter.freebsd.dk> Sender: phk@critter.freebsd.dk Cc: des@des.no, current@freebsd.org Subject: Re: [CFT] BSDL iconv in base system X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 20:19:41 -0000 In message <201006181955.o5IJtcVY095611@hergotha.csail.mit.edu>, Garrett Wollma n writes: >In general, the addition of "const" to C in 1989 was a bit of a botch: [...] >That's water under the bridge now, of course. Does that sentiment mean that it will not be fixed it in C1X ? -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 22:17:12 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BFE341065672 for ; Fri, 18 Jun 2010 22:17:12 +0000 (UTC) (envelope-from cswiger@mac.com) Received: from asmtpout024.mac.com (asmtpout024.mac.com [17.148.16.99]) by mx1.freebsd.org (Postfix) with ESMTP id A7CC98FC12 for ; Fri, 18 Jun 2010 22:17:12 +0000 (UTC) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; charset=us-ascii Received: from cswiger1.apple.com ([17.209.4.71]) by asmtp024.mac.com (Sun Java(tm) System Messaging Server 6.3-8.01 (built Dec 16 2008; 32bit)) with ESMTPSA id <0L4800ECRDWNWS70@asmtp024.mac.com> for freebsd-current@freebsd.org; Fri, 18 Jun 2010 15:17:12 -0700 (PDT) X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx engine=6.0.2-1004200000 definitions=main-1006180151 X-Proofpoint-Virus-Version: vendor=fsecure engine=1.12.8161:2.4.5,1.2.40,4.0.166 definitions=2010-06-18_03:2010-02-06, 2010-06-18, 2010-06-18 signatures=0 From: Chuck Swiger In-reply-to: <4C1B3792.9000007@freemail.hu> Date: Fri, 18 Jun 2010 15:17:11 -0700 Message-id: <8CA16EA2-9B00-4A09-AD71-5E3E9A4E469D@mac.com> References: <4C1AB4C0.4020604@freemail.hu> <4C1B3792.9000007@freemail.hu> To: oizs X-Mailer: Apple Mail (2.1081) Cc: freebsd-current@freebsd.org Subject: Re: Dell Perc 5/i Performance issues X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 22:17:12 -0000 On Jun 18, 2010, at 2:08 AM, oizs wrote: > I've seen people with the same configuration doing 160MB/s writes and 250MB/s+ reads with raid5 so I still think something isn't right. How is that being measured? > And using raid10 with 4 disks is a rather large waste of capacity. If you value performance and reliability more than cost, RAID-10 is a better choice. If you value cost more than performance, RAID-5 is what you use. See: http://lists.freebsd.org/pipermail/freebsd-questions/2006-March/116122.html Regards, -- -Chuck From owner-freebsd-current@FreeBSD.ORG Fri Jun 18 22:21:57 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 629A9106566B for ; Fri, 18 Jun 2010 22:21:57 +0000 (UTC) (envelope-from kraduk@googlemail.com) Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.157]) by mx1.freebsd.org (Postfix) with ESMTP id E46108FC12 for ; Fri, 18 Jun 2010 22:21:56 +0000 (UTC) Received: by fg-out-1718.google.com with SMTP id l26so334180fgb.13 for ; Fri, 18 Jun 2010 15:21:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type; bh=KFQUIkLh9o3BcWJngSpbeOSG+M9//6YW6wYvemq+S4I=; b=qWBb83bhDFewbOHA36l5DNAX0I57bPMK/BVAR1lf7LxFZUBgbLLi64MuIx2lFz8nAv 5z9VCyoUL8aChICa3xIDNxAGNgFbV4vc7L6hw9Io0oDxvWKaFQ/6st6rsSVJfEY1c1Q0 lY9edDqeld8vZivIRtPYCFJLJyAA4EQa+6rCg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=INQI0wAmLVjsQ+H8lOH0Fag4rdH7n+5n7K+vQ1dLucc4/drrfTwvLCf3d0oO13tzkm SzEMwyBAHzK7ThSb6cvu0OhP2tW2kNqMQHjbRzroHEgSlOehThf7BbKFR4CuPOeiOpNR s9+aeE65AgQ6L5rjTCWjRl3epU9Yjk3jCcX3k= MIME-Version: 1.0 Received: by 10.239.160.132 with SMTP id c4mr109545hbd.150.1276899715474; Fri, 18 Jun 2010 15:21:55 -0700 (PDT) Received: by 10.239.165.129 with HTTP; Fri, 18 Jun 2010 15:21:55 -0700 (PDT) In-Reply-To: <4C1B3792.9000007@freemail.hu> References: <4C1AB4C0.4020604@freemail.hu> <4C1B3792.9000007@freemail.hu> Date: Fri, 18 Jun 2010 23:21:55 +0100 Message-ID: From: krad To: oizs Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: freebsd-current@freebsd.org Subject: Re: Dell Perc 5/i Performance issues X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2010 22:21:57 -0000 On 18 June 2010 10:08, oizs wrote: > I've seen people with the same configuration doing 160MB/s writes and > 250MB/s+ reads with raid5 so I still think something isn't right. And using > raid10 with 4 disks is a rather large waste of capacity. > > -zsozso > > > On 2010.06.18. 1:55, Chuck Swiger wrote: > >> On Jun 17, 2010, at 4:50 PM, oizs wrote: >> >> >>> I've bought a Dell Perc 5/i because I couldn't make the onboard marvell >>> 88sx7042 work with 8.0/8.1 or current, but as lucky as I am, the best I can >>> do with 4x1.5tb samsung in raid5 is 60MB/s writes and 90MB/s reads, with >>> bbu/write-back/adaptive-read-ahead. >>> >>> I was expecting at least twice of that, and I'm not sure what can I do to >>> get that speed. (I've read man 7 tuning with no success) >>> >>> >> Switch to using RAID-10 rather than RAID-5. It's normal for RAID-5 to >> have worse write performance than that of a single drive. >> >> Regards, >> >> > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" > what are your drives though? Are they SATA green/eco type drives or proper SAS enterprise ones From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 00:27:17 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2D6601065670 for ; Sat, 19 Jun 2010 00:27:17 +0000 (UTC) (envelope-from oizs@freemail.hu) Received: from fep15.mx.upcmail.net (fep15.mx.upcmail.net [62.179.121.35]) by mx1.freebsd.org (Postfix) with ESMTP id 7CA678FC0C for ; Sat, 19 Jun 2010 00:27:15 +0000 (UTC) Received: from edge04.upcmail.net ([192.168.13.239]) by viefep15-int.chello.at (InterMail vM.8.01.02.02 201-2260-120-106-20100312) with ESMTP id <20100619002714.DUHX21071.viefep15-int.chello.at@edge04.upcmail.net> for ; Sat, 19 Jun 2010 02:27:14 +0200 Received: from [192.168.0.6] ([213.222.167.104]) by edge04.upcmail.net with edge id XcTC1e04b2FUr7104cTEcU; Sat, 19 Jun 2010 02:27:14 +0200 X-SourceIP: 213.222.167.104 Message-ID: <4C1C0ED9.8090103@freemail.hu> Date: Sat, 19 Jun 2010 02:27:05 +0200 From: oizs User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.10) Gecko/20100512 Thunderbird/3.0.5 MIME-Version: 1.0 To: freebsd-current@freebsd.org References: <4C1AB4C0.4020604@freemail.hu> <4C1B3792.9000007@freemail.hu> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Cloudmark-Analysis: v=1.1 cv=BX1z5e3lS7RAKjOkUI/uDpZ/pP4xz0N/VImyOZX9Sfk= c=1 sm=0 a=q8OS1GolVHwA:10 a=8nJEP1OIZ-IA:10 a=6I5d2MoRAAAA:8 a=WKDJjGGMSlmJLsMjeWkA:9 a=FvaffqHDPILdG-ScY0oA:7 a=qSpVFLIrDjT1hlPIIFlRcyAcjd4A:4 a=wPNLvfGTeEIA:10 a=SV7veod9ZcQA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Subject: Re: Dell Perc 5/i Performance issues X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 00:27:17 -0000 Im using the Samsung F3 disks, which can do 140MB/s sequentially. I have tried different raids raid0 will do just as bad as raid5. I even tried one disk which performed as expected 100MB/s+ reads and writes so I'm not sure anymore what could be the problem. Maybe the controller hates samsung disks? -zsozso On 2010.06.19. 0:21, krad wrote: > On 18 June 2010 10:08, oizs wrote: > > >> I've seen people with the same configuration doing 160MB/s writes and >> 250MB/s+ reads with raid5 so I still think something isn't right. And using >> raid10 with 4 disks is a rather large waste of capacity. >> >> -zsozso >> >> >> On 2010.06.18. 1:55, Chuck Swiger wrote: >> >> >>> On Jun 17, 2010, at 4:50 PM, oizs wrote: >>> >>> >>> >>>> I've bought a Dell Perc 5/i because I couldn't make the onboard marvell >>>> 88sx7042 work with 8.0/8.1 or current, but as lucky as I am, the best I can >>>> do with 4x1.5tb samsung in raid5 is 60MB/s writes and 90MB/s reads, with >>>> bbu/write-back/adaptive-read-ahead. >>>> >>>> I was expecting at least twice of that, and I'm not sure what can I do to >>>> get that speed. (I've read man 7 tuning with no success) >>>> >>>> >>>> >>> Switch to using RAID-10 rather than RAID-5. It's normal for RAID-5 to >>> have worse write performance than that of a single drive. >>> >>> Regards, >>> >>> >>> >> _______________________________________________ >> freebsd-current@freebsd.org mailing list >> http://lists.freebsd.org/mailman/listinfo/freebsd-current >> To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" >> >> > what are your drives though? Are they SATA green/eco type drives or proper > SAS enterprise ones > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" > > > From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 02:19:25 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 66438106564A; Sat, 19 Jun 2010 02:19:25 +0000 (UTC) (envelope-from scottl@samsco.org) Received: from pooker.samsco.org (pooker.samsco.org [168.103.85.57]) by mx1.freebsd.org (Postfix) with ESMTP id 027508FC0C; Sat, 19 Jun 2010 02:19:24 +0000 (UTC) Received: from [192.168.4.183] ([68.177.209.202]) (authenticated bits=0) by pooker.samsco.org (8.14.4/8.14.4) with ESMTP id o5J2JAgJ098009; Fri, 18 Jun 2010 20:19:18 -0600 (MDT) (envelope-from scottl@samsco.org) References: <6BEF4925-A058-4EFA-B005-30A01B3132FC@samsco.org> <4C0A9D57.8000900@quis.cx> <201006070957.07376.jhb@freebsd.org> Message-Id: <9B404DAF-CD34-4799-8DFA-F24AF62F0117@samsco.org> From: Scott Long To: Alexander Best In-Reply-To: Content-Type: text/plain; charset=us-ascii; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit X-Mailer: iPhone Mail (7D11) Mime-Version: 1.0 (iPhone Mail 7D11) Date: Fri, 18 Jun 2010 20:18:54 -0600 X-Spam-Status: No, score=1.3 required=3.8 tests=RDNS_NONE autolearn=no version=3.3.0 X-Spam-Level: * X-Spam-Checker-Version: SpamAssassin 3.3.0 (2010-01-18) on pooker.samsco.org Cc: "freebsd-current@freebsd.org" , Jille Timmermans Subject: Re: strange scsi/CAM related dmesg output X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 02:19:25 -0000 On Jun 18, 2010, at 9:11 AM, Alexander Best wrote: > On Mon, Jun 7, 2010 at 3:57 PM, John Baldwin wrote: >> On Saturday 05 June 2010 2:54:15 pm Jille Timmermans wrote: >>> Scott Long schreef: >>>> On Jun 4, 2010, at 4:35 PM, Alexander Best wrote: >>>> >>>>> hi there. running HEAD, amd64 and r208806 i get this dmesg output >>>>> which doesn't look right: >>>>> >>>>> ada0 at ahcich2 bus 0 scbus3 target 0 lun 0 >>>>> ada0: ATA-7 SATA 2.x device >>>>> ada0: 300.000MB/s transferscd0 at ata2 bus 0 scbus2 target 0 lun 0 >>>>> cd0: Removable CD-ROM SCSI-0 >>>>> device >>>>> cd0: 33.300MB/s transfers (UDMA2, ATAPI 12bytes, PIO 65534bytes) >>>>> cd0: cd present [1944656 x 2048 byte records] >>>>> (SATA 2.x, UDMA6, PIO 8192bytes) >>>>> ada0: Command Queueing enabled >>>>> ada0: 238474MB (488395055 512 byte sectors: 16H 63S/T 16383C) >>>>> >>>>> >>>>> my kernel contains: >>>>> >>>>> options SC_HISTORY_SIZE=1000 >>>>> options MSGBUF_SIZE=65536 >>>>> options PRINTF_BUFR_SIZE=128 >>>>> >>>>> might this be caused by one of these lines? >>>>> >>>>> cheers. >>>>> >>>> >>>> Can you be more specific about what you think is not right? >>>> >>>> Scott >>> I assume he means that 'cd0 at ata2 ...' is on the same line as the >>> third ada0 line. After all the cd0-lines, the ada0 line continues. >>> That shouldn't happen with PRINTF_BUFR_SIZE set, should it? >> >> It can happen because the print buffer size thing is not line- >> buffered, it is >> printf-invocation buffered. > > hmmm...can this somehow be fixed? i'm not sure this is specific to > scsi/cam. the other day i bootd my system and almost all of the dmesg > output was displayed incorrectly. would increasing PRINTF_BUFR_SIZE > from 128 to lets say 512 or 1024 solve the issue Johns response is off base. I explained the issue prior to him, please review that. Scott >> From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 03:27:32 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CBAF5106564A for ; Sat, 19 Jun 2010 03:27:32 +0000 (UTC) (envelope-from lstewart@freebsd.org) Received: from lauren.room52.net (lauren.room52.net [210.50.193.198]) by mx1.freebsd.org (Postfix) with ESMTP id 6447B8FC08 for ; Sat, 19 Jun 2010 03:27:31 +0000 (UTC) Received: from lawrence1.loshell.room52.net (unknown [59.167.184.191]) by lauren.room52.net (Postfix) with ESMTPSA id 004827E84A for ; Sat, 19 Jun 2010 13:27:30 +1000 (EST) Message-ID: <4C1C3922.2050102@freebsd.org> Date: Sat, 19 Jun 2010 13:27:30 +1000 From: Lawrence Stewart User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-AU; rv:1.9.1.9) Gecko/20100405 Thunderbird/3.0.4 MIME-Version: 1.0 To: freebsd-current@freebsd.org References: <4C1492D0.6020704@freebsd.org> In-Reply-To: <4C1492D0.6020704@freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [CFT] SIFTR - Statistical Information For TCP Research: Uncle Lawrence needs YOU! X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 03:27:33 -0000 Amount of feedback received thus far: nichts, nil, nada *sings "I'm so ronery" in his best Kim Jong-il voice* [4] Just like Uncle Sam [5], Uncle Lawrence needs you too - yes, I'm pointing at YOU! More specifically, people out there running current with 10-15 mins to spare for some testing, please read on. On 06/13/10 18:12, Lawrence Stewart wrote: > Hi all, > > The time has come to solicit some external testing for my SIFTR tool. > I'm hoping to commit it within a week or so unless problems are discovered. > > SIFTR is a kernel module that logs a range of statistics on active TCP > connections to a log file. It provides the ability to make highly > granular measurements of TCP connection state, aimed at system > administrators, developers and researchers. You can use the data to find > bugs in the stack, understand why connections are performing badly and > test new code to name a few uses. > > Development has been made possible in part by grants from the Cisco > University Research Program Fund at Community Foundation Silicon Valley, > and the FreeBSD Foundation. Bringing it into FreeBSD proper is being > carried out under the auspices of the "Enhancing the FreeBSD TCP > Implementation" FreeBSD Foundation project. More details are available > at [1,2,3]. > > If you can help out, please read on! > > Before continuing, make sure you're running with at least svn revision > 209119 (my commit to ), or you can manually apply the > r209119 diff to to your earlier rev source tree. > > The SIFTR patch is here: > > http://people.freebsd.org/~lstewart/patches/tcp_ffcaia2008/siftr_9.x.r209119.patch An updated version of the patch against svn head revision 209325 is available from: http://people.freebsd.org/~lstewart/patches/tcp_ffcaia2008/siftr_9.x.r209325.patch There was a backwards incompatible change in the external DPCPU_SUM() macro in in r209325 of head so SIFTR also had to be updated. Please adapt the following instructions as appropriate based on the patch version you're testing. > Copy it to the root of your source tree and run the following: > > patch -p1 < siftr_9.x.r209119.patch > > It's a loadable kernel module so you can build it for testing like so: > > cd /sys/modules/siftr > make > kldload ./siftr.ko > (don't forget to "make cleandir" to remove cruft when finished testing) > > After applying the patch, you can read the man page by running: > > man -M /share/man siftr > > If I've done a decent job, all the info you need to understand what it > does and how to use it should be in the man page. > > I'm interested in all feedback and reports of success/failure, along > with details of the architecture tested and number of CPUs if you would > be so kind. > > That should be enough to get the ball rolling. Thanks and I look forward > to hearing from you! > > Cheers, > Lawrence > > [1] http://caia.swin.edu.au/freebsd/etcp09/ > > [2] http://www.freebsdfoundation.org/projects.shtml#Swinburne > > [3] http://caia.swin.edu.au/urp/newtcp/ [4] http://www.youtube.com/watch?v=xh_9QhRzJEs (language warning) [5] http://www.sonofthesouth.net/uncle-sam/images/uncle-sam-wants-you.jpg From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 06:26:22 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 36D101065670 for ; Sat, 19 Jun 2010 06:26:22 +0000 (UTC) (envelope-from lev@FreeBSD.org) Received: from ftp.translate.ru (ftp.translate.ru [80.249.188.42]) by mx1.freebsd.org (Postfix) with ESMTP id D64BC8FC17 for ; Sat, 19 Jun 2010 06:26:21 +0000 (UTC) Received: from desktop.home.serebryakov.spb.ru (85-142-52-164.well-com.net [85.142.52.164]) (Authenticated sender: lev@serebryakov.spb.ru) by ftp.translate.ru (Postfix) with ESMTPA id BE2EE13DF5D; Sat, 19 Jun 2010 10:26:19 +0400 (MSD) Date: Sat, 19 Jun 2010 10:26:09 +0400 From: Lev Serebryakov Organization: FreeBSD X-Priority: 3 (Normal) Message-ID: <179977397.20100619102609@serebryakov.spb.ru> To: Lawrence Stewart In-Reply-To: <4C1C3922.2050102@freebsd.org> References: <4C1492D0.6020704@freebsd.org> <4C1C3922.2050102@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=windows-1251 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: [CFT] SIFTR - Statistical Information For TCP Research: Uncle Lawrence needs YOU! X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: lev@FreeBSD.org List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 06:26:22 -0000 Hello, Lawrence. You wrote 19 =E8=FE=ED=FF 2010 =E3., 07:27:30: > Amount of feedback received thus far: nichts, nil, nada I wanted to help you, but here is one problem: I dont have any traffic-loaded 9-CURRENT machines. I have some not-so-critical 7.x and 8.x machines with noticeable traffic (for example, my torrent box still run 7-STABLE), but no 9-CURRENT except VMWare on my desktop :( I think, it is common case: 9-CURRENT machines are developers one, without noticeable amount of network traffic and all traffic-loaded machines run more stable versions. --=20 // Black Lion AKA Lev Serebryakov From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 06:28:54 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 53C171065674; Sat, 19 Jun 2010 06:28:54 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id 222FC8FC16; Sat, 19 Jun 2010 06:28:53 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5J6SrjW014481; Sat, 19 Jun 2010 02:28:53 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5J6Srjv014472; Sat, 19 Jun 2010 06:28:53 GMT (envelope-from tinderbox@freebsd.org) Date: Sat, 19 Jun 2010 06:28:53 GMT Message-Id: <201006190628.o5J6Srjv014472@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on arm/arm X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 06:28:54 -0000 TB --- 2010-06-19 06:10:00 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-19 06:10:00 - starting HEAD tinderbox run for arm/arm TB --- 2010-06-19 06:10:00 - cleaning the object tree TB --- 2010-06-19 06:10:14 - cvsupping the source tree TB --- 2010-06-19 06:10:14 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/arm/arm/supfile TB --- 2010-06-19 06:10:58 - building world TB --- 2010-06-19 06:10:58 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-19 06:10:58 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-19 06:10:58 - TARGET=arm TB --- 2010-06-19 06:10:58 - TARGET_ARCH=arm TB --- 2010-06-19 06:10:58 - TZ=UTC TB --- 2010-06-19 06:10:58 - __MAKE_CONF=/dev/null TB --- 2010-06-19 06:10:58 - cd /src TB --- 2010-06-19 06:10:58 - /usr/bin/make -B buildworld >>> World build started on Sat Jun 19 06:10:58 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries [...] cc -O -pipe -I/obj/arm/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c dt_grammar.c cc -O -pipe -I/obj/arm/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c cc -O -pipe -I/obj/arm/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c cc -O -pipe -I/obj/arm/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_inttab.c cc -O -pipe -I/obj/arm/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c dt_lex.c cc1: warnings being treated as errors /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l: In function 'yylex': /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l:623: warning: comparison is always true due to limited range of data type *** Error code 1 Stop in /src/cddl/lib/libdtrace. *** Error code 1 Stop in /src/cddl/lib. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-19 06:28:53 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-19 06:28:53 - ERROR: failed to build world TB --- 2010-06-19 06:28:53 - 884.60 user 217.20 system 1132.31 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-arm-arm.full From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 07:17:08 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5717D1065670 for ; Sat, 19 Jun 2010 07:17:08 +0000 (UTC) (envelope-from mike@reifenberger.com) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by mx1.freebsd.org (Postfix) with ESMTP id DA8A98FC08 for ; Sat, 19 Jun 2010 07:17:07 +0000 (UTC) Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 2ED3B1C15651; Sat, 19 Jun 2010 09:17:06 +0200 (CEST) Received: from mail.reifenberger.com (ppp-93-104-119-89.dynamic.mnet-online.de [93.104.119.89]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS id 146431C00194; Sat, 19 Jun 2010 09:17:06 +0200 (CEST) Received: by mail.reifenberger.com (Postfix, from userid 1001) id C3B4E14AA2; Sat, 19 Jun 2010 09:17:05 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.reifenberger.com (Postfix) with ESMTP id B5A0214AA1; Sat, 19 Jun 2010 09:17:05 +0200 (CEST) Date: Sat, 19 Jun 2010 09:17:05 +0200 (CEST) From: Michael Reifenberger To: oizs In-Reply-To: <4C1C0ED9.8090103@freemail.hu> Message-ID: References: <4C1AB4C0.4020604@freemail.hu> <4C1B3792.9000007@freemail.hu> <4C1C0ED9.8090103@freemail.hu> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: freebsd-current@freebsd.org Subject: Re: Dell Perc 5/i Performance issues X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 07:17:08 -0000 On Sat, 19 Jun 2010, oizs wrote: > Date: Sat, 19 Jun 2010 02:27:05 +0200 > From: oizs > To: freebsd-current@freebsd.org > Subject: Re: Dell Perc 5/i Performance issues > > Im using the Samsung F3 disks, which can do 140MB/s sequentially. I have > tried different raids raid0 will do just as bad as raid5. I even tried one > disk which performed as expected 100MB/s+ reads and writes so I'm not sure > anymore what could be the problem. Maybe the controller hates samsung disks? > I have a 8-disk Samsung F1/F3 mixed setup under FreeBSD-current: (fs)(root) mfiutil show drives mfi0 Physical Drives: ( 932G) ONLINE SATA slot 0 ( 932G) ONLINE SATA slot 1 ( 932G) ONLINE SATA slot 2 ( 932G) ONLINE SATA slot 3 ( 932G) ONLINE SATA slot 4 ( 932G) ONLINE SATA slot 5 ( 932G) ONLINE SATA slot 6 ( 932G) ONLINE SATA slot 7 The disks are organized as JBOD disks. Later on they form one ZFS pool: config: NAME STATE READ WRITE CKSUM x ONLINE 0 0 0 mirror ONLINE 0 0 0 mfid0p4 ONLINE 0 0 0 mfid1p4 ONLINE 0 0 0 mirror ONLINE 0 0 0 mfid2p4 ONLINE 0 0 0 mfid3p4 ONLINE 0 0 0 mirror ONLINE 0 0 0 mfid4p4 ONLINE 0 0 0 mfid5p4 ONLINE 0 0 0 mirror ONLINE 0 0 0 mfid6p4 ONLINE 0 0 0 mfid7p4 ONLINE 0 0 0 ada0p3 ONLINE 0 0 0 (ada0 is there because mfid6 had some unreadable blocks lately) I get ~370MiB/s writing performance using `iozone -s10g -r1m`. While my samsung disks are problematic in the area of reliability (I get occasional parity mismatches or read errors), performance is good. Have you enabled the disk caches as well? Something like: MegaCli -LdSetProp Cached -LALL -a0 MegaCli -LdSetProp NORA -LALL -a0 MegaCli -LdSetProp WB -LALL -a0 MegaCli -LdSetProp -EnDskCache -LALL -a0 (Only if having a USV of course) Dunno if there is a mfiutil equivalent though. Bye/2 --- Michael Reifenberger Michael@Reifenberger.com http://www.Reifenberger.com From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 07:45:09 2010 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A528106564A for ; Sat, 19 Jun 2010 07:45:09 +0000 (UTC) (envelope-from lstewart@freebsd.org) Received: from lauren.room52.net (lauren.room52.net [210.50.193.198]) by mx1.freebsd.org (Postfix) with ESMTP id DEA208FC08 for ; Sat, 19 Jun 2010 07:45:08 +0000 (UTC) Received: from lawrence1.loshell.room52.net (unknown [59.167.184.191]) by lauren.room52.net (Postfix) with ESMTPSA id F40AC7E878; Sat, 19 Jun 2010 17:45:06 +1000 (EST) Message-ID: <4C1C7582.1000404@freebsd.org> Date: Sat, 19 Jun 2010 17:45:06 +1000 From: Lawrence Stewart User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-AU; rv:1.9.1.9) Gecko/20100405 Thunderbird/3.0.4 MIME-Version: 1.0 To: lev@FreeBSD.org References: <4C1492D0.6020704@freebsd.org> <4C1C3922.2050102@freebsd.org> <179977397.20100619102609@serebryakov.spb.ru> In-Reply-To: <179977397.20100619102609@serebryakov.spb.ru> Content-Type: text/plain; charset=windows-1251; format=flowed Content-Transfer-Encoding: 8bit Cc: freebsd-current@FreeBSD.org Subject: Re: [CFT] SIFTR - Statistical Information For TCP Research: Uncle Lawrence needs YOU! X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 07:45:09 -0000 Hi Lev, On 06/19/10 16:26, Lev Serebryakov wrote: > Hello, Lawrence. > You wrote 19 èþíÿ 2010 ã., 07:27:30: > >> Amount of feedback received thus far: nichts, nil, nada > I wanted to help you, but here is one problem: I dont have any > traffic-loaded 9-CURRENT machines. I have some not-so-critical 7.x and > 8.x machines with noticeable traffic (for example, my torrent box > still run 7-STABLE), but no 9-CURRENT except VMWare on my desktop :( > I think, it is common case: 9-CURRENT machines are developers one, > without noticeable amount of network traffic and all traffic-loaded > machines run more stable versions. Right now the traffic load of the test machine is not really all that important to the testing. As long as the module loads, logs some coherent looking data whilst enabled and unloads across a range of different hardware and kernel archs, I'll be happy. SIFTR will be backported to 8 and possibly 7 also, so there will be plenty of time to get people with more heavily loaded systems running stable branches to join in testing. This is the first real push I've made to get the code widely tested, so I wouldn't feel comfortable asking people to run it on (semi-)production, stable branch systems yet. If you're really keen to help test it and you wouldn't be worried about running the code on such a system, I would be happy to create a 7 and/or 8 backport of the required bits. Otherwise, I'm happy to get the initial round of 9-CURRENT only testing feedback, commit it to head and then revisit once it's settled and time to merge it back to the stable branches. Cheers, Lawrence From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 08:34:45 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4804A106566B for ; Sat, 19 Jun 2010 08:34:45 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id CEED58FC08 for ; Sat, 19 Jun 2010 08:34:44 +0000 (UTC) Received: by wyb33 with SMTP id 33so1706311wyb.13 for ; Sat, 19 Jun 2010 01:34:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type; bh=JGx+WRHBlWk7xamc3CDQ9GvkTTXsHq2NV/7atS+3v84=; b=faznWQao5i5IGh/7D/ZvjtTxOO2ZSV+5sHqjIi8NriI8tNwcmuBleaavI0CAb1YzGW mSHdEgiNJxaN48C6gVaG+7Rs8dxPfPgOwsBQ/8X3S3pIfNjNdZzFvLp7fQ/yEqS2eDGQ 7cvkotKJvz+TplDteE5gwysrZGNaet69uIIKE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=JnoAhpTENyhfcJZCtUjKqByC/9eNh3VLcNYCiFwA4mrGuUNL6A0d2vw8tztJ1DnFXa 4oH3YtLTIp/0E54o3EuKspMV/pGufYv9eaUyIKTPIvLEvqcv+CocUWf8DdxHtray8cMc Su6BGbMC62eH8SkfzoVQ98cBfC0MXI1vj19ig= MIME-Version: 1.0 Received: by 10.216.162.84 with SMTP id x62mr1581374wek.39.1276936480037; Sat, 19 Jun 2010 01:34:40 -0700 (PDT) Received: by 10.216.51.78 with HTTP; Sat, 19 Jun 2010 01:34:39 -0700 (PDT) In-Reply-To: References: <4C1AB4C0.4020604@freemail.hu> <4C1B3792.9000007@freemail.hu> <4C1C0ED9.8090103@freemail.hu> Date: Sat, 19 Jun 2010 12:34:39 +0400 Message-ID: From: pluknet To: Michael Reifenberger Content-Type: text/plain; charset=ISO-8859-1 Cc: oizs , freebsd-current@freebsd.org Subject: Re: Dell Perc 5/i Performance issues X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 08:34:45 -0000 On 19 June 2010 11:17, Michael Reifenberger wrote: > > Have you enabled the disk caches as well? > Something like: > MegaCli -LdSetProp Cached -LALL -a0 > MegaCli -LdSetProp NORA -LALL -a0 > MegaCli -LdSetProp WB -LALL -a0 > MegaCli -LdSetProp -EnDskCache -LALL -a0 > (Only if having a USV of course) > > Dunno if there is a mfiutil equivalent though. Hi. That would be: mfiutil cache mfid0 enable mfiutil cache mfid0 read-ahead none mfiutil cache mfid0 write-back mfiutil cache mfid0 write-cache enable -- wbr, pluknet From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 08:48:42 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BBF901065670 for ; Sat, 19 Jun 2010 08:48:42 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id 29A348FC0C for ; Sat, 19 Jun 2010 08:48:41 +0000 (UTC) Received: by wyb33 with SMTP id 33so1713089wyb.13 for ; Sat, 19 Jun 2010 01:48:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type; bh=EoxhL0F2bw6IW+j1+HHz4x3B2H1sFXdDxIZOoeKeAuA=; b=GdDcDUQ1GVRSVz9Ny2l2SbJcCMSfTISzTFnLHo8/HVPkG+KLrxTrtNuSlL0LgGFxPm mXI7Jy8QxgN4Y7gMg0WWI9ttPF1SscJE+BKeyqibj//ByD3Dtf0MSHnfDZg4ecYiSXGX jvzzzGKZpHfrh2bKiVBVwnWzdAWBAr0G3OK8A= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=kryvYg1yA9u+N6q70F5infL1ghN9K+zGV8C3a1BKuAunir1m8vB3B3Bw6Ud2ayLrfJ DYRgE7spjPTqm5wwdvI9EDc5j5tMDkZ+PqxZZhfy3sAs2G5SzCoT1dhLbwdDvGoMbnhA h2mwLJa1V8YVcTkEMi9EHZB3tgYo3kH18khQE= MIME-Version: 1.0 Received: by 10.216.87.5 with SMTP id x5mr1558985wee.90.1276937320918; Sat, 19 Jun 2010 01:48:40 -0700 (PDT) Received: by 10.216.51.78 with HTTP; Sat, 19 Jun 2010 01:48:40 -0700 (PDT) In-Reply-To: <4C1492D0.6020704@freebsd.org> References: <4C1492D0.6020704@freebsd.org> Date: Sat, 19 Jun 2010 12:48:40 +0400 Message-ID: From: pluknet To: Lawrence Stewart Content-Type: text/plain; charset=ISO-8859-1 Cc: freebsd-current@freebsd.org Subject: Re: [CFT] SIFTR - Statistical Information For TCP Research X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 08:48:42 -0000 On 13 June 2010 12:12, Lawrence Stewart wrote: > Hi all, > > The time has come to solicit some external testing for my SIFTR tool. I'm > hoping to commit it within a week or so unless problems are discovered. > > SIFTR is a kernel module that logs a range of statistics on active TCP > connections to a log file. It provides the ability to make highly granular > measurements of TCP connection state, aimed at system administrators, > developers and researchers. You can use the data to find bugs in the stack, > understand why connections are performing badly and test new code to name a > few uses. > > Development has been made possible in part by grants from the Cisco > University Research Program Fund at Community Foundation Silicon Valley, and > the FreeBSD Foundation. Bringing it into FreeBSD proper is being carried out > under the auspices of the "Enhancing the FreeBSD TCP Implementation" FreeBSD > Foundation project. More details are available at [1,2,3]. > > If you can help out, please read on! > > Before continuing, make sure you're running with at least svn revision > 209119 (my commit to ), or you can manually apply the r209119 > diff to to your earlier rev source tree. > > The SIFTR patch is here: > > http://people.freebsd.org/~lstewart/patches/tcp_ffcaia2008/siftr_9.x.r209119.patch > > Copy it to the root of your source tree and run the following: > > patch -p1 < siftr_9.x.r209119.patch > > It's a loadable kernel module so you can build it for testing like so: > > cd /sys/modules/siftr > make > kldload ./siftr.ko > (don't forget to "make cleandir" to remove cruft when finished testing) > > After applying the patch, you can read the man page by running: > > man -M /share/man siftr > > If I've done a decent job, all the info you need to understand what it does > and how to use it should be in the man page. > > I'm interested in all feedback and reports of success/failure, along with > details of the architecture tested and number of CPUs if you would be so > kind. > > That should be enough to get the ball rolling. Thanks and I look forward to > hearing from you! > > Cheers, > Lawrence > > [1] http://caia.swin.edu.au/freebsd/etcp09/ > > [2] http://www.freebsdfoundation.org/projects.shtml#Swinburne > > [3] http://caia.swin.edu.au/urp/newtcp/ Hi. I'm seeing this right after enabling siftr via sysctl and changing ppl. Sorry, if that was already discussed, known or unrelated (since em is in locking chain). lock order reversal: 1st 0xffffffff80e51568 PFil hook read/write mutex (PFil hook read/write mutex) @ /usr/src/sys/net/pfil.c:77 2nd 0xffffffff80e52788 tcp (tcp) @ /usr/src/sys/modules/siftr/../../netinet/siftr.c:698 KDB: stack backtrace: db_trace_self_wrapper() at db_trace_self_wrapper+0x2a _witness_debugger() at _witness_debugger+0x2e witness_checkorder() at witness_checkorder+0x81e _rw_rlock() at _rw_rlock+0x5f siftr_chkpkt() at siftr_chkpkt+0x374 pfil_run_hooks() at pfil_run_hooks+0xcf ip_input() at ip_input+0x2ae netisr_dispatch_src() at netisr_dispatch_src+0xb8 ether_demux() at ether_demux+0x17d ether_input() at ether_input+0x175 em_rxeof() at em_rxeof+0x193 em_handle_que() at em_handle_que+0x4a taskqueue_run() at taskqueue_run+0x91 taskqueue_thread_loop() at taskqueue_thread_loop+0x3f fork_exit() at fork_exit+0x12a fork_trampoline() at fork_trampoline+0xe --- trap 0, rip = 0, rsp = 0xffffff80000bed30, rbp = 0 --- -- wbr, pluknet From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 09:07:32 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11FB01065670 for ; Sat, 19 Jun 2010 09:07:31 +0000 (UTC) (envelope-from svein-listmail@stillbilde.net) Received: from mail.stillbilde.net (unknown [IPv6:2002:51af:3dc3:0:20c:29ff:fece:79f3]) by mx1.freebsd.org (Postfix) with ESMTP id 79D108FC0A for ; Sat, 19 Jun 2010 09:07:31 +0000 (UTC) Received: from [IPv6:2002:51af:3dc3:0:19f4:72db:b8ac:23a] (unknown [IPv6:2002:51af:3dc3:0:19f4:72db:b8ac:23a]) (Authenticated sender: svein-listmail) by mail.stillbilde.net (Familien Skogens mail) with ESMTPSA id 10A0B7C for ; Sat, 19 Jun 2010 11:07:45 +0200 (CEST) Message-ID: <4C1C88CD.3000506@stillbilde.net> Date: Sat, 19 Jun 2010 11:07:25 +0200 From: "Svein Skogen (Listmail Account)" User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.10) Gecko/20100512 Lightning/1.0b1 Thunderbird/3.0.5 MIME-Version: 1.0 To: freebsd-current@freebsd.org References: <4C1AB4C0.4020604@freemail.hu> In-Reply-To: <4C1AB4C0.4020604@freemail.hu> X-Enigmail-Version: 1.0.1 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig42F10D6CA89CBAA2908658F2" Subject: Re: Dell Perc 5/i Performance issues X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 09:07:32 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig42F10D6CA89CBAA2908658F2 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 18.06.2010 01:50, oizs wrote: > Hi, >=20 > I've bought a Dell Perc 5/i because I couldn't make the onboard marvell= > 88sx7042 work with 8.0/8.1 or current, but as lucky as I am, the best I= > can do with 4x1.5tb samsung in raid5 is 60MB/s writes and 90MB/s reads,= > with bbu/write-back/adaptive-read-ahead. >=20 > I was expecting at least twice of that, and I'm not sure what can I do > to get that speed. (I've read man 7 tuning with no success) >=20 > As far as I know this controller should be as fast as on other systems.= > (Freebsd.org mx1 has one of these cards.) >=20 > I'm hoping somebody on the list reads this and helps because I can't > afford to buy another card. I've lost track of what actual boards Dell has OEMized to make the various PERCs, but if I remember somewhat correctly, the PERC5 is basically an LSI Megaraid SAS 8308elp with different labels and firmware?= If so, I've got that exact controller (minus the dell labels and firmware) in my primary storage box here, and yes, you SHOULD be able to get more performance out of it. What's your strip sizes and logical disk layout? (I've got the same board running on 8x 1T5 Seagates in RAID5+0, and that setup easily pulls 5 times the values you're seeing, and by all logic you should see about half of what I'm seeing) //Svein --=20 --------+-------------------+------------------------------- /"\ |Svein Skogen | svein@d80.iso100.no \ / |Solberg =D8stli 9 | PGP Key: 0xE5E76831 X |2020 Skedsmokorset | svein@jernhuset.no / \ |Norway | PGP Key: 0xCE96CE13 | | svein@stillbilde.net ascii | | PGP Key: 0x58CD33B6 ribbon |System Admin | svein-listmail@stillbilde.net Campaign|stillbilde.net | PGP Key: 0x22D494A4 +-------------------+------------------------------- |msn messenger: | Mobile Phone: +47 907 03 575 |svein@jernhuset.no | RIPE handle: SS16503-RIPE --------+-------------------+------------------------------- If you really are in a hurry, mail me at svein-mobile@stillbilde.net This mailbox goes directly to my cellphone and is checked even when I'm not in front of my computer. ------------------------------------------------------------ Picture Gallery: https://gallery.stillbilde.net/v/svein/ ------------------------------------------------------------ --------------enig42F10D6CA89CBAA2908658F2 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.12 (MingW32) iEYEARECAAYFAkwciNEACgkQODUnwSLUlKSKvwCfUbpJGbWsjHONYeh3oUuBfRm5 +LkAn3vz/ahFyr01eF+wgz0tRSqmO85G =OSIK -----END PGP SIGNATURE----- --------------enig42F10D6CA89CBAA2908658F2-- From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 09:10:26 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29E59106566C; Sat, 19 Jun 2010 09:10:26 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id EDD0B8FC1A; Sat, 19 Jun 2010 09:10:25 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5J9APCX098871; Sat, 19 Jun 2010 05:10:25 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5J9APEW098850; Sat, 19 Jun 2010 09:10:25 GMT (envelope-from tinderbox@freebsd.org) Date: Sat, 19 Jun 2010 09:10:25 GMT Message-Id: <201006190910.o5J9APEW098850@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on powerpc/powerpc X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 09:10:26 -0000 TB --- 2010-06-19 08:40:45 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-19 08:40:45 - starting HEAD tinderbox run for powerpc/powerpc TB --- 2010-06-19 08:40:45 - cleaning the object tree TB --- 2010-06-19 08:40:49 - cvsupping the source tree TB --- 2010-06-19 08:40:49 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/powerpc/powerpc/supfile TB --- 2010-06-19 08:46:52 - building world TB --- 2010-06-19 08:46:52 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-19 08:46:52 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-19 08:46:52 - TARGET=powerpc TB --- 2010-06-19 08:46:52 - TARGET_ARCH=powerpc TB --- 2010-06-19 08:46:52 - TZ=UTC TB --- 2010-06-19 08:46:52 - __MAKE_CONF=/dev/null TB --- 2010-06-19 08:46:52 - cd /src TB --- 2010-06-19 08:46:52 - /usr/bin/make -B buildworld >>> World build started on Sat Jun 19 08:46:52 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries [...] cc -O2 -pipe -I/obj/powerpc/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -fstack-protector -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c dt_grammar.c cc -O2 -pipe -I/obj/powerpc/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -fstack-protector -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c cc -O2 -pipe -I/obj/powerpc/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -fstack-protector -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c cc -O2 -pipe -I/obj/powerpc/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -fstack-protector -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_inttab.c cc -O2 -pipe -I/obj/powerpc/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -fstack-protector -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c dt_lex.c cc1: warnings being treated as errors /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l: In function 'yylex': /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l:623: warning: comparison is always true due to limited range of data type *** Error code 1 Stop in /src/cddl/lib/libdtrace. *** Error code 1 Stop in /src/cddl/lib. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-19 09:10:25 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-19 09:10:25 - ERROR: failed to build world TB --- 2010-06-19 09:10:25 - 1041.16 user 236.51 system 1779.17 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-powerpc-powerpc.full From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 09:58:56 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F21C6106564A for ; Sat, 19 Jun 2010 09:58:56 +0000 (UTC) (envelope-from oizs@freemail.hu) Received: from fep14.mx.upcmail.net (fep14.mx.upcmail.net [62.179.121.34]) by mx1.freebsd.org (Postfix) with ESMTP id 3969A8FC1B for ; Sat, 19 Jun 2010 09:58:55 +0000 (UTC) Received: from edge01.upcmail.net ([192.168.13.236]) by viefep14-int.chello.at (InterMail vM.8.01.02.02 201-2260-120-106-20100312) with ESMTP id <20100619095854.SJSM8381.viefep14-int.chello.at@edge01.upcmail.net> for ; Sat, 19 Jun 2010 11:58:54 +0200 Received: from [192.168.0.6] ([213.222.167.104]) by edge01.upcmail.net with edge id Xlys1e08W2FUr7101lytQE; Sat, 19 Jun 2010 11:58:54 +0200 X-SourceIP: 213.222.167.104 Message-ID: <4C1C94D4.7040302@freemail.hu> Date: Sat, 19 Jun 2010 11:58:44 +0200 From: oizs User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.10) Gecko/20100512 Thunderbird/3.0.5 MIME-Version: 1.0 To: freebsd-current@freebsd.org References: <4C1AB4C0.4020604@freemail.hu> <4C1C88CD.3000506@stillbilde.net> In-Reply-To: <4C1C88CD.3000506@stillbilde.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Cloudmark-Analysis: v=1.1 cv=M71sKKeyFebLYdq5hFNIGMR02ATQkL1qNhm49ttUYSY= c=1 sm=0 a=q8OS1GolVHwA:10 a=8nJEP1OIZ-IA:10 a=6I5d2MoRAAAA:8 a=LqlliF7G4zm9AMZb3lIA:9 a=ixs2dUwmwN7ia3oIe1u0jbMYLDUA:4 a=wPNLvfGTeEIA:10 a=SV7veod9ZcQA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Subject: Re: Dell Perc 5/i Performance issues X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 09:58:57 -0000 I tried almost everything raid 0 1 5 10 with all kind of stripes 32/64/128 and settings direct io/cached/read-ahead/wt/wb/disk-cache but nothing seems to work. I changed the card to another dell perc 5 which had an older firmware. Tried 4 kind of motherboards even tried changing the os to linux and windows xp/7. In windows I got some funny results 1.3MB/s with write-back and 150MB/s reads with 5 disks in raid0. I just wanted to have a hw raid with no problems since the motherboard 88sx7042 and bsd did not like eachother. -zsozso On 2010.06.19. 11:07, Svein Skogen (Listmail Account) wrote: > On 18.06.2010 01:50, oizs wrote: > >> Hi, >> >> I've bought a Dell Perc 5/i because I couldn't make the onboard marvell >> 88sx7042 work with 8.0/8.1 or current, but as lucky as I am, the best I >> can do with 4x1.5tb samsung in raid5 is 60MB/s writes and 90MB/s reads, >> with bbu/write-back/adaptive-read-ahead. >> >> I was expecting at least twice of that, and I'm not sure what can I do >> to get that speed. (I've read man 7 tuning with no success) >> >> As far as I know this controller should be as fast as on other systems. >> (Freebsd.org mx1 has one of these cards.) >> >> I'm hoping somebody on the list reads this and helps because I can't >> afford to buy another card. >> > I've lost track of what actual boards Dell has OEMized to make the > various PERCs, but if I remember somewhat correctly, the PERC5 is > basically an LSI Megaraid SAS 8308elp with different labels and firmware? > > If so, I've got that exact controller (minus the dell labels and > firmware) in my primary storage box here, and yes, you SHOULD be able to > get more performance out of it. What's your strip sizes and logical disk > layout? > > (I've got the same board running on 8x 1T5 Seagates in RAID5+0, and that > setup easily pulls 5 times the values you're seeing, and by all logic > you should see about half of what I'm seeing) > > //Svein > > From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 11:17:21 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E63A4106566C for ; Sat, 19 Jun 2010 11:17:20 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: from mail-qy0-f182.google.com (mail-qy0-f182.google.com [209.85.216.182]) by mx1.freebsd.org (Postfix) with ESMTP id A15C88FC18 for ; Sat, 19 Jun 2010 11:17:20 +0000 (UTC) Received: by qyk11 with SMTP id 11so575703qyk.13 for ; Sat, 19 Jun 2010 04:17:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type; bh=dccXEJnnuuToXLJ+j+JsoXJFN5nmKqEEF/au4uuTAKg=; b=WrEgrLLMggxOZTbh9kdo6Um1nWAB4fvqaAYvAxS6dkb10Q+uKTV8HHOX4VJivvFzsd 6JmG+275Sz1TT0vHN1wO2ts1GV5kLyn0SdiEBS9vTX+0udKADN24SWJ9Y9wCrYVL1dW7 Lql1kxMAf1qiYaetrkudtZ45POwT7o6TkPTPc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=CIq63chWO5S636pPeodfQGBiO2YXHXFlRObxVOt8dSUzTyMSLtyMLs0YR3d7N3pAoi bsFcJIK0RWvlVZHjAnOS4jM1zttiNSP5Z8laXnvyuVpzoqsvWWivMXpavtqRsNEqj2yP 1+3M5CyMZ3BSQ7O3Zj35atck1IHUwfouEPdbA= MIME-Version: 1.0 Received: by 10.224.118.75 with SMTP id u11mr1587612qaq.261.1276946239835; Sat, 19 Jun 2010 04:17:19 -0700 (PDT) Received: by 10.229.80.75 with HTTP; Sat, 19 Jun 2010 04:17:19 -0700 (PDT) In-Reply-To: <4C1C94D4.7040302@freemail.hu> References: <4C1AB4C0.4020604@freemail.hu> <4C1C88CD.3000506@stillbilde.net> <4C1C94D4.7040302@freemail.hu> Date: Sat, 19 Jun 2010 04:17:19 -0700 Message-ID: From: Garrett Cooper To: oizs Content-Type: text/plain; charset=ISO-8859-1 Cc: freebsd-current@freebsd.org Subject: Re: Dell Perc 5/i Performance issues X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 11:17:21 -0000 On Sat, Jun 19, 2010 at 2:58 AM, oizs wrote: > I tried almost everything raid 0 1 5 10 with all kind of stripes 32/64/128 > and settings direct io/cached/read-ahead/wt/wb/disk-cache but nothing seems > to work. > I changed the card to another dell perc 5 which had an older firmware. Tried > 4 kind of motherboards even tried changing the os to linux and windows xp/7. > In windows I got some funny results 1.3MB/s with write-back and 150MB/s > reads with 5 disks in raid0. > I just wanted to have a hw raid with no problems since the motherboard > 88sx7042 and bsd did not like eachother. > > On 2010.06.19. 11:07, Svein Skogen (Listmail Account) wrote: >> >> On 18.06.2010 01:50, oizs wrote: >> >>> >>> Hi, >>> >>> I've bought a Dell Perc 5/i because I couldn't make the onboard marvell >>> 88sx7042 work with 8.0/8.1 or current, but as lucky as I am, the best I >>> can do with 4x1.5tb samsung in raid5 is 60MB/s writes and 90MB/s reads, >>> with bbu/write-back/adaptive-read-ahead. >>> >>> I was expecting at least twice of that, and I'm not sure what can I do >>> to get that speed. (I've read man 7 tuning with no success) >>> >>> As far as I know this controller should be as fast as on other systems. >>> (Freebsd.org mx1 has one of these cards.) >>> >>> I'm hoping somebody on the list reads this and helps because I can't >>> afford to buy another card. >>> >> >> I've lost track of what actual boards Dell has OEMized to make the >> various PERCs, but if I remember somewhat correctly, the PERC5 is >> basically an LSI Megaraid SAS 8308elp with different labels and firmware? >> >> If so, I've got that exact controller (minus the dell labels and >> firmware) in my primary storage box here, and yes, you SHOULD be able to >> get more performance out of it. What's your strip sizes and logical disk >> layout? >> >> (I've got the same board running on 8x 1T5 Seagates in RAID5+0, and that >> setup easily pulls 5 times the values you're seeing, and by all logic >> you should see about half of what I'm seeing) Dumb question: are you sure that the problem that you're seeing isn't in fact inhibited by the application that you're getting `performance' results with? HTH, -Garrett From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 11:21:59 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2F163106564A for ; Sat, 19 Jun 2010 11:21:59 +0000 (UTC) (envelope-from oizs@freemail.hu) Received: from fep17.mx.upcmail.net (fep17.mx.upcmail.net [62.179.121.37]) by mx1.freebsd.org (Postfix) with ESMTP id 82ECB8FC0C for ; Sat, 19 Jun 2010 11:21:57 +0000 (UTC) Received: from edge03.upcmail.net ([192.168.13.238]) by viefep17-int.chello.at (InterMail vM.8.01.02.02 201-2260-120-106-20100312) with ESMTP id <20100619112156.LFAW21441.viefep17-int.chello.at@edge03.upcmail.net> for ; Sat, 19 Jun 2010 13:21:56 +0200 Received: from [192.168.0.6] ([213.222.167.104]) by edge03.upcmail.net with edge id XnMu1e06A2FUr7103nMvCN; Sat, 19 Jun 2010 13:21:56 +0200 X-SourceIP: 213.222.167.104 Message-ID: <4C1CA852.6000900@freemail.hu> Date: Sat, 19 Jun 2010 13:21:54 +0200 From: oizs User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.10) Gecko/20100512 Thunderbird/3.0.5 MIME-Version: 1.0 To: freebsd-current@freebsd.org References: <4C1AB4C0.4020604@freemail.hu> <4C1C88CD.3000506@stillbilde.net> <4C1C94D4.7040302@freemail.hu> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Cloudmark-Analysis: v=1.1 cv=BX1z5e3lS7RAKjOkUI/uDpZ/pP4xz0N/VImyOZX9Sfk= c=1 sm=0 a=q8OS1GolVHwA:10 a=8nJEP1OIZ-IA:10 a=6I5d2MoRAAAA:8 a=tuDog-1FAIi7E6ruvPQA:9 a=_Ekh5yll71A9zUNXudcnogbh2d8A:4 a=wPNLvfGTeEIA:10 a=SV7veod9ZcQA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Subject: Re: Dell Perc 5/i Performance issues X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 11:21:59 -0000 Since I tested it on different kind of os's, and with at least 5 testing applications, I don't think that would be the case. -zsozso On 2010.06.19. 13:17, Garrett Cooper wrote: > On Sat, Jun 19, 2010 at 2:58 AM, oizs wrote: > >> I tried almost everything raid 0 1 5 10 with all kind of stripes 32/64/128 >> and settings direct io/cached/read-ahead/wt/wb/disk-cache but nothing seems >> to work. >> I changed the card to another dell perc 5 which had an older firmware. Tried >> 4 kind of motherboards even tried changing the os to linux and windows xp/7. >> In windows I got some funny results 1.3MB/s with write-back and 150MB/s >> reads with 5 disks in raid0. >> I just wanted to have a hw raid with no problems since the motherboard >> 88sx7042 and bsd did not like eachother. >> >> On 2010.06.19. 11:07, Svein Skogen (Listmail Account) wrote: >> >>> On 18.06.2010 01:50, oizs wrote: >>> >>> >>>> Hi, >>>> >>>> I've bought a Dell Perc 5/i because I couldn't make the onboard marvell >>>> 88sx7042 work with 8.0/8.1 or current, but as lucky as I am, the best I >>>> can do with 4x1.5tb samsung in raid5 is 60MB/s writes and 90MB/s reads, >>>> with bbu/write-back/adaptive-read-ahead. >>>> >>>> I was expecting at least twice of that, and I'm not sure what can I do >>>> to get that speed. (I've read man 7 tuning with no success) >>>> >>>> As far as I know this controller should be as fast as on other systems. >>>> (Freebsd.org mx1 has one of these cards.) >>>> >>>> I'm hoping somebody on the list reads this and helps because I can't >>>> afford to buy another card. >>>> >>>> >>> I've lost track of what actual boards Dell has OEMized to make the >>> various PERCs, but if I remember somewhat correctly, the PERC5 is >>> basically an LSI Megaraid SAS 8308elp with different labels and firmware? >>> >>> If so, I've got that exact controller (minus the dell labels and >>> firmware) in my primary storage box here, and yes, you SHOULD be able to >>> get more performance out of it. What's your strip sizes and logical disk >>> layout? >>> >>> (I've got the same board running on 8x 1T5 Seagates in RAID5+0, and that >>> setup easily pulls 5 times the values you're seeing, and by all logic >>> you should see about half of what I'm seeing) >>> > Dumb question: are you sure that the problem that you're seeing isn't > in fact inhibited by the application that you're getting `performance' > results with? > HTH, > -Garrett > > > From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 11:24:49 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B39E11065674 for ; Sat, 19 Jun 2010 11:24:49 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: from mail-yx0-f182.google.com (mail-yx0-f182.google.com [209.85.213.182]) by mx1.freebsd.org (Postfix) with ESMTP id 6C6AE8FC18 for ; Sat, 19 Jun 2010 11:24:49 +0000 (UTC) Received: by yxm34 with SMTP id 34so427384yxm.13 for ; Sat, 19 Jun 2010 04:24:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=KOANP2hSQ6L7+jmRQcouzuwPRR2wln4Ujt28gWAjXyM=; b=PYmX/9wJlxMmwtO5daYx2rz5kEqbro/e17TPsnCOaUgNovDijNV+c8nRNNKlnLw2zr 6u+wiO3uw4Fo2a0uXtGx9P4An0OkTm3jc0NlsF8tC1ujVRSBd8ceh24mmNF2k26FF3pX C89KyiLoePmuEf4T8OFseXzRceIxKAhbCp5Rs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=G3cxTMBzSyETyizFjFbrpoqt9bWBQiu+ku4kKqZPHjg4SZWCPgaYqqUe/1jjbGbIXy Wn8knjLVy/jk7sTezXSnVAMEke5VJ8zCzE1SBvXs9xywhM1dhkJm+p+cZUUkGGV2Rq4+ OTVXQ9NQuq55My2sH8u3JsG+Vma4PO/9MM+t8= MIME-Version: 1.0 Received: by 10.229.236.140 with SMTP id kk12mr1253143qcb.280.1276946688603; Sat, 19 Jun 2010 04:24:48 -0700 (PDT) Received: by 10.229.80.75 with HTTP; Sat, 19 Jun 2010 04:24:48 -0700 (PDT) In-Reply-To: <4C1CA852.6000900@freemail.hu> References: <4C1AB4C0.4020604@freemail.hu> <4C1C88CD.3000506@stillbilde.net> <4C1C94D4.7040302@freemail.hu> <4C1CA852.6000900@freemail.hu> Date: Sat, 19 Jun 2010 04:24:48 -0700 Message-ID: From: Garrett Cooper To: oizs Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: Dell Perc 5/i Performance issues X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 11:24:49 -0000 On Sat, Jun 19, 2010 at 4:21 AM, oizs wrote: > Since I tested it on different kind of os's, and with at least 5 testing > applications, I don't think that would be the case. > > On 2010.06.19. 13:17, Garrett Cooper wrote: >> >> On Sat, Jun 19, 2010 at 2:58 AM, oizs =A0wrote: >> >>> >>> I tried almost everything raid 0 1 5 10 with all kind of stripes >>> 32/64/128 >>> and settings direct io/cached/read-ahead/wt/wb/disk-cache but nothing >>> seems >>> to work. >>> I changed the card to another dell perc 5 which had an older firmware. >>> Tried >>> 4 kind of motherboards even tried changing the os to linux and windows >>> xp/7. >>> In windows I got some funny results 1.3MB/s with write-back and 150MB/s >>> reads with 5 disks in raid0. >>> I just wanted to have a hw raid with no problems since the motherboard >>> 88sx7042 and bsd did not like eachother. >>> >>> On 2010.06.19. 11:07, Svein Skogen (Listmail Account) wrote: >>> >>>> >>>> On 18.06.2010 01:50, oizs wrote: >>>> >>>> >>>>> >>>>> Hi, >>>>> >>>>> I've bought a Dell Perc 5/i because I couldn't make the onboard marve= ll >>>>> 88sx7042 work with 8.0/8.1 or current, but as lucky as I am, the best= I >>>>> can do with 4x1.5tb samsung in raid5 is 60MB/s writes and 90MB/s read= s, >>>>> with bbu/write-back/adaptive-read-ahead. >>>>> >>>>> I was expecting at least twice of that, and I'm not sure what can I d= o >>>>> to get that speed. (I've read man 7 tuning with no success) >>>>> >>>>> As far as I know this controller should be as fast as on other system= s. >>>>> (Freebsd.org mx1 has one of these cards.) >>>>> >>>>> I'm hoping somebody on the list reads this and helps because I can't >>>>> afford to buy another card. >>>>> >>>>> >>>> >>>> I've lost track of what actual boards Dell has OEMized to make the >>>> various PERCs, but if I remember somewhat correctly, the PERC5 is >>>> basically an LSI Megaraid SAS 8308elp with different labels and >>>> firmware? >>>> >>>> If so, I've got that exact controller (minus the dell labels and >>>> firmware) in my primary storage box here, and yes, you SHOULD be able = to >>>> get more performance out of it. What's your strip sizes and logical di= sk >>>> layout? >>>> >>>> (I've got the same board running on 8x 1T5 Seagates in RAID5+0, and th= at >>>> setup easily pulls 5 times the values you're seeing, and by all logic >>>> you should see about half of what I'm seeing) >>>> >> >> Dumb question: are you sure that the problem that you're seeing isn't >> in fact inhibited by the application that you're getting `performance' >> results with? If your applications aren't well suited for your hardware's capabilities, then of course performance will be bad. -Garrett From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 11:32:45 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2F2531065674 for ; Sat, 19 Jun 2010 11:32:45 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: from mail-gw0-f54.google.com (mail-gw0-f54.google.com [74.125.83.54]) by mx1.freebsd.org (Postfix) with ESMTP id DD33B8FC0C for ; Sat, 19 Jun 2010 11:32:44 +0000 (UTC) Received: by gwj20 with SMTP id 20so1800328gwj.13 for ; Sat, 19 Jun 2010 04:32:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=DJy5beJ1z2YOV4I2lD6D6nPWyAdF5vvzhlZDwmDGq+A=; b=k1lXWQScS+irPglUHuMbV2V6XAiuASri39kdB5BbeeyBN+/y1jXakO4XVKuZTW3OZU 8llc1Ec6gHDzlgAgGmSBAApcK0qB/kZIInFMRb/HfhwjKuOTDvUnJY/QSrOsJkez9f09 D35gHQttjovzT4/NQ+1vVAy/AXZzM0PRAfrvA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=kmZAmj5J0UVx6p74LTguYGYSfdT3Jpb2OfQ9KO6fqJ7eBC37QPdR3Z9rTVhDbyFoSW YMlL/hJp/9XTfRVc1Jn2EkT3GWG7godkVWJdIuX5Lw2ZQ3+yEKnVWKkxRbi3ZcwK3ifv NlNT13wnc0PP4JzoYcJq+K3yBRFjHU9hecLnc= MIME-Version: 1.0 Received: by 10.229.189.143 with SMTP id de15mr1253439qcb.283.1276947164002; Sat, 19 Jun 2010 04:32:44 -0700 (PDT) Received: by 10.229.80.75 with HTTP; Sat, 19 Jun 2010 04:32:43 -0700 (PDT) In-Reply-To: References: <4C1AB4C0.4020604@freemail.hu> <4C1C88CD.3000506@stillbilde.net> <4C1C94D4.7040302@freemail.hu> <4C1CA852.6000900@freemail.hu> Date: Sat, 19 Jun 2010 04:32:43 -0700 Message-ID: From: Garrett Cooper To: oizs Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: Dell Perc 5/i Performance issues X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 11:32:45 -0000 On Sat, Jun 19, 2010 at 4:24 AM, Garrett Cooper wrote: > On Sat, Jun 19, 2010 at 4:21 AM, oizs wrote: >> Since I tested it on different kind of os's, and with at least 5 testing >> applications, I don't think that would be the case. >> >> On 2010.06.19. 13:17, Garrett Cooper wrote: >>> >>> On Sat, Jun 19, 2010 at 2:58 AM, oizs =A0wrote: >>> >>>> >>>> I tried almost everything raid 0 1 5 10 with all kind of stripes >>>> 32/64/128 >>>> and settings direct io/cached/read-ahead/wt/wb/disk-cache but nothing >>>> seems >>>> to work. >>>> I changed the card to another dell perc 5 which had an older firmware. >>>> Tried >>>> 4 kind of motherboards even tried changing the os to linux and windows >>>> xp/7. >>>> In windows I got some funny results 1.3MB/s with write-back and 150MB/= s >>>> reads with 5 disks in raid0. >>>> I just wanted to have a hw raid with no problems since the motherboard >>>> 88sx7042 and bsd did not like eachother. >>>> >>>> On 2010.06.19. 11:07, Svein Skogen (Listmail Account) wrote: >>>> >>>>> >>>>> On 18.06.2010 01:50, oizs wrote: >>>>> >>>>> >>>>>> >>>>>> Hi, >>>>>> >>>>>> I've bought a Dell Perc 5/i because I couldn't make the onboard marv= ell >>>>>> 88sx7042 work with 8.0/8.1 or current, but as lucky as I am, the bes= t I >>>>>> can do with 4x1.5tb samsung in raid5 is 60MB/s writes and 90MB/s rea= ds, >>>>>> with bbu/write-back/adaptive-read-ahead. >>>>>> >>>>>> I was expecting at least twice of that, and I'm not sure what can I = do >>>>>> to get that speed. (I've read man 7 tuning with no success) >>>>>> >>>>>> As far as I know this controller should be as fast as on other syste= ms. >>>>>> (Freebsd.org mx1 has one of these cards.) >>>>>> >>>>>> I'm hoping somebody on the list reads this and helps because I can't >>>>>> afford to buy another card. >>>>>> >>>>>> >>>>> >>>>> I've lost track of what actual boards Dell has OEMized to make the >>>>> various PERCs, but if I remember somewhat correctly, the PERC5 is >>>>> basically an LSI Megaraid SAS 8308elp with different labels and >>>>> firmware? >>>>> >>>>> If so, I've got that exact controller (minus the dell labels and >>>>> firmware) in my primary storage box here, and yes, you SHOULD be able= to >>>>> get more performance out of it. What's your strip sizes and logical d= isk >>>>> layout? >>>>> >>>>> (I've got the same board running on 8x 1T5 Seagates in RAID5+0, and t= hat >>>>> setup easily pulls 5 times the values you're seeing, and by all logic >>>>> you should see about half of what I'm seeing) >>>>> >>> >>> Dumb question: are you sure that the problem that you're seeing isn't >>> in fact inhibited by the application that you're getting `performance' >>> results with? > > If your applications aren't well suited for your hardware's > capabilities, then of course performance will be bad. Furthermore, if the performance applications and your use scenarios are centered around reading, as opposed to writing, there is an option within mficontrol and the mfi(4) interface where you can actually enable read-ahead, instead of writeback (you unfortunately can't enable both scenarios). I realize that this is an artificial improvement in a way, but you should judge whether or not your application will be doing more reading than writing in whatever capacity it's doing... HTH, -Garrett From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 11:40:36 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5311E1065672 for ; Sat, 19 Jun 2010 11:40:36 +0000 (UTC) (envelope-from mike@reifenberger.com) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by mx1.freebsd.org (Postfix) with ESMTP id 0A99B8FC1C for ; Sat, 19 Jun 2010 11:40:35 +0000 (UTC) Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 56D1B1C1582E; Sat, 19 Jun 2010 13:40:34 +0200 (CEST) Received: from mail.reifenberger.com (ppp-93-104-119-89.dynamic.mnet-online.de [93.104.119.89]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS id 448551C000E2; Sat, 19 Jun 2010 13:40:34 +0200 (CEST) Received: by mail.reifenberger.com (Postfix, from userid 1001) id DF15F14B57; Sat, 19 Jun 2010 13:40:33 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.reifenberger.com (Postfix) with ESMTP id CDE7C14B54; Sat, 19 Jun 2010 13:40:33 +0200 (CEST) Date: Sat, 19 Jun 2010 13:40:33 +0200 (CEST) From: Michael Reifenberger To: pluknet In-Reply-To: Message-ID: References: <4C1AB4C0.4020604@freemail.hu> <4C1B3792.9000007@freemail.hu> <4C1C0ED9.8090103@freemail.hu> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: oizs , freebsd-current@freebsd.org Subject: Re: Dell Perc 5/i Performance issues X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 11:40:36 -0000 On Sat, 19 Jun 2010, pluknet wrote: ... >> MegaCli -LdSetProp Cached -LALL -a0 >> MegaCli -LdSetProp NORA -LALL -a0 >> MegaCli -LdSetProp WB -LALL -a0 >> MegaCli -LdSetProp -EnDskCache -LALL -a0 >> (Only if having a USV of course) >> >> Dunno if there is a mfiutil equivalent though. > > Hi. > > That would be: > mfiutil cache mfid0 enable > mfiutil cache mfid0 read-ahead none > mfiutil cache mfid0 write-back > mfiutil cache mfid0 write-cache enable > Thanks! Bye/2 --- Michael Reifenberger Michael@Reifenberger.com http://www.Reifenberger.com From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 12:26:28 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E286D1065672 for ; Sat, 19 Jun 2010 12:26:27 +0000 (UTC) (envelope-from svein-listmail@stillbilde.net) Received: from mail.stillbilde.net (unknown [IPv6:2002:51af:3dc3:0:20c:29ff:fece:79f3]) by mx1.freebsd.org (Postfix) with ESMTP id 66E798FC16 for ; Sat, 19 Jun 2010 12:26:27 +0000 (UTC) Received: from [IPv6:2002:51af:3dc3:0:2008:d04b:186d:9641] (unknown [IPv6:2002:51af:3dc3:0:2008:d04b:186d:9641]) (Authenticated sender: svein-listmail) by mail.stillbilde.net (Familien Skogens mail) with ESMTPSA id CA6A122 for ; Sat, 19 Jun 2010 14:26:40 +0200 (CEST) Message-ID: <4C1CB76D.8020301@stillbilde.net> Date: Sat, 19 Jun 2010 14:26:21 +0200 From: "Svein Skogen (Listmail Account)" User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.10) Gecko/20100512 Lightning/1.0b1 Thunderbird/3.0.5 MIME-Version: 1.0 To: freebsd-current@freebsd.org References: <4C1AB4C0.4020604@freemail.hu> <4C1C88CD.3000506@stillbilde.net> <4C1C94D4.7040302@freemail.hu> In-Reply-To: <4C1C94D4.7040302@freemail.hu> X-Enigmail-Version: 1.0.1 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig6302425AF81F99881220E7F0" Subject: Re: Dell Perc 5/i Performance issues X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 12:26:28 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig6302425AF81F99881220E7F0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 19.06.2010 11:58, oizs wrote: > I tried almost everything raid 0 1 5 10 with all kind of stripes > 32/64/128 and settings direct io/cached/read-ahead/wt/wb/disk-cache but= > nothing seems to work. > I changed the card to another dell perc 5 which had an older firmware. > Tried 4 kind of motherboards even tried changing the os to linux and > windows xp/7. In windows I got some funny results 1.3MB/s with > write-back and 150MB/s reads with 5 disks in raid0. > I just wanted to have a hw raid with no problems since the motherboard > 88sx7042 and bsd did not like eachother. This is from a similar controller running that 8-disk raid5+0 setup: -------------------------------------------------- CrystalDiskMark 2.2 (C) 2007-2008 hiyohiyo Crystal Dew World : http://crystalmark.info/ -------------------------------------------------- Sequential Read : 665.383 MB/s Sequential Write : 300.452 MB/s Random Read 512KB : 616.604 MB/s Random Write 512KB : 306.306 MB/s Random Read 4KB : 64.465 MB/s Random Write 4KB : 7.646 MB/s Test Size : 100 MB Date : 2010/06/19 14:24:12 You should be looking at number about half of these. I ran the test with adaptive readahead enabled, and write-through for cache (since I run with BBU, I normally use write-back) //Svein --=20 --------+-------------------+------------------------------- /"\ |Svein Skogen | svein@d80.iso100.no \ / |Solberg =D8stli 9 | PGP Key: 0xE5E76831 X |2020 Skedsmokorset | svein@jernhuset.no / \ |Norway | PGP Key: 0xCE96CE13 | | svein@stillbilde.net ascii | | PGP Key: 0x58CD33B6 ribbon |System Admin | svein-listmail@stillbilde.net Campaign|stillbilde.net | PGP Key: 0x22D494A4 +-------------------+------------------------------- |msn messenger: | Mobile Phone: +47 907 03 575 |svein@jernhuset.no | RIPE handle: SS16503-RIPE --------+-------------------+------------------------------- If you really are in a hurry, mail me at svein-mobile@stillbilde.net This mailbox goes directly to my cellphone and is checked even when I'm not in front of my computer. ------------------------------------------------------------ Picture Gallery: https://gallery.stillbilde.net/v/svein/ ------------------------------------------------------------ --------------enig6302425AF81F99881220E7F0 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.12 (MingW32) iEYEARECAAYFAkwct3EACgkQODUnwSLUlKSLHwCfaW169xkc5YS8xa3Hn7uJp8fD degAniU5eIImcGlq4aalRQ+E3jxRsBt9 =CIo+ -----END PGP SIGNATURE----- --------------enig6302425AF81F99881220E7F0-- From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 16:22:49 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52F27106564A for ; Sat, 19 Jun 2010 16:22:49 +0000 (UTC) (envelope-from lstewart@freebsd.org) Received: from lauren.room52.net (lauren.room52.net [210.50.193.198]) by mx1.freebsd.org (Postfix) with ESMTP id 15FD08FC13 for ; Sat, 19 Jun 2010 16:22:48 +0000 (UTC) Received: from lawrence1.loshell.room52.net (unknown [59.167.184.191]) by lauren.room52.net (Postfix) with ESMTPSA id F10657E84A; Sun, 20 Jun 2010 02:22:46 +1000 (EST) Message-ID: <4C1CEED6.3060209@freebsd.org> Date: Sun, 20 Jun 2010 02:22:46 +1000 From: Lawrence Stewart User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-AU; rv:1.9.1.9) Gecko/20100405 Thunderbird/3.0.4 MIME-Version: 1.0 To: pluknet References: <4C1492D0.6020704@freebsd.org> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-current@freebsd.org Subject: Re: [CFT] SIFTR - Statistical Information For TCP Research X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 16:22:49 -0000 Hi Pluknet, On 06/19/10 18:48, pluknet wrote: [snip] > Hi. > > I'm seeing this right after enabling siftr via sysctl and changing ppl. > Sorry, if that was already discussed, known or unrelated (since em is > in locking chain). > > lock order reversal: > 1st 0xffffffff80e51568 PFil hook read/write mutex (PFil hook > read/write mutex) @ /usr/src/sys/net/pfil.c:77 > 2nd 0xffffffff80e52788 tcp (tcp) @ > /usr/src/sys/modules/siftr/../../netinet/siftr.c:698 > KDB: stack backtrace: > db_trace_self_wrapper() at db_trace_self_wrapper+0x2a > _witness_debugger() at _witness_debugger+0x2e > witness_checkorder() at witness_checkorder+0x81e > _rw_rlock() at _rw_rlock+0x5f > siftr_chkpkt() at siftr_chkpkt+0x374 > pfil_run_hooks() at pfil_run_hooks+0xcf > ip_input() at ip_input+0x2ae > netisr_dispatch_src() at netisr_dispatch_src+0xb8 > ether_demux() at ether_demux+0x17d > ether_input() at ether_input+0x175 > em_rxeof() at em_rxeof+0x193 > em_handle_que() at em_handle_que+0x4a > taskqueue_run() at taskqueue_run+0x91 > taskqueue_thread_loop() at taskqueue_thread_loop+0x3f > fork_exit() at fork_exit+0x12a > fork_trampoline() at fork_trampoline+0xe > --- trap 0, rip = 0, rsp = 0xffffff80000bed30, rbp = 0 --- I believe I discussed this LOR with Robert Watson some time back and we came to the conclusion it is a false positive witness report and is safe to ignore. I should document it in the man page and figure out if there's some way to tell witness to not report it. Thanks for reminding me and for testing. Did everything else behave sanely and work ok? Cheers, Lawrence From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 17:16:39 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 71901106566B for ; Sat, 19 Jun 2010 17:16:39 +0000 (UTC) (envelope-from andreast-list@fgznet.ch) Received: from smtp.fgznet.ch (mail.fgznet.ch [81.92.96.47]) by mx1.freebsd.org (Postfix) with ESMTP id 0FB328FC13 for ; Sat, 19 Jun 2010 17:16:37 +0000 (UTC) Received: from deuterium.andreas.nets (dhclient-91-190-8-131.flashcable.ch [91.190.8.131]) by smtp.fgznet.ch (8.13.8/8.13.8/Submit_SMTPAUTH) with ESMTP id o5JHGYqP094966 for ; Sat, 19 Jun 2010 19:16:35 +0200 (CEST) (envelope-from andreast-list@fgznet.ch) Message-ID: <4C1CFB72.5000806@fgznet.ch> Date: Sat, 19 Jun 2010 19:16:34 +0200 From: Andreas Tobler User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.1.10) Gecko/20100512 Lightning/1.0b1 Thunderbird/3.0.5 MIME-Version: 1.0 To: freebsd-current Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.64 on 81.92.96.47 Subject: only 3 of 4GB memory available on amd64 8.1-RC1 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 17:16:39 -0000 Hi all, I got my hands on a t60 with 4GB of RAM (BIOS displays it) And I installed 8.1-RC1 on it: FreeBSD 8.1-RC1 #0: Mon Jun 14 13:40:28 UTC 2010 root@mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 Timecounter "i8254" frequency 1193182 Hz quality 0 CPU: Intel(R) Core(TM)2 CPU T5600 @ 1.83GHz (1828.76-MHz K8-class CPU) Origin = "GenuineIntel" Id = 0x6f6 Family = 6 Model = f Stepping = 6 Features=0xbfebfbff Features2=0xe3bd AMD Features=0x20100800 AMD Features2=0x1 TSC: P-state invariant real memory = 4294967296 (4096 MB) avail memory = 3092344832 (2949 MB) ACPI APIC Table: FreeBSD/SMP: Multiprocessor System Detected: 2 CPUs FreeBSD/SMP: 1 package(s) x 2 core(s) cpu0 (BSP): APIC ID: 0 cpu1 (AP): APIC ID: 1 Do I need to configure something special to get the full 4GB of memory? I only found the PAE hint, but this is for x86 machines, right? Thanks for any hint. Andreas From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 17:27:23 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F3AE106566C for ; Sat, 19 Jun 2010 17:27:23 +0000 (UTC) (envelope-from f0andrey@gmail.com) Received: from mail-fx0-f54.google.com (mail-fx0-f54.google.com [209.85.161.54]) by mx1.freebsd.org (Postfix) with ESMTP id 907DC8FC12 for ; Sat, 19 Jun 2010 17:27:22 +0000 (UTC) Received: by fxm7 with SMTP id 7so1521205fxm.13 for ; Sat, 19 Jun 2010 10:27:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=+l1uXea8O0Lx/hsyajMu8YsnUBcEHixS0EZZAqyyHyo=; b=bDL/z9n/FE5MrhkRrrlBDpKZQHO5P+/BIYc+egQWKt4Il7MfeApVFamhQ8xqjJems/ 0Xo1YkyQNyp9Ci8bQWOGZQNGhBAZZHIthDR60V9UUNtBlCMRdN1ioQ+nFvpduKXGTuvJ UGTbYRs8+WtvfdtYLKw1xrNSmPauaTXssTQew= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=WuJjKk4C5uaOAJNS+lOec0XWory96BE3BEBaSxxIyW93BuwjsrbxAxfx55ubw3/rMe +lFxil0RdK61odaRci5QDaiDoJAwjooh7biKL0nhuGx0SvtMgj/8etIOOYlqFvuIOAgG QxH01Zgf7ituI6IwnHJfRsiLrGqN5lJ6XNR/k= MIME-Version: 1.0 Received: by 10.239.159.148 with SMTP id y20mr173846hbc.42.1276968441237; Sat, 19 Jun 2010 10:27:21 -0700 (PDT) Received: by 10.239.150.133 with HTTP; Sat, 19 Jun 2010 10:27:21 -0700 (PDT) In-Reply-To: <4C1CFB72.5000806@fgznet.ch> References: <4C1CFB72.5000806@fgznet.ch> Date: Sat, 19 Jun 2010 21:27:21 +0400 Message-ID: From: Andrey Fesenko To: Andreas Tobler Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current Subject: Re: only 3 of 4GB memory available on amd64 8.1-RC1 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 17:27:23 -0000 On Sat, Jun 19, 2010 at 9:16 PM, Andreas Tobler w= rote: > Hi all, > > I got my hands on a t60 with 4GB of RAM (BIOS displays it) > > And I installed 8.1-RC1 on it: > > FreeBSD 8.1-RC1 #0: Mon Jun 14 13:40:28 UTC 2010 > =C2=A0 =C2=A0root@mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd6= 4 > Timecounter "i8254" frequency 1193182 Hz quality 0 > CPU: Intel(R) Core(TM)2 CPU =C2=A0 =C2=A0 =C2=A0 =C2=A0 T5600 =C2=A0@ 1.8= 3GHz (1828.76-MHz K8-class > CPU) > =C2=A0Origin =3D "GenuineIntel" =C2=A0Id =3D 0x6f6 =C2=A0Family =3D 6 =C2= =A0Model =3D f =C2=A0Stepping =3D 6 > > Features=3D0xbfebfbff > =C2=A0Features2=3D0xe3bd > =C2=A0AMD Features=3D0x20100800 > =C2=A0AMD Features2=3D0x1 > =C2=A0TSC: P-state invariant > real memory =C2=A0=3D 4294967296 (4096 MB) > avail memory =3D 3092344832 (2949 MB) > ACPI APIC Table: > FreeBSD/SMP: Multiprocessor System Detected: 2 CPUs > FreeBSD/SMP: 1 package(s) x 2 core(s) > =C2=A0cpu0 (BSP): APIC ID: =C2=A00 > =C2=A0cpu1 (AP): APIC ID: =C2=A01 > > > > Do I need to configure something special to get the full 4GB of memory? > > I only found the PAE hint, but this is for x86 machines, right? > I think this BIOS specific, may be video rezerv FreeBSD 9.0-CURRENT #0 r208284: Wed May 19 09:34:15 MSD 2010 andrey@my_book:/home/andrey/obj/obj/home/andrey/src_head/sys/MY_BOOK am= d64 WARNING: WITNESS option enabled, expect reduced performance. Timecounter "i8254" frequency 1193182 Hz quality 0 CPU: Intel(R) Core(TM)2 CPU T5600 @ 1.83GHz (1828.77-MHz K8-class = CPU) Origin =3D "GenuineIntel" Id =3D 0x6f2 Family =3D 6 Model =3D f Stepp= ing =3D 2 Features=3D0xbfebfbff Features2=3D0xe3bd AMD Features=3D0x20100800 AMD Features2=3D0x1 TSC: P-state invariant real memory =3D 4294967296 (4096 MB) avail memory =3D 3339923456 (3185 MB) From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 17:52:22 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 611301065674 for ; Sat, 19 Jun 2010 17:52:22 +0000 (UTC) (envelope-from andreast-list@fgznet.ch) Received: from smtp.fgznet.ch (mail.fgznet.ch [81.92.96.47]) by mx1.freebsd.org (Postfix) with ESMTP id D73168FC13 for ; Sat, 19 Jun 2010 17:52:21 +0000 (UTC) Received: from deuterium.andreas.nets (dhclient-91-190-8-131.flashcable.ch [91.190.8.131]) by smtp.fgznet.ch (8.13.8/8.13.8/Submit_SMTPAUTH) with ESMTP id o5JHqIt0054568; Sat, 19 Jun 2010 19:52:19 +0200 (CEST) (envelope-from andreast-list@fgznet.ch) Message-ID: <4C1D03D2.9090805@fgznet.ch> Date: Sat, 19 Jun 2010 19:52:18 +0200 From: Andreas Tobler User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.1.10) Gecko/20100512 Lightning/1.0b1 Thunderbird/3.0.5 MIME-Version: 1.0 To: Andrey Fesenko References: <4C1CFB72.5000806@fgznet.ch> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.64 on 81.92.96.47 Cc: freebsd-current Subject: Re: only 3 of 4GB memory available on amd64 8.1-RC1 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 17:52:22 -0000 On 19.06.10 19:27, Andrey Fesenko wrote: > On Sat, Jun 19, 2010 at 9:16 PM, Andreas Tobler wrote: >> Hi all, >> >> I got my hands on a t60 with 4GB of RAM (BIOS displays it) >> >> And I installed 8.1-RC1 on it: >> >> FreeBSD 8.1-RC1 #0: Mon Jun 14 13:40:28 UTC 2010 >> root@mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 >> Timecounter "i8254" frequency 1193182 Hz quality 0 >> CPU: Intel(R) Core(TM)2 CPU T5600 @ 1.83GHz (1828.76-MHz K8-class >> CPU) >> Origin = "GenuineIntel" Id = 0x6f6 Family = 6 Model = f Stepping = 6 >> >> Features=0xbfebfbff >> Features2=0xe3bd >> AMD Features=0x20100800 >> AMD Features2=0x1 >> TSC: P-state invariant >> real memory = 4294967296 (4096 MB) >> avail memory = 3092344832 (2949 MB) >> ACPI APIC Table: >> FreeBSD/SMP: Multiprocessor System Detected: 2 CPUs >> FreeBSD/SMP: 1 package(s) x 2 core(s) >> cpu0 (BSP): APIC ID: 0 >> cpu1 (AP): APIC ID: 1 >> >> >> >> Do I need to configure something special to get the full 4GB of memory? >> >> I only found the PAE hint, but this is for x86 machines, right? >> > I think this BIOS specific, may be video rezerv > > > FreeBSD 9.0-CURRENT #0 r208284: Wed May 19 09:34:15 MSD 2010 > andrey@my_book:/home/andrey/obj/obj/home/andrey/src_head/sys/MY_BOOK amd64 > WARNING: WITNESS option enabled, expect reduced performance. > Timecounter "i8254" frequency 1193182 Hz quality 0 > CPU: Intel(R) Core(TM)2 CPU T5600 @ 1.83GHz (1828.77-MHz K8-class CPU) > Origin = "GenuineIntel" Id = 0x6f2 Family = 6 Model = f Stepping = 2 > Features=0xbfebfbff > Features2=0xe3bd > AMD Features=0x20100800 > AMD Features2=0x1 > TSC: P-state invariant > real memory = 4294967296 (4096 MB) > avail memory = 3339923456 (3185 MB) Thanks. I'll explore the bios a bit more then. Andreas From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 17:58:12 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 487DD106564A; Sat, 19 Jun 2010 17:58:12 +0000 (UTC) (envelope-from freebsd-listen@fabiankeil.de) Received: from smtprelay02.ispgateway.de (smtprelay02.ispgateway.de [80.67.18.14]) by mx1.freebsd.org (Postfix) with ESMTP id C7DD18FC08; Sat, 19 Jun 2010 17:58:11 +0000 (UTC) Received: from [78.34.189.21] (helo=r500.local) by smtprelay02.ispgateway.de with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.68) (envelope-from ) id 1OQ2J0-0002GI-3R; Sat, 19 Jun 2010 19:58:10 +0200 Date: Sat, 19 Jun 2010 19:58:23 +0200 From: Fabian Keil To: Lawrence Stewart Message-ID: <20100619195823.53a7baaa@r500.local> In-Reply-To: <4C1C3922.2050102@freebsd.org> References: <4C1492D0.6020704@freebsd.org> <4C1C3922.2050102@freebsd.org> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; amd64-portbld-freebsd9.0) X-PGP-KEY-URL: http://www.fabiankeil.de/gpg-keys/freebsd-listen-2008-08-18.asc Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/tZ7KxyfI78_if3E+m95.tpX"; protocol="application/pgp-signature" X-Df-Sender: 775067 Cc: freebsd-current@freebsd.org Subject: Re: [CFT] SIFTR - Statistical Information For TCP Research: Uncle Lawrence needs YOU! X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 17:58:12 -0000 --Sig_/tZ7KxyfI78_if3E+m95.tpX Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Lawrence Stewart wrote: > On 06/13/10 18:12, Lawrence Stewart wrote: > > The time has come to solicit some external testing for my SIFTR tool. > > I'm hoping to commit it within a week or so unless problems are discove= red. > > I'm interested in all feedback and reports of success/failure, along > > with details of the architecture tested and number of CPUs if you would > > be so kind. I got the following hand-transcribed panic maybe a second after sysctl net.inet.siftr.enabled=3D1 Fatal trap 12: page fault while in kernel mode cpuid =3D 1; apic id =3D 01 [...] current process =3D 12 (swi4: clock) [ thread pid 12 tid 100006 ] Stopped at siftr_chkpkt+0xd0: addq $0x1,0x8(%r14) db> where Tracing pid 12 tid 100006 td 0xffffff00034037e0 siftr_chkpt() at siftr_chkpkt+0xd0 pfil_run_hooks() at pfil_run_hooks+0xb4 ip_output() at ip_output+0x382 tcp_output() tcp_output+0xa41 tcp_timer_rexmt() at tcp_timer_rexmt+0x251 softclock() at softclock+0x291 intr_event_execute_handlers() at intr_event_execute_handlers+0x66 ithread_loop at ithread_loop+0x8e fork_exit() at fork_exit+0x112 fork_trampoline() at fork_trampoline+0xe --- trap 0, rip =3D 0, rsp =3D 0xffffff800003ad30, rbp =3D 0 --- This is from the third attempt, the second time I got a different backtrace that also contained some *_iwn_* functions, the first time I had X running, so I didn't get anything. Unfortunately at that point the system seems to be too busted to dump core. I'm using: FreeBSD 9.0-CURRENT #99 r+b768fe1: Sat Jun 19 15:01:37 CEST 2010 fk@r500.local:/usr/obj/usr/src/sys/ZOEY amd64 Timecounter "i8254" frequency 1193182 Hz quality 0 CPU: Intel(R) Core(TM)2 Duo CPU T5870 @ 2.00GHz (1995.01-MHz K8-class = CPU) Origin =3D "GenuineIntel" Id =3D 0x6fd Family =3D 6 Model =3D f Stepp= ing =3D 13 Features=3D0xbfebfbff Features2=3D0xe39d AMD Features=3D0x20100800 AMD Features2=3D0x1 TSC: P-state invariant real memory =3D 2147483648 (2048 MB) avail memory =3D 1976610816 (1885 MB) ACPI APIC Table: FreeBSD/SMP: Multiprocessor System Detected: 2 CPUs FreeBSD/SMP: 1 package(s) x 2 core(s) cpu0 (BSP): APIC ID: 0 cpu1 (AP): APIC ID: 1 ioapic0: Changing APIC ID to 1 ioapic0 irqs 0-23 on motherboard I'm not using vanilla sources, but none of the modifications should matter here. I have powerd running and did not yet try without it. The system has bge0 and iwn0, but bge0 is mainly down. pf is compiled into the kernel, siftr is loaded as a module. The panic seems to occur without logging a single packet first: fk@r500 ~ $cat /var/log/siftr.log=20 enable_time_secs=3D1276966161 enable_time_usecs=3D945080 siftrve= r=3D1.2.3 hz=3D100 tcp_rtt_scale=3D32 sysname=3DFreeBSD sysver=3D9= 00014 ipmode=3D4 enable_time_secs=3D1276966586 enable_time_usecs=3D314023 siftrve= r=3D1.2.3 hz=3D100 tcp_rtt_scale=3D32 sysname=3DFreeBSD sysver=3D9= 00014 ipmode=3D4 I get the impression that this is reproducible, but only tried three times (the last time with everything mounted read-only). Fabian --Sig_/tZ7KxyfI78_if3E+m95.tpX Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAkwdBUUACgkQBYqIVf93VJ02AgCgqy+IOAFvqJXv80sL/R0svXX7 tyEAn1H7tgORbRAcmzX17mZ2oyLdOoow =GNZV -----END PGP SIGNATURE----- --Sig_/tZ7KxyfI78_if3E+m95.tpX-- From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 18:13:08 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0FBDB106564A; Sat, 19 Jun 2010 18:13:08 +0000 (UTC) (envelope-from freebsd-listen@fabiankeil.de) Received: from smtprelay03.ispgateway.de (smtprelay03.ispgateway.de [80.67.29.28]) by mx1.freebsd.org (Postfix) with ESMTP id BD6508FC14; Sat, 19 Jun 2010 18:13:07 +0000 (UTC) Received: from [78.34.189.21] (helo=r500.local) by smtprelay03.ispgateway.de with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.68) (envelope-from ) id 1OQ2XR-0001nr-9z; Sat, 19 Jun 2010 20:13:05 +0200 Date: Sat, 19 Jun 2010 20:13:03 +0200 From: Fabian Keil To: Lawrence Stewart Message-ID: <20100619201303.407aee97@r500.local> In-Reply-To: <20100619195823.53a7baaa@r500.local> References: <4C1492D0.6020704@freebsd.org> <4C1C3922.2050102@freebsd.org> <20100619195823.53a7baaa@r500.local> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; amd64-portbld-freebsd9.0) X-PGP-KEY-URL: http://www.fabiankeil.de/gpg-keys/freebsd-listen-2008-08-18.asc Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/YI8wk4i1qBT6yviRZlpVn0f"; protocol="application/pgp-signature" X-Df-Sender: 775067 Cc: freebsd-current@freebsd.org Subject: Re: [CFT] SIFTR - Statistical Information For TCP Research: Uncle Lawrence needs YOU! X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 18:13:08 -0000 --Sig_/YI8wk4i1qBT6yviRZlpVn0f Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Fabian Keil wrote: > Lawrence Stewart wrote: >=20 > > On 06/13/10 18:12, Lawrence Stewart wrote: >=20 > > > The time has come to solicit some external testing for my SIFTR tool. > > > I'm hoping to commit it within a week or so unless problems are disco= vered. >=20 > > > I'm interested in all feedback and reports of success/failure, along > > > with details of the architecture tested and number of CPUs if you wou= ld > > > be so kind. >=20 > I got the following hand-transcribed panic maybe a second after > sysctl net.inet.siftr.enabled=3D1 > I have powerd running and did not yet try without it. Disabling powerd doesn't seem to make a difference. I'll try with a GENERIC kernel tomorrow. Fabian --Sig_/YI8wk4i1qBT6yviRZlpVn0f Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAkwdCLIACgkQBYqIVf93VJ2kAwCfdfXQQoTlSGU2b8gA7bDHEj8d LAoAnRuJF645u6pDX6GyuCUEdp6+WrlT =+RaE -----END PGP SIGNATURE----- --Sig_/YI8wk4i1qBT6yviRZlpVn0f-- From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 18:17:12 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 99FB9106566B for ; Sat, 19 Jun 2010 18:17:12 +0000 (UTC) (envelope-from john-lists@johntate.org) Received: from hapkido.dreamhost.com (hapkido.dreamhost.com [66.33.216.122]) by mx1.freebsd.org (Postfix) with ESMTP id 6F1578FC14 for ; Sat, 19 Jun 2010 18:17:12 +0000 (UTC) Received: from homiemail-a18.g.dreamhost.com (mailbigip.dreamhost.com [208.97.132.5]) by hapkido.dreamhost.com (Postfix) with ESMTP id 28BBE179A56 for ; Sat, 19 Jun 2010 10:55:02 -0700 (PDT) Received: from homiemail-a18.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a18.g.dreamhost.com (Postfix) with ESMTP id 83022250071; Sat, 19 Jun 2010 10:54:59 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=johntate.org; h=from:to :references:in-reply-to:subject:date:message-id:mime-version :content-type:content-transfer-encoding; q=dns; s=johntate.org; b=SoaIofFzqKgthOO5B1kqeK7YMiCdUHSCNdlVz4DhDdV/B3/egSMHWu6b0LuVw MYoJuSVs59rXyGUYkS/SNXjL7tyOJx/MWiro+q+VToq+XE9ajthXl2Wqys1bvHSl rZdR7okMMvzVvnnrV7INL5f3jwFwi6kgwuRp3gyfu/BYws= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=johntate.org; h=from:to :references:in-reply-to:subject:date:message-id:mime-version :content-type:content-transfer-encoding; s=johntate.org; bh=EywW PiPjU8yDAeZz9Dwalt2OyxY=; b=h3XuJzauBKpHbvrm0xOrhDYO5CI5gFVzL+6h JotPpF0QPc/0A/2cRHLmMcO4PvCVxavUn38dXXvERWWsXHTXWmOSclGqg6eNnvoW QfXnEmd2nDRfozY5UuerDRU2JrfUCQ5ngmtGC/elriR2r0z5DAfa76Iwl4VMY5hA pII7nH8= Received: from MISES (unknown [202.164.202.87]) (Authenticated sender: john-lists@johntate.org) by homiemail-a18.g.dreamhost.com (Postfix) with ESMTPA id 96F3525006B; Sat, 19 Jun 2010 10:54:58 -0700 (PDT) From: "John Lists Tate" To: "'Andreas Tobler'" , "'freebsd-current'" References: <4C1CFB72.5000806@fgznet.ch> In-Reply-To: <4C1CFB72.5000806@fgznet.ch> Date: Sun, 20 Jun 2010 03:55:04 +1000 Message-ID: <005601cb0fd8$8e100c00$aa302400$@org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-Index: AcsP01F/wVY4NnewRH6Jox2Dd7RonwABSNuQ Content-Language: en-us Cc: Subject: RE: only 3 of 4GB memory available on amd64 8.1-RC1 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 18:17:12 -0000 This is likely related to shared memory for your video card. Often you can turn down how much it gets from the BIOS. ==================== www.johntate.org This address can recieve heavy traffic. To give your messages priority please put PERSONALX at the start of the subject line. This will allow your message to float to the top of my inbox. -----Original Message----- From: owner-freebsd-current@freebsd.org [mailto:owner-freebsd-current@freebsd.org] On Behalf Of Andreas Tobler Sent: Sunday, June 20, 2010 3:17 AM To: freebsd-current Subject: only 3 of 4GB memory available on amd64 8.1-RC1 Hi all, I got my hands on a t60 with 4GB of RAM (BIOS displays it) And I installed 8.1-RC1 on it: FreeBSD 8.1-RC1 #0: Mon Jun 14 13:40:28 UTC 2010 root@mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 Timecounter "i8254" frequency 1193182 Hz quality 0 CPU: Intel(R) Core(TM)2 CPU T5600 @ 1.83GHz (1828.76-MHz K8-class CPU) Origin = "GenuineIntel" Id = 0x6f6 Family = 6 Model = f Stepping = 6 Features=0xbfebfbff Features2=0xe3bd AMD Features=0x20100800 AMD Features2=0x1 TSC: P-state invariant real memory = 4294967296 (4096 MB) avail memory = 3092344832 (2949 MB) ACPI APIC Table: FreeBSD/SMP: Multiprocessor System Detected: 2 CPUs FreeBSD/SMP: 1 package(s) x 2 core(s) cpu0 (BSP): APIC ID: 0 cpu1 (AP): APIC ID: 1 Do I need to configure something special to get the full 4GB of memory? I only found the PAE hint, but this is for x86 machines, right? Thanks for any hint. Andreas _______________________________________________ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 20:06:10 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 329BD1065672; Sat, 19 Jun 2010 20:06:10 +0000 (UTC) (envelope-from ben@b1c1l1.com) Received: from lancer.b1c1l1.com (unknown [IPv6:2607:f358:1a:1a:1000::]) by mx1.freebsd.org (Postfix) with ESMTP id 1DDCA8FC14; Sat, 19 Jun 2010 20:06:10 +0000 (UTC) Received: from supra.b1c1l1.com (supra.b1c1l1.com [IPv6:2001:470:83fb:0:225:ff:fe4d:54b6]) by lancer.b1c1l1.com (Postfix) with ESMTPSA id 8F5A95C29; Sat, 19 Jun 2010 13:06:09 -0700 (PDT) Message-ID: <4C1D232A.8040601@b1c1l1.com> Date: Sat, 19 Jun 2010 13:06:02 -0700 From: Benjamin Lee User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100531 Thunderbird/3.0.4 MIME-Version: 1.0 To: freebsd-current@freebsd.org, freebsd-stable@freebsd.org X-Enigmail-Version: 1.0.1 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig7E1C3E987C56CF576F0EB976" Cc: Subject: [patch] Unbreak libgssapi and upgrade for heimdal-1.1 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 20:06:10 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig7E1C3E987C56CF576F0EB976 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hello, The following patch unbreaks libgssapi and upgrades it to be consistent with the previous heimdal-1.1 merge: http://www.b1c1l1.com/media/patches/libgssapi-9.0-CURRENT.diff.bz2 http://www.b1c1l1.com/media/patches/libgssapi-8.1-STABLE.diff.bz2 Currently, libgssapi is out of date because it was not upgraded when the rest of heimdal was upgraded to heimdal-1.1. Also, 3 new libraries (libgssapi_krb5, libgssapi_ntlm, libgssapi_spnego) were unnecessarily introduced -- MIT Kerberos separates these libraries, but Heimdal does not. This broke some libgssapi-dependent applications (e.g. www/mod_auth_kerb2, PR #147282). SHLIB_MAJOR is bumped from 10 to 11, so libgssapi-dependent applications must be rebuilt after applying this patch. I renamed some of upstream's files due to filename collisions. If buildworld can create corresponding subdirectories in obj/ to match src/, then the renames are not necessary. Feedback is appreciated. Thanks, --=20 Benjamin Lee http://www.b1c1l1.com/ --------------enig7E1C3E987C56CF576F0EB976 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJMHSMxAAoJEHBW16CPoSMCsvcP/RARHI1kI2vannLVxpYcYSeg nhFyB2jdlFD6Ma+WsA0Oo/dxRU363BpjSaWqJAD4WM8KtF4yzLlHZFgAeiSdIq5u WQf5Z1IJ0CSsImOsuL4MlJgBCVlededJ6VvzqlOwoFHbgLOH/yWuVihymbb/rI28 fX/s2ERsiornTIREfEr1YmR41BElo6aPTQeAPzgTVEUdxp7CSP9mR2V+4S5SE5cE JVOZGGGtg/g56ZK2nj+F4lQH7UADEH85iDWWxqZXkiNS+YDEtxfqnWBXuYGxqjs9 tSH+JRdzLhbSLozSGmuAxO0rs6ZuiNnbLtCypeYknphlSu4IztrK4+0MByEoHAni CShnZ6T6fw6KQOurbMZT2NEsg3VuJMHNCLXY0njmrjOg2ezX5gZ5jwVQhS8HS7mX cYU5mJOPdaFtfmWaTp14sr+5pVy9SpqGv53WkqbZ/PJrOxnHKzbj4bN6u66W+WcB gnts/vsz7AfMbJrySQKO3jNOXNQ4ldwRwezIttk4q1i9Y6c8L8ETQHHIsdUQd6N7 KGTT/0saj5+avg12NVGcxCVkaXe6hMZ96bRWis0R0NdnyCCV4TnqcMZOeVkLek2P FKxTgLgX8JDME551DdjOa/a6CQClb9MCRXLqA5tTnN0YlAk0djEBji/fQMXprtxE Y7eylVAWzjefooi/UEGC =g8Sx -----END PGP SIGNATURE----- --------------enig7E1C3E987C56CF576F0EB976-- From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 20:26:52 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D053F106566B for ; Sat, 19 Jun 2010 20:26:52 +0000 (UTC) (envelope-from avg@icyb.net.ua) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 2FFC68FC0A for ; Sat, 19 Jun 2010 20:26:51 +0000 (UTC) Received: from porto.topspin.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id XAA13609; Sat, 19 Jun 2010 23:26:35 +0300 (EEST) (envelope-from avg@icyb.net.ua) Received: from localhost.topspin.kiev.ua ([127.0.0.1]) by porto.topspin.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1OQ4cd-000FDE-2g; Sat, 19 Jun 2010 23:26:35 +0300 Message-ID: <4C1D27F9.60709@icyb.net.ua> Date: Sat, 19 Jun 2010 23:26:33 +0300 From: Andriy Gapon User-Agent: Thunderbird 2.0.0.24 (X11/20100603) MIME-Version: 1.0 To: Andreas Tobler References: <4C1CFB72.5000806@fgznet.ch> In-Reply-To: <4C1CFB72.5000806@fgznet.ch> X-Enigmail-Version: 0.96.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-current Subject: Re: only 3 of 4GB memory available on amd64 8.1-RC1 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 20:26:53 -0000 on 19/06/2010 20:16 Andreas Tobler said the following: > Hi all, > > I got my hands on a t60 with 4GB of RAM (BIOS displays it) > > And I installed 8.1-RC1 on it: > > FreeBSD 8.1-RC1 #0: Mon Jun 14 13:40:28 UTC 2010 > root@mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 > Timecounter "i8254" frequency 1193182 Hz quality 0 > CPU: Intel(R) Core(TM)2 CPU T5600 @ 1.83GHz (1828.76-MHz > K8-class CPU) > Origin = "GenuineIntel" Id = 0x6f6 Family = 6 Model = f Stepping = 6 > > Features=0xbfebfbff > > Features2=0xe3bd > AMD Features=0x20100800 > AMD Features2=0x1 > TSC: P-state invariant > real memory = 4294967296 (4096 MB) > avail memory = 3092344832 (2949 MB) > ACPI APIC Table: > FreeBSD/SMP: Multiprocessor System Detected: 2 CPUs > FreeBSD/SMP: 1 package(s) x 2 core(s) > cpu0 (BSP): APIC ID: 0 > cpu1 (AP): APIC ID: 1 > > > > Do I need to configure something special to get the full 4GB of memory? > > I only found the PAE hint, but this is for x86 machines, right? Yes, PAE is for what we call in FreeBSD land "i386". "x86" we use for both i386 and amd64. Now, to the rest. I recently investigated this topic myself, so I can share what I learned. The first thing you'd want to have is SMAP information. You can get it at the loader prompt with 'smap' command. It is also reported by kernel during a verbose boot, but it is only printed to console; it is not saved to dmesg, because it is printed before msgbuf is created. Example of how SMAP information looks: SMAP type=01 base=0000000000000000 end=000000000009f800 SMAP type=02 base=00000000000f0000 end=0000000000100000 SMAP type=02 base=00000000fec00000 end=0000000100000000 SMAP type=02 base=00000000e0000000 end=00000000f0000000 SMAP type=02 base=000000000009f800 end=00000000000a0000 SMAP type=02 base=00000000bfdf0000 end=00000000bfe00000 SMAP type=01 base=0000000000100000 end=00000000bfde0000 SMAP type=03 base=00000000bfde3000 end=00000000bfdf0000 SMAP type=04 base=00000000bfde0000 end=00000000bfde3000 SMAP type=01 base=0000000100000000 end=0000000130000000 Type 1 ('01') is memory ranges free for OS use. Note that the ranges could be unsorted. SMAP would give you an idea what is free for OS use and what is taken away for BIOS and hardware needs. Also note that what's reported as "avail memory" is smaller than sum of sizes of all unreserved regions. Some space is taken away by FreeBSD virtual memory code to store some core page/memory management information (~3%). Memory used by kernel and preloaded modules is also not included into "avail memory". If you discover that your system reserves, in your opinion, too much memory, then consider the following things. 1. Some memory might be allocated as video adapter's aperture and/or video adapter's memory in case of some integrated graphics solutions. 2. Some memory addresses below 4GB are used for MMIO (memory mapped input/output) - accessing those addresses is actually communicating with some hardware rather than accessing DRAM. Some hardware+firmware combinations can hoist (or remap) DRAM that corresponds to such an address range to a different address range above 4G. If you examine last line of my sample SMAP output, then you'll see that there is 756MB of "type 01" RAM above 4GB and that machine has exactly 4GB of DRAM installed - this is MMIO range 0xd0000000-0x100000000 hoisted to 0x100000000-0x130000000. If your hardware doesn't support that option, then too bad - the memory is "overshadowed" by MMIO and is effectively lost. Sometimes hoisting option (under whatever name) has to be explicitly set in BIOS configuration. That's about all. I am curious as to what you would discover about your system - please share with us. -- Andriy Gapon From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 21:09:03 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CBC87106566B; Sat, 19 Jun 2010 21:09:03 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id 9802A8FC14; Sat, 19 Jun 2010 21:09:03 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5JL9260034927; Sat, 19 Jun 2010 17:09:02 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5JL92hu034888; Sat, 19 Jun 2010 21:09:02 GMT (envelope-from tinderbox@freebsd.org) Date: Sat, 19 Jun 2010 21:09:02 GMT Message-Id: <201006192109.o5JL92hu034888@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on arm/arm X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 21:09:03 -0000 TB --- 2010-06-19 20:50:01 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-19 20:50:01 - starting HEAD tinderbox run for arm/arm TB --- 2010-06-19 20:50:01 - cleaning the object tree TB --- 2010-06-19 20:50:07 - cvsupping the source tree TB --- 2010-06-19 20:50:07 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/arm/arm/supfile TB --- 2010-06-19 20:50:43 - building world TB --- 2010-06-19 20:50:43 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-19 20:50:43 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-19 20:50:43 - TARGET=arm TB --- 2010-06-19 20:50:43 - TARGET_ARCH=arm TB --- 2010-06-19 20:50:43 - TZ=UTC TB --- 2010-06-19 20:50:43 - __MAKE_CONF=/dev/null TB --- 2010-06-19 20:50:43 - cd /src TB --- 2010-06-19 20:50:43 - /usr/bin/make -B buildworld >>> World build started on Sat Jun 19 20:50:43 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries [...] cc -O -pipe -I/obj/arm/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c dt_grammar.c cc -O -pipe -I/obj/arm/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c cc -O -pipe -I/obj/arm/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c cc -O -pipe -I/obj/arm/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_inttab.c cc -O -pipe -I/obj/arm/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c dt_lex.c cc1: warnings being treated as errors /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l: In function 'yylex': /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l:623: warning: comparison is always true due to limited range of data type *** Error code 1 Stop in /src/cddl/lib/libdtrace. *** Error code 1 Stop in /src/cddl/lib. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-19 21:09:02 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-19 21:09:02 - ERROR: failed to build world TB --- 2010-06-19 21:09:02 - 888.27 user 214.91 system 1141.71 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-arm-arm.full From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 23:45:28 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7660F1065670; Sat, 19 Jun 2010 23:45:28 +0000 (UTC) (envelope-from tinderbox@freebsd.org) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) by mx1.freebsd.org (Postfix) with ESMTP id 423608FC08; Sat, 19 Jun 2010 23:45:27 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.4/8.14.3) with ESMTP id o5JNjRe4034207; Sat, 19 Jun 2010 19:45:27 -0400 (EDT) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.4/8.14.3/Submit) id o5JNjRa5034206; Sat, 19 Jun 2010 23:45:27 GMT (envelope-from tinderbox@freebsd.org) Date: Sat, 19 Jun 2010 23:45:27 GMT Message-Id: <201006192345.o5JNjRa5034206@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Precedence: bulk Cc: Subject: [head tinderbox] failure on powerpc/powerpc X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 23:45:28 -0000 TB --- 2010-06-19 23:21:07 - tinderbox 2.6 running on freebsd-current.sentex.ca TB --- 2010-06-19 23:21:07 - starting HEAD tinderbox run for powerpc/powerpc TB --- 2010-06-19 23:21:07 - cleaning the object tree TB --- 2010-06-19 23:21:11 - cvsupping the source tree TB --- 2010-06-19 23:21:11 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sentex.ca /tinderbox/HEAD/powerpc/powerpc/supfile TB --- 2010-06-19 23:21:40 - building world TB --- 2010-06-19 23:21:40 - MAKEOBJDIRPREFIX=/obj TB --- 2010-06-19 23:21:40 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2010-06-19 23:21:40 - TARGET=powerpc TB --- 2010-06-19 23:21:40 - TARGET_ARCH=powerpc TB --- 2010-06-19 23:21:40 - TZ=UTC TB --- 2010-06-19 23:21:40 - __MAKE_CONF=/dev/null TB --- 2010-06-19 23:21:40 - cd /src TB --- 2010-06-19 23:21:40 - /usr/bin/make -B buildworld >>> World build started on Sat Jun 19 23:21:40 UTC 2010 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools >>> stage 4.1: building includes >>> stage 4.2: building libraries [...] cc -O2 -pipe -I/obj/powerpc/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -fstack-protector -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c dt_grammar.c cc -O2 -pipe -I/obj/powerpc/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -fstack-protector -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c cc -O2 -pipe -I/obj/powerpc/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -fstack-protector -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c cc -O2 -pipe -I/obj/powerpc/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -fstack-protector -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_inttab.c cc -O2 -pipe -I/obj/powerpc/src/cddl/lib/libdtrace -I/src/cddl/lib/libdtrace/../../../sys/cddl/compat/opensolaris -I/src/cddl/lib/libdtrace/../../../cddl/compat/opensolaris/include -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/head -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libctf/common -I/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/common -I/src/cddl/lib/libdtrace/../../../sys/cddl/contrib/opensolaris/uts/intel -DNEED_SOLARIS_BOOLEAN -std=gnu89 -fstack-protector -Wsystem-headers -Werror -Wno-pointer-sign -Wno-unknown-pragmas -c dt_lex.c cc1: warnings being treated as errors /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l: In function 'yylex': /src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l:623: warning: comparison is always true due to limited range of data type *** Error code 1 Stop in /src/cddl/lib/libdtrace. *** Error code 1 Stop in /src/cddl/lib. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. *** Error code 1 Stop in /src. TB --- 2010-06-19 23:45:27 - WARNING: /usr/bin/make returned exit code 1 TB --- 2010-06-19 23:45:27 - ERROR: failed to build world TB --- 2010-06-19 23:45:27 - 1042.09 user 234.37 system 1460.16 real http://tinderbox.freebsd.org/tinderbox-head-HEAD-powerpc-powerpc.full From owner-freebsd-current@FreeBSD.ORG Sat Jun 19 23:47:47 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 999E11065677; Sat, 19 Jun 2010 23:47:47 +0000 (UTC) (envelope-from jamesbrandongooch@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 16FC28FC1A; Sat, 19 Jun 2010 23:47:46 +0000 (UTC) Received: by iwn7 with SMTP id 7so2892630iwn.13 for ; Sat, 19 Jun 2010 16:47:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type; bh=UZiyOngNu+jkg7E88RY0f6efpVPptiIcIpPS8iSQFfA=; b=EqyUQPcBYtd/N2hOBn/KzZZSyMPjn7Jc+wW+eeKr053x3pwnbjc++d4e3mfdOtU25d PAXsp6f5nsSVBjLiNu3up7BC8vk0oxblaZncEsRURxS5vyRL6nib9w2Wwh5HI6DiM9Ka G6UZhk2i/ylSN226uyVsV0gP6n8VBUcvihUQg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=sKzUhKaLJQqKKam/w3gutJmRi9+9cQ0KRi1GIclPDVt3N7jKy6qjcyD3fmZe9GV/Af DkZUxzyOzyz6Hy3lhYRvCKZN8ONX0guKvLtvHp8LR+dbsOwJS7upBIXFG5pxIw+OeJOR XBH6KPdL+gNqObHUJ4vqi05viCI+VaFl6D1N0= MIME-Version: 1.0 Received: by 10.231.32.129 with SMTP id c1mr3445478ibd.112.1276991265997; Sat, 19 Jun 2010 16:47:45 -0700 (PDT) Received: by 10.231.182.212 with HTTP; Sat, 19 Jun 2010 16:47:45 -0700 (PDT) In-Reply-To: <4C0C1AE4.8050807@FreeBSD.org> References: <4C0C1AE4.8050807@FreeBSD.org> Date: Sat, 19 Jun 2010 18:47:45 -0500 Message-ID: From: Brandon Gooch To: Alexander Motin Content-Type: multipart/mixed; boundary=002215048d0bca851504896ab298 Cc: FreeBSD-Current , freebsd-arch@freebsd.org Subject: Re: RFC: New event timers infrastructure X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 23:47:47 -0000 --002215048d0bca851504896ab298 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable 2010/6/6 Alexander Motin : > Hi. > > Most of x86 systems now has at least 4 types of event timers: i8254, > RTC, LAPIC and HPET. Respective code in kernel is very tangled, heavily > hardcoded and absolutely not scalable. I have reimplemented it, trying > to solve these issues. > > I did such things: > =A0- created unified timer driver's API (sys/timeet.h, kernel/kern_et.c). > It supports global and per-CPU timers, periodic and one-shot. Provides > driver and consumer interfaces for choosing timers and operating them; > =A0- cleaned existing x86 event timer driver's code and modified it for > new API (x86/isa/atrtc.c, x86/isa/clock.c, x86/x86/local_apic.c). LAPIC > timer is now per-CPU and supports both periodic and one-shot modes; > =A0- extended HPET driver to support it's event timers in periodic and > one-shot mode (dev/acpica/acpi_hpet.c). Support for per-CPU operation > and FSB interrupts planned for later; > =A0- written mostly machine-independent mid-layer for managing any presen= t > timers to provide clocks needed for kernel (x86/x86/timeevents.c). It > supports both global and per-CPU timers. Now it supports only periodic > mode, but one-shot mode support planned for later. > > All this stuff deeply configurable via both loader tunables on boot and > sysctls in real time: > > %sysctl kern.eventtimer > kern.eventtimer.choice: LAPIC(500) HPET(400) HPET1(390) HPET2(390) > i8254(100) RTC(0) > kern.eventtimer.et.LAPIC.flags: 7 > kern.eventtimer.et.LAPIC.frequency: 99752386 > kern.eventtimer.et.LAPIC.quality: 500 > kern.eventtimer.et.HPET.flags: 3 > kern.eventtimer.et.HPET.frequency: 14318180 > kern.eventtimer.et.HPET.quality: 400 > kern.eventtimer.et.HPET1.flags: 3 > kern.eventtimer.et.HPET1.frequency: 14318180 > kern.eventtimer.et.HPET1.quality: 390 > kern.eventtimer.et.HPET2.flags: 3 > kern.eventtimer.et.HPET2.frequency: 14318180 > kern.eventtimer.et.HPET2.quality: 390 > kern.eventtimer.et.RTC.flags: 1 > kern.eventtimer.et.RTC.frequency: 32768 > kern.eventtimer.et.RTC.quality: 0 > kern.eventtimer.et.i8254.flags: 1 > kern.eventtimer.et.i8254.frequency: 1193182 > kern.eventtimer.et.i8254.quality: 100 > kern.eventtimer.timer2: NONE > kern.eventtimer.timer1: i8254 > kern.eventtimer.singlemul: 2 > > By default system chooses two timers with highest "quality" for > hardclock and statclock/profclock. User may affect that choice via > disabling unwanted drivers and/or via direct specification of wanted > ones. It is possible to change timers on-flight via sysctls: > > %sysctl kern.eventtimer.timer1=3Dhpet > kern.eventtimer.timer1: i8254 -> HPET > %sysctl kern.eventtimer.timer2=3Dhpet1 > kern.eventtimer.timer2: NONE -> HPET1 > > After every timer change, if two timers available, mid-layer > cross-checks them, and if one of them is not functional - replaces it. > > If there is no second timer available, or user specified to not use it - > mid-layer automatically increases rate of the first timer and divide > it's frequency to satisfy system needs as good as possible. User may > specify how fast he wish to run fist timer relative to hz by setting > kern.eventtimer.singlemul tunable/sysctl. > > When profiling is active, mid-layer automatically rises respective timer > frequency to about 8KHz (was 1KHz previously) and decreases it back on > profiling end. > > All above was tested on i386 and amd64. XEN was not affected and builds > fine. pc98 was slightly touched. It wasn't tested, but builds fine. It's > pc98/cbus/clock.c needs respective rewrite to use new features. Other > architectures are untouched, but if any of them may benefit from this > functionality - it should be possible to share most of the code. > > Latest patches can be found here: > http://people.freebsd.org/~mav/et.20100606.patch > > Known issues: > =A0- i8254 timer generates 18Hz interrupt rate when not used and not > disabled. I haven't found a way to disable it's interrupt source while > holding spinlock. > =A0- timer drivers code will need some more cleaning after interrupt > handler will be able to return both argument and frame same time. > > Feedback is very appreciated. I've been testing these patches since the first iteration (et.20100606), and I haven't discovered any related issues. I'm not able to perform a suspend/resume cycle, but in all fairness, this machine has never been fully functional in this regard. I will look into the issue further if time allows... It seems to me that a more widespread review and test of the code by knowledgeable, skilled developers is warranted at this stage; as I understand it, these patches comprise the initial stages necessary to provide the so-called "tickless" kernel functionality which seems to be all the rage in today's virtualized environments (at least according to VMware, VirtualBox, etc...). So, big thanks to Alexander for bravely undertaking this task and seemingly making great progress! Also, Alexander, I've attached two dmesg outputs, one with your patch (r209354, applied and built today patched with http://people.freebsd.org/~mav/et.20100618.patch) and another without, r209256 from Thursday, June 17. I am unclear about the number of interrupts I should expect from the hpet0 device (compared to the 99 from the rtc at 100Hz), so here is the output of vmstat -i with and without the "et" patches: With "et" patches: interrupt total rate irq1: atkbd0 369 3 irq9: acpi0 961 8 irq12: psm0 1002 9 irq18: uhci5 140 1 irq19: uhci2 ehci0* 4823 45 irq20: hpet0 23893 223 irq23: uhci3 ehci1 11 0 irq256: vgapci0 1031 9 irq257: hdac0 14 0 irq258: iwn0 4258 39 irq259: bge0 1 0 Total 36503 341 Without "et" patches: interrupt total rate irq1: atkbd0 449 2 irq0: clk 17334 99 irq9: acpi0 1701 9 irq12: psm0 8784 50 irq18: uhci5 188 1 irq19: uhci2 ehci0* 5828 33 irq23: uhci3 ehci1 11 0 irq256: vgapci0 1896 10 irq257: hdac0 14 0 irq258: iwn0 29571 169 irq259: bge0 1 0 Total 65777 378 And lastly, the values of the kern.eventtimer sysctls: $ sysctl kern.eventtimer kern.eventtimer.choice: HPET(450) HPET1(440) HPET2(440) HPET3(440) i8254(10= 0) kern.eventtimer.et.HPET.flags: 3 kern.eventtimer.et.HPET.frequency: 14318180 kern.eventtimer.et.HPET.quality: 450 kern.eventtimer.et.HPET1.flags: 3 kern.eventtimer.et.HPET1.frequency: 14318180 kern.eventtimer.et.HPET1.quality: 440 kern.eventtimer.et.HPET2.flags: 3 kern.eventtimer.et.HPET2.frequency: 14318180 kern.eventtimer.et.HPET2.quality: 440 kern.eventtimer.et.HPET3.flags: 3 kern.eventtimer.et.HPET3.frequency: 14318180 kern.eventtimer.et.HPET3.quality: 440 kern.eventtimer.et.i8254.flags: 1 kern.eventtimer.et.i8254.frequency: 1193182 kern.eventtimer.et.i8254.quality: 100 kern.eventtimer.timer2: HPET1 kern.eventtimer.timer1: HPET kern.eventtimer.singlemul: 4 Is there anything else one should provide (I know I've asked this before, but I can't recall if you stated anything "officially")? Thanks again, -Brandon --002215048d0bca851504896ab298 Content-Type: application/octet-stream; name="dmesg.boot.et.20100618" Content-Disposition: attachment; filename="dmesg.boot.et.20100618" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gan3nl380 MHgwMDAwMDAwMGJkNGE3MDAwIC0gMHgwMDAwMDAwMGJkNWNmZmZmLCAxMjE2NTEyIGJ5dGVzICgy OTcgcGFnZXMpCjB4MDAwMDAwMDBiZDYwZjAwMCAtIDB4MDAwMDAwMDBiZDcwOGZmZiwgMTAyNDAw MCBieXRlcyAoMjUwIHBhZ2VzKQoweDAwMDAwMDAwYmQ5MGYwMDAgLSAweDAwMDAwMDAwYmQ5MTdm ZmYsIDM2ODY0IGJ5dGVzICg5IHBhZ2VzKQoweDAwMDAwMDAwYmQ5MWYwMDAgLSAweDAwMDAwMDAw YmQ5NjJmZmYsIDI3ODUyOCBieXRlcyAoNjggcGFnZXMpCjB4MDAwMDAwMDBiZDk5ZjAwMCAtIDB4 MDAwMDAwMDBiZDllMmZmZiwgMjc4NTI4IGJ5dGVzICg2OCBwYWdlcykKMHgwMDAwMDAwMGJkOWZm MDAwIC0gMHgwMDAwMDAwMGJkOWZmZmZmLCA0MDk2IGJ5dGVzICgxIHBhZ2VzKQoweDAwMDAwMDAx MDAwMDAwMDAgLSAweDAwMDAwMDAxM2ZmZWZmZmYsIDEwNzM2NzYyODggYnl0ZXMgKDI2MjEyOCBw YWdlcykKYXZhaWwgbWVtb3J5ID0gNDA1Nzg0MTY2NCAoMzg2OSBNQikKQUNQSSBBUElDIFRhYmxl OiA8UFRMVEQgIAkgQVBJQyAgPgpJTlRSOiBBZGRpbmcgbG9jYWwgQVBJQyAxIGFzIGEgdGFyZ2V0 CkZyZWVCU0QvU01QOiBNdWx0aXByb2Nlc3NvciBTeXN0ZW0gRGV0ZWN0ZWQ6IDIgQ1BVcwpGcmVl QlNEL1NNUDogMSBwYWNrYWdlKHMpIHggMiBjb3JlKHMpCiBjcHUwIChCU1ApOiBBUElDIElEOiAg MAogY3B1MSAoQVApOiBBUElDIElEOiAgMQpBUElDOiBDUFUgMCBoYXMgQUNQSSBJRCAwCkFQSUM6 IENQVSAxIGhhcyBBQ1BJIElEIDEKeDg2YmlvczogICBJVlQgMHgwMDAwMDAtMHgwMDA0ZmYgYXQg MHhmZmZmZmYwMDAwMDAwMDAwCng4NmJpb3M6ICBTU0VHIDB4MDEwMDAwLTB4MDFmZmZmIGF0IDB4 ZmZmZmZmODAwMDAxNjAwMAp4ODZiaW9zOiAgRUJEQSAweDA5YzAwMC0weDA5ZmZmZiBhdCAweGZm ZmZmZjAwMDAwOWMwMDAKeDg2YmlvczogICBST00gMHgwYTAwMDAtMHgwZWZmZmYgYXQgMHhmZmZm ZmYwMDAwMGEwMDAwCldBUk5JTkc6IFZJTUFHRSAodmlydHVhbGl6ZWQgbmV0d29yayBzdGFjaykg aXMgYSBoaWdobHkgZXhwZXJpbWVudGFsIGZlYXR1cmUuClVMRTogc2V0dXAgY3B1IDAKVUxFOiBz ZXR1cCBjcHUgMQpBQ1BJOiBSU0RQIDB4Zjc4ZTAgMDAwMjQgKHYyIFBUTFREICkKQUNQSTogWFNE VCAweGJkOWY3NmM1IDAwMDdDICh2MSBERUxMICAgIFFBMDkgICAgMDYwNDAwMDAgIExUUCAwMDAw MDAwMCkKQUNQSTogRkFDUCAweGJkOWU3MDAwIDAwMEY0ICh2MyBJTlRFTCAgQ1JFU1RMTkUgMDYw NDAwMDAgQUxBTiAwMDAwMDAwMSkKQUNQSTogRFNEVCAweGJkOWU4MDAwIDA3NDBDICh2MiBJbnRl bCAgQ0FOVElHQSAgMDYwNDAwMDAgSU5UTCAyMDA1MDYyNCkKQUNQSTogRkFDUyAweGJkOTllZmMw IDAwMDQwCkFDUEk6IEhQRVQgMHhiZDlmZWQxNiAwMDAzOCAodjEgSU5URUwgIENSRVNUTE5FIDA2 MDQwMDAwIExPSFIgMDAwMDAwNUEpCkFDUEk6IE1DRkcgMHhiZDlmZWQ0ZSAwMDAzQyAodjEgSU5U RUwgIENSRVNUTE5FIDA2MDQwMDAwIExPSFIgMDAwMDAwNUEpCkFDUEk6IEFQSUMgMHhiZDlmZWQ4 YSAwMDA2OCAodjEgUFRMVEQgID8gQVBJQyAgIDA2MDQwMDAwICBMVFAgMDAwMDAwMDApCkFDUEk6 IEJPT1QgMHhiZDlmZWRmMiAwMDAyOCAodjEgUFRMVEQgICRTQkZUQkwkIDA2MDQwMDAwICBMVFAg MDAwMDAwMDEpCkFDUEk6IFNMSUMgMHhiZDlmZWUxYSAwMDE3NiAodjEgREVMTCAgICBRQTA5ICAg IDA2MDQwMDAwICBMVFAgMDAwMDAwMDApCkFDUEk6IE9TRlIgMHhiZDlmZWY5MCAwMDA3MCAodjEg REVMTCAgIERFTEwgICAgIDA2MDQwMDAwIEFTTCAgMDAwMDAwNjEpCkFDUEk6IFNTRFQgMHhiZDlm Nzc2OSAwMDAzOSAodjEgQnJ0UmVmICBERDAxQlJUIDAwMDAxMDAwIElOVEwgMjAwNTA2MjQpCkFD UEk6IFNTRFQgMHhiZDllNjAwMCAwMDY1NSAodjEgIFBtUmVmICAgIENwdVBtIDAwMDAzMDAwIElO VEwgMjAwNTA2MjQpCkFDUEk6IFNTRFQgMHhiZDllNTAwMCAwMDI1OSAodjEgIFBtUmVmICBDcHUw VHN0IDAwMDAzMDAwIElOVEwgMjAwNTA2MjQpCkFDUEk6IFNTRFQgMHhiZDllNDAwMCAwMDIwRiAo djEgIFBtUmVmICAgIEFwVHN0IDAwMDAzMDAwIElOVEwgMjAwNTA2MjQpCk1BRFQ6IEZvdW5kIElP IEFQSUMgSUQgMiwgSW50ZXJydXB0IDAgYXQgMHhmZWMwMDAwMAppb2FwaWMwOiBSb3V0aW5nIGV4 dGVybmFsIDgyNTlBJ3MgLT4gaW50cGluIDAKbGFwaWMwOiBSb3V0aW5nIE5NSSAtPiBMSU5UMQps YXBpYzA6IExJTlQxIHRyaWdnZXI6IGVkZ2UKbGFwaWMwOiBMSU5UMSBwb2xhcml0eTogaGlnaAps YXBpYzE6IFJvdXRpbmcgTk1JIC0+IExJTlQxCmxhcGljMTogTElOVDEgdHJpZ2dlcjogZWRnZQps YXBpYzE6IExJTlQxIHBvbGFyaXR5OiBoaWdoCk1BRFQ6IEludGVycnVwdCBvdmVycmlkZTogc291 cmNlIDAsIGlycSAyCmlvYXBpYzA6IFJvdXRpbmcgSVJRIDAgLT4gaW50cGluIDIKTUFEVDogSW50 ZXJydXB0IG92ZXJyaWRlOiBzb3VyY2UgOSwgaXJxIDkKaW9hcGljMDogaW50cGluIDkgdHJpZ2dl cjogbGV2ZWwKaW9hcGljMCA8VmVyc2lvbiAyLjA+IGlycXMgMC0yMyBvbiBtb3RoZXJib2FyZApj cHUwIEJTUDoKICAgICBJRDogMHgwMDAwMDAwMCAgIFZFUjogMHgwMDA1MDAxNCBMRFI6IDB4MDAw MDAwMDAgREZSOiAweGZmZmZmZmZmCiAgbGludDA6IDB4MDAwMTA3MDAgbGludDE6IDB4MDAwMDA0 MDAgVFBSOiAweDAwMDAwMDAwIFNWUjogMHgwMDAwMDFmZgogIHRpbWVyOiAweDAwMDEwMGVmIHRo ZXJtOiAweDAwMDEwMDAwIGVycjogMHgwMDAwMDBmMCBwbWM6IDB4MDAwMTA0MDAKICAgY21jaTog MHgwMDAwMDAwMApzbmRfdW5pdF9pbml0KCkgdT0weDAwZmY4MDAwIFs1MTJdIGQ9MHgwMDAwN2Mw MCBbMzJdIGM9MHgwMDAwMDNmZiBbMTAyNF0KZmVlZGVyX3JlZ2lzdGVyOiBzbmRfdW5pdD0tMSBz bmRfbWF4YXV0b3ZjaGFucz0xNiBsYXRlbmN5PTUgZmVlZGVyX3JhdGVfbWluPTEgZmVlZGVyX3Jh dGVfbWF4PTIwMTYwMDAgZmVlZGVyX3JhdGVfcm91bmQ9MjUKd2xhbjogPDgwMi4xMSBMaW5rIExh eWVyPgpWRVNBOiBpbmZvcm1hdGlvbiBibG9jawowMDAwICAgNTYgNDUgNTMgNDEgMDAgMDMgMDAg MDEgMDAgMDEgMDEgMDAgMDAgMDAgNDAgMDAKMDAxMCAgIDAwIDAxIGZmIDAxIDAwIDAxIDMzIDAx IDAwIDAxIDQ1IDAxIDAwIDAxIDY5IDAxCjAwMjAgICAwMCAwMSAwMCAwMCAwMCAwMCAwMCAwMCAw MCAwMCAwMCAwMCAwMCAwMCAwMCAwMAowMDMwICAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAg MDAgMDAgMDAgMDAgMDAgMDAgMDAKMDA0MCAgIDYwIDAxIDYxIDAxIDYyIDAxIDYzIDAxIDY0IDAx IDY1IDAxIDY2IDAxIDY3IDAxCjAwNTAgICA2OCAwMSA2OSAwMSA2YSAwMSA2YiAwMSA2YyAwMSA2 ZCAwMSA2ZSAwMSA2ZiAwMQowMDYwICAgNzAgMDEgNzEgMDEgM2MgMDEgNGQgMDEgNWMgMDEgM2Eg MDEgNGIgMDEgNWEgMDEKMDA3MCAgIDA3IDAxIDFhIDAxIDFiIDAxIDA1IDAxIDE3IDAxIDE4IDAx IDEyIDAxIDE0IDAxCjAwODAgICAxNSAwMSAwMSAwMSAwMyAwMSAxMSAwMSBmZiBmZiAwMCAwMCAw MCAwMCAwMCAwMAowMDkwICAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAg MDAgMDAgMDAKMDBhMCAgIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAw IDAwIDAwCjAwYjAgICAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAw MCAwMAowMGMwICAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAg MDAKMDBkMCAgIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAw CjAwZTAgICAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMAow MGYwICAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAKMDEw MCAgIDQ5IDZlIDc0IDY1IDZjIDI4IDcyIDI5IDQzIDYxIDZlIDc0IDY5IDY3IDYxIDIwCjAxMTAg ICA0NyA3MiA2MSA3MCA2OCA2OSA2MyA3MyAyMCA0MyA2OCA2OSA3MCAyMCA0MSA2MwowMTIwICAg NjMgNjUgNmMgNjUgNzIgNjEgNzQgNjUgNjQgMjAgNTYgNDcgNDEgMjAgNDIgNDkKMDEzMCAgIDRm IDUzIDAwIDQ5IDZlIDc0IDY1IDZjIDIwIDQzIDZmIDcyIDcwIDZmIDcyIDYxCjAxNDAgICA3NCA2 OSA2ZiA2ZSAwMCA0OSA2ZSA3NCA2NSA2YyAyOCA3MiAyOSA0MyA2MSA2ZQowMTUwICAgNzQgNjkg NjcgNjEgMjAgNDcgNzIgNjEgNzAgNjggNjkgNjMgNzMgMjAgNDMgNmYKMDE2MCAgIDZlIDc0IDcy IDZmIDZjIDZjIDY1IDcyIDAwIDQ4IDYxIDcyIDY0IDc3IDYxIDcyCjAxNzAgICA2NSAyMCA1NiA2 NSA3MiA3MyA2OSA2ZiA2ZSAyMCAzMCAyZSAzMCAwMCAwMCAwMAowMTgwICAgMDAgMDAgMDAgMDAg MDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAKMDE5MCAgIDAwIDAwIDAwIDAwIDAw IDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwCjAxYTAgICAwMCAwMCAwMCAwMCAwMCAw MCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMAowMWIwICAgMDAgMDAgMDAgMDAgMDAgMDAg MDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAKMDFjMCAgIDAwIDAwIDAwIDAwIDAwIDAwIDAw IDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwCjAxZDAgICAwMCAwMCAwMCAwMCAwMCAwMCAwMCAw MCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMAowMWUwICAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAg MDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAKMDFmMCAgIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAw IDAwIDAwIDAwIDAwIDAwIDAwIDAwClZFU0E6IDkgbW9kZShzKSBmb3VuZApWRVNBOiB2My4wLCAz MjcwNGsgbWVtb3J5LCBmbGFnczoweDEsIG1vZGUgdGFibGU6MHhmZmZmZmY4MDAwMDYyMDQwICgx MDAwMDQwKQpWRVNBOiBJbnRlbChyKUNhbnRpZ2EgR3JhcGhpY3MgQ2hpcCBBY2NlbGVyYXRlZCBW R0EgQklPUwpWRVNBOiBJbnRlbCBDb3Jwb3JhdGlvbiBJbnRlbChyKUNhbnRpZ2EgR3JhcGhpY3Mg Q29udHJvbGxlciBIYXJkd2FyZSBWZXJzaW9uIDAuMAppbzogPEkvTz4Ka2JkOiBuZXcgYXJyYXkg c2l6ZSA0CmtiZDEgYXQga2JkbXV4MAptZW06IDxtZW1vcnk+Cm51bGw6IDxudWxsIGRldmljZSwg emVybyBkZXZpY2U+Cm5mc2xvY2s6IHBzZXVkby1kZXZpY2UKcmFuZG9tOiA8ZW50cm9weSBzb3Vy Y2UsIFNvZnR3YXJlLCBZYXJyb3c+CkNQVTA6IGxvY2FsIEFQSUMgZXJyb3IgMHg4MAphY3BpMDog PERFTEwgUUEwOSAgID4gb24gbW90aGVyYm9hcmQKUENJZTogTWVtb3J5IE1hcHBlZCBjb25maWd1 cmF0aW9uIGJhc2UgQCAweGUwMDAwMDAwCmlvYXBpYzA6IHJvdXRpbmcgaW50cGluIDkgKElTQSBJ UlEgOSkgdG8gbGFwaWMgMCB2ZWN0b3IgNDgKYWNwaTA6IFtNUFNBRkVdCmFjcGkwOiBbSVRIUkVB RF0KQWNwaU9zRGVyaXZlUGNpSWQ6IFxcX1NCXy5QQ0kwLkhCVVMgLT4gYnVzIDAgZGV2IDAgZnVu YyAwCkFjcGlPc0Rlcml2ZVBjaUlkOiBcXF9TQl8uUENJMC5SUDA0LlBYQ1MgLT4gYnVzIDAgZGV2 IDI4IGZ1bmMgMwphY3BpMDogUG93ZXIgQnV0dG9uIChmaXhlZCkKQWNwaU9zRGVyaXZlUGNpSWQ6 IFxcX1NCXy5QQ0kwLkxQQ0IuTFBDMCAtPiBidXMgMCBkZXYgMzEgZnVuYyAwCkFjcGlPc0Rlcml2 ZVBjaUlkOiBcXF9TQl8uUENJMC5MUENCLkxQQzEgLT4gYnVzIDAgZGV2IDMxIGZ1bmMgMApocGV0 MDogdmVuZG9yIDB4ODA4NiwgcmV2IDB4MSwgMTQzMTgxODBIeiA2NGJpdCwgNCB0aW1lcnMsIGxl Z2FjeSByb3V0ZQpocGV0MDogIHQwOiBpcnFzIDB4MDBmMDAwMDAgKDApLCA2NGJpdCwgcGVyaW9k aWMKaHBldDA6ICB0MTogaXJxcyAweDAwZjAwMDAwICgwKQpocGV0MDogIHQyOiBpcnFzIDB4MDBm MDA4MDAgKDApCmhwZXQwOiAgdDM6IGlycXMgMHgwMGYwMTAwMCAoMCkKVGltZWNvdW50ZXIgIkhQ RVQiIGZyZXF1ZW5jeSAxNDMxODE4MCBIeiBxdWFsaXR5IDkwMAppb2FwaWMwOiByb3V0aW5nIGlu dHBpbiAyMCAoUENJIElSUSAyMCkgdG8gbGFwaWMgMCB2ZWN0b3IgNDkKaHBldDA6IFtNUFNBRkVd CmhwZXQwOiBbRklMVEVSXQpFdmVudCB0aW1lciAiSFBFVCIgZnJlcXVlbmN5IDE0MzE4MTgwIEh6 IHF1YWxpdHkgNDUwCkV2ZW50IHRpbWVyICJIUEVUMSIgZnJlcXVlbmN5IDE0MzE4MTgwIEh6IHF1 YWxpdHkgNDQwCkV2ZW50IHRpbWVyICJIUEVUMiIgZnJlcXVlbmN5IDE0MzE4MTgwIEh6IHF1YWxp dHkgNDQwCkV2ZW50IHRpbWVyICJIUEVUMyIgZnJlcXVlbmN5IDE0MzE4MTgwIEh6IHF1YWxpdHkg NDQwCkFDUEkgdGltZXI6IDAvMyAwLzMgMC8zIDAvMyAxLzIgMS8yIDEvMiAwLzMgMC8zIDAvMyAt PiAzClRpbWVjb3VudGVyICJBQ1BJLXNhZmUiIGZyZXF1ZW5jeSAzNTc5NTQ1IEh6IHF1YWxpdHkg ODUwCmFjcGlfdGltZXIwOiA8MjQtYml0IHRpbWVyIGF0IDMuNTc5NTQ1TUh6PiBwb3J0IDB4NDA4 LTB4NDBiIG9uIGFjcGkwCmNwdTA6IDxBQ1BJIENQVT4gb24gYWNwaTAKQUNQSTogU1NEVCAweGJk OTFhYzIwIDAwMjY1ICh2MSAgUG1SZWYgIENwdTBJc3QgMDAwMDMwMDAgSU5UTCAyMDA1MDYyNCkK QUNQSTogRHluYW1pYyBPRU0gVGFibGUgTG9hZDoKQUNQSTogU1NEVCAwIDAwMjY1ICh2MSAgUG1S ZWYgIENwdTBJc3QgMDAwMDMwMDAgSU5UTCAyMDA1MDYyNCkKQUNQSTogU1NEVCAweGJkOTE4NjIw IDAwNTc1ICh2MSAgUG1SZWYgIENwdTBDc3QgMDAwMDMwMDEgSU5UTCAyMDA1MDYyNCkKQUNQSTog RHluYW1pYyBPRU0gVGFibGUgTG9hZDoKQUNQSTogU1NEVCAwIDAwNTc1ICh2MSAgUG1SZWYgIENw dTBDc3QgMDAwMDMwMDEgSU5UTCAyMDA1MDYyNCkKY3B1MTogPEFDUEkgQ1BVPiBvbiBhY3BpMApB Q1BJOiBTU0RUIDB4YmQ5MTljYTAgMDAxQ0YgKHYxICBQbVJlZiAgICBBcElzdCAwMDAwMzAwMCBJ TlRMIDIwMDUwNjI0KQpBQ1BJOiBEeW5hbWljIE9FTSBUYWJsZSBMb2FkOgpBQ1BJOiBTU0RUIDAg MDAxQ0YgKHYxICBQbVJlZiAgICBBcElzdCAwMDAwMzAwMCBJTlRMIDIwMDUwNjI0KQpBQ1BJOiBT U0RUIDB4YmQ5MTlmMjAgMDAwOEQgKHYxICBQbVJlZiAgICBBcENzdCAwMDAwMzAwMCBJTlRMIDIw MDUwNjI0KQpBQ1BJOiBEeW5hbWljIE9FTSBUYWJsZSBMb2FkOgpBQ1BJOiBTU0RUIDAgMDAwOEQg KHYxICBQbVJlZiAgICBBcENzdCAwMDAwMzAwMCBJTlRMIDIwMDUwNjI0KQphY3BpX2VjMDogPEVt YmVkZGVkIENvbnRyb2xsZXI6IEdQRSAweDFjPiBwb3J0IDB4NjIsMHg2NiBvbiBhY3BpMApwY2lf bGluazA6ICAgICAgICBJbmRleCAgSVJRICBSdGQgIFJlZiAgSVJRcwogIEluaXRpYWwgUHJvYmUg ICAgICAgMCAgICA1ICAgTiAgICAgMCAgMSAzIDQgNSA2IDcgMTAgMTIgMTQgMTUKICBWYWxpZGF0 aW9uICAgICAgICAgIDAgICAgNSAgIE4gICAgIDAgIDEgMyA0IDUgNiA3IDEwIDEyIDE0IDE1CiAg QWZ0ZXIgRGlzYWJsZSAgICAgICAwICAyNTUgICBOICAgICAwICAxIDMgNCA1IDYgNyAxMCAxMiAx NCAxNQpwY2lfbGluazE6ICAgICAgICBJbmRleCAgSVJRICBSdGQgIFJlZiAgSVJRcwogIEluaXRp YWwgUHJvYmUgICAgICAgMCAgIDExICAgTiAgICAgMCAgMSAzIDQgNSA2IDcgMTEgMTIgMTQgMTUK ICBWYWxpZGF0aW9uICAgICAgICAgIDAgICAxMSAgIE4gICAgIDAgIDEgMyA0IDUgNiA3IDExIDEy IDE0IDE1CiAgQWZ0ZXIgRGlzYWJsZSAgICAgICAwICAyNTUgICBOICAgICAwICAxIDMgNCA1IDYg NyAxMSAxMiAxNCAxNQpwY2lfbGluazI6ICAgICAgICBJbmRleCAgSVJRICBSdGQgIFJlZiAgSVJR cwogIEluaXRpYWwgUHJvYmUgICAgICAgMCAgIDEwICAgTiAgICAgMCAgMSAzIDQgNSA2IDcgMTAg MTIgMTQgMTUKICBWYWxpZGF0aW9uICAgICAgICAgIDAgICAxMCAgIE4gICAgIDAgIDEgMyA0IDUg NiA3IDEwIDEyIDE0IDE1CiAgQWZ0ZXIgRGlzYWJsZSAgICAgICAwICAyNTUgICBOICAgICAwICAx IDMgNCA1IDYgNyAxMCAxMiAxNCAxNQpwY2lfbGluazM6ICAgICAgICBJbmRleCAgSVJRICBSdGQg IFJlZiAgSVJRcwogIEluaXRpYWwgUHJvYmUgICAgICAgMCAgIDEwICAgTiAgICAgMCAgMSAzIDQg NSA2IDcgMTEgMTIgMTQgMTUKICBWYWxpZGF0aW9uICAgICAgICAgIDAgIDI1NSAgIE4gICAgIDAg IDEgMyA0IDUgNiA3IDExIDEyIDE0IDE1CiAgQWZ0ZXIgRGlzYWJsZSAgICAgICAwICAyNTUgICBO ICAgICAwICAxIDMgNCA1IDYgNyAxMSAxMiAxNCAxNQpwY2lfbGluazQ6ICAgICAgICBJbmRleCAg SVJRICBSdGQgIFJlZiAgSVJRcwogIEluaXRpYWwgUHJvYmUgICAgICAgMCAgMjU1ICAgTiAgICAg MCAgMSAzIDQgNSA2IDcgMTAgMTIgMTQgMTUKICBWYWxpZGF0aW9uICAgICAgICAgIDAgIDI1NSAg IE4gICAgIDAgIDEgMyA0IDUgNiA3IDEwIDEyIDE0IDE1CiAgQWZ0ZXIgRGlzYWJsZSAgICAgICAw ICAyNTUgICBOICAgICAwICAxIDMgNCA1IDYgNyAxMCAxMiAxNCAxNQpwY2lfbGluazU6ICAgICAg ICBJbmRleCAgSVJRICBSdGQgIFJlZiAgSVJRcwogIEluaXRpYWwgUHJvYmUgICAgICAgMCAgIDEx ICAgTiAgICAgMCAgMSAzIDQgNSA2IDcgMTEgMTIgMTQgMTUKICBWYWxpZGF0aW9uICAgICAgICAg IDAgICAxMSAgIE4gICAgIDAgIDEgMyA0IDUgNiA3IDExIDEyIDE0IDE1CiAgQWZ0ZXIgRGlzYWJs ZSAgICAgICAwICAyNTUgICBOICAgICAwICAxIDMgNCA1IDYgNyAxMSAxMiAxNCAxNQpwY2lfbGlu azY6ICAgICAgICBJbmRleCAgSVJRICBSdGQgIFJlZiAgSVJRcwogIEluaXRpYWwgUHJvYmUgICAg ICAgMCAgIDEwICAgTiAgICAgMCAgMSAzIDQgNSA2IDcgMTAgMTIgMTQgMTUKICBWYWxpZGF0aW9u ICAgICAgICAgIDAgICAxMCAgIE4gICAgIDAgIDEgMyA0IDUgNiA3IDEwIDEyIDE0IDE1CiAgQWZ0 ZXIgRGlzYWJsZSAgICAgICAwICAyNTUgICBOICAgICAwICAxIDMgNCA1IDYgNyAxMCAxMiAxNCAx NQpwY2lfbGluazc6ICAgICAgICBJbmRleCAgSVJRICBSdGQgIFJlZiAgSVJRcwogIEluaXRpYWwg UHJvYmUgICAgICAgMCAgICA3ICAgTiAgICAgMCAgMSAzIDQgNSA2IDcgMTEgMTIgMTQgMTUKICBW YWxpZGF0aW9uICAgICAgICAgIDAgICAgNyAgIE4gICAgIDAgIDEgMyA0IDUgNiA3IDExIDEyIDE0 IDE1CiAgQWZ0ZXIgRGlzYWJsZSAgICAgICAwICAyNTUgICBOICAgICAwICAxIDMgNCA1IDYgNyAx MSAxMiAxNCAxNQpwY2liMDogPEFDUEkgSG9zdC1QQ0kgYnJpZGdlPiBwb3J0IDB4Y2Y4LTB4Y2Zm IG9uIGFjcGkwCnBjaTA6IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWIwCnBjaTA6IGRvbWFpbj0wLCBw aHlzaWNhbCBidXM9MApmb3VuZC0+CXZlbmRvcj0weDgwODYsIGRldj0weDJhNDAsIHJldmlkPTB4 MDcKCWRvbWFpbj0wLCBidXM9MCwgc2xvdD0wLCBmdW5jPTAKCWNsYXNzPTA2LTAwLTAwLCBoZHJ0 eXBlPTB4MDAsIG1mZGV2PTAKCWNtZHJlZz0weDAxMDYsIHN0YXRyZWc9MHgyMDkwLCBjYWNoZWxu c3o9MCAoZHdvcmRzKQoJbGF0dGltZXI9MHgwMCAoMCBucyksIG1pbmdudD0weDAwICgwIG5zKSwg bWF4bGF0PTB4MDAgKDAgbnMpCmZvdW5kLT4JdmVuZG9yPTB4ODA4NiwgZGV2PTB4MmE0MiwgcmV2 aWQ9MHgwNwoJZG9tYWluPTAsIGJ1cz0wLCBzbG90PTIsIGZ1bmM9MAoJY2xhc3M9MDMtMDAtMDAs IGhkcnR5cGU9MHgwMCwgbWZkZXY9MQoJY21kcmVnPTB4MDAwNywgc3RhdHJlZz0weDAwOTAsIGNh Y2hlbG5zej0wIChkd29yZHMpCglsYXR0aW1lcj0weDAwICgwIG5zKSwgbWluZ250PTB4MDAgKDAg bnMpLCBtYXhsYXQ9MHgwMCAoMCBucykKCWludHBpbj1hLCBpcnE9NQoJcG93ZXJzcGVjIDMgIHN1 cHBvcnRzIEQwIEQzICBjdXJyZW50IEQwCglNU0kgc3VwcG9ydHMgMSBtZXNzYWdlCgltYXBbMTBd OiB0eXBlIE1lbW9yeSwgcmFuZ2UgNjQsIGJhc2UgMHhmODAwMDAwMCwgc2l6ZSAyMiwgZW5hYmxl ZAoJbWFwWzE4XTogdHlwZSBQcmVmZXRjaGFibGUgTWVtb3J5LCByYW5nZSA2NCwgYmFzZSAweGQw MDAwMDAwLCBzaXplIDI4LCBlbmFibGVkCgltYXBbMjBdOiB0eXBlIEkvTyBQb3J0LCByYW5nZSAz MiwgYmFzZSAweDE4MDAsIHNpemUgIDMsIGVuYWJsZWQKcGNpYjA6IG1hdGNoZWQgZW50cnkgZm9y IDAuMi5JTlRBCnBjaWIwOiBzbG90IDIgSU5UQSBoYXJkd2lyZWQgdG8gSVJRIDE2CmZvdW5kLT4J dmVuZG9yPTB4ODA4NiwgZGV2PTB4MmE0MywgcmV2aWQ9MHgwNwoJZG9tYWluPTAsIGJ1cz0wLCBz bG90PTIsIGZ1bmM9MQoJY2xhc3M9MDMtODAtMDAsIGhkcnR5cGU9MHgwMCwgbWZkZXY9MQoJY21k cmVnPTB4MDAwNywgc3RhdHJlZz0weDAwOTAsIGNhY2hlbG5zej0wIChkd29yZHMpCglsYXR0aW1l cj0weDAwICgwIG5zKSwgbWluZ250PTB4MDAgKDAgbnMpLCBtYXhsYXQ9MHgwMCAoMCBucykKCXBv d2Vyc3BlYyAzICBzdXBwb3J0cyBEMCBEMyAgY3VycmVudCBEMAoJbWFwWzEwXTogdHlwZSBNZW1v cnksIHJhbmdlIDY0LCBiYXNlIDB4Zjg0MDAwMDAsIHNpemUgMjAsIGVuYWJsZWQKZm91bmQtPgl2 ZW5kb3I9MHg4MDg2LCBkZXY9MHgyOTM3LCByZXZpZD0weDAzCglkb21haW49MCwgYnVzPTAsIHNs b3Q9MjYsIGZ1bmM9MAoJY2xhc3M9MGMtMDMtMDAsIGhkcnR5cGU9MHgwMCwgbWZkZXY9MQoJY21k cmVnPTB4MDAwNSwgc3RhdHJlZz0weDAyOTAsIGNhY2hlbG5zej0wIChkd29yZHMpCglsYXR0aW1l cj0weDAwICgwIG5zKSwgbWluZ250PTB4MDAgKDAgbnMpLCBtYXhsYXQ9MHgwMCAoMCBucykKCWlu dHBpbj1hLCBpcnE9NQoJbWFwWzIwXTogdHlwZSBJL08gUG9ydCwgcmFuZ2UgMzIsIGJhc2UgMHgx ODIwLCBzaXplICA1LCBlbmFibGVkCnBjaWIwOiBtYXRjaGVkIGVudHJ5IGZvciAwLjI2LklOVEEK cGNpYjA6IHNsb3QgMjYgSU5UQSBoYXJkd2lyZWQgdG8gSVJRIDE2CmZvdW5kLT4JdmVuZG9yPTB4 ODA4NiwgZGV2PTB4MjkzOCwgcmV2aWQ9MHgwMwoJZG9tYWluPTAsIGJ1cz0wLCBzbG90PTI2LCBm dW5jPTEKCWNsYXNzPTBjLTAzLTAwLCBoZHJ0eXBlPTB4MDAsIG1mZGV2PTAKCWNtZHJlZz0weDAw MDUsIHN0YXRyZWc9MHgwMjkwLCBjYWNoZWxuc3o9MCAoZHdvcmRzKQoJbGF0dGltZXI9MHgwMCAo MCBucyksIG1pbmdudD0weDAwICgwIG5zKSwgbWF4bGF0PTB4MDAgKDAgbnMpCglpbnRwaW49Yiwg aXJxPTExCgltYXBbMjBdOiB0eXBlIEkvTyBQb3J0LCByYW5nZSAzMiwgYmFzZSAweDE4NDAsIHNp emUgIDUsIGVuYWJsZWQKcGNpYjA6IG1hdGNoZWQgZW50cnkgZm9yIDAuMjYuSU5UQgpwY2liMDog c2xvdCAyNiBJTlRCIGhhcmR3aXJlZCB0byBJUlEgMjEKZm91bmQtPgl2ZW5kb3I9MHg4MDg2LCBk ZXY9MHgyOTM5LCByZXZpZD0weDAzCglkb21haW49MCwgYnVzPTAsIHNsb3Q9MjYsIGZ1bmM9MgoJ Y2xhc3M9MGMtMDMtMDAsIGhkcnR5cGU9MHgwMCwgbWZkZXY9MAoJY21kcmVnPTB4MDAwNSwgc3Rh dHJlZz0weDAyOTAsIGNhY2hlbG5zej0wIChkd29yZHMpCglsYXR0aW1lcj0weDAwICgwIG5zKSwg bWluZ250PTB4MDAgKDAgbnMpLCBtYXhsYXQ9MHgwMCAoMCBucykKCWludHBpbj1jLCBpcnE9MTAK CW1hcFsyMF06IHR5cGUgSS9PIFBvcnQsIHJhbmdlIDMyLCBiYXNlIDB4MTg2MCwgc2l6ZSAgNSwg ZW5hYmxlZApwY2liMDogbWF0Y2hlZCBlbnRyeSBmb3IgMC4yNi5JTlRDCnBjaWIwOiBzbG90IDI2 IElOVEMgaGFyZHdpcmVkIHRvIElSUSAxOQpmb3VuZC0+CXZlbmRvcj0weDgwODYsIGRldj0weDI5 M2MsIHJldmlkPTB4MDMKCWRvbWFpbj0wLCBidXM9MCwgc2xvdD0yNiwgZnVuYz03CgljbGFzcz0w Yy0wMy0yMCwgaGRydHlwZT0weDAwLCBtZmRldj0wCgljbWRyZWc9MHgwMTA2LCBzdGF0cmVnPTB4 MDI5MCwgY2FjaGVsbnN6PTAgKGR3b3JkcykKCWxhdHRpbWVyPTB4MDAgKDAgbnMpLCBtaW5nbnQ9 MHgwMCAoMCBucyksIG1heGxhdD0weDAwICgwIG5zKQoJaW50cGluPWMsIGlycT0xMAoJcG93ZXJz cGVjIDIgIHN1cHBvcnRzIEQwIEQzICBjdXJyZW50IEQwCgltYXBbMTBdOiB0eXBlIE1lbW9yeSwg cmFuZ2UgMzIsIGJhc2UgMHhmODgwNDgwMCwgc2l6ZSAxMCwgZW5hYmxlZApwY2liMDogbWF0Y2hl ZCBlbnRyeSBmb3IgMC4yNi5JTlRDCnBjaWIwOiBzbG90IDI2IElOVEMgaGFyZHdpcmVkIHRvIElS USAxOQpmb3VuZC0+CXZlbmRvcj0weDgwODYsIGRldj0weDI5M2UsIHJldmlkPTB4MDMKCWRvbWFp bj0wLCBidXM9MCwgc2xvdD0yNywgZnVuYz0wCgljbGFzcz0wNC0wMy0wMCwgaGRydHlwZT0weDAw LCBtZmRldj0wCgljbWRyZWc9MHgwMTA2LCBzdGF0cmVnPTB4MDAxMCwgY2FjaGVsbnN6PTE2IChk d29yZHMpCglsYXR0aW1lcj0weDAwICgwIG5zKSwgbWluZ250PTB4MDAgKDAgbnMpLCBtYXhsYXQ9 MHgwMCAoMCBucykKCWludHBpbj1hLCBpcnE9MTAKCXBvd2Vyc3BlYyAyICBzdXBwb3J0cyBEMCBE MyAgY3VycmVudCBEMAoJTVNJIHN1cHBvcnRzIDEgbWVzc2FnZSwgNjQgYml0CgltYXBbMTBdOiB0 eXBlIE1lbW9yeSwgcmFuZ2UgNjQsIGJhc2UgMHhmODYwMDAwMCwgc2l6ZSAxNCwgZW5hYmxlZApw Y2liMDogbWF0Y2hlZCBlbnRyeSBmb3IgMC4yNy5JTlRBCnBjaWIwOiBzbG90IDI3IElOVEEgaGFy ZHdpcmVkIHRvIElSUSAyMgpmb3VuZC0+CXZlbmRvcj0weDgwODYsIGRldj0weDI5NDAsIHJldmlk PTB4MDMKCWRvbWFpbj0wLCBidXM9MCwgc2xvdD0yOCwgZnVuYz0wCgljbGFzcz0wNi0wNC0wMCwg aGRydHlwZT0weDAxLCBtZmRldj0xCgljbWRyZWc9MHgwMTA3LCBzdGF0cmVnPTB4MDAxMCwgY2Fj aGVsbnN6PTE2IChkd29yZHMpCglsYXR0aW1lcj0weDAwICgwIG5zKSwgbWluZ250PTB4MDQgKDEw MDAgbnMpLCBtYXhsYXQ9MHgwMCAoMCBucykKCWludHBpbj1hLCBpcnE9MTEKCXBvd2Vyc3BlYyAy ICBzdXBwb3J0cyBEMCBEMyAgY3VycmVudCBEMAoJTVNJIHN1cHBvcnRzIDEgbWVzc2FnZQpwY2li MDogbWF0Y2hlZCBlbnRyeSBmb3IgMC4yOC5JTlRBCnBjaWIwOiBzbG90IDI4IElOVEEgaGFyZHdp cmVkIHRvIElSUSAxNwpmb3VuZC0+CXZlbmRvcj0weDgwODYsIGRldj0weDI5NDIsIHJldmlkPTB4 MDMKCWRvbWFpbj0wLCBidXM9MCwgc2xvdD0yOCwgZnVuYz0xCgljbGFzcz0wNi0wNC0wMCwgaGRy dHlwZT0weDAxLCBtZmRldj0xCgljbWRyZWc9MHgwMTA3LCBzdGF0cmVnPTB4MDAxMCwgY2FjaGVs bnN6PTE2IChkd29yZHMpCglsYXR0aW1lcj0weDAwICgwIG5zKSwgbWluZ250PTB4MDQgKDEwMDAg bnMpLCBtYXhsYXQ9MHgwMCAoMCBucykKCWludHBpbj1iLCBpcnE9NQoJcG93ZXJzcGVjIDIgIHN1 cHBvcnRzIEQwIEQzICBjdXJyZW50IEQwCglNU0kgc3VwcG9ydHMgMSBtZXNzYWdlCnBjaWIwOiBt YXRjaGVkIGVudHJ5IGZvciAwLjI4LklOVEIKcGNpYjA6IHNsb3QgMjggSU5UQiBoYXJkd2lyZWQg dG8gSVJRIDE2CmZvdW5kLT4JdmVuZG9yPTB4ODA4NiwgZGV2PTB4Mjk0YSwgcmV2aWQ9MHgwMwoJ ZG9tYWluPTAsIGJ1cz0wLCBzbG90PTI4LCBmdW5jPTUKCWNsYXNzPTA2LTA0LTAwLCBoZHJ0eXBl PTB4MDEsIG1mZGV2PTEKCWNtZHJlZz0weDAxMDcsIHN0YXRyZWc9MHgwMDEwLCBjYWNoZWxuc3o9 MTYgKGR3b3JkcykKCWxhdHRpbWVyPTB4MDAgKDAgbnMpLCBtaW5nbnQ9MHgwNCAoMTAwMCBucyks IG1heGxhdD0weDAwICgwIG5zKQoJaW50cGluPWIsIGlycT01Cglwb3dlcnNwZWMgMiAgc3VwcG9y dHMgRDAgRDMgIGN1cnJlbnQgRDAKCU1TSSBzdXBwb3J0cyAxIG1lc3NhZ2UKcGNpYjA6IG1hdGNo ZWQgZW50cnkgZm9yIDAuMjguSU5UQgpwY2liMDogc2xvdCAyOCBJTlRCIGhhcmR3aXJlZCB0byBJ UlEgMTYKZm91bmQtPgl2ZW5kb3I9MHg4MDg2LCBkZXY9MHgyOTM0LCByZXZpZD0weDAzCglkb21h aW49MCwgYnVzPTAsIHNsb3Q9MjksIGZ1bmM9MAoJY2xhc3M9MGMtMDMtMDAsIGhkcnR5cGU9MHgw MCwgbWZkZXY9MQoJY21kcmVnPTB4MDAwNSwgc3RhdHJlZz0weDAyOTAsIGNhY2hlbG5zej0wIChk d29yZHMpCglsYXR0aW1lcj0weDAwICgwIG5zKSwgbWluZ250PTB4MDAgKDAgbnMpLCBtYXhsYXQ9 MHgwMCAoMCBucykKCWludHBpbj1hLCBpcnE9NwoJbWFwWzIwXTogdHlwZSBJL08gUG9ydCwgcmFu Z2UgMzIsIGJhc2UgMHgxODgwLCBzaXplICA1LCBlbmFibGVkCnBjaWIwOiBtYXRjaGVkIGVudHJ5 IGZvciAwLjI5LklOVEEKcGNpYjA6IHNsb3QgMjkgSU5UQSBoYXJkd2lyZWQgdG8gSVJRIDIzCmZv dW5kLT4JdmVuZG9yPTB4ODA4NiwgZGV2PTB4MjkzNSwgcmV2aWQ9MHgwMwoJZG9tYWluPTAsIGJ1 cz0wLCBzbG90PTI5LCBmdW5jPTEKCWNsYXNzPTBjLTAzLTAwLCBoZHJ0eXBlPTB4MDAsIG1mZGV2 PTAKCWNtZHJlZz0weDAwMDUsIHN0YXRyZWc9MHgwMjkwLCBjYWNoZWxuc3o9MCAoZHdvcmRzKQoJ bGF0dGltZXI9MHgwMCAoMCBucyksIG1pbmdudD0weDAwICgwIG5zKSwgbWF4bGF0PTB4MDAgKDAg bnMpCglpbnRwaW49YiwgaXJxPTEwCgltYXBbMjBdOiB0eXBlIEkvTyBQb3J0LCByYW5nZSAzMiwg YmFzZSAweDE4YTAsIHNpemUgIDUsIGVuYWJsZWQKcGNpYjA6IG1hdGNoZWQgZW50cnkgZm9yIDAu MjkuSU5UQgpwY2liMDogc2xvdCAyOSBJTlRCIGhhcmR3aXJlZCB0byBJUlEgMTkKZm91bmQtPgl2 ZW5kb3I9MHg4MDg2LCBkZXY9MHgyOTM2LCByZXZpZD0weDAzCglkb21haW49MCwgYnVzPTAsIHNs b3Q9MjksIGZ1bmM9MgoJY2xhc3M9MGMtMDMtMDAsIGhkcnR5cGU9MHgwMCwgbWZkZXY9MAoJY21k cmVnPTB4MDAwNSwgc3RhdHJlZz0weDAyOTAsIGNhY2hlbG5zej0wIChkd29yZHMpCglsYXR0aW1l cj0weDAwICgwIG5zKSwgbWluZ250PTB4MDAgKDAgbnMpLCBtYXhsYXQ9MHgwMCAoMCBucykKCWlu dHBpbj1jLCBpcnE9MTAKCW1hcFsyMF06IHR5cGUgSS9PIFBvcnQsIHJhbmdlIDMyLCBiYXNlIDB4 MThjMCwgc2l6ZSAgNSwgZW5hYmxlZApwY2liMDogbWF0Y2hlZCBlbnRyeSBmb3IgMC4yOS5JTlRD CnBjaWIwOiBzbG90IDI5IElOVEMgaGFyZHdpcmVkIHRvIElSUSAxOApmb3VuZC0+CXZlbmRvcj0w eDgwODYsIGRldj0weDI5M2EsIHJldmlkPTB4MDMKCWRvbWFpbj0wLCBidXM9MCwgc2xvdD0yOSwg ZnVuYz03CgljbGFzcz0wYy0wMy0yMCwgaGRydHlwZT0weDAwLCBtZmRldj0wCgljbWRyZWc9MHgw MTA2LCBzdGF0cmVnPTB4MDI5MCwgY2FjaGVsbnN6PTAgKGR3b3JkcykKCWxhdHRpbWVyPTB4MDAg KDAgbnMpLCBtaW5nbnQ9MHgwMCAoMCBucyksIG1heGxhdD0weDAwICgwIG5zKQoJaW50cGluPWEs IGlycT03Cglwb3dlcnNwZWMgMiAgc3VwcG9ydHMgRDAgRDMgIGN1cnJlbnQgRDAKCW1hcFsxMF06 IHR5cGUgTWVtb3J5LCByYW5nZSAzMiwgYmFzZSAweGY4ODA0YzAwLCBzaXplIDEwLCBlbmFibGVk CnBjaWIwOiBtYXRjaGVkIGVudHJ5IGZvciAwLjI5LklOVEEKcGNpYjA6IHNsb3QgMjkgSU5UQSBo YXJkd2lyZWQgdG8gSVJRIDIzCmZvdW5kLT4JdmVuZG9yPTB4ODA4NiwgZGV2PTB4MjQ0OCwgcmV2 aWQ9MHg5MwoJZG9tYWluPTAsIGJ1cz0wLCBzbG90PTMwLCBmdW5jPTAKCWNsYXNzPTA2LTA0LTAx LCBoZHJ0eXBlPTB4MDEsIG1mZGV2PTAKCWNtZHJlZz0weDAxMDcsIHN0YXRyZWc9MHgwMDEwLCBj YWNoZWxuc3o9MCAoZHdvcmRzKQoJbGF0dGltZXI9MHgwMCAoMCBucyksIG1pbmdudD0weDA0ICgx MDAwIG5zKSwgbWF4bGF0PTB4MDAgKDAgbnMpCmZvdW5kLT4JdmVuZG9yPTB4ODA4NiwgZGV2PTB4 MjkxNywgcmV2aWQ9MHgwMwoJZG9tYWluPTAsIGJ1cz0wLCBzbG90PTMxLCBmdW5jPTAKCWNsYXNz PTA2LTAxLTAwLCBoZHJ0eXBlPTB4MDAsIG1mZGV2PTEKCWNtZHJlZz0weDAwMDcsIHN0YXRyZWc9 MHgwMjEwLCBjYWNoZWxuc3o9MCAoZHdvcmRzKQoJbGF0dGltZXI9MHgwMCAoMCBucyksIG1pbmdu dD0weDAwICgwIG5zKSwgbWF4bGF0PTB4MDAgKDAgbnMpCmZvdW5kLT4JdmVuZG9yPTB4ODA4Niwg ZGV2PTB4MjkyOSwgcmV2aWQ9MHgwMwoJZG9tYWluPTAsIGJ1cz0wLCBzbG90PTMxLCBmdW5jPTIK CWNsYXNzPTAxLTA2LTAxLCBoZHJ0eXBlPTB4MDAsIG1mZGV2PTAKCWNtZHJlZz0weDAwMDcsIHN0 YXRyZWc9MHgwMmIwLCBjYWNoZWxuc3o9MCAoZHdvcmRzKQoJbGF0dGltZXI9MHgwMCAoMCBucyks IG1pbmdudD0weDAwICgwIG5zKSwgbWF4bGF0PTB4MDAgKDAgbnMpCglpbnRwaW49YiwgaXJxPTEw Cglwb3dlcnNwZWMgMyAgc3VwcG9ydHMgRDAgRDMgIGN1cnJlbnQgRDAKCU1TSSBzdXBwb3J0cyAx NiBtZXNzYWdlcwoJbWFwWzEwXTogdHlwZSBJL08gUG9ydCwgcmFuZ2UgMzIsIGJhc2UgMHgxODE4 LCBzaXplICAzLCBlbmFibGVkCgltYXBbMTRdOiB0eXBlIEkvTyBQb3J0LCByYW5nZSAzMiwgYmFz ZSAweDE4MGMsIHNpemUgIDIsIGVuYWJsZWQKCW1hcFsxOF06IHR5cGUgSS9PIFBvcnQsIHJhbmdl IDMyLCBiYXNlIDB4MTgxMCwgc2l6ZSAgMywgZW5hYmxlZAoJbWFwWzFjXTogdHlwZSBJL08gUG9y dCwgcmFuZ2UgMzIsIGJhc2UgMHgxODA4LCBzaXplICAyLCBlbmFibGVkCgltYXBbMjBdOiB0eXBl IEkvTyBQb3J0LCByYW5nZSAzMiwgYmFzZSAweDE4ZTAsIHNpemUgIDUsIGVuYWJsZWQKCW1hcFsy NF06IHR5cGUgTWVtb3J5LCByYW5nZSAzMiwgYmFzZSAweGY4ODA0MDAwLCBzaXplIDExLCBlbmFi bGVkCnBjaWIwOiBtYXRjaGVkIGVudHJ5IGZvciAwLjMxLklOVEIKcGNpYjA6IHNsb3QgMzEgSU5U QiBoYXJkd2lyZWQgdG8gSVJRIDE5CmZvdW5kLT4JdmVuZG9yPTB4ODA4NiwgZGV2PTB4MjkzMCwg cmV2aWQ9MHgwMwoJZG9tYWluPTAsIGJ1cz0wLCBzbG90PTMxLCBmdW5jPTMKCWNsYXNzPTBjLTA1 LTAwLCBoZHJ0eXBlPTB4MDAsIG1mZGV2PTAKCWNtZHJlZz0weDAxMDMsIHN0YXRyZWc9MHgwMjgw LCBjYWNoZWxuc3o9MCAoZHdvcmRzKQoJbGF0dGltZXI9MHgwMCAoMCBucyksIG1pbmdudD0weDAw ICgwIG5zKSwgbWF4bGF0PTB4MDAgKDAgbnMpCglpbnRwaW49YywgaXJxPTEwCgltYXBbMTBdOiB0 eXBlIE1lbW9yeSwgcmFuZ2UgNjQsIGJhc2UgMCwgc2l6ZSAgOCwgZW5hYmxlZAoJbWFwWzIwXTog dHlwZSBJL08gUG9ydCwgcmFuZ2UgMzIsIGJhc2UgMHgxYzAwLCBzaXplICA1LCBlbmFibGVkCnBj aWIwOiBtYXRjaGVkIGVudHJ5IGZvciAwLjMxLklOVEMKcGNpYjA6IHNsb3QgMzEgSU5UQyBoYXJk d2lyZWQgdG8gSVJRIDE5CnZnYXBjaTA6IDxWR0EtY29tcGF0aWJsZSBkaXNwbGF5PiBwb3J0IDB4 MTgwMC0weDE4MDcgbWVtIDB4ZjgwMDAwMDAtMHhmODNmZmZmZiwweGQwMDAwMDAwLTB4ZGZmZmZm ZmYgaXJxIDE2IGF0IGRldmljZSAyLjAgb24gcGNpMAphY3BpX3ZpZGVvMDogPEFDUEkgdmlkZW8g ZXh0ZW5zaW9uPiBvbiB2Z2FwY2kwCmZvdW5kIFZHQSBDUlQgb3IgVkVTQSBDb21wYXRpYmxlIEFu YWxvZyBNb25pdG9yKDEwMCksIGlkeCMwLCBwb3J0IzAsIGhlYWQgIzAKZm91bmQgSW50ZXJuYWwv SW50ZWdyYXRlZCBEaWdpdGFsIEZsYXQgUGFuZWwoNDAwKSwgaWR4IzAsIHBvcnQjMCwgaGVhZCAj MApmb3VuZCBFeHRlcm5hbCBEaWdpdGFsIE1vbml0b3IoMzAwKSwgaWR4IzAsIHBvcnQjMCwgaGVh ZCAjMApmb3VuZCBFeHRlcm5hbCBEaWdpdGFsIE1vbml0b3IoMzAxKSwgaWR4IzEsIHBvcnQjMCwg aGVhZCAjMApmb3VuZCBFeHRlcm5hbCBEaWdpdGFsIE1vbml0b3IoMzAyKSwgaWR4IzIsIHBvcnQj MCwgaGVhZCAjMAphZ3AwOiA8SW50ZWwgR000NSBTVkdBIGNvbnRyb2xsZXI+IG9uIHZnYXBjaTAK YWdwMDogYXBlcnR1cmUgc2l6ZSBpcyAyNTZNLCBkZXRlY3RlZCAzMjc2NGsgc3RvbGVuIG1lbW9y eQpkcm0wOiA8TW9iaWxlIEludGVsXE0tQlxNLS4gR000NSBFeHByZXNzIENoaXBzZXQ+IG9uIHZn YXBjaTAKdmdhcGNpMDogYXR0ZW1wdGluZyB0byBhbGxvY2F0ZSAxIE1TSSB2ZWN0b3JzICgxIHN1 cHBvcnRlZCkKbXNpOiByb3V0aW5nIE1TSSBJUlEgMjU2IHRvIGxvY2FsIEFQSUMgMCB2ZWN0b3Ig NTAKdmdhcGNpMDogdXNpbmcgSVJRIDI1NiBmb3IgTVNJCmluZm86IFtkcm1dIE1TSSBlbmFibGVk IDEgbWVzc2FnZShzKQp2Z2FwY2kwOiBjaGlsZCBkcm0wIHJlcXVlc3RlZCBwY2lfZW5hYmxlX2J1 c21hc3RlcgppbmZvOiBbZHJtXSBBR1AgYXQgMHhkMDAwMDAwMCAyNTZNQgppbmZvOiBbZHJtXSBJ bml0aWFsaXplZCBpOTE1IDEuNi4wIDIwMDgwNzMwCnZnYXBjaTE6IDxWR0EtY29tcGF0aWJsZSBk aXNwbGF5PiBtZW0gMHhmODQwMDAwMC0weGY4NGZmZmZmIGF0IGRldmljZSAyLjEgb24gcGNpMAp1 aGNpMDogPEludGVsIDgyODAxSSAoSUNIOSkgVVNCIGNvbnRyb2xsZXI+IHBvcnQgMHgxODIwLTB4 MTgzZiBpcnEgMTYgYXQgZGV2aWNlIDI2LjAgb24gcGNpMAppb2FwaWMwOiByb3V0aW5nIGludHBp biAxNiAoUENJIElSUSAxNikgdG8gbGFwaWMgMCB2ZWN0b3IgNTEKdWhjaTA6IFtNUFNBRkVdCnVo Y2kwOiBbSVRIUkVBRF0KdXNidXMwOiA8SW50ZWwgODI4MDFJIChJQ0g5KSBVU0IgY29udHJvbGxl cj4gb24gdWhjaTAKdWhjaTE6IDxJbnRlbCA4MjgwMUkgKElDSDkpIFVTQiBjb250cm9sbGVyPiBw b3J0IDB4MTg0MC0weDE4NWYgaXJxIDIxIGF0IGRldmljZSAyNi4xIG9uIHBjaTAKaW9hcGljMDog cm91dGluZyBpbnRwaW4gMjEgKFBDSSBJUlEgMjEpIHRvIGxhcGljIDAgdmVjdG9yIDUyCnVoY2kx OiBbTVBTQUZFXQp1aGNpMTogW0lUSFJFQURdCnVzYnVzMTogPEludGVsIDgyODAxSSAoSUNIOSkg VVNCIGNvbnRyb2xsZXI+IG9uIHVoY2kxCnVoY2kyOiA8SW50ZWwgODI4MDFJIChJQ0g5KSBVU0Ig Y29udHJvbGxlcj4gcG9ydCAweDE4NjAtMHgxODdmIGlycSAxOSBhdCBkZXZpY2UgMjYuMiBvbiBw Y2kwCmlvYXBpYzA6IHJvdXRpbmcgaW50cGluIDE5IChQQ0kgSVJRIDE5KSB0byBsYXBpYyAwIHZl Y3RvciA1Mwp1aGNpMjogW01QU0FGRV0KdWhjaTI6IFtJVEhSRUFEXQp1c2J1czI6IDxJbnRlbCA4 MjgwMUkgKElDSDkpIFVTQiBjb250cm9sbGVyPiBvbiB1aGNpMgplaGNpMDogPEludGVsIDgyODAx SSAoSUNIOSkgVVNCIDIuMCBjb250cm9sbGVyPiBtZW0gMHhmODgwNDgwMC0weGY4ODA0YmZmIGly cSAxOSBhdCBkZXZpY2UgMjYuNyBvbiBwY2kwCmVoY2kwOiBbTVBTQUZFXQplaGNpMDogW0lUSFJF QURdCnVzYnVzMzogRUhDSSB2ZXJzaW9uIDEuMAp1c2J1czM6IDxJbnRlbCA4MjgwMUkgKElDSDkp IFVTQiAyLjAgY29udHJvbGxlcj4gb24gZWhjaTAKaGRhYzA6IDxJbnRlbCA4MjgwMUkgSGlnaCBE ZWZpbml0aW9uIEF1ZGlvIENvbnRyb2xsZXI+IG1lbSAweGY4NjAwMDAwLTB4Zjg2MDNmZmYgaXJx IDIyIGF0IGRldmljZSAyNy4wIG9uIHBjaTAKaGRhYzA6IEhEQSBEcml2ZXIgUmV2aXNpb246IDIw MTAwMjI2XzAxNDIKaGRhYzA6IGF0dGVtcHRpbmcgdG8gYWxsb2NhdGUgMSBNU0kgdmVjdG9ycyAo MSBzdXBwb3J0ZWQpCm1zaTogcm91dGluZyBNU0kgSVJRIDI1NyB0byBsb2NhbCBBUElDIDAgdmVj dG9yIDU0CmhkYWMwOiB1c2luZyBJUlEgMjU3IGZvciBNU0kKaGRhYzA6IFtNUFNBRkVdCmhkYWMw OiBbSVRIUkVBRF0KaGRhYzA6IENhcHM6IE9TUyA0LCBJU1MgNCwgQlNTIDAsIE5TRE8gMSwgNjRi aXQsIENPUkIgMjU2LCBSSVJCIDI1NgpwY2liMTogPEFDUEkgUENJLVBDSSBicmlkZ2U+IGlycSAx NyBhdCBkZXZpY2UgMjguMCBvbiBwY2kwCnBjaWIxOiAgIGRvbWFpbiAgICAgICAgICAgIDAKcGNp YjE6ICAgc2Vjb25kYXJ5IGJ1cyAgICAgMgpwY2liMTogICBzdWJvcmRpbmF0ZSBidXMgICAzCnBj aWIxOiAgIEkvTyBkZWNvZGUgICAgICAgIDB4MjAwMC0weDJmZmYKcGNpYjE6ICAgbWVtb3J5IGRl Y29kZSAgICAgMHhmNDAwMDAwMC0weGY1ZmZmZmZmCnBjaWIxOiAgIHByZWZldGNoZWQgZGVjb2Rl IDB4ZjAwMDAwMDAtMHhmMWZmZmZmZgpwY2kyOiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liMQpwY2ky OiBkb21haW49MCwgcGh5c2ljYWwgYnVzPTIKcGNpYjI6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBp cnEgMTYgYXQgZGV2aWNlIDI4LjEgb24gcGNpMApwY2liMjogICBkb21haW4gICAgICAgICAgICAw CnBjaWIyOiAgIHNlY29uZGFyeSBidXMgICAgIDQKcGNpYjI6ICAgc3Vib3JkaW5hdGUgYnVzICAg NQpwY2liMjogICBJL08gZGVjb2RlICAgICAgICAweDMwMDAtMHgzZmZmCnBjaWIyOiAgIG1lbW9y eSBkZWNvZGUgICAgIDB4ZjYwMDAwMDAtMHhmN2ZmZmZmZgpwY2liMjogICBwcmVmZXRjaGVkIGRl Y29kZSAweGYyMDAwMDAwLTB4ZjNmZmZmZmYKcGNpNDogPEFDUEkgUENJIGJ1cz4gb24gcGNpYjIK cGNpNDogZG9tYWluPTAsIHBoeXNpY2FsIGJ1cz00CmZvdW5kLT4JdmVuZG9yPTB4ODA4NiwgZGV2 PTB4NDIzNSwgcmV2aWQ9MHgwMAoJZG9tYWluPTAsIGJ1cz00LCBzbG90PTAsIGZ1bmM9MAoJY2xh c3M9MDItODAtMDAsIGhkcnR5cGU9MHgwMCwgbWZkZXY9MAoJY21kcmVnPTB4MDEwNiwgc3RhdHJl Zz0weDAwMTAsIGNhY2hlbG5zej0xNiAoZHdvcmRzKQoJbGF0dGltZXI9MHgwMCAoMCBucyksIG1p bmdudD0weDAwICgwIG5zKSwgbWF4bGF0PTB4MDAgKDAgbnMpCglpbnRwaW49YSwgaXJxPTExCglw b3dlcnNwZWMgMyAgc3VwcG9ydHMgRDAgRDMgIGN1cnJlbnQgRDAKCU1TSSBzdXBwb3J0cyAxIG1l c3NhZ2UsIDY0IGJpdAoJbWFwWzEwXTogdHlwZSBNZW1vcnksIHJhbmdlIDY0LCBiYXNlIDB4ZjYw MDAwMDAsIHNpemUgMTMsIGVuYWJsZWQKcGNpYjI6IHJlcXVlc3RlZCBtZW1vcnkgcmFuZ2UgMHhm NjAwMDAwMC0weGY2MDAxZmZmOiBnb29kCnBjaWIyOiBtYXRjaGVkIGVudHJ5IGZvciA0LjAuSU5U QQpwY2liMjogc2xvdCAwIElOVEEgaGFyZHdpcmVkIHRvIElSUSAxNwppd24wOiA8SW50ZWwoUikg UFJPL1dpcmVsZXNzIDUzMDA+IG1lbSAweGY2MDAwMDAwLTB4ZjYwMDFmZmYgaXJxIDE3IGF0IGRl dmljZSAwLjAgb24gcGNpNAppd24wOiBhdHRlbXB0aW5nIHRvIGFsbG9jYXRlIDEgTVNJIHZlY3Rv cnMgKDEgc3VwcG9ydGVkKQptc2k6IHJvdXRpbmcgTVNJIElSUSAyNTggdG8gbG9jYWwgQVBJQyAw IHZlY3RvciA1NQppd24wOiB1c2luZyBJUlEgMjU4IGZvciBNU0kKaXduMDogTUlNTyAzVDNSLCBN b1csIGFkZHJlc3MgMDA6MjE6NmE6Nzc6Y2Q6OTIKaXduMDogW01QU0FGRV0KaXduMDogW0lUSFJF QURdCml3bjA6IDExYSByYXRlczogNk1icHMgOU1icHMgMTJNYnBzIDE4TWJwcyAyNE1icHMgMzZN YnBzIDQ4TWJwcyA1NE1icHMKaXduMDogMTFiIHJhdGVzOiAxTWJwcyAyTWJwcyA1LjVNYnBzIDEx TWJwcwppd24wOiAxMWcgcmF0ZXM6IDFNYnBzIDJNYnBzIDUuNU1icHMgMTFNYnBzIDZNYnBzIDlN YnBzIDEyTWJwcyAxOE1icHMgMjRNYnBzIDM2TWJwcyA0OE1icHMgNTRNYnBzCnBjaWIzOiA8QUNQ SSBQQ0ktUENJIGJyaWRnZT4gaXJxIDE2IGF0IGRldmljZSAyOC41IG9uIHBjaTAKcGNpYjM6ICAg ZG9tYWluICAgICAgICAgICAgMApwY2liMzogICBzZWNvbmRhcnkgYnVzICAgICA2CnBjaWIzOiAg IHN1Ym9yZGluYXRlIGJ1cyAgIDYKcGNpYjM6ICAgSS9PIGRlY29kZSAgICAgICAgMHhmMDAwLTB4 ZmZmCnBjaWIzOiAgIG1lbW9yeSBkZWNvZGUgICAgIDB4Zjg1MDAwMDAtMHhmODVmZmZmZgpwY2li MzogICBubyBwcmVmZXRjaGVkIGRlY29kZQpwY2k2OiA8QUNQSSBQQ0kgYnVzPiBvbiBwY2liMwpw Y2k2OiBkb21haW49MCwgcGh5c2ljYWwgYnVzPTYKZm91bmQtPgl2ZW5kb3I9MHgxNGU0LCBkZXY9 MHgxNjk4LCByZXZpZD0weDEwCglkb21haW49MCwgYnVzPTYsIHNsb3Q9MCwgZnVuYz0wCgljbGFz cz0wMi0wMC0wMCwgaGRydHlwZT0weDAwLCBtZmRldj0wCgljbWRyZWc9MHgwMTA2LCBzdGF0cmVn PTB4MDAxMCwgY2FjaGVsbnN6PTE2IChkd29yZHMpCglsYXR0aW1lcj0weDAwICgwIG5zKSwgbWlu Z250PTB4MDAgKDAgbnMpLCBtYXhsYXQ9MHgwMCAoMCBucykKCWludHBpbj1hLCBpcnE9MTEKCXBv d2Vyc3BlYyAzICBzdXBwb3J0cyBEMCBEMyAgY3VycmVudCBEMAoJTVNJIHN1cHBvcnRzIDEgbWVz c2FnZSwgNjQgYml0CgltYXBbMTBdOiB0eXBlIE1lbW9yeSwgcmFuZ2UgNjQsIGJhc2UgMHhmODUw MDAwMCwgc2l6ZSAxNiwgZW5hYmxlZApwY2liMzogcmVxdWVzdGVkIG1lbW9yeSByYW5nZSAweGY4 NTAwMDAwLTB4Zjg1MGZmZmY6IGdvb2QKcGNpYjM6IG1hdGNoZWQgZW50cnkgZm9yIDYuMC5JTlRB CnBjaWIzOiBzbG90IDAgSU5UQSBoYXJkd2lyZWQgdG8gSVJRIDE3CmJnZTA6IDxCcm9hZGNvbSBO ZXRMaW5rIEdpZ2FiaXQgRXRoZXJuZXQgQ29udHJvbGxlciAgICAsIEFTSUMgcmV2LiAweDU3ODQx MDA+IG1lbSAweGY4NTAwMDAwLTB4Zjg1MGZmZmYgaXJxIDE3IGF0IGRldmljZSAwLjAgb24gcGNp NgpiZ2UwOiBhdHRlbXB0aW5nIHRvIGFsbG9jYXRlIDEgTVNJIHZlY3RvcnMgKDEgc3VwcG9ydGVk KQptc2k6IHJvdXRpbmcgTVNJIElSUSAyNTkgdG8gbG9jYWwgQVBJQyAwIHZlY3RvciA1NgpiZ2Uw OiB1c2luZyBJUlEgMjU5IGZvciBNU0kKYmdlMDogQ0hJUCBJRCAweDA1Nzg0MTAwOyBBU0lDIFJF ViAweDU3ODQ7IENISVAgUkVWIDB4NTc4NDE7IFBDSS1FCmJnZTA6IERpc2FibGluZyBmYXN0Ym9v dApiZ2UwOiBEaXNhYmxpbmcgZmFzdGJvb3QKbWlpYnVzMDogPE1JSSBidXM+IG9uIGJnZTAKYnJn cGh5MDogPEJDTTU3ODQgMTAvMTAwLzEwMDBiYXNlVFggUEhZPiBQSFkgMSBvbiBtaWlidXMwCmJy Z3BoeTA6IE9VSSAweDAwNTBlZiwgbW9kZWwgMHgwMDNhLCByZXYuIDQKYnJncGh5MDogIDEwYmFz ZVQsIDEwYmFzZVQtRkRYLCAxMDBiYXNlVFgsIDEwMGJhc2VUWC1GRFgsIDEwMDBiYXNlVCwgMTAw MGJhc2VULUZEWCwgYXV0bwpiZ2UwOiBicGYgYXR0YWNoZWQKYmdlMDogRXRoZXJuZXQgYWRkcmVz czogMDA6MjI6MTk6ZTU6Y2E6NTEKYmdlMDogW01QU0FGRV0KYmdlMDogW0ZJTFRFUl0KdWhjaTM6 IDxJbnRlbCA4MjgwMUkgKElDSDkpIFVTQiBjb250cm9sbGVyPiBwb3J0IDB4MTg4MC0weDE4OWYg aXJxIDIzIGF0IGRldmljZSAyOS4wIG9uIHBjaTAKaW9hcGljMDogcm91dGluZyBpbnRwaW4gMjMg KFBDSSBJUlEgMjMpIHRvIGxhcGljIDAgdmVjdG9yIDU3CnVoY2kzOiBbTVBTQUZFXQp1aGNpMzog W0lUSFJFQURdCnVzYnVzNDogPEludGVsIDgyODAxSSAoSUNIOSkgVVNCIGNvbnRyb2xsZXI+IG9u IHVoY2kzCnVoY2k0OiA8SW50ZWwgODI4MDFJIChJQ0g5KSBVU0IgY29udHJvbGxlcj4gcG9ydCAw eDE4YTAtMHgxOGJmIGlycSAxOSBhdCBkZXZpY2UgMjkuMSBvbiBwY2kwCnVoY2k0OiBbTVBTQUZF XQp1aGNpNDogW0lUSFJFQURdCnVzYnVzNTogPEludGVsIDgyODAxSSAoSUNIOSkgVVNCIGNvbnRy b2xsZXI+IG9uIHVoY2k0CnVoY2k1OiA8SW50ZWwgODI4MDFJIChJQ0g5KSBVU0IgY29udHJvbGxl cj4gcG9ydCAweDE4YzAtMHgxOGRmIGlycSAxOCBhdCBkZXZpY2UgMjkuMiBvbiBwY2kwCmlvYXBp YzA6IHJvdXRpbmcgaW50cGluIDE4IChQQ0kgSVJRIDE4KSB0byBsYXBpYyAwIHZlY3RvciA1OAp1 aGNpNTogW01QU0FGRV0KdWhjaTU6IFtJVEhSRUFEXQp1c2J1czY6IDxJbnRlbCA4MjgwMUkgKElD SDkpIFVTQiBjb250cm9sbGVyPiBvbiB1aGNpNQplaGNpMTogPEludGVsIDgyODAxSSAoSUNIOSkg VVNCIDIuMCBjb250cm9sbGVyPiBtZW0gMHhmODgwNGMwMC0weGY4ODA0ZmZmIGlycSAyMyBhdCBk ZXZpY2UgMjkuNyBvbiBwY2kwCmVoY2kxOiBbTVBTQUZFXQplaGNpMTogW0lUSFJFQURdCnVzYnVz NzogRUhDSSB2ZXJzaW9uIDEuMAp1c2J1czc6IDxJbnRlbCA4MjgwMUkgKElDSDkpIFVTQiAyLjAg Y29udHJvbGxlcj4gb24gZWhjaTEKcGNpYjQ6IDxBQ1BJIFBDSS1QQ0kgYnJpZGdlPiBhdCBkZXZp Y2UgMzAuMCBvbiBwY2kwCnBjaWI0OiAgIGRvbWFpbiAgICAgICAgICAgIDAKcGNpYjQ6ICAgc2Vj b25kYXJ5IGJ1cyAgICAgNwpwY2liNDogICBzdWJvcmRpbmF0ZSBidXMgICA3CnBjaWI0OiAgIEkv TyBkZWNvZGUgICAgICAgIDB4ZjAwMC0weGZmZgpwY2liNDogICBubyBwcmVmZXRjaGVkIGRlY29k ZQpwY2liNDogICBTdWJ0cmFjdGl2ZWx5IGRlY29kZWQgYnJpZGdlLgpwY2liNDogY291bGQgbm90 IGdldCBQQ0kgaW50ZXJydXB0IHJvdXRpbmcgdGFibGUgZm9yIFxcX1NCXy5QQ0kwLlAwUDEgLSBB RV9OT1RfRk9VTkQKcGNpNzogPEFDUEkgUENJIGJ1cz4gb24gcGNpYjQKcGNpNzogZG9tYWluPTAs IHBoeXNpY2FsIGJ1cz03CmlzYWIwOiA8UENJLUlTQSBicmlkZ2U+IGF0IGRldmljZSAzMS4wIG9u IHBjaTAKaXNhMDogPElTQSBidXM+IG9uIGlzYWIwCmF0YXBjaTA6IDxJbnRlbCAoSUQ9MjkyOTgw ODYpIEFIQ0kgY29udHJvbGxlcj4gcG9ydCAweDE4MTgtMHgxODFmLDB4MTgwYy0weDE4MGYsMHgx ODEwLTB4MTgxNywweDE4MDgtMHgxODBiLDB4MThlMC0weDE4ZmYgbWVtIDB4Zjg4MDQwMDAtMHhm ODgwNDdmZiBpcnEgMTkgYXQgZGV2aWNlIDMxLjIgb24gcGNpMAphdGFwY2kwOiBbTVBTQUZFXQph dGFwY2kwOiBbSVRIUkVBRF0KYXRhcGNpMDogQUhDSSB2MS4yMCBjb250cm9sbGVyIHdpdGggNCAz R2JwcyBwb3J0cywgUE0gc3VwcG9ydGVkCmF0YXBjaTA6IENhcHM6IDY0Yml0IE5DUSBTTlRGIEFM UCBBTCBDTE8gM0dicHMgUE0gUE1EIFNTQyBQU0MgMzJjbWQgQ0NDIGVTQVRBIDRwb3J0cwphdGEy OiA8QVRBIGNoYW5uZWwgMD4gb24gYXRhcGNpMAphdGEyOiBbTVBTQUZFXQphdGEyOiBbSVRIUkVB RF0KYXRhMzogPEFUQSBjaGFubmVsIDE+IG9uIGF0YXBjaTAKYXRhMzogW01QU0FGRV0KYXRhMzog W0lUSFJFQURdCnBjaTA6IDxzZXJpYWwgYnVzLCBTTUJ1cz4gYXQgZGV2aWNlIDMxLjMgKG5vIGRy aXZlciBhdHRhY2hlZCkKYWNwaV9idXR0b24wOiA8UG93ZXIgQnV0dG9uPiBvbiBhY3BpMAphY3Bp X2J1dHRvbjE6IDxTbGVlcCBCdXR0b24+IG9uIGFjcGkwCmFjcGlfbGlkMDogPENvbnRyb2wgTWV0 aG9kIExpZCBTd2l0Y2g+IG9uIGFjcGkwCmFjcGlfbGlkMDogZW5hYmxlIHdha2UgZmFpbGVkCmFj cGlfYWNhZDA6IDxBQyBBZGFwdGVyPiBvbiBhY3BpMApiYXR0ZXJ5MDogPEFDUEkgQ29udHJvbCBN ZXRob2QgQmF0dGVyeT4gb24gYWNwaTAKYWNwaV90ejA6IDxUaGVybWFsIFpvbmU+IG9uIGFjcGkw CmFjcGlfdHoxOiA8VGhlcm1hbCBab25lPiBvbiBhY3BpMAphY3BpX3R6MjogPFRoZXJtYWwgWm9u ZT4gb24gYWNwaTAKYXRydGMwOiA8QVQgcmVhbHRpbWUgY2xvY2s+IHBvcnQgMHg3MC0weDc3IGly cSA4IG9uIGFjcGkwCmF0cnRjMDogV2FybmluZzogQ291bGRuJ3QgbWFwIEkvTy4KaW9hcGljMDog cm91dGluZyBpbnRwaW4gOCAoSVNBIElSUSA4KSB0byBsYXBpYyAwIHZlY3RvciA1OQphdHJ0YzA6 IFtNUFNBRkVdCmF0cnRjMDogW0ZJTFRFUl0KYXRydGMwOiByZWdpc3RlcmVkIGFzIGEgdGltZS1v Zi1kYXkgY2xvY2sgKHJlc29sdXRpb24gMTAwMDAwMHVzKQphdHRpbWVyMDogPEFUIHRpbWVyPiBw b3J0IDB4NDAtMHg0MywweDUwLTB4NTMgaXJxIDAgb24gYWNwaTAKVGltZWNvdW50ZXIgImk4MjU0 IiBmcmVxdWVuY3kgMTE5MzE4MiBIeiBxdWFsaXR5IDAKYXR0aW1lcjA6IFtNUFNBRkVdCmF0dGlt ZXIwOiBbRklMVEVSXQppb2FwaWMwOiByb3V0aW5nIGludHBpbiAyIChJU0EgSVJRIDApIHRvIGxh cGljIDAgdmVjdG9yIDYwCkV2ZW50IHRpbWVyICJpODI1NCIgZnJlcXVlbmN5IDExOTMxODIgSHog cXVhbGl0eSAxMDAKYXRrYmRjMDogPEtleWJvYXJkIGNvbnRyb2xsZXIgKGk4MDQyKT4gcG9ydCAw eDYwLDB4NjQgaXJxIDEgb24gYWNwaTAKYXRrYmQwOiA8QVQgS2V5Ym9hcmQ+IGlycSAxIG9uIGF0 a2JkYzAKYXRrYmQ6IHRoZSBjdXJyZW50IGtiZCBjb250cm9sbGVyIGNvbW1hbmQgYnl0ZSAwMDQ3 CmF0a2JkOiBrZXlib2FyZCBJRCAweDQxYWIgKDIpCmtiZDAgYXQgYXRrYmQwCmtiZDA6IGF0a2Jk MCwgQVQgMTAxLzEwMiAoMiksIGNvbmZpZzoweDAsIGZsYWdzOjB4M2QwMDAwCmlvYXBpYzA6IHJv dXRpbmcgaW50cGluIDEgKElTQSBJUlEgMSkgdG8gbGFwaWMgMCB2ZWN0b3IgNjEKYXRrYmQwOiBb R0lBTlQtTE9DS0VEXQphdGtiZDA6IFtJVEhSRUFEXQpwc20wOiB1bmFibGUgdG8gYWxsb2NhdGUg SVJRCnBzbWNwbnAwOiA8UFMvMiBtb3VzZSBwb3J0PiBpcnEgMTIgb24gYWNwaTAKcHNtMDogY3Vy cmVudCBjb21tYW5kIGJ5dGU6MDA0Nwpwc20wOiA8UFMvMiBNb3VzZT4gaXJxIDEyIG9uIGF0a2Jk YzAKaW9hcGljMDogcm91dGluZyBpbnRwaW4gMTIgKElTQSBJUlEgMTIpIHRvIGxhcGljIDAgdmVj dG9yIDYyCnBzbTA6IFtHSUFOVC1MT0NLRURdCnBzbTA6IFtJVEhSRUFEXQpwc20wOiBtb2RlbCBT eW5hcHRpY3MgVG91Y2hwYWQsIGRldmljZSBJRCAwLTAwLCAzIGJ1dHRvbnMKcHNtMDogY29uZmln OjAwMDA2MDAwLCBmbGFnczowMDAwMDAwOCwgcGFja2V0IHNpemU6Ngpwc20wOiBzeW5jbWFzazpj MCwgc3luY2JpdHM6MDAKYWNwaTA6IHdha2V1cCBjb2RlIHZhIDB4ZmZmZmZmODA3NGRlODAwMCBw YSAweDQwMDAKaXNhX3Byb2JlX2NoaWxkcmVuOiBkaXNhYmxpbmcgUG5QIGRldmljZXMKYXRrYmRj OiBhdGtiZGMwIGFscmVhZHkgZXhpc3RzOyBza2lwcGluZyBpdAphdHJ0YzogYXRydGMwIGFscmVh ZHkgZXhpc3RzOyBza2lwcGluZyBpdApzYzogc2MwIGFscmVhZHkgZXhpc3RzOyBza2lwcGluZyBp dAppc2FfcHJvYmVfY2hpbGRyZW46IHByb2Jpbmcgbm9uLVBuUCBkZXZpY2VzCnNjMDogPFN5c3Rl bSBjb25zb2xlPiBhdCBmbGFncyAweDEwMCBvbiBpc2EwCnNjMDogVkdBIDwxNiB2aXJ0dWFsIGNv bnNvbGVzLCBmbGFncz0weDMwMD4Kc2MwOiBmYjAsIGtiZDEsIHRlcm1pbmFsIGVtdWxhdG9yOiBz Y3Rla2VuICh0ZWtlbiB0ZXJtaW5hbCkKdmdhMDogPEdlbmVyaWMgSVNBIFZHQT4gYXQgcG9ydCAw eDNjMC0weDNkZiBpb21lbSAweGEwMDAwLTB4YmZmZmYgb24gaXNhMApmZGMwIGZhaWxlZCB0byBw cm9iZSBhdCBwb3J0IDB4M2YwIGlycSA2IGRycSAyIG9uIGlzYTAKcHBjMCBmYWlsZWQgdG8gcHJv YmUgYXQgaXJxIDcgb24gaXNhMAp1YXJ0MCBmYWlsZWQgdG8gcHJvYmUgYXQgcG9ydCAweDNmOCBp cnEgNCBvbiBpc2EwCnVhcnQxIGZhaWxlZCB0byBwcm9iZSBhdCBwb3J0IDB4MmY4IGlycSAzIG9u IGlzYTAKaXNhX3Byb2JlX2NoaWxkcmVuOiBwcm9iaW5nIFBuUCBkZXZpY2VzCmVzdDA6IDxFbmhh bmNlZCBTcGVlZFN0ZXAgRnJlcXVlbmN5IENvbnRyb2w+IG9uIGNwdTAKZXN0MTogPEVuaGFuY2Vk IFNwZWVkU3RlcCBGcmVxdWVuY3kgQ29udHJvbD4gb24gY3B1MQpEZXZpY2UgY29uZmlndXJhdGlv biBmaW5pc2hlZC4KUmVkdWNpbmcga2Vybi5tYXh2bm9kZXMgMjU1MjU4IC0+IDEwMDAwMApwcm9j ZnMgcmVnaXN0ZXJlZApUaW1lY291bnRlciAiVFNDIiBmcmVxdWVuY3kgMTQwMDA3OTExNCBIeiBx dWFsaXR5IC0xMDAKU3RhcnRpbmcga2VybmVsIGV2ZW50IHRpbWVyczogSFBFVCBAIDEwMEh6LCBI UEVUMSBAIDEyOEh6ClRpbWVjb3VudGVycyB0aWNrIGV2ZXJ5IDEwLjAwMCBtc2VjCnZsYW46IGlu aXRpYWxpemVkLCB1c2luZyBoYXNoIHRhYmxlcyB3aXRoIGNoYWluaW5nCmlwZncyICgraXB2Nikg aW5pdGlhbGl6ZWQsIGRpdmVydCBlbmFibGVkLCBuYXQgZW5hYmxlZCwgcnVsZS1iYXNlZCBmb3J3 YXJkaW5nIGVuYWJsZWQsIGRlZmF1bHQgdG8gYWNjZXB0LCBsb2dnaW5nIGRpc2FibGVkCmlwZncw OiBicGYgYXR0YWNoZWQKRFVNTVlORVQgMHhmZmZmZmYwMDAxMzljMWMwIHdpdGggSVB2NiBpbml0 aWFsaXplZCAoMTAwNDA5KQpsb2FkX2RuX3NjaGVkIGRuX3NjaGVkIFFGUSBsb2FkZWQKbG9hZF9k bl9zY2hlZCBkbl9zY2hlZCBSUiBsb2FkZWQKbG9hZF9kbl9zY2hlZCBkbl9zY2hlZCBXRjJRKyBs b2FkZWQKbG8wOiBicGYgYXR0YWNoZWQKbG9hZF9kbl9zY2hlZCBkbl9zY2hlZCBGSUZPIGxvYWRl ZApsb2FkX2RuX3NjaGVkIGRuX3NjaGVkIFBSSU8gbG9hZGVkCmhkYWMwOiBQcm9iaW5nIGNvZGVj ICMwLi4uCmhkYWMwOiBIREEgQ29kZWMgIzA6IElEVCA5MkhENzNDMQpoZGFjMDogIEhEQSBDb2Rl YyBJRDogMHgxMTFkNzY3NQpoZGFjMDogICAgICAgIFZlbmRvcjogMHgxMTFkCmhkYWMwOiAgICAg ICAgRGV2aWNlOiAweDc2NzUKaGRhYzA6ICAgICAgUmV2aXNpb246IDB4MDIKaGRhYzA6ICAgICAg U3RlcHBpbmc6IDB4MDIKaGRhYzA6IFBDSSBTdWJ2ZW5kb3I6IDB4MDJiOTEwMjgKaGRhYzA6IAlG b3VuZCBhdWRpbyBGRyBuaWQ9MSBzdGFydG5vZGU9MTAgZW5kbm9kZT00NCB0b3RhbD0zNApoZGFj MDogUHJvYmluZyBjb2RlYyAjMS4uLgpoZGFjMDogSERBIENvZGVjICMxOiBJbnRlbCBHNDUgSERN SQpoZGFjMDogIEhEQSBDb2RlYyBJRDogMHg4MDg2MjgwMgpoZGFjMDogICAgICAgIFZlbmRvcjog MHg4MDg2CmhkYWMwOiAgICAgICAgRGV2aWNlOiAweDI4MDIKaGRhYzA6ICAgICAgUmV2aXNpb246 IDB4MDAKaGRhYzA6ICAgICAgU3RlcHBpbmc6IDB4MDAKaGRhYzA6IFBDSSBTdWJ2ZW5kb3I6IDB4 MDJiOTEwMjgKaGRhYzA6IAlGb3VuZCBhdWRpbyBGRyBuaWQ9MSBzdGFydG5vZGU9MiBlbmRub2Rl PTQgdG90YWw9MgpoZGFjMDogCmhkYWMwOiBQcm9jZXNzaW5nIGF1ZGlvIEZHIGNhZD0wIG5pZD0x Li4uCmhkYWMwOiBHUElPOiAweGMwMDAwMDA4IE51bUdQSU89OCBOdW1HUE89MCBOdW1HUEk9MCBH UElXYWtlPTEgR1BJVW5zb2w9MQpoZGFjMDogIG5pZCAxMCAweDA0MjExMDFmIGFzICAxIHNlcSAx NSAgICBIZWFkcGhvbmVzICBKYWNrIGphY2sgIDEgbG9jICA0IGNvbG9yICAgQmxhY2sgbWlzYyAw CmhkYWMwOiAgbmlkIDExIDB4NDAwMDAxZjEgYXMgMTUgc2VxICAxICAgICAgTGluZS1vdXQgIE5v bmUgamFjayAgMCBsb2MgIDAgY29sb3IgVW5rbm93biBtaXNjIDEKaGRhYzA6ICBuaWQgMTIgMHg0 MDAwMDFmMiBhcyAxNSBzZXEgIDIgICAgICBMaW5lLW91dCAgTm9uZSBqYWNrICAwIGxvYyAgMCBj b2xvciBVbmtub3duIG1pc2MgMQpoZGFjMDogIG5pZCAxMyAweDkwMTcwMTEwIGFzICAxIHNlcSAg MCAgICAgICBTcGVha2VyIEZpeGVkIGphY2sgIDcgbG9jIDE2IGNvbG9yIFVua25vd24gbWlzYyAx CmhkYWMwOiAgbmlkIDE0IDB4NDAwMDAxZjMgYXMgMTUgc2VxICAzICAgICAgTGluZS1vdXQgIE5v bmUgamFjayAgMCBsb2MgIDAgY29sb3IgVW5rbm93biBtaXNjIDEKaGRhYzA6ICBuaWQgMTUgMHg0 MDAwMDFmMCBhcyAxNSBzZXEgIDAgICAgICBMaW5lLW91dCAgTm9uZSBqYWNrICAwIGxvYyAgMCBj b2xvciBVbmtub3duIG1pc2MgMQpoZGFjMDogIG5pZCAxNiAweDQwMDAwMWY0IGFzIDE1IHNlcSAg NCAgICAgIExpbmUtb3V0ICBOb25lIGphY2sgIDAgbG9jICAwIGNvbG9yIFVua25vd24gbWlzYyAx CmhkYWMwOiAgbmlkIDE3IDB4NDAwMDAxZjUgYXMgMTUgc2VxICA1ICAgICAgTGluZS1vdXQgIE5v bmUgamFjayAgMCBsb2MgIDAgY29sb3IgVW5rbm93biBtaXNjIDEKaGRhYzA6ICBuaWQgMTggMHg0 MDAwMDFmNiBhcyAxNSBzZXEgIDYgICAgICBMaW5lLW91dCAgTm9uZSBqYWNrICAwIGxvYyAgMCBj b2xvciBVbmtub3duIG1pc2MgMQpoZGFjMDogIG5pZCAxOSAweDkwYTYwMTYwIGFzICA2IHNlcSAg MCAgICAgICAgICAgTWljIEZpeGVkIGphY2sgIDYgbG9jIDE2IGNvbG9yIFVua25vd24gbWlzYyAx CmhkYWMwOiAgbmlkIDIwIDB4NDAwMDAxZjcgYXMgMTUgc2VxICA3ICAgICAgTGluZS1vdXQgIE5v bmUgamFjayAgMCBsb2MgIDAgY29sb3IgVW5rbm93biBtaXNjIDEKaGRhYzA6ICBuaWQgMzQgMHg0 MDAwMDFmOCBhcyAxNSBzZXEgIDggICAgICBMaW5lLW91dCAgTm9uZSBqYWNrICAwIGxvYyAgMCBj b2xvciBVbmtub3duIG1pc2MgMQpoZGFjMDogIG5pZCAzNSAweDQwMDAwMWY5IGFzIDE1IHNlcSAg OSAgICAgIExpbmUtb3V0ICBOb25lIGphY2sgIDAgbG9jICAwIGNvbG9yIFVua25vd24gbWlzYyAx CmhkYWMwOiAgbmlkIDM2IDB4NDAwMDAxZmEgYXMgMTUgc2VxIDEwICAgICAgTGluZS1vdXQgIE5v bmUgamFjayAgMCBsb2MgIDAgY29sb3IgVW5rbm93biBtaXNjIDEKaGRhYzA6IFBhdGNoZWQgcGlu cyBjb25maWd1cmF0aW9uOgpoZGFjMDogIG5pZCAxMCAweDA0MjExMDFmIGFzICAxIHNlcSAxNSAg ICBIZWFkcGhvbmVzICBKYWNrIGphY2sgIDEgbG9jICA0IGNvbG9yICAgQmxhY2sgbWlzYyAwCmhk YWMwOiAgbmlkIDExIDB4NDAwMDAxZjEgYXMgMTUgc2VxICAxICAgICAgTGluZS1vdXQgIE5vbmUg amFjayAgMCBsb2MgIDAgY29sb3IgVW5rbm93biBtaXNjIDEgW0RJU0FCTEVEXQpoZGFjMDogIG5p ZCAxMiAweDQwMDAwMWYyIGFzIDE1IHNlcSAgMiAgICAgIExpbmUtb3V0ICBOb25lIGphY2sgIDAg bG9jICAwIGNvbG9yIFVua25vd24gbWlzYyAxIFtESVNBQkxFRF0KaGRhYzA6ICBuaWQgMTMgMHg5 MDE3MDExMCBhcyAgMSBzZXEgIDAgICAgICAgU3BlYWtlciBGaXhlZCBqYWNrICA3IGxvYyAxNiBj b2xvciBVbmtub3duIG1pc2MgMQpoZGFjMDogIG5pZCAxNCAweDQwMDAwMWYzIGFzIDE1IHNlcSAg MyAgICAgIExpbmUtb3V0ICBOb25lIGphY2sgIDAgbG9jICAwIGNvbG9yIFVua25vd24gbWlzYyAx IFtESVNBQkxFRF0KaGRhYzA6ICBuaWQgMTUgMHg0MDAwMDFmMCBhcyAxNSBzZXEgIDAgICAgICBM aW5lLW91dCAgTm9uZSBqYWNrICAwIGxvYyAgMCBjb2xvciBVbmtub3duIG1pc2MgMSBbRElTQUJM RURdCmhkYWMwOiAgbmlkIDE2IDB4NDAwMDAxZjQgYXMgMTUgc2VxICA0ICAgICAgTGluZS1vdXQg IE5vbmUgamFjayAgMCBsb2MgIDAgY29sb3IgVW5rbm93biBtaXNjIDEgW0RJU0FCTEVEXQpoZGFj MDogIG5pZCAxNyAweDQwMDAwMWY1IGFzIDE1IHNlcSAgNSAgICAgIExpbmUtb3V0ICBOb25lIGph Y2sgIDAgbG9jICAwIGNvbG9yIFVua25vd24gbWlzYyAxIFtESVNBQkxFRF0KaGRhYzA6ICBuaWQg MTggMHg0MDAwMDFmNiBhcyAxNSBzZXEgIDYgICAgICBMaW5lLW91dCAgTm9uZSBqYWNrICAwIGxv YyAgMCBjb2xvciBVbmtub3duIG1pc2MgMSBbRElTQUJMRURdCmhkYWMwOiAgbmlkIDE5IDB4OTBh NjAxNjAgYXMgIDYgc2VxICAwICAgICAgICAgICBNaWMgRml4ZWQgamFjayAgNiBsb2MgMTYgY29s b3IgVW5rbm93biBtaXNjIDEKaGRhYzA6ICBuaWQgMjAgMHg0MDAwMDFmNyBhcyAxNSBzZXEgIDcg ICAgICBMaW5lLW91dCAgTm9uZSBqYWNrICAwIGxvYyAgMCBjb2xvciBVbmtub3duIG1pc2MgMSBb RElTQUJMRURdCmhkYWMwOiAgbmlkIDM0IDB4NDAwMDAxZjggYXMgMTUgc2VxICA4ICAgICAgTGlu ZS1vdXQgIE5vbmUgamFjayAgMCBsb2MgIDAgY29sb3IgVW5rbm93biBtaXNjIDEgW0RJU0FCTEVE XQpoZGFjMDogIG5pZCAzNSAweDQwMDAwMWY5IGFzIDE1IHNlcSAgOSAgICAgIExpbmUtb3V0ICBO b25lIGphY2sgIDAgbG9jICAwIGNvbG9yIFVua25vd24gbWlzYyAxIFtESVNBQkxFRF0KaGRhYzA6 ICBuaWQgMzYgMHg0MDAwMDFmYSBhcyAxNSBzZXEgMTAgICAgICBMaW5lLW91dCAgTm9uZSBqYWNr ICAwIGxvYyAgMCBjb2xvciBVbmtub3duIG1pc2MgMSBbRElTQUJMRURdCmhkYWMwOiAyIGFzc29j aWF0aW9ucyBmb3VuZDoKaGRhYzA6IEFzc29jaWF0aW9uIDAgKDEpIG91dDoKaGRhYzA6ICBQaW4g bmlkPTEzIHNlcT0wCmhkYWMwOiAgUGluIG5pZD0xMCBzZXE9MTUKaGRhYzA6IEFzc29jaWF0aW9u IDEgKDYpIGluOgpoZGFjMDogIFBpbiBuaWQ9MTkgc2VxPTAKaGRhYzA6IFRyYWNpbmcgYXNzb2Np YXRpb24gMCAoMSkKaGRhYzA6ICBQaW4gMTMgdHJhY2VkIHRvIERBQyAyMQpoZGFjMDogIFBpbiAx MCB0cmFjZWQgdG8gREFDIDIxIGFuZCBocHJlZGlyIDAKaGRhYzA6IEFzc29jaWF0aW9uIDAgKDEp IHRyYWNlIHN1Y2NlZWRlZApoZGFjMDogVHJhY2luZyBhc3NvY2lhdGlvbiAxICg2KQpoZGFjMDog IFBpbiAxOSB0cmFjZWQgdG8gQURDIDI2CmhkYWMwOiBBc3NvY2lhdGlvbiAxICg2KSB0cmFjZSBz dWNjZWVkZWQKaGRhYzA6IFRyYWNpbmcgaW5wdXQgbW9uaXRvcgpoZGFjMDogVHJhY2luZyBvdGhl ciBpbnB1dCBtb25pdG9ycwpoZGFjMDogIFRyYWNpbmcgbmlkIDE5IHRvIG91dApoZGFjMDogVHJh Y2luZyBiZWVwZXIKaGRhYzA6IEVuYWJsaW5nIGhlYWRwaG9uZS9zcGVha2VyIGF1ZGlvIHJvdXRp bmcgc3dpdGNoaW5nOgpoZGFjMDogCWFzPTAgc2Vuc2UgbmlkPTEwIFtVTlNPTF0KaGRhYzA6IFBp biBzZW5zZTogbmlkPTEwIHJlcz0weDdmZmZmZmZmCmhkYWMwOiBGRyBjb25maWcvcXVpcmtzOiBm b3JjZXN0ZXJlbyBpdnJlZjUwIGl2cmVmODAgaXZyZWYxMDAgaXZyZWYKaGRhYzA6IApoZGFjMDog Ky0tLS0tLS0tLS0tLS0tLS0tLS0rCmhkYWMwOiB8IERVTVBJTkcgSERBIE5PREVTIHwKaGRhYzA6 ICstLS0tLS0tLS0tLS0tLS0tLS0tKwpoZGFjMDogCmhkYWMwOiBEZWZhdWx0IFBhcmFtZXRlcgpo ZGFjMDogLS0tLS0tLS0tLS0tLS0tLS0KaGRhYzA6ICAgICAgU3RyZWFtIGNhcDogMHgwMDAwMDAw MQpoZGFjMDogICAgICAgICAgICAgICAgICBQQ00KaGRhYzA6ICAgICAgICAgUENNIGNhcDogMHgw MDBlMDVlMApoZGFjMDogICAgICAgICAgICAgICAgICAxNiAyMCAyNCBiaXRzLCA0NCA0OCA4OCA5 NiAxOTIgS0h6CmhkYWMwOiAgICAgICAgICBJTiBhbXA6IDB4MDAyNzAzMDAKaGRhYzA6ICAgICAg ICAgT1VUIGFtcDogMHg4MDAyN2Y3ZgpoZGFjMDogCmhkYWMwOiAgICAgICAgICAgICBuaWQ6IDEw CmhkYWMwOiAgICAgICAgICAgIE5hbWU6IHBpbjogSGVhZHBob25lcyAoQmxhY2sgSmFjaykKaGRh YzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDQwMDE4MwpoZGFjMDogICAgICAgICAgICAgICAgICBV TlNPTCBTVEVSRU8KaGRhYzA6ICAgICBBc3NvY2lhdGlvbjogMCAoMHgwMDAwODAwMCkKaGRhYzA6 ICAgICAgICAgUGluIGNhcDogMHgwMDAwMTczZgpoZGFjMDogICAgICAgICAgICAgICAgICBJU0Mg VFJRRCBQREMgSFAgT1VUIElOIFZSRUZbIDUwIDgwIEdST1VORCBISVogXQpoZGFjMDogICAgICBQ aW4gY29uZmlnOiAweDA0MjExMDFmCmhkYWMwOiAgICAgUGluIGNvbnRyb2w6IDB4MDAwMDAwODAg SFAKaGRhYzA6ICAgICAgIElucHV0IGFtcDogMHgwMDI3MDMwMApoZGFjMDogICAgICAgICAgICAg ICAgICBtdXRlPTAgc3RlcD0zIHNpemU9Mzkgb2Zmc2V0PTAKaGRhYzA6ICAgICBjb25uZWN0aW9u czogNApoZGFjMDogICAgICAgICAgIHwKaGRhYzA6ICAgICAgICAgICArIDwtIG5pZD0yMSBbYXVk aW8gb3V0cHV0XSAoc2VsZWN0ZWQpCmhkYWMwOiAgICAgICAgICAgKyBbRElTQUJMRURdIDwtIG5p ZD0yMiBbYXVkaW8gb3V0cHV0XSBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgKyBbRElTQUJM RURdIDwtIG5pZD0yMyBbYXVkaW8gb3V0cHV0XSBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAg KyBbRElTQUJMRURdIDwtIG5pZD0zMCBbYXVkaW8gc2VsZWN0b3JdIFtESVNBQkxFRF0KaGRhYzA6 IApoZGFjMDogICAgICAgICAgICAgbmlkOiAxMSBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAg IE5hbWU6IHBpbjogTGluZS1vdXQgKE5vbmUpCmhkYWMwOiAgICAgIFdpZGdldCBjYXA6IDB4MDA0 MDAxODMKaGRhYzA6ICAgICAgICAgICAgICAgICAgVU5TT0wgU1RFUkVPCmhkYWMwOiAgICAgICAg IFBpbiBjYXA6IDB4MDAwMDE3M2YKaGRhYzA6ICAgICAgICAgICAgICAgICAgSVNDIFRSUUQgUERD IEhQIE9VVCBJTiBWUkVGWyA1MCA4MCBHUk9VTkQgSElaIF0KaGRhYzA6ICAgICAgUGluIGNvbmZp ZzogMHg0MDAwMDFmMQpoZGFjMDogICAgIFBpbiBjb250cm9sOiAweDAwMDAwMDAwCmhkYWMwOiAg ICAgICBJbnB1dCBhbXA6IDB4MDAyNzAzMDAKaGRhYzA6ICAgICAgICAgICAgICAgICAgbXV0ZT0w IHN0ZXA9MyBzaXplPTM5IG9mZnNldD0wCmhkYWMwOiAgICAgY29ubmVjdGlvbnM6IDQKaGRhYzA6 ICAgICAgICAgICB8CmhkYWMwOiAgICAgICAgICAgKyA8LSBuaWQ9MjEgW2F1ZGlvIG91dHB1dF0g KHNlbGVjdGVkKQpoZGFjMDogICAgICAgICAgICsgPC0gbmlkPTIyIFthdWRpbyBvdXRwdXRdIFtE SVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICArIDwtIG5pZD0yMyBbYXVkaW8gb3V0cHV0XSBbRElT QUJMRURdCmhkYWMwOiAgICAgICAgICAgKyA8LSBuaWQ9MzAgW2F1ZGlvIHNlbGVjdG9yXSBbRElT QUJMRURdCmhkYWMwOiAKaGRhYzA6ICAgICAgICAgICAgIG5pZDogMTIgW0RJU0FCTEVEXQpoZGFj MDogICAgICAgICAgICBOYW1lOiBwaW46IExpbmUtb3V0IChOb25lKQpoZGFjMDogICAgICBXaWRn ZXQgY2FwOiAweDAwNDAwMTgzCmhkYWMwOiAgICAgICAgICAgICAgICAgIFVOU09MIFNURVJFTwpo ZGFjMDogICAgICAgICBQaW4gY2FwOiAweDAwMDAxNzM3CmhkYWMwOiAgICAgICAgICAgICAgICAg IElTQyBUUlFEIFBEQyBPVVQgSU4gVlJFRlsgNTAgODAgR1JPVU5EIEhJWiBdCmhkYWMwOiAgICAg IFBpbiBjb25maWc6IDB4NDAwMDAxZjIKaGRhYzA6ICAgICBQaW4gY29udHJvbDogMHgwMDAwMDAw MApoZGFjMDogICAgICAgSW5wdXQgYW1wOiAweDAwMjcwMzAwCmhkYWMwOiAgICAgICAgICAgICAg ICAgIG11dGU9MCBzdGVwPTMgc2l6ZT0zOSBvZmZzZXQ9MApoZGFjMDogICAgIGNvbm5lY3Rpb25z OiA0CmhkYWMwOiAgICAgICAgICAgfApoZGFjMDogICAgICAgICAgICsgPC0gbmlkPTIxIFthdWRp byBvdXRwdXRdIChzZWxlY3RlZCkKaGRhYzA6ICAgICAgICAgICArIDwtIG5pZD0yMiBbYXVkaW8g b3V0cHV0XSBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgKyA8LSBuaWQ9MjMgW2F1ZGlvIG91 dHB1dF0gW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICsgPC0gbmlkPTMwIFthdWRpbyBzZWxl Y3Rvcl0gW0RJU0FCTEVEXQpoZGFjMDogCmhkYWMwOiAgICAgICAgICAgICBuaWQ6IDEzCmhkYWMw OiAgICAgICAgICAgIE5hbWU6IHBpbjogU3BlYWtlciAoRml4ZWQpCmhkYWMwOiAgICAgIFdpZGdl dCBjYXA6IDB4MDA0MDAxODMKaGRhYzA6ICAgICAgICAgICAgICAgICAgVU5TT0wgU1RFUkVPCmhk YWMwOiAgICAgQXNzb2NpYXRpb246IDAgKDB4MDAwMDAwMDEpCmhkYWMwOiAgICAgICAgIFBpbiBj YXA6IDB4MDAwMDAwM2YKaGRhYzA6ICAgICAgICAgICAgICAgICAgSVNDIFRSUUQgUERDIEhQIE9V VCBJTgpoZGFjMDogICAgICBQaW4gY29uZmlnOiAweDkwMTcwMTEwCmhkYWMwOiAgICAgUGluIGNv bnRyb2w6IDB4MDAwMDAwNDAgT1VUCmhkYWMwOiAgICAgICBJbnB1dCBhbXA6IDB4MDAyNzAzMDAK aGRhYzA6ICAgICAgICAgICAgICAgICAgbXV0ZT0wIHN0ZXA9MyBzaXplPTM5IG9mZnNldD0wCmhk YWMwOiAgICAgY29ubmVjdGlvbnM6IDQKaGRhYzA6ICAgICAgICAgICB8CmhkYWMwOiAgICAgICAg ICAgKyA8LSBuaWQ9MjEgW2F1ZGlvIG91dHB1dF0gKHNlbGVjdGVkKQpoZGFjMDogICAgICAgICAg ICsgW0RJU0FCTEVEXSA8LSBuaWQ9MjIgW2F1ZGlvIG91dHB1dF0gW0RJU0FCTEVEXQpoZGFjMDog ICAgICAgICAgICsgW0RJU0FCTEVEXSA8LSBuaWQ9MjMgW2F1ZGlvIG91dHB1dF0gW0RJU0FCTEVE XQpoZGFjMDogICAgICAgICAgICsgW0RJU0FCTEVEXSA8LSBuaWQ9MzAgW2F1ZGlvIHNlbGVjdG9y XSBbRElTQUJMRURdCmhkYWMwOiAKaGRhYzA6ICAgICAgICAgICAgIG5pZDogMTQgW0RJU0FCTEVE XQpoZGFjMDogICAgICAgICAgICBOYW1lOiBwaW46IExpbmUtb3V0IChOb25lKQpoZGFjMDogICAg ICBXaWRnZXQgY2FwOiAweDAwNDAwMTgzCmhkYWMwOiAgICAgICAgICAgICAgICAgIFVOU09MIFNU RVJFTwpoZGFjMDogICAgICAgICBQaW4gY2FwOiAweDAwMDAxNzM3CmhkYWMwOiAgICAgICAgICAg ICAgICAgIElTQyBUUlFEIFBEQyBPVVQgSU4gVlJFRlsgNTAgODAgR1JPVU5EIEhJWiBdCmhkYWMw OiAgICAgIFBpbiBjb25maWc6IDB4NDAwMDAxZjMKaGRhYzA6ICAgICBQaW4gY29udHJvbDogMHgw MDAwMDAwMApoZGFjMDogICAgICAgSW5wdXQgYW1wOiAweDAwMjcwMzAwCmhkYWMwOiAgICAgICAg ICAgICAgICAgIG11dGU9MCBzdGVwPTMgc2l6ZT0zOSBvZmZzZXQ9MApoZGFjMDogICAgIGNvbm5l Y3Rpb25zOiA0CmhkYWMwOiAgICAgICAgICAgfApoZGFjMDogICAgICAgICAgICsgPC0gbmlkPTIx IFthdWRpbyBvdXRwdXRdIChzZWxlY3RlZCkKaGRhYzA6ICAgICAgICAgICArIDwtIG5pZD0yMiBb YXVkaW8gb3V0cHV0XSBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgKyA8LSBuaWQ9MjMgW2F1 ZGlvIG91dHB1dF0gW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICsgPC0gbmlkPTMwIFthdWRp byBzZWxlY3Rvcl0gW0RJU0FCTEVEXQpoZGFjMDogCmhkYWMwOiAgICAgICAgICAgICBuaWQ6IDE1 IFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICAgTmFtZTogcGluOiBMaW5lLW91dCAoTm9uZSkK aGRhYzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDQwMDE4MwpoZGFjMDogICAgICAgICAgICAgICAg ICBVTlNPTCBTVEVSRU8KaGRhYzA6ICAgICAgICAgUGluIGNhcDogMHgwMDAwMDAzNwpoZGFjMDog ICAgICAgICAgICAgICAgICBJU0MgVFJRRCBQREMgT1VUIElOCmhkYWMwOiAgICAgIFBpbiBjb25m aWc6IDB4NDAwMDAxZjAKaGRhYzA6ICAgICBQaW4gY29udHJvbDogMHgwMDAwMDAwMApoZGFjMDog ICAgICAgSW5wdXQgYW1wOiAweDAwMjcwMzAwCmhkYWMwOiAgICAgICAgICAgICAgICAgIG11dGU9 MCBzdGVwPTMgc2l6ZT0zOSBvZmZzZXQ9MApoZGFjMDogICAgIGNvbm5lY3Rpb25zOiA0CmhkYWMw OiAgICAgICAgICAgfApoZGFjMDogICAgICAgICAgICsgPC0gbmlkPTIxIFthdWRpbyBvdXRwdXRd IChzZWxlY3RlZCkKaGRhYzA6ICAgICAgICAgICArIDwtIG5pZD0yMiBbYXVkaW8gb3V0cHV0XSBb RElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgKyA8LSBuaWQ9MjMgW2F1ZGlvIG91dHB1dF0gW0RJ U0FCTEVEXQpoZGFjMDogICAgICAgICAgICsgPC0gbmlkPTMwIFthdWRpbyBzZWxlY3Rvcl0gW0RJ U0FCTEVEXQpoZGFjMDogCmhkYWMwOiAgICAgICAgICAgICBuaWQ6IDE2IFtESVNBQkxFRF0KaGRh YzA6ICAgICAgICAgICAgTmFtZTogcGluOiBMaW5lLW91dCAoTm9uZSkKaGRhYzA6ICAgICAgV2lk Z2V0IGNhcDogMHgwMDQwMDE4MwpoZGFjMDogICAgICAgICAgICAgICAgICBVTlNPTCBTVEVSRU8K aGRhYzA6ICAgICAgICAgUGluIGNhcDogMHgwMDAwMDAzNwpoZGFjMDogICAgICAgICAgICAgICAg ICBJU0MgVFJRRCBQREMgT1VUIElOCmhkYWMwOiAgICAgIFBpbiBjb25maWc6IDB4NDAwMDAxZjQK aGRhYzA6ICAgICBQaW4gY29udHJvbDogMHgwMDAwMDAwMApoZGFjMDogICAgICAgSW5wdXQgYW1w OiAweDAwMjcwMzAwCmhkYWMwOiAgICAgICAgICAgICAgICAgIG11dGU9MCBzdGVwPTMgc2l6ZT0z OSBvZmZzZXQ9MApoZGFjMDogICAgIGNvbm5lY3Rpb25zOiA0CmhkYWMwOiAgICAgICAgICAgfApo ZGFjMDogICAgICAgICAgICsgPC0gbmlkPTIxIFthdWRpbyBvdXRwdXRdIChzZWxlY3RlZCkKaGRh YzA6ICAgICAgICAgICArIDwtIG5pZD0yMiBbYXVkaW8gb3V0cHV0XSBbRElTQUJMRURdCmhkYWMw OiAgICAgICAgICAgKyA8LSBuaWQ9MjMgW2F1ZGlvIG91dHB1dF0gW0RJU0FCTEVEXQpoZGFjMDog ICAgICAgICAgICsgPC0gbmlkPTMwIFthdWRpbyBzZWxlY3Rvcl0gW0RJU0FCTEVEXQpoZGFjMDog CmhkYWMwOiAgICAgICAgICAgICBuaWQ6IDE3IFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICAg TmFtZTogcGluOiBMaW5lLW91dCAoTm9uZSkKaGRhYzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDQw MDE4MwpoZGFjMDogICAgICAgICAgICAgICAgICBVTlNPTCBTVEVSRU8KaGRhYzA6ICAgICAgICAg UGluIGNhcDogMHgwMDAwMDAzNwpoZGFjMDogICAgICAgICAgICAgICAgICBJU0MgVFJRRCBQREMg T1VUIElOCmhkYWMwOiAgICAgIFBpbiBjb25maWc6IDB4NDAwMDAxZjUKaGRhYzA6ICAgICBQaW4g Y29udHJvbDogMHgwMDAwMDAwMApoZGFjMDogICAgICAgSW5wdXQgYW1wOiAweDAwMjcwMzAwCmhk YWMwOiAgICAgICAgICAgICAgICAgIG11dGU9MCBzdGVwPTMgc2l6ZT0zOSBvZmZzZXQ9MApoZGFj MDogICAgIGNvbm5lY3Rpb25zOiA0CmhkYWMwOiAgICAgICAgICAgfApoZGFjMDogICAgICAgICAg ICsgPC0gbmlkPTIxIFthdWRpbyBvdXRwdXRdIChzZWxlY3RlZCkKaGRhYzA6ICAgICAgICAgICAr IDwtIG5pZD0yMiBbYXVkaW8gb3V0cHV0XSBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgKyA8 LSBuaWQ9MjMgW2F1ZGlvIG91dHB1dF0gW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICsgPC0g bmlkPTMwIFthdWRpbyBzZWxlY3Rvcl0gW0RJU0FCTEVEXQpoZGFjMDogCmhkYWMwOiAgICAgICAg ICAgICBuaWQ6IDE4IFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICAgTmFtZTogcGluOiBMaW5l LW91dCAoTm9uZSkKaGRhYzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDQwMDA4MQpoZGFjMDogICAg ICAgICAgICAgICAgICBVTlNPTCBTVEVSRU8KaGRhYzA6ICAgICAgICAgUGluIGNhcDogMHgwMDAw MDAyNApoZGFjMDogICAgICAgICAgICAgICAgICBQREMgSU4KaGRhYzA6ICAgICAgUGluIGNvbmZp ZzogMHg0MDAwMDFmNgpoZGFjMDogICAgIFBpbiBjb250cm9sOiAweDAwMDAwMDAwCmhkYWMwOiAK aGRhYzA6ICAgICAgICAgICAgIG5pZDogMTkKaGRhYzA6ICAgICAgICAgICAgTmFtZTogcGluOiBN aWMgKEZpeGVkKQpoZGFjMDogICAgICBXaWRnZXQgY2FwOiAweDAwNDAwMDAzCmhkYWMwOiAgICAg ICAgICAgICAgICAgIFNURVJFTwpoZGFjMDogICAgIEFzc29jaWF0aW9uOiAxICgweDAwMDAwMDAx KQpoZGFjMDogICAgICAgICAgICAgT1NTOiBtb25pdG9yIChtb25pdG9yKQpoZGFjMDogICAgICAg ICBQaW4gY2FwOiAweDAwMDAwMDIwCmhkYWMwOiAgICAgICAgICAgICAgICAgIElOCmhkYWMwOiAg ICAgIFBpbiBjb25maWc6IDB4OTBhNjAxNjAKaGRhYzA6ICAgICBQaW4gY29udHJvbDogMHgwMDAw MDAyMCBJTgpoZGFjMDogICAgICAgSW5wdXQgYW1wOiAweDAwMjcwMzAwCmhkYWMwOiAgICAgICAg ICAgICAgICAgIG11dGU9MCBzdGVwPTMgc2l6ZT0zOSBvZmZzZXQ9MApoZGFjMDogCmhkYWMwOiAg ICAgICAgICAgICBuaWQ6IDIwIFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICAgTmFtZTogcGlu OiBMaW5lLW91dCAoTm9uZSkKaGRhYzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDQwMDAwMwpoZGFj MDogICAgICAgICAgICAgICAgICBTVEVSRU8KaGRhYzA6ICAgICAgICAgUGluIGNhcDogMHgwMDAw MDAyMApoZGFjMDogICAgICAgICAgICAgICAgICBJTgpoZGFjMDogICAgICBQaW4gY29uZmlnOiAw eDQwMDAwMWY3CmhkYWMwOiAgICAgUGluIGNvbnRyb2w6IDB4MDAwMDAwMDAKaGRhYzA6ICAgICAg IElucHV0IGFtcDogMHgwMDI3MDMwMApoZGFjMDogICAgICAgICAgICAgICAgICBtdXRlPTAgc3Rl cD0zIHNpemU9Mzkgb2Zmc2V0PTAKaGRhYzA6IApoZGFjMDogICAgICAgICAgICAgbmlkOiAyMQpo ZGFjMDogICAgICAgICAgICBOYW1lOiBhdWRpbyBvdXRwdXQKaGRhYzA6ICAgICAgV2lkZ2V0IGNh cDogMHgwMDBkMGMwNQpoZGFjMDogICAgICAgICAgICAgICAgICBMUlNXQVAgUFdSIFNURVJFTwpo ZGFjMDogICAgIEFzc29jaWF0aW9uOiAwICgweDAwMDA4MDAxKQpoZGFjMDogICAgICAgICAgICAg T1NTOiBwY20gKHBjbSkKaGRhYzA6ICAgICAgU3RyZWFtIGNhcDogMHgwMDAwMDAwMQpoZGFjMDog ICAgICAgICAgICAgICAgICBQQ00KaGRhYzA6ICAgICAgICAgUENNIGNhcDogMHgwMDBlMDVlMApo ZGFjMDogICAgICAgICAgICAgICAgICAxNiAyMCAyNCBiaXRzLCA0NCA0OCA4OCA5NiAxOTIgS0h6 CmhkYWMwOiAgICAgIE91dHB1dCBhbXA6IDB4ODAwMjdmN2YKaGRhYzA6ICAgICAgICAgICAgICAg ICAgbXV0ZT0xIHN0ZXA9MTI3IHNpemU9MiBvZmZzZXQ9MTI3CmhkYWMwOiAKaGRhYzA6ICAgICAg ICAgICAgIG5pZDogMjIgW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICBOYW1lOiBhdWRpbyBv dXRwdXQKaGRhYzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDBkMGMwNQpoZGFjMDogICAgICAgICAg ICAgICAgICBMUlNXQVAgUFdSIFNURVJFTwpoZGFjMDogICAgICBTdHJlYW0gY2FwOiAweDAwMDAw MDAxCmhkYWMwOiAgICAgICAgICAgICAgICAgIFBDTQpoZGFjMDogICAgICAgICBQQ00gY2FwOiAw eDAwMGUwNWUwCmhkYWMwOiAgICAgICAgICAgICAgICAgIDE2IDIwIDI0IGJpdHMsIDQ0IDQ4IDg4 IDk2IDE5MiBLSHoKaGRhYzA6ICAgICAgT3V0cHV0IGFtcDogMHg4MDAyN2Y3ZgpoZGFjMDogICAg ICAgICAgICAgICAgICBtdXRlPTEgc3RlcD0xMjcgc2l6ZT0yIG9mZnNldD0xMjcKaGRhYzA6IApo ZGFjMDogICAgICAgICAgICAgbmlkOiAyMyBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgIE5h bWU6IGF1ZGlvIG91dHB1dApoZGFjMDogICAgICBXaWRnZXQgY2FwOiAweDAwMGQwYzA1CmhkYWMw OiAgICAgICAgICAgICAgICAgIExSU1dBUCBQV1IgU1RFUkVPCmhkYWMwOiAgICAgIFN0cmVhbSBj YXA6IDB4MDAwMDAwMDEKaGRhYzA6ICAgICAgICAgICAgICAgICAgUENNCmhkYWMwOiAgICAgICAg IFBDTSBjYXA6IDB4MDAwZTA1ZTAKaGRhYzA6ICAgICAgICAgICAgICAgICAgMTYgMjAgMjQgYml0 cywgNDQgNDggODggOTYgMTkyIEtIegpoZGFjMDogICAgICBPdXRwdXQgYW1wOiAweDgwMDI3Zjdm CmhkYWMwOiAgICAgICAgICAgICAgICAgIG11dGU9MSBzdGVwPTEyNyBzaXplPTIgb2Zmc2V0PTEy NwpoZGFjMDogCmhkYWMwOiAgICAgICAgICAgICBuaWQ6IDI0IFtESVNBQkxFRF0KaGRhYzA6ICAg ICAgICAgICAgTmFtZTogdmVuZG9yIHdpZGdldApoZGFjMDogICAgICBXaWRnZXQgY2FwOiAweDAw ZmQwYzA1CmhkYWMwOiAgICAgICAgICAgICAgICAgIExSU1dBUCBQV1IgU1RFUkVPCmhkYWMwOiAg ICAgIE91dHB1dCBhbXA6IDB4ODAwMjdmN2YKaGRhYzA6ICAgICAgICAgICAgICAgICAgbXV0ZT0x IHN0ZXA9MTI3IHNpemU9MiBvZmZzZXQ9MTI3CmhkYWMwOiAKaGRhYzA6ICAgICAgICAgICAgIG5p ZDogMjUgW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICBOYW1lOiB2ZW5kb3Igd2lkZ2V0Cmhk YWMwOiAgICAgIFdpZGdldCBjYXA6IDB4MDBmZDBjMDUKaGRhYzA6ICAgICAgICAgICAgICAgICAg TFJTV0FQIFBXUiBTVEVSRU8KaGRhYzA6ICAgICAgT3V0cHV0IGFtcDogMHg4MDAyN2Y3ZgpoZGFj MDogICAgICAgICAgICAgICAgICBtdXRlPTEgc3RlcD0xMjcgc2l6ZT0yIG9mZnNldD0xMjcKaGRh YzA6IApoZGFjMDogICAgICAgICAgICAgbmlkOiAyNgpoZGFjMDogICAgICAgICAgICBOYW1lOiBh dWRpbyBpbnB1dApoZGFjMDogICAgICBXaWRnZXQgY2FwOiAweDAwMWQwNTQxCmhkYWMwOiAgICAg ICAgICAgICAgICAgIFBXUiBQUk9DIFNURVJFTwpoZGFjMDogICAgIEFzc29jaWF0aW9uOiAxICgw eDAwMDAwMDAxKQpoZGFjMDogICAgICBTdHJlYW0gY2FwOiAweDAwMDAwMDAxCmhkYWMwOiAgICAg ICAgICAgICAgICAgIFBDTQpoZGFjMDogICAgICAgICBQQ00gY2FwOiAweDAwMGUwNWUwCmhkYWMw OiAgICAgICAgICAgICAgICAgIDE2IDIwIDI0IGJpdHMsIDQ0IDQ4IDg4IDk2IDE5MiBLSHoKaGRh YzA6ICAgICBjb25uZWN0aW9uczogMQpoZGFjMDogICAgICAgICAgIHwKaGRhYzA6ICAgICAgICAg ICArIDwtIG5pZD0zMiBbYXVkaW8gc2VsZWN0b3JdCmhkYWMwOiAKaGRhYzA6ICAgICAgICAgICAg IG5pZDogMjcgW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICBOYW1lOiBhdWRpbyBpbnB1dApo ZGFjMDogICAgICBXaWRnZXQgY2FwOiAweDAwMWQwNTQxCmhkYWMwOiAgICAgICAgICAgICAgICAg IFBXUiBQUk9DIFNURVJFTwpoZGFjMDogICAgICBTdHJlYW0gY2FwOiAweDAwMDAwMDAxCmhkYWMw OiAgICAgICAgICAgICAgICAgIFBDTQpoZGFjMDogICAgICAgICBQQ00gY2FwOiAweDAwMGUwNWUw CmhkYWMwOiAgICAgICAgICAgICAgICAgIDE2IDIwIDI0IGJpdHMsIDQ0IDQ4IDg4IDk2IDE5MiBL SHoKaGRhYzA6ICAgICBjb25uZWN0aW9uczogMQpoZGFjMDogICAgICAgICAgIHwKaGRhYzA6ICAg ICAgICAgICArIDwtIG5pZD0zMyBbYXVkaW8gc2VsZWN0b3JdIFtESVNBQkxFRF0KaGRhYzA6IApo ZGFjMDogICAgICAgICAgICAgbmlkOiAyOApoZGFjMDogICAgICAgICAgICBOYW1lOiBiZWVwIHdp ZGdldApoZGFjMDogICAgICBXaWRnZXQgY2FwOiAweDAwNzAwMDBjCmhkYWMwOiAgICAgQXNzb2Np YXRpb246IC0yICgweDAwMDAwMDAwKQpoZGFjMDogICAgICAgICAgICAgT1NTOiBzcGVha2VyIChz cGVha2VyKQpoZGFjMDogICAgICBPdXRwdXQgYW1wOiAweDgwMTcwMzAzCmhkYWMwOiAgICAgICAg ICAgICAgICAgIG11dGU9MSBzdGVwPTMgc2l6ZT0yMyBvZmZzZXQ9MwpoZGFjMDogCmhkYWMwOiAg ICAgICAgICAgICBuaWQ6IDI5IFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICAgTmFtZTogYXVk aW8gbWl4ZXIKaGRhYzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDIwMDEwYgpoZGFjMDogICAgICAg ICAgICAgICAgICBTVEVSRU8KaGRhYzA6ICAgICAgIElucHV0IGFtcDogMHg4MDA1MWYxNwpoZGFj MDogICAgICAgICAgICAgICAgICBtdXRlPTEgc3RlcD0zMSBzaXplPTUgb2Zmc2V0PTIzCmhkYWMw OiAgICAgY29ubmVjdGlvbnM6IDUKaGRhYzA6ICAgICAgICAgICB8CmhkYWMwOiAgICAgICAgICAg KyBbRElTQUJMRURdIDwtIG5pZD00MCBbYXVkaW8gc2VsZWN0b3JdIFtESVNBQkxFRF0KaGRhYzA6 ICAgICAgICAgICArIFtESVNBQkxFRF0gPC0gbmlkPTQxIFthdWRpbyBzZWxlY3Rvcl0gW0RJU0FC TEVEXQpoZGFjMDogICAgICAgICAgICsgW0RJU0FCTEVEXSA8LSBuaWQ9NDIgW2F1ZGlvIHNlbGVj dG9yXSBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgKyBbRElTQUJMRURdIDwtIG5pZD00MyBb YXVkaW8gc2VsZWN0b3JdIFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICArIFtESVNBQkxFRF0g PC0gbmlkPTE4IFtwaW46IExpbmUtb3V0IChOb25lKV0gW0RJU0FCTEVEXQpoZGFjMDogCmhkYWMw OiAgICAgICAgICAgICBuaWQ6IDMwIFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICAgTmFtZTog YXVkaW8gc2VsZWN0b3IKaGRhYzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDMwMDEwZApoZGFjMDog ICAgICAgICAgICAgICAgICBTVEVSRU8KaGRhYzA6ICAgICAgT3V0cHV0IGFtcDogMHg4MDA1MWYx ZgpoZGFjMDogICAgICAgICAgICAgICAgICBtdXRlPTEgc3RlcD0zMSBzaXplPTUgb2Zmc2V0PTMx CmhkYWMwOiAgICAgY29ubmVjdGlvbnM6IDEKaGRhYzA6ICAgICAgICAgICB8CmhkYWMwOiAgICAg ICAgICAgKyA8LSBuaWQ9MjkgW2F1ZGlvIG1peGVyXSBbRElTQUJMRURdCmhkYWMwOiAKaGRhYzA6 ICAgICAgICAgICAgIG5pZDogMzEgW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICBOYW1lOiB2 b2x1bWUgd2lkZ2V0CmhkYWMwOiAgICAgIFdpZGdldCBjYXA6IDB4MDA2MDAwMDAKaGRhYzA6ICAg ICBjb25uZWN0aW9uczogMwpoZGFjMDogICAgICAgICAgIHwKaGRhYzA6ICAgICAgICAgICArIDwt IG5pZD0yMSBbYXVkaW8gb3V0cHV0XSAoc2VsZWN0ZWQpCmhkYWMwOiAgICAgICAgICAgKyA8LSBu aWQ9MjIgW2F1ZGlvIG91dHB1dF0gW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICsgPC0gbmlk PTIzIFthdWRpbyBvdXRwdXRdIFtESVNBQkxFRF0KaGRhYzA6IApoZGFjMDogICAgICAgICAgICAg bmlkOiAzMgpoZGFjMDogICAgICAgICAgICBOYW1lOiBhdWRpbyBzZWxlY3RvcgpoZGFjMDogICAg ICBXaWRnZXQgY2FwOiAweDAwMzAwOTBkCmhkYWMwOiAgICAgICAgICAgICAgICAgIExSU1dBUCBT VEVSRU8KaGRhYzA6ICAgICBBc3NvY2lhdGlvbjogMSAoMHgwMDAwMDAwMSkKaGRhYzA6ICAgICAg ICAgICAgIE9TUzogbW9uaXRvcgpoZGFjMDogICAgICBPdXRwdXQgYW1wOiAweDgwMDUwZjAwCmhk YWMwOiAgICAgICAgICAgICAgICAgIG11dGU9MSBzdGVwPTE1IHNpemU9NSBvZmZzZXQ9MApoZGFj MDogICAgIGNvbm5lY3Rpb25zOiAxMgpoZGFjMDogICAgICAgICAgIHwKaGRhYzA6ICAgICAgICAg ICArIFtESVNBQkxFRF0gPC0gbmlkPTEwIFtwaW46IEhlYWRwaG9uZXMgKEJsYWNrIEphY2spXQpo ZGFjMDogICAgICAgICAgICsgW0RJU0FCTEVEXSA8LSBuaWQ9MTEgW3BpbjogTGluZS1vdXQgKE5v bmUpXSBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgKyBbRElTQUJMRURdIDwtIG5pZD0xMiBb cGluOiBMaW5lLW91dCAoTm9uZSldIFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICArIFtESVNB QkxFRF0gPC0gbmlkPTEzIFtwaW46IFNwZWFrZXIgKEZpeGVkKV0KaGRhYzA6ICAgICAgICAgICAr IFtESVNBQkxFRF0gPC0gbmlkPTE0IFtwaW46IExpbmUtb3V0IChOb25lKV0gW0RJU0FCTEVEXQpo ZGFjMDogICAgICAgICAgICsgW0RJU0FCTEVEXSA8LSBuaWQ9MTUgW3BpbjogTGluZS1vdXQgKE5v bmUpXSBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgKyBbRElTQUJMRURdIDwtIG5pZD0xNiBb cGluOiBMaW5lLW91dCAoTm9uZSldIFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICArIFtESVNB QkxFRF0gPC0gbmlkPTE3IFtwaW46IExpbmUtb3V0IChOb25lKV0gW0RJU0FCTEVEXQpoZGFjMDog ICAgICAgICAgICsgW0RJU0FCTEVEXSA8LSBuaWQ9MTggW3BpbjogTGluZS1vdXQgKE5vbmUpXSBb RElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgKyA8LSBuaWQ9MTkgW3BpbjogTWljIChGaXhlZCld IChzZWxlY3RlZCkKaGRhYzA6ICAgICAgICAgICArIFtESVNBQkxFRF0gPC0gbmlkPTIwIFtwaW46 IExpbmUtb3V0IChOb25lKV0gW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICsgW0RJU0FCTEVE XSA8LSBuaWQ9MjkgW2F1ZGlvIG1peGVyXSBbRElTQUJMRURdCmhkYWMwOiAKaGRhYzA6ICAgICAg ICAgICAgIG5pZDogMzMgW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICBOYW1lOiBhdWRpbyBz ZWxlY3RvcgpoZGFjMDogICAgICBXaWRnZXQgY2FwOiAweDAwMzAwOTBkCmhkYWMwOiAgICAgICAg ICAgICAgICAgIExSU1dBUCBTVEVSRU8KaGRhYzA6ICAgICAgT3V0cHV0IGFtcDogMHg4MDA1MGYw MApoZGFjMDogICAgICAgICAgICAgICAgICBtdXRlPTEgc3RlcD0xNSBzaXplPTUgb2Zmc2V0PTAK aGRhYzA6ICAgICBjb25uZWN0aW9uczogMTIKaGRhYzA6ICAgICAgICAgICB8CmhkYWMwOiAgICAg ICAgICAgKyA8LSBuaWQ9MTAgW3BpbjogSGVhZHBob25lcyAoQmxhY2sgSmFjayldIChzZWxlY3Rl ZCkKaGRhYzA6ICAgICAgICAgICArIFtESVNBQkxFRF0gPC0gbmlkPTExIFtwaW46IExpbmUtb3V0 IChOb25lKV0gW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICsgW0RJU0FCTEVEXSA8LSBuaWQ9 MTIgW3BpbjogTGluZS1vdXQgKE5vbmUpXSBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgKyA8 LSBuaWQ9MTMgW3BpbjogU3BlYWtlciAoRml4ZWQpXQpoZGFjMDogICAgICAgICAgICsgW0RJU0FC TEVEXSA8LSBuaWQ9MTQgW3BpbjogTGluZS1vdXQgKE5vbmUpXSBbRElTQUJMRURdCmhkYWMwOiAg ICAgICAgICAgKyBbRElTQUJMRURdIDwtIG5pZD0xNSBbcGluOiBMaW5lLW91dCAoTm9uZSldIFtE SVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICArIFtESVNBQkxFRF0gPC0gbmlkPTE2IFtwaW46IExp bmUtb3V0IChOb25lKV0gW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICsgW0RJU0FCTEVEXSA8 LSBuaWQ9MTcgW3BpbjogTGluZS1vdXQgKE5vbmUpXSBbRElTQUJMRURdCmhkYWMwOiAgICAgICAg ICAgKyBbRElTQUJMRURdIDwtIG5pZD0xOCBbcGluOiBMaW5lLW91dCAoTm9uZSldIFtESVNBQkxF RF0KaGRhYzA6ICAgICAgICAgICArIDwtIG5pZD0xOSBbcGluOiBNaWMgKEZpeGVkKV0KaGRhYzA6 ICAgICAgICAgICArIFtESVNBQkxFRF0gPC0gbmlkPTIwIFtwaW46IExpbmUtb3V0IChOb25lKV0g W0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICsgPC0gbmlkPTI5IFthdWRpbyBtaXhlcl0gW0RJ U0FCTEVEXQpoZGFjMDogCmhkYWMwOiAgICAgICAgICAgICBuaWQ6IDM0IFtESVNBQkxFRF0KaGRh YzA6ICAgICAgICAgICAgTmFtZTogcGluOiBMaW5lLW91dCAoTm9uZSkKaGRhYzA6ICAgICAgV2lk Z2V0IGNhcDogMHgwMDQwMDMwMQpoZGFjMDogICAgICAgICAgICAgICAgICBESUdJVEFMIFNURVJF TwpoZGFjMDogICAgICAgICBQaW4gY2FwOiAweDAwMDAwMDEwCmhkYWMwOiAgICAgICAgICAgICAg ICAgIE9VVApoZGFjMDogICAgICBQaW4gY29uZmlnOiAweDQwMDAwMWY4CmhkYWMwOiAgICAgUGlu IGNvbnRyb2w6IDB4MDAwMDAwMDAKaGRhYzA6ICAgICBjb25uZWN0aW9uczogMwpoZGFjMDogICAg ICAgICAgIHwKaGRhYzA6ICAgICAgICAgICArIDwtIG5pZD0zNyBbYXVkaW8gb3V0cHV0XSBbRElT QUJMRURdIChzZWxlY3RlZCkKaGRhYzA6ICAgICAgICAgICArIDwtIG5pZD0zMiBbYXVkaW8gc2Vs ZWN0b3JdCmhkYWMwOiAgICAgICAgICAgKyA8LSBuaWQ9MzMgW2F1ZGlvIHNlbGVjdG9yXSBbRElT QUJMRURdCmhkYWMwOiAKaGRhYzA6ICAgICAgICAgICAgIG5pZDogMzUgW0RJU0FCTEVEXQpoZGFj MDogICAgICAgICAgICBOYW1lOiBwaW46IExpbmUtb3V0IChOb25lKQpoZGFjMDogICAgICBXaWRn ZXQgY2FwOiAweDAwNDAwMzAxCmhkYWMwOiAgICAgICAgICAgICAgICAgIERJR0lUQUwgU1RFUkVP CmhkYWMwOiAgICAgICAgIFBpbiBjYXA6IDB4MDAwMDAwMTAKaGRhYzA6ICAgICAgICAgICAgICAg ICAgT1VUCmhkYWMwOiAgICAgIFBpbiBjb25maWc6IDB4NDAwMDAxZjkKaGRhYzA6ICAgICBQaW4g Y29udHJvbDogMHgwMDAwMDAwMApoZGFjMDogICAgIGNvbm5lY3Rpb25zOiAzCmhkYWMwOiAgICAg ICAgICAgfApoZGFjMDogICAgICAgICAgICsgPC0gbmlkPTM4IFthdWRpbyBvdXRwdXRdIFtESVNB QkxFRF0gKHNlbGVjdGVkKQpoZGFjMDogICAgICAgICAgICsgPC0gbmlkPTMyIFthdWRpbyBzZWxl Y3Rvcl0KaGRhYzA6ICAgICAgICAgICArIDwtIG5pZD0zMyBbYXVkaW8gc2VsZWN0b3JdIFtESVNB QkxFRF0KaGRhYzA6IApoZGFjMDogICAgICAgICAgICAgbmlkOiAzNiBbRElTQUJMRURdCmhkYWMw OiAgICAgICAgICAgIE5hbWU6IHBpbjogTGluZS1vdXQgKE5vbmUpCmhkYWMwOiAgICAgIFdpZGdl dCBjYXA6IDB4MDA0MDA2ODEKaGRhYzA6ICAgICAgICAgICAgICAgICAgUFdSIERJR0lUQUwgVU5T T0wgU1RFUkVPCmhkYWMwOiAgICAgICAgIFBpbiBjYXA6IDB4MDAwMTAwMjQKaGRhYzA6ICAgICAg ICAgICAgICAgICAgUERDIElOIEVBUEQKaGRhYzA6ICAgICAgUGluIGNvbmZpZzogMHg0MDAwMDFm YQpoZGFjMDogICAgIFBpbiBjb250cm9sOiAweDAwMDAwMDAwCmhkYWMwOiAgICAgICAgICAgIEVB UEQ6IDB4MDAwMDAwMDIKaGRhYzA6IApoZGFjMDogICAgICAgICAgICAgbmlkOiAzNyBbRElTQUJM RURdCmhkYWMwOiAgICAgICAgICAgIE5hbWU6IGF1ZGlvIG91dHB1dApoZGFjMDogICAgICBXaWRn ZXQgY2FwOiAweDAwMDQwMjFkCmhkYWMwOiAgICAgICAgICAgICAgICAgIERJR0lUQUwgU1RFUkVP CmhkYWMwOiAgICAgIFN0cmVhbSBjYXA6IDB4MDAwMDAwMDUKaGRhYzA6ICAgICAgICAgICAgICAg ICAgQUMzIFBDTQpoZGFjMDogICAgICAgICBQQ00gY2FwOiAweDAwMGUwNWUwCmhkYWMwOiAgICAg ICAgICAgICAgICAgIDE2IDIwIDI0IGJpdHMsIDQ0IDQ4IDg4IDk2IDE5MiBLSHoKaGRhYzA6ICAg ICAgT3V0cHV0IGFtcDogMHg4MDAwMDAwMApoZGFjMDogICAgICAgICAgICAgICAgICBtdXRlPTEg c3RlcD0wIHNpemU9MCBvZmZzZXQ9MApoZGFjMDogCmhkYWMwOiAgICAgICAgICAgICBuaWQ6IDM4 IFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICAgTmFtZTogYXVkaW8gb3V0cHV0CmhkYWMwOiAg ICAgIFdpZGdldCBjYXA6IDB4MDAwNDAyMWQKaGRhYzA6ICAgICAgICAgICAgICAgICAgRElHSVRB TCBTVEVSRU8KaGRhYzA6ICAgICAgU3RyZWFtIGNhcDogMHgwMDAwMDAwNQpoZGFjMDogICAgICAg ICAgICAgICAgICBBQzMgUENNCmhkYWMwOiAgICAgICAgIFBDTSBjYXA6IDB4MDAwZTA1ZTAKaGRh YzA6ICAgICAgICAgICAgICAgICAgMTYgMjAgMjQgYml0cywgNDQgNDggODggOTYgMTkyIEtIegpo ZGFjMDogICAgICBPdXRwdXQgYW1wOiAweDgwMDAwMDAwCmhkYWMwOiAgICAgICAgICAgICAgICAg IG11dGU9MSBzdGVwPTAgc2l6ZT0wIG9mZnNldD0wCmhkYWMwOiAKaGRhYzA6ICAgICAgICAgICAg IG5pZDogMzkgW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICBOYW1lOiBhdWRpbyBpbnB1dApo ZGFjMDogICAgICBXaWRnZXQgY2FwOiAweDAwMTQwMzFiCmhkYWMwOiAgICAgICAgICAgICAgICAg IERJR0lUQUwgU1RFUkVPCmhkYWMwOiAgICAgIFN0cmVhbSBjYXA6IDB4MDAwMDAwMDUKaGRhYzA6 ICAgICAgICAgICAgICAgICAgQUMzIFBDTQpoZGFjMDogICAgICAgICBQQ00gY2FwOiAweDAwMGUw MTYwCmhkYWMwOiAgICAgICAgICAgICAgICAgIDE2IDIwIDI0IGJpdHMsIDQ0IDQ4IDk2IEtIegpo ZGFjMDogICAgICAgSW5wdXQgYW1wOiAweDgwMDAwMDAwCmhkYWMwOiAgICAgICAgICAgICAgICAg IG11dGU9MSBzdGVwPTAgc2l6ZT0wIG9mZnNldD0wCmhkYWMwOiAgICAgY29ubmVjdGlvbnM6IDEK aGRhYzA6ICAgICAgICAgICB8CmhkYWMwOiAgICAgICAgICAgKyBbRElTQUJMRURdIDwtIG5pZD0z NiBbcGluOiBMaW5lLW91dCAoTm9uZSldIFtESVNBQkxFRF0KaGRhYzA6IApoZGFjMDogICAgICAg ICAgICAgbmlkOiA0MCBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgIE5hbWU6IGF1ZGlvIHNl bGVjdG9yCmhkYWMwOiAgICAgIFdpZGdldCBjYXA6IDB4MDAzMDAxMDEKaGRhYzA6ICAgICAgICAg ICAgICAgICAgU1RFUkVPCmhkYWMwOiAgICAgY29ubmVjdGlvbnM6IDQKaGRhYzA6ICAgICAgICAg ICB8CmhkYWMwOiAgICAgICAgICAgKyA8LSBuaWQ9MTAgW3BpbjogSGVhZHBob25lcyAoQmxhY2sg SmFjayldIChzZWxlY3RlZCkKaGRhYzA6ICAgICAgICAgICArIFtESVNBQkxFRF0gPC0gbmlkPTEx IFtwaW46IExpbmUtb3V0IChOb25lKV0gW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICsgPC0g bmlkPTEzIFtwaW46IFNwZWFrZXIgKEZpeGVkKV0KaGRhYzA6ICAgICAgICAgICArIFtESVNBQkxF RF0gPC0gbmlkPTE1IFtwaW46IExpbmUtb3V0IChOb25lKV0gW0RJU0FCTEVEXQpoZGFjMDogCmhk YWMwOiAgICAgICAgICAgICBuaWQ6IDQxIFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICAgTmFt ZTogYXVkaW8gc2VsZWN0b3IKaGRhYzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDMwMDEwMQpoZGFj MDogICAgICAgICAgICAgICAgICBTVEVSRU8KaGRhYzA6ICAgICBjb25uZWN0aW9uczogNApoZGFj MDogICAgICAgICAgIHwKaGRhYzA6ICAgICAgICAgICArIDwtIG5pZD0xMCBbcGluOiBIZWFkcGhv bmVzIChCbGFjayBKYWNrKV0gKHNlbGVjdGVkKQpoZGFjMDogICAgICAgICAgICsgW0RJU0FCTEVE XSA8LSBuaWQ9MTQgW3BpbjogTGluZS1vdXQgKE5vbmUpXSBbRElTQUJMRURdCmhkYWMwOiAgICAg ICAgICAgKyBbRElTQUJMRURdIDwtIG5pZD0xNiBbcGluOiBMaW5lLW91dCAoTm9uZSldIFtESVNB QkxFRF0KaGRhYzA6ICAgICAgICAgICArIFtESVNBQkxFRF0gPC0gbmlkPTE3IFtwaW46IExpbmUt b3V0IChOb25lKV0gW0RJU0FCTEVEXQpoZGFjMDogCmhkYWMwOiAgICAgICAgICAgICBuaWQ6IDQy IFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICAgTmFtZTogYXVkaW8gc2VsZWN0b3IKaGRhYzA6 ICAgICAgV2lkZ2V0IGNhcDogMHgwMDMwMDEwMQpoZGFjMDogICAgICAgICAgICAgICAgICBTVEVS RU8KaGRhYzA6ICAgICBjb25uZWN0aW9uczogNApoZGFjMDogICAgICAgICAgIHwKaGRhYzA6ICAg ICAgICAgICArIFtESVNBQkxFRF0gPC0gbmlkPTExIFtwaW46IExpbmUtb3V0IChOb25lKV0gW0RJ U0FCTEVEXSAoc2VsZWN0ZWQpCmhkYWMwOiAgICAgICAgICAgKyBbRElTQUJMRURdIDwtIG5pZD0x MiBbcGluOiBMaW5lLW91dCAoTm9uZSldIFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICArIFtE SVNBQkxFRF0gPC0gbmlkPTE2IFtwaW46IExpbmUtb3V0IChOb25lKV0gW0RJU0FCTEVEXQpoZGFj MDogICAgICAgICAgICsgW0RJU0FCTEVEXSA8LSBuaWQ9MTcgW3BpbjogTGluZS1vdXQgKE5vbmUp XSBbRElTQUJMRURdCmhkYWMwOiAKaGRhYzA6ICAgICAgICAgICAgIG5pZDogNDMgW0RJU0FCTEVE XQpoZGFjMDogICAgICAgICAgICBOYW1lOiBhdWRpbyBzZWxlY3RvcgpoZGFjMDogICAgICBXaWRn ZXQgY2FwOiAweDAwMzAwMTAxCmhkYWMwOiAgICAgICAgICAgICAgICAgIFNURVJFTwpoZGFjMDog ICAgIGNvbm5lY3Rpb25zOiAzCmhkYWMwOiAgICAgICAgICAgfApoZGFjMDogICAgICAgICAgICsg PC0gbmlkPTIxIFthdWRpbyBvdXRwdXRdIChzZWxlY3RlZCkKaGRhYzA6ICAgICAgICAgICArIDwt IG5pZD0yMiBbYXVkaW8gb3V0cHV0XSBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgKyA8LSBu aWQ9MjMgW2F1ZGlvIG91dHB1dF0gW0RJU0FCTEVEXQpoZGFjMDogCmhkYWMwOiBQcm9jZXNzaW5n IGF1ZGlvIEZHIGNhZD0xIG5pZD0xLi4uCmhkYWMwOiBHUElPOiAweDAwMDAwMDAwIE51bUdQSU89 MCBOdW1HUE89MCBOdW1HUEk9MCBHUElXYWtlPTAgR1BJVW5zb2w9MApoZGFjMDogIG5pZCAzIDB4 MTg1NjAwMTAgYXMgIDEgc2VxICAwICAgRGlnaXRhbC1vdXQgIEphY2sgamFjayAgNiBsb2MgMjQg Y29sb3IgVW5rbm93biBtaXNjIDAKaGRhYzA6IFBhdGNoZWQgcGlucyBjb25maWd1cmF0aW9uOgpo ZGFjMDogIG5pZCAzIDB4MTg1NjAwMTAgYXMgIDEgc2VxICAwICAgRGlnaXRhbC1vdXQgIEphY2sg amFjayAgNiBsb2MgMjQgY29sb3IgVW5rbm93biBtaXNjIDAKaGRhYzA6IDEgYXNzb2NpYXRpb25z IGZvdW5kOgpoZGFjMDogQXNzb2NpYXRpb24gMCAoMSkgb3V0OgpoZGFjMDogIFBpbiBuaWQ9MyBz ZXE9MApoZGFjMDogVHJhY2luZyBhc3NvY2lhdGlvbiAwICgxKQpoZGFjMDogIFBpbiAzIHRyYWNl ZCB0byBEQUMgMgpoZGFjMDogQXNzb2NpYXRpb24gMCAoMSkgdHJhY2Ugc3VjY2VlZGVkCmhkYWMw OiBUcmFjaW5nIGlucHV0IG1vbml0b3IKaGRhYzA6IFRyYWNpbmcgb3RoZXIgaW5wdXQgbW9uaXRv cnMKaGRhYzA6IFRyYWNpbmcgYmVlcGVyCmhkYWMwOiBGRyBjb25maWcvcXVpcmtzOiBmb3JjZXN0 ZXJlbyBpdnJlZjUwIGl2cmVmODAgaXZyZWYxMDAgaXZyZWYKaGRhYzA6IApoZGFjMDogKy0tLS0t LS0tLS0tLS0tLS0tLS0rCmhkYWMwOiB8IERVTVBJTkcgSERBIE5PREVTIHwKaGRhYzA6ICstLS0t LS0tLS0tLS0tLS0tLS0tKwpoZGFjMDogCmhkYWMwOiBEZWZhdWx0IFBhcmFtZXRlcgpoZGFjMDog LS0tLS0tLS0tLS0tLS0tLS0KaGRhYzA6ICAgICAgICAgIElOIGFtcDogMHgwMDAwMDAwMApoZGFj MDogICAgICAgICBPVVQgYW1wOiAweDAwMDAwMDAwCmhkYWMwOiAKaGRhYzA6ICAgICAgICAgICAg IG5pZDogMgpoZGFjMDogICAgICAgICAgICBOYW1lOiBhdWRpbyBvdXRwdXQKaGRhYzA6ICAgICAg V2lkZ2V0IGNhcDogMHgwMDAwNjIxMQpoZGFjMDogICAgICAgICAgICAgICAgICBESUdJVEFMIDhD SApoZGFjMDogICAgIEFzc29jaWF0aW9uOiAwICgweDAwMDAwMDAxKQpoZGFjMDogICAgICAgICAg ICAgT1NTOiBwY20gKHBjbSkKaGRhYzA6ICAgICAgU3RyZWFtIGNhcDogMHgwMDAwMDAwNQpoZGFj MDogICAgICAgICAgICAgICAgICBBQzMgUENNCmhkYWMwOiAgICAgICAgIFBDTSBjYXA6IDB4MDAx ZTA3ZjAKaGRhYzA6ICAgICAgICAgICAgICAgICAgMTYgMjAgMjQgMzIgYml0cywgMzIgNDQgNDgg ODggOTYgMTc2IDE5MiBLSHoKaGRhYzA6IApoZGFjMDogICAgICAgICAgICAgbmlkOiAzCmhkYWMw OiAgICAgICAgICAgIE5hbWU6IHBpbjogRGlnaXRhbC1vdXQgKEphY2spCmhkYWMwOiAgICAgIFdp ZGdldCBjYXA6IDB4MDA0MDczOWQKaGRhYzA6ICAgICAgICAgICAgICAgICAgRElHSVRBTCBVTlNP TCA4Q0gKaGRhYzA6ICAgICBBc3NvY2lhdGlvbjogMCAoMHgwMDAwMDAwMSkKaGRhYzA6ICAgICAg ICAgUGluIGNhcDogMHgwMDAwMDA5NApoZGFjMDogICAgICAgICAgICAgICAgICBQREMgT1VUIEhE TUkKaGRhYzA6ICAgICAgUGluIGNvbmZpZzogMHgxODU2MDAxMApoZGFjMDogICAgIFBpbiBjb250 cm9sOiAweDAwMDAwMDQwIE9VVApoZGFjMDogICAgICBPdXRwdXQgYW1wOiAweDgwMDAwMDAwCmhk YWMwOiAgICAgICAgICAgICAgICAgIG11dGU9MSBzdGVwPTAgc2l6ZT0wIG9mZnNldD0wCmhkYWMw OiAgICAgY29ubmVjdGlvbnM6IDEKaGRhYzA6ICAgICAgICAgICB8CmhkYWMwOiAgICAgICAgICAg KyA8LSBuaWQ9MiBbYXVkaW8gb3V0cHV0XQpoZGFjMDogCnBjbTA6IDxIREEgSURUIDkySEQ3M0Mx IFBDTSAjMCBBbmFsb2c+IGF0IGNhZCAwIG5pZCAxIG9uIGhkYWMwCnBjbTA6ICstLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSsKcGNtMDogfCBEVU1QSU5HIFBDTSBQbGF5YmFj ay9SZWNvcmQgQ2hhbm5lbHMgfApwY20wOiArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0rCnBjbTA6IApwY20wOiBQbGF5YmFjazoKcGNtMDogCnBjbTA6ICAgICAgU3RyZWFt IGNhcDogMHgwMDAwMDAwMQpwY20wOiAgICAgICAgICAgICAgICAgIFBDTQpwY20wOiAgICAgICAg IFBDTSBjYXA6IDB4MDAwZTA1ZTAKcGNtMDogICAgICAgICAgICAgICAgICAxNiAyMCAyNCBiaXRz LCA0NCA0OCA4OCA5NiAxOTIgS0h6CnBjbTA6ICAgICAgICAgICAgIERBQzogMjEKcGNtMDogCnBj bTA6IFJlY29yZDoKcGNtMDogCnBjbTA6ICAgICAgU3RyZWFtIGNhcDogMHgwMDAwMDAwMQpwY20w OiAgICAgICAgICAgICAgICAgIFBDTQpwY20wOiAgICAgICAgIFBDTSBjYXA6IDB4MDAwZTA1ZTAK cGNtMDogICAgICAgICAgICAgICAgICAxNiAyMCAyNCBiaXRzLCA0NCA0OCA4OCA5NiAxOTIgS0h6 CnBjbTA6ICAgICAgICAgICAgIEFEQzogMjYKcGNtMDogCnBjbTA6ICstLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tKwpwY20wOiB8IERVTVBJTkcgUGxheWJhY2svUmVjb3JkIFBhdGhzIHwK cGNtMDogKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0rCnBjbTA6IApwY20wOiBQbGF5 YmFjazoKcGNtMDogCnBjbTA6ICAgICBuaWQ9MTMgW3BpbjogU3BlYWtlciAoRml4ZWQpXQpwY20w OiAgICAgICB8CnBjbTA6ICAgICAgICsgPC0gbmlkPTIxIFthdWRpbyBvdXRwdXRdIFtzcmM6IHBj bV0KcGNtMDogCnBjbTA6ICAgICBuaWQ9MTAgW3BpbjogSGVhZHBob25lcyAoQmxhY2sgSmFjayld CnBjbTA6ICAgICAgIHwKcGNtMDogICAgICAgKyA8LSBuaWQ9MjEgW2F1ZGlvIG91dHB1dF0gW3Ny YzogcGNtXQpwY20wOiAKcGNtMDogUmVjb3JkOgpwY20wOiAKcGNtMDogICAgIG5pZD0yNiBbYXVk aW8gaW5wdXRdCnBjbTA6ICAgICAgIHwKcGNtMDogICAgICAgKyA8LSBuaWQ9MzIgW2F1ZGlvIHNl bGVjdG9yXSBbc3JjOiBtb25pdG9yXQpwY20wOiAgICAgICAgICAgICAgfApwY20wOiAgICAgICAg ICAgICAgKyA8LSBuaWQ9MTkgW3BpbjogTWljIChGaXhlZCldIFtzcmM6IG1vbml0b3JdCnBjbTA6 IApwY20wOiArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSsKcGNtMDogfCBEVU1QSU5HIFZvbHVt ZSBDb250cm9scyB8CnBjbTA6ICstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tKwpwY20wOiAKcGNt MDogTWFzdGVyIFZvbHVtZSAoT1NTOiB2b2wpCnBjbTA6ICAgIHwKcGNtMDogICAgKy0gY3RsIDEx IChuaWQgIDIxIG91dCk6ICAgIC05NS8wZEIgKDEyOCBzdGVwcykgKyBtdXRlCnBjbTA6IApwY20w OiBQQ00gVm9sdW1lIChPU1M6IHBjbSkKcGNtMDogICAgfApwY20wOiAgICArLSBjdGwgMTEgKG5p ZCAgMjEgb3V0KTogICAgLTk1LzBkQiAoMTI4IHN0ZXBzKSArIG11dGUKcGNtMDogCnBjbTA6IE1p Y3JvcGhvbmUyIFZvbHVtZSAoT1NTOiBtb25pdG9yKQpwY20wOiAgICB8CnBjbTA6ICAgICstIGN0 bCAgOSAobmlkICAxOSBvdXQpOiAgICAwLzMwZEIgKDQgc3RlcHMpCnBjbTA6IApwY20wOiBTcGVh a2VyL0JlZXAgVm9sdW1lIChPU1M6IHNwZWFrZXIpCnBjbTA6ICAgIHwKcGNtMDogICAgKy0gY3Rs IDE2IChuaWQgIDI4IG91dCk6ICAgIC0xOC8wZEIgKDQgc3RlcHMpICsgbXV0ZQpwY20wOiAKcGNt MDogUmVjb3JkaW5nIExldmVsIChPU1M6IHJlYykKcGNtMDogICAgfApwY20wOiAgICArLSBjdGwg MjMgKG5pZCAgMzIgb3V0KTogICAgMC8yMmRCICgxNiBzdGVwcykgKyBtdXRlCnBjbTA6IApwY20w OiBNaXhlciAidm9sIjoKcGNtMDogTWl4ZXIgImJhc3MiOgpwY20wOiBNaXhlciAidHJlYmxlIjoK cGNtMDogTWl4ZXIgInBjbSI6CnBjbTA6IE1peGVyICJzcGVha2VyIjoKcGNtMDogTWl4ZXIgInJl YyI6CnBjbTA6IE1peGVyICJtb25pdG9yIjoKcGNtMDogRVEgVHJlYmxlL0Jhc3MgRU5BQkxFRApw Y20wOiBjbG9uZSBtYW5hZ2VyOiBkZWFkbGluZT03NTBtcyBmbGFncz0weDgwMDAwMDFlCnBjbTA6 IHNuZGJ1Zl9zZXRtYXAgMTNmZmEwMDAwLCA0MDAwOyAweGZmZmZmZjgwNzRlMDAwMDAgLT4gMTNm ZmEwMDAwCnBjbTA6IHNuZGJ1Zl9zZXRtYXAgMTNmZmIwMDAwLCA0MDAwOyAweGZmZmZmZjgwNzRl MTAwMDAgLT4gMTNmZmIwMDAwCnBjbTE6IDxIREEgSW50ZWwgRzQ1IEhETUkgUENNICMwIEhETUk+ IGF0IGNhZCAxIG5pZCAxIG9uIGhkYWMwCnBjbTE6ICstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLSsKcGNtMTogfCBEVU1QSU5HIFBDTSBQbGF5YmFjay9SZWNvcmQgQ2hhbm5l bHMgfApwY20xOiArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0rCnBjbTE6 IApwY20xOiBQbGF5YmFjazoKcGNtMTogCnBjbTE6ICAgICAgU3RyZWFtIGNhcDogMHgwMDAwMDAw NQpwY20xOiAgICAgICAgICAgICAgICAgIEFDMyBQQ00KcGNtMTogICAgICAgICBQQ00gY2FwOiAw eDAwMWUwN2YwCnBjbTE6ICAgICAgICAgICAgICAgICAgMTYgMjAgMjQgMzIgYml0cywgMzIgNDQg NDggODggOTYgMTc2IDE5MiBLSHoKcGNtMTogICAgICAgICAgICAgREFDOiAyCnBjbTE6IApwY20x OiArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSsKcGNtMTogfCBEVU1QSU5HIFBsYXli YWNrL1JlY29yZCBQYXRocyB8CnBjbTE6ICstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t KwpwY20xOiAKcGNtMTogUGxheWJhY2s6CnBjbTE6IApwY20xOiAgICAgbmlkPTMgW3BpbjogRGln aXRhbC1vdXQgKEphY2spXQpwY20xOiAgICAgICB8CnBjbTE6ICAgICAgICsgPC0gbmlkPTIgW2F1 ZGlvIG91dHB1dF0gW3NyYzogcGNtXQpwY20xOiAKcGNtMTogKy0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0rCnBjbTE6IHwgRFVNUElORyBWb2x1bWUgQ29udHJvbHMgfApwY20xOiArLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLSsKcGNtMTogCnBjbTE6IE1hc3RlciBWb2x1bWUgKE9TUzogdm9sKQpw Y20xOiAgICB8CnBjbTE6ICAgICstIGN0bCAgMSAobmlkICAgMyBpbiApOiAgICBtdXRlCnBjbTE6 IApwY20xOiBQQ00gVm9sdW1lIChPU1M6IHBjbSkKcGNtMTogICAgfApwY20xOiAgICArLSBjdGwg IDEgKG5pZCAgIDMgaW4gKTogICAgbXV0ZQpwY20xOiAKcGNtMTogRW5hYmxpbmcgU29mdCBQQ00g dm9sdW1lCnBjbTE6IE1peGVyICJ2b2wiOgpwY20xOiBNaXhlciAicGNtIjoKcGNtMTogU29mdCBQ Q00gbWl4ZXIgRU5BQkxFRApwY20xOiBjbG9uZSBtYW5hZ2VyOiBkZWFkbGluZT03NTBtcyBmbGFn cz0weDgwMDAwMDFlCnBjbTE6IHNuZGJ1Zl9zZXRtYXAgMmJiMDAwMCwgNDAwMDsgMHhmZmZmZmY4 MDc0ZTIwMDAwIC0+IDJiYjAwMDAKYXRhMjogQUhDSSByZXNldC4uLgphdGEyOiBoYXJkd2FyZSBy ZXNldCAuLi4KYXRhMjogU0FUQSBjb25uZWN0IHRpbWU9MG1zIHN0YXR1cz0wMDAwMDEyMwphdGEy OiByZWFkeSB3YWl0IHRpbWU9Nm1zCmF0YTI6IHNvZnR3YXJlIHJlc2V0IHBvcnQgMTUuLi4KYXRh MjogcmVhZHkgd2FpdCB0aW1lPTBtcwphdGEyOiBTSUdOQVRVUkU6IDAwMDAwMTAxCmF0YTI6IEFI Q0kgcmVzZXQgZG9uZTogZGV2aWNlcz0wMDAwMDAwMQphdGEzOiBBSENJIHJlc2V0Li4uCmF0YTM6 IGhhcmR3YXJlIHJlc2V0IC4uLgphdGEzOiBTQVRBIGNvbm5lY3QgdGltZW91dCBzdGF0dXM9MDAw MDAwMDAKYXRhMzogQUhDSSByZXNldCBkb25lOiBwaHkgcmVzZXQgZm91bmQgbm8gZGV2aWNlCihh cHJvYmUwOmF0YTI6MDowOjApOiBTSUdOQVRVUkU6IDAwMDAKdXNidXMwOiAxMk1icHMgRnVsbCBT cGVlZCBVU0IgdjEuMAp1c2J1czE6IDEyTWJwcyBGdWxsIFNwZWVkIFVTQiB2MS4wCnVzYnVzMjog MTJNYnBzIEZ1bGwgU3BlZWQgVVNCIHYxLjAKdXNidXMzOiA0ODBNYnBzIEhpZ2ggU3BlZWQgVVNC IHYyLjAKdXNidXM0OiAxMk1icHMgRnVsbCBTcGVlZCBVU0IgdjEuMAp1c2J1czU6IDEyTWJwcyBG dWxsIFNwZWVkIFVTQiB2MS4wCnVzYnVzNjogMTJNYnBzIEZ1bGwgU3BlZWQgVVNCIHYxLjAKdXNi dXM3OiA0ODBNYnBzIEhpZ2ggU3BlZWQgVVNCIHYyLjAKYWNwaV9hY2FkMDogYWNsaW5lIGluaXRp YWxpemF0aW9uIHN0YXJ0CmJhdHRlcnkwOiBiYXR0ZXJ5IGluaXRpYWxpemF0aW9uIHN0YXJ0CmFk YTAgYXQgYXRhMiBidXMgMCBzY2J1czAgdGFyZ2V0IDAgbHVuIDBHRU9NOiBuZXcgZGlzayBhZGEw CgphZGEwOiA8U0FNU1VORyBTU0QgUEIyMi1DUzMgVE0gMjU2R0IgVkJNMjNEMVE+IEFUQS03IFNB VEEgMi54IGRldmljZQphZGEwOiBTZXJpYWwgTnVtYmVyIFlGMzBGMEs5MzlTWTkzOUI4MzM0CmFk YTA6IDMwMC4wMDBNQi9zIHRyYW5zZmVycyAoU0FUQSAyLngsIFVETUE1LCBQSU8gODE5MmJ5dGVz KQphZGEwOiAyNDQxOThNQiAoNTAwMTE4MTkyIDUxMiBieXRlIHNlY3RvcnM6IDE2SCA2M1MvVCAx NjM4M0MpCnBhc3MwIGF0IGF0YTIgYnVzIDAgc2NidXMwIHRhcmdldCAwIGx1biAwCnBhc3MwOiA8 U0FNU1VORyBTU0QgUEIyMi1DUzMgVE0gMjU2R0IgVkJNMjNEMVE+IEFUQS03IFNBVEEgMi54IGRl dmljZQpwYXNzMDogU2VyaWFsIE51bWJlciBZRjMwRjBLOTM5U1k5MzlCODMzNApwYXNzMDogMzAw LjAwME1CL3MgdHJhbnNmZXJzIChTQVRBIDIueCwgVURNQTUsIFBJTyA4MTkyYnl0ZXMpCkFjcGlP c0Rlcml2ZVBjaUlkOiBcXF9TQl8uUENJMC5SUDAxLlBYQ1MgLT4gYnVzIDAgZGV2IDI4IGZ1bmMg MApBY3BpT3NEZXJpdmVQY2lJZDogXFxfU0JfLlBDSTAuUlAwMi5QWENTIC0+IGJ1cyAwIGRldiAy OCBmdW5jIDEKU01QOiBBUCBDUFUgIzEgTGF1bmNoZWQhCmNwdTEgQVA6CiAgICAgSUQ6IDB4MDEw MDAwMDAgICBWRVI6IDB4MDAwNTAwMTQgTERSOiAweDAwMDAwMDAwIERGUjogMHhmZmZmZmZmZgog IGxpbnQwOiAweDAwMDEwNzAwIGxpbnQxOiAweDAwMDAwNDAwIFRQUjogMHgwMDAwMDAwMCBTVlI6 IDB4MDAwMDAxZmYKICB0aW1lcjogMHgwMDAxMDBlZiB0aGVybTogMHgwMDAxMDAwMCBlcnI6IDB4 MDAwMDAwZjAgcG1jOiAweDAwMDEwNDAwCiAgIGNtY2k6IDB4MDAwMDAwMDAKaW9hcGljMDogcm91 dGluQ2cgUGlVbnQxcGk6biAgMWwgbyhjYWwgQVBJQyBlcnJvciAweDgwSVNBIElSUSAxCikgdG8g bGFwaWMgMSB2ZWN0b3IgNDgKaW9hcGljMDogcm91dGluZyBpbnRwaW4gMTIgKElTQSBJUlEgMTIp IHRvIGxhcGljIDEgdmVjdG9yIDQ5CmlvYXBpYzA6IHJvdXRpbmcgaW50cGluIDE4IChQQ0kgSVJR IDE4KSB0byBsYXBpYyAxIHZlY3RvciA1MAppb2FwaWMwOiByb3V0aW5nIGludHBpbiAyMSAoUENJ IElSUSAyMSkgdG8gbGFwaWMgMSB2ZWN0b3IgNTEKbXNpOiBBc3NpZ25pbmcgTVNJIElSUSAyNTcg dG8gbG9jYWwgQVBJQyAxIHZlY3RvciA1Mgptc2k6IEFzc2lnbmluZyBNU0kgSVJRIDI1OSB0byBs b2NhbCBBUElDIDEgdmVjdG9yIDUzCldBUk5JTkc6IFdJVE5FU1Mgb3B0aW9uIGVuYWJsZWQsIGV4 cGVjdCByZWR1Y2VkIHBlcmZvcm1hbmNlLgp1Z2VuMC4xOiA8SW50ZWw+IGF0IHVzYnVzMHVnZW4x LjE6IDxJbnRlbD4gYXQgdXNidXMxCgp1aHViMDogPEludGVsIFVIQ0kgcm9vdCBIVUIsIGNsYXNz IDkvMCwgcmV2IDEuMDAvMS4wMCwgYWRkciAxPiBvbiB1c2J1czAKdWh1YjE6IDxJbnRlbCBVSENJ IHJvb3QgSFVCLCBjbGFzcyA5LzAsIHJldiAxLjAwLzEuMDAsIGFkZHIgMT4gb24gdXNidXMxCnVn ZW4yLjE6IDxJbnRlbD4gYXQgdXNidXMyCnVodWIyOiA8SW50ZWwgVUhDSSByb290IEhVQiwgY2xh c3MgOS8wLCByZXYgMS4wMC8xLjAwLCBhZGRyIDE+IG9uIHVzYnVzMgp1Z2VuMy4xOiA8SW50ZWw+ IGF0IHVzYnVzMwp1aHViMzogPEludGVsIEVIQ0kgcm9vdCBIVUIsIGNsYXNzIDkvMCwgcmV2IDIu MDAvMS4wMCwgYWRkciAxPiBvbiB1c2J1czMKdWdlbjQuMTogPEludGVsPiBhdCB1c2J1czR1Z2Vu NS4xOiA8SW50ZWw+IGF0IHVzYnVzNQoKdWh1YjQ6IDxJbnRlbCBVSENJIHJvb3QgSFVCLCBjbGFz cyA5LzAsIHJldiAxLjAwLzEuMDAsIGFkZHIgMT4gb24gdXNidXM0CnVodWI1OiA8SW50ZWwgVUhD SSByb290IEhVQiwgY2xhc3MgOS8wLCByZXYgMS4wMC8xLjAwLCBhZGRyIDE+IG9uIHVzYnVzNQp1 Z2VuNi4xOiA8SW50ZWw+IGF0IHVzYnVzNgp1Z2VuNy4xOiA8SW50ZWw+IGF0IHVzYnVzNwp1aHVi NjogPEludGVsIFVIQ0kgcm9vdCBIVUIsIGNsYXNzIDkvMCwgcmV2IDEuMDAvMS4wMCwgYWRkciAx PiBvbiB1c2J1czYKdWh1Yjc6IDxJbnRlbCBFSENJIHJvb3QgSFVCLCBjbGFzcyA5LzAsIHJldiAy LjAwLzEuMDAsIGFkZHIgMT4gb24gdXNidXM3CmJhdHRlcnkwOiBiYXR0ZXJ5IGluaXRpYWxpemF0 aW9uIGRvbmUsIHRyaWVkIDEgdGltZXMKYWNwaV9saWQwOiBMaWQgb3BlbmVkCmFjcGlfbGlkMDog TGlkIG9wZW5lZApSb290IG1vdW50IHdhaXRpbmcgZm9yOiB1c2J1czcgdXNidXM2IHVzYnVzNSB1 c2J1czQgdXNidXMzIHVzYnVzMiB1c2J1czEgdXNidXMwCkFjcGlPc0Rlcml2ZVBjaUlkOiBcXF9T Ql8uUENJMC5SUDAzLlBYQ1MgLT4gYnVzIDAgZGV2IDI4IGZ1bmMgMgpBY3BpT3NEZXJpdmVQY2lJ ZDogXFxfU0JfLlBDSTAuUlAwNi5QWENTIC0+IGJ1cyAwIGRldiAyOCBmdW5jIDUKYWNwaV9hY2Fk MDogT24gTGluZQphY3BpX2FjYWQwOiBhY2xpbmUgaW5pdGlhbGl6YXRpb24gZG9uZSwgdHJpZWQg MSB0aW1lcwp1aHViMTogMiBwb3J0cyB3aXRoIDIgcmVtb3ZhYmxlLCBzZWxmIHBvd2VyZWQKdWh1 YjA6IDIgcG9ydHMgd2l0aCAyIHJlbW92YWJsZSwgc2VsZiBwb3dlcmVkCnVodWIyOiAyIHBvcnRz IHdpdGggMiByZW1vdmFibGUsIHNlbGYgcG93ZXJlZAp1aHViNTogMiBwb3J0cyB3aXRoIDIgcmVt b3ZhYmxlLCBzZWxmIHBvd2VyZWQKdWh1YjQ6IDIgcG9ydHMgd2l0aCAyIHJlbW92YWJsZSwgc2Vs ZiBwb3dlcmVkCnVodWI2OiAyIHBvcnRzIHdpdGggMiByZW1vdmFibGUsIHNlbGYgcG93ZXJlZApS b290IG1vdW50IHdhaXRpbmcgZm9yOiB1c2J1czcgdXNidXMzClJvb3QgbW91bnQgd2FpdGluZyBm b3I6IHVzYnVzNyB1c2J1czMKdWh1Yjc6IDYgcG9ydHMgd2l0aCA2IHJlbW92YWJsZSwgc2VsZiBw b3dlcmVkCnVodWIzOiA2IHBvcnRzIHdpdGggNiByZW1vdmFibGUsIHNlbGYgcG93ZXJlZApSb290 IG1vdW50IHdhaXRpbmcgZm9yOiB1c2J1czcKUm9vdCBtb3VudCB3YWl0aW5nIGZvcjogdXNidXM3 ClJvb3QgbW91bnQgd2FpdGluZyBmb3I6IHVzYnVzNwpSb290IG1vdW50IHdhaXRpbmcgZm9yOiB1 c2J1czcKUm9vdCBtb3VudCB3YWl0aW5nIGZvcjogdXNidXM3CnVnZW43LjI6IDwobnVsbCk+IGF0 IHVzYnVzNyAoZGlzY29ubmVjdGVkKQpSb290IG1vdW50IHdhaXRpbmcgZm9yOiB1c2J1czcKVHJ5 aW5nIHRvIG1vdW50IHJvb3QgZnJvbSB1ZnM6L2Rldi9ncHQvcGFydDAKY3RfdG9fdHMoWzIwMTAt MDYtMTkgMjM6MTQ6NDddKSA9IDEyNzY5ODkyODcuMDAwMDAwMDAwCnN0YXJ0X2luaXQ6IHRyeWlu ZyAvc2Jpbi9pbml0CmFjcGlfbGlkMDogTGlkIG9wZW5lZAphY3BpX2xpZDA6IExpZCBvcGVuZWQK TGludXggRUxGIGV4ZWMgaGFuZGxlciBpbnN0YWxsZWQKbGlucHJvY2ZzIHJlZ2lzdGVyZWQKdWdl bjYuMjogPEJyb2FkY29tPiBhdCB1c2J1czYKdWh1Yjg6IDxCcm9hZGNvbSBCQ00yMDQ2QjEsIGNs YXNzIDkvMCwgcmV2IDIuMDAvMS4wMCwgYWRkciAyPiBvbiB1c2J1czYKbGFnZzA6IGJwZiBhdHRh Y2hlZAp1aHViODogMyBwb3J0cyB3aXRoIDAgcmVtb3ZhYmxlLCBzZWxmIHBvd2VyZWQKdWdlbjYu MzogPHZlbmRvciAweDQxM2M+IGF0IHVzYnVzNgp1a2JkMDogPHZlbmRvciAweDQxM2MgcHJvZHVj dCAweDgxNTcsIGNsYXNzIDAvMCwgcmV2IDIuMDAvMS4wMCwgYWRkciAzPiBvbiB1c2J1czYKa2Jk MiBhdCB1a2JkMAprYmQyOiB1a2JkMCwgZ2VuZXJpYyAoMCksIGNvbmZpZzoweDAsIGZsYWdzOjB4 M2QwMDAwCnVnZW42LjQ6IDx2ZW5kb3IgMHg0MTNjPiBhdCB1c2J1czYKdW1zMDogPHZlbmRvciAw eDQxM2MgcHJvZHVjdCAweDgxNTgsIGNsYXNzIDAvMCwgcmV2IDIuMDAvMS4wMCwgYWRkciA0PiBv biB1c2J1czYKdW1zMDogMyBidXR0b25zIGFuZCBbWFldIGNvb3JkaW5hdGVzIElEPTIKZmlybXdh cmU6ICdpd241MDAwZncnIHZlcnNpb24gMDogMzUzMjQwIGJ5dGVzIGxvYWRlZCBhdCAweGZmZmZm ZmZmODBlMzQwYjAKd2xhbjA6IGJwZiBhdHRhY2hlZAp3bGFuMDogYnBmIGF0dGFjaGVkCndsYW4w OiBFdGhlcm5ldCBhZGRyZXNzOiAwMDoyMjoxOTplNTpjYTo1MQpiZ2UwOiBEaXNhYmxpbmcgZmFz dGJvb3QKYmdlMDogRGlzYWJsaW5nIGZhc3Rib290CndsYW4wOiBsaW5rIHN0YXRlIGNoYW5nZWQg dG8gVVAKbGFnZzA6IGxpbmsgc3RhdGUgY2hhbmdlZCB0byBVUAphY3BpX2xpZDA6IExpZCBvcGVu ZWQKYWNwaV9saWQwOiBMaWQgb3BlbmVkCmRybTA6IFtNUFNBRkVdCmRybTA6IFtJVEhSRUFEXQpz eXN0ZW0gcG93ZXIgcHJvZmlsZSBjaGFuZ2VkIHRvICdlY29ub215JwphY3BpX2FjYWQwOiBPZmYg TGluZQpsb2NrIG9yZGVyIHJldmVyc2FsOgogMXN0IDB4ZmZmZmZmODA1MTVjYzQ5OCBidWZ3YWl0 IChidWZ3YWl0KSBAIC91c3Ivc3JjL3N5cy9rZXJuL3Zmc19iaW8uYzoyNjA4CiAybmQgMHhmZmZm ZmYwMGIyNGM1YzAwIGRpcmhhc2ggKGRpcmhhc2gpIEAgL3Vzci9zcmMvc3lzL3Vmcy91ZnMvdWZz X2Rpcmhhc2guYzoyODMKS0RCOiBzdGFjayBiYWNrdHJhY2U6CmRiX3RyYWNlX3NlbGZfd3JhcHBl cigpIGF0IGRiX3RyYWNlX3NlbGZfd3JhcHBlcisweDJhCl93aXRuZXNzX2RlYnVnZ2VyKCkgYXQg X3dpdG5lc3NfZGVidWdnZXIrMHgyZQp3aXRuZXNzX2NoZWNrb3JkZXIoKSBhdCB3aXRuZXNzX2No ZWNrb3JkZXIrMHg4MWUKX3N4X3hsb2NrKCkgYXQgX3N4X3hsb2NrKzB4NTUKdWZzZGlyaGFzaF9h Y3F1aXJlKCkgYXQgdWZzZGlyaGFzaF9hY3F1aXJlKzB4MzMKdWZzZGlyaGFzaF9hZGQoKSBhdCB1 ZnNkaXJoYXNoX2FkZCsweDE5CnVmc19kaXJlbnRlcigpIGF0IHVmc19kaXJlbnRlcisweDhiYwp1 ZnNfbWFrZWlub2RlKCkgYXQgdWZzX21ha2Vpbm9kZSsweDI1MApWT1BfQ1JFQVRFX0FQVigpIGF0 IFZPUF9DUkVBVEVfQVBWKzB4OGQKdm5fb3Blbl9jcmVkKCkgYXQgdm5fb3Blbl9jcmVkKzB4NDZh Cmtlcm5fb3BlbmF0KCkgYXQga2Vybl9vcGVuYXQrMHgxNzkKc3lzY2FsbGVudGVyKCkgYXQgc3lz Y2FsbGVudGVyKzB4ZjAKc3lzY2FsbCgpIGF0IHN5c2NhbGwrMHg0YwpYZmFzdF9zeXNjYWxsKCkg YXQgWGZhc3Rfc3lzY2FsbCsweGUxCi0tLSBzeXNjYWxsICg1LCBGcmVlQlNEIEVMRjY0LCBvcGVu KSwgcmlwID0gMHg4MDE5OGZhZWMsIHJzcCA9IDB4N2ZmZmZmZmZkMjI4LCByYnAgPSAweDEgLS0t CmFjcXVpcmluZyBkdXBsaWNhdGUgbG9jayBvZiBzYW1lIHR5cGU6ICJmdGxrIgogMXN0IGZ0bGsg QCAvdXNyL3NyYy9zeXMvbW9kdWxlcy9saW51eC8uLi8uLi9jb21wYXQvbGludXgvbGludXhfZnV0 ZXguYzoxNzcKIDJuZCBmdGxrIEAgL3Vzci9zcmMvc3lzL21vZHVsZXMvbGludXgvLi4vLi4vY29t cGF0L2xpbnV4L2xpbnV4X2Z1dGV4LmM6MjAzCktEQjogc3RhY2sgYmFja3RyYWNlOgpkYl90cmFj ZV9zZWxmX3dyYXBwZXIoKSBhdCBkYl90cmFjZV9zZWxmX3dyYXBwZXIrMHgyYQpfd2l0bmVzc19k ZWJ1Z2dlcigpIGF0IF93aXRuZXNzX2RlYnVnZ2VyKzB4MmUKd2l0bmVzc19jaGVja29yZGVyKCkg YXQgd2l0bmVzc19jaGVja29yZGVyKzB4OGVmCl9zeF94bG9jaygpIGF0IF9zeF94bG9jaysweDU1 CmZ1dGV4X2dldDAoKSBhdCBmdXRleF9nZXQwKzB4ZmUKbGludXhfc3lzX2Z1dGV4KCkgYXQgbGlu dXhfc3lzX2Z1dGV4KzB4OTYKc3lzY2FsbGVudGVyKCkgYXQgc3lzY2FsbGVudGVyKzB4ZjAKaWEz Ml9zeXNjYWxsKCkgYXQgaWEzMl9zeXNjYWxsKzB4NGIKWGludDB4ODBfc3lzY2FsbCgpIGF0IFhp bnQweDgwX3N5c2NhbGwrMHg5NQotLS0gc3lzY2FsbCAoMjQwLCBMaW51eCBFTEYzMiwgbGludXhf c3lzX2Z1dGV4KSwgcmlwID0gMHgyODc5OTUzMywgcnNwID0gMHhmZmZmY2QwYywgcmJwID0gMHg0 MDAwMDAxIC0tLQo= --002215048d0bca851504896ab298 Content-Type: application/octet-stream; name="dmesg.boot.no_et" Content-Disposition: attachment; filename="dmesg.boot.no_et" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gan3nwcv1 Q29weXJpZ2h0IChjKSAxOTkyLTIwMTAgVGhlIEZyZWVCU0QgUHJvamVjdC4KQ29weXJpZ2h0IChj KSAxOTc5LCAxOTgwLCAxOTgzLCAxOTg2LCAxOTg4LCAxOTg5LCAxOTkxLCAxOTkyLCAxOTkzLCAx OTk0CglUaGUgUmVnZW50cyBvZiB0aGUgVW5pdmVyc2l0eSBvZiBDYWxpZm9ybmlhLiBBbGwgcmln aHRzIHJlc2VydmVkLgpGcmVlQlNEIGlzIGEgcmVnaXN0ZXJlZCB0cmFkZW1hcmsgb2YgVGhlIEZy ZWVCU0QgRm91bmRhdGlvbi4KRnJlZUJTRCA5LjAtQ1VSUkVOVCAjMCByMjA5MjU2OiBUaHUgSnVu IDE3IDEyOjEwOjIzIENEVCAyMDEwCiAgICByb290QGFkYW1vOi91c3Ivb2JqL3Vzci9zcmMvc3lz L0FEQU1PIGFtZDY0CldBUk5JTkc6IFdJVE5FU1Mgb3B0aW9uIGVuYWJsZWQsIGV4cGVjdCByZWR1 Y2VkIHBlcmZvcm1hbmNlLgpQcmVsb2FkZWQgZWxmIGtlcm5lbCAiL2Jvb3Qva2VybmVsLm9sZC9r ZXJuZWwiIGF0IDB4ZmZmZmZmZmY4MGQwNzAwMC4KUHJlbG9hZGVkIGVsZiBvYmogbW9kdWxlICIv Ym9vdC9rZXJuZWwub2xkL21paWJ1cy5rbyIgYXQgMHhmZmZmZmZmZjgwZDA3MjcwLgpQcmVsb2Fk ZWQgZWxmIG9iaiBtb2R1bGUgIi9ib290L2tlcm5lbC5vbGQvaWZfYmdlLmtvIiBhdCAweGZmZmZm ZmZmODBkMDc4NjAuClByZWxvYWRlZCBlbGYgb2JqIG1vZHVsZSAiL2Jvb3Qva2VybmVsLm9sZC9z b3VuZC5rbyIgYXQgMHhmZmZmZmZmZjgwZDA3ZWQwLgpQcmVsb2FkZWQgZWxmIG9iaiBtb2R1bGUg Ii9ib290L2tlcm5lbC5vbGQvc25kX2hkYS5rbyIgYXQgMHhmZmZmZmZmZjgwZDA4NTgwLgpQcmVs b2FkZWQgZWxmIG9iaiBtb2R1bGUgIi9ib290L2tlcm5lbC5vbGQvdXNiLmtvIiBhdCAweGZmZmZm ZmZmODBkMDhiYjAuClByZWxvYWRlZCBlbGYgb2JqIG1vZHVsZSAiL2Jvb3Qva2VybmVsLm9sZC91 aGlkLmtvIiBhdCAweGZmZmZmZmZmODBkMDkyNTguClByZWxvYWRlZCBlbGYgb2JqIG1vZHVsZSAi L2Jvb3Qva2VybmVsLm9sZC91a2JkLmtvIiBhdCAweGZmZmZmZmZmODBkMDk4MDguClByZWxvYWRl ZCBlbGYgb2JqIG1vZHVsZSAiL2Jvb3Qva2VybmVsLm9sZC91bXMua28iIGF0IDB4ZmZmZmZmZmY4 MGQwOWUzOC4KUHJlbG9hZGVkIGVsZiBvYmogbW9kdWxlICIvYm9vdC9rZXJuZWwub2xkL3VtYXNz LmtvIiBhdCAweGZmZmZmZmZmODBkMGEzZTAuClByZWxvYWRlZCBlbGYgb2JqIG1vZHVsZSAiL2Jv b3Qva2VybmVsLm9sZC9hY3BpX3ZpZGVvLmtvIiBhdCAweGZmZmZmZmZmODBkMGE5OTAuClByZWxv YWRlZCAvYm9vdC96ZnMvenBvb2wuY2FjaGUgIi9ib290L3pmcy96cG9vbC5jYWNoZSIgYXQgMHhm ZmZmZmZmZjgwZDBhZjQwLgpQcmVsb2FkZWQgZWxmIG9iaiBtb2R1bGUgIi9ib290L2tlcm5lbC5v bGQvZHJtLmtvIiBhdCAweGZmZmZmZmZmODBkMGFmYTAuClByZWxvYWRlZCBlbGYgb2JqIG1vZHVs ZSAiL2Jvb3Qva2VybmVsLm9sZC9pOTE1LmtvIiBhdCAweGZmZmZmZmZmODBkMGI2NDguClByZWxv YWRlZCBlbGYgb2JqIG1vZHVsZSAiL2Jvb3Qva2VybmVsLm9sZC9laGNpLmtvIiBhdCAweGZmZmZm ZmZmODBkMGJiZjguClByZWxvYWRlZCBlbGYgb2JqIG1vZHVsZSAiL2Jvb3Qva2VybmVsLm9sZC91 aGNpLmtvIiBhdCAweGZmZmZmZmZmODBkMGMxYTguClByZWxvYWRlZCBlbGYgb2JqIG1vZHVsZSAi L2Jvb3Qva2VybmVsLm9sZC91Y29tLmtvIiBhdCAweGZmZmZmZmZmODBkMGM3NTguClByZWxvYWRl ZCBlbGYgb2JqIG1vZHVsZSAiL2Jvb3Qva2VybmVsLm9sZC91bWN0LmtvIiBhdCAweGZmZmZmZmZm ODBkMGNmMDguClByZWxvYWRlZCBlbGYgb2JqIG1vZHVsZSAiL2Jvb3Qva2VybmVsLm9sZC91cGxj b20ua28iIGF0IDB4ZmZmZmZmZmY4MGQwZDRiOC4KUHJlbG9hZGVkIGVsZiBvYmogbW9kdWxlICIv Ym9vdC9rZXJuZWwub2xkL2lmX2l3bi5rbyIgYXQgMHhmZmZmZmZmZjgwZDBkYTY4LgpQcmVsb2Fk ZWQgZWxmIG9iaiBtb2R1bGUgIi9ib290L2tlcm5lbC5vbGQvaWZfbGFnZy5rbyIgYXQgMHhmZmZm ZmZmZjgwZDBlMDU4LgpUaW1lY291bnRlciAiaTgyNTQiIGZyZXF1ZW5jeSAxMTkzMTgyIEh6IHF1 YWxpdHkgMApDYWxpYnJhdGluZyBUU0MgY2xvY2sgLi4uIFRTQyBjbG9jazogMTQwMDA2MDU1NyBI egpDUFU6IEludGVsKFIpIENvcmUoVE0pMiBEdW8gQ1BVICAgICBVOTQwMCAgQCAxLjQwR0h6ICgx NDAwLjA2LU1IeiBLOC1jbGFzcyBDUFUpCiAgT3JpZ2luID0gIkdlbnVpbmVJbnRlbCIgIElkID0g MHgxMDY3NiAgRmFtaWx5ID0gNiAgTW9kZWwgPSAxNyAgU3RlcHBpbmcgPSA2CiAgRmVhdHVyZXM9 MHhiZmViZmJmZjxGUFUsVk1FLERFLFBTRSxUU0MsTVNSLFBBRSxNQ0UsQ1g4LEFQSUMsU0VQLE1U UlIsUEdFLE1DQSxDTU9WLFBBVCxQU0UzNixDTEZMVVNILERUUyxBQ1BJLE1NWCxGWFNSLFNTRSxT U0UyLFNTLEhUVCxUTSxQQkU+CiAgRmVhdHVyZXMyPTB4OGUzZmQ8U1NFMyxEVEVTNjQsTU9OLERT X0NQTCxWTVgsU01YLEVTVCxUTTIsU1NTRTMsQ1gxNix4VFBSLFBEQ00sU1NFNC4xPgogIEFNRCBG ZWF0dXJlcz0weDIwMTAwODAwPFNZU0NBTEwsTlgsTE0+CiAgQU1EIEZlYXR1cmVzMj0weDE8TEFI Rj4KICBUU0M6IFAtc3RhdGUgaW52YXJpYW50CnJlYWwgbWVtb3J5ICA9IDQyOTQ5NjcyOTYgKDQw OTYgTUIpClBoeXNpY2FsIG1lbW9yeSBjaHVuayhzKToKMHgwMDAwMDAwMDAwMDAxMDAwIC0gMHgw MDAwMDAwMDAwMDk3ZmZmLCA2MTg0OTYgYnl0ZXMgKDE1MSBwYWdlcykKMHgwMDAwMDAwMDAwZDNk MDAwIC0gMHgwMDAwMDAwMGIzZTIwZmZmLCAzMDA0MDU1NTUyIGJ5dGVzICg3MzM0MTIgcGFnZXMp CjB4MDAwMDAwMDBiZDRhNzAwMCAtIDB4MDAwMDAwMDBiZDVjZmZmZiwgMTIxNjUxMiBieXRlcyAo Mjk3IHBhZ2VzKQoweDAwMDAwMDAwYmQ2MGYwMDAgLSAweDAwMDAwMDAwYmQ3MDhmZmYsIDEwMjQw MDAgYnl0ZXMgKDI1MCBwYWdlcykKMHgwMDAwMDAwMGJkOTBmMDAwIC0gMHgwMDAwMDAwMGJkOTE3 ZmZmLCAzNjg2NCBieXRlcyAoOSBwYWdlcykKMHgwMDAwMDAwMGJkOTFmMDAwIC0gMHgwMDAwMDAw MGJkOTYyZmZmLCAyNzg1MjggYnl0ZXMgKDY4IHBhZ2VzKQoweDAwMDAwMDAwYmQ5OWYwMDAgLSAw eDAwMDAwMDAwYmQ5ZTJmZmYsIDI3ODUyOCBieXRlcyAoNjggcGFnZXMpCjB4MDAwMDAwMDBiZDlm ZjAwMCAtIDB4MDAwMDAwMDBiZDlmZmZmZiwgNDA5NiBieXRlcyAoMSBwYWdlcykKMHgwMDAwMDAw MTAwMDAwMDAwIC0gMHgwMDAwMDAwMTNmZmVmZmZmLCAxMDczNjc2Mjg4IGJ5dGVzICgyNjIxMjgg cGFnZXMpCmF2YWlsIG1lbW9yeSA9IDQwNTc4NTgwNDggKDM4NjkgTUIpCkFDUEkgQVBJQyBUYWJs ZTogPFBUTFREICAJIEFQSUMgID4KSU5UUjogQWRkaW5nIGxvY2FsIEFQSUMgMSBhcyBhIHRhcmdl dApGcmVlQlNEL1NNUDogTXVsdGlwcm9jZXNzb3IgU3lzdGVtIERldGVjdGVkOiAyIENQVXMKRnJl ZUJTRC9TTVA6IDEgcGFja2FnZShzKSB4IDIgY29yZShzKQogY3B1MCAoQlNQKTogQVBJQyBJRDog IDAKIGNwdTEgKEFQKTogQVBJQyBJRDogIDEKQVBJQzogQ1BVIDAgaGFzIEFDUEkgSUQgMApBUElD OiBDUFUgMSBoYXMgQUNQSSBJRCAxCng4NmJpb3M6ICAgSVZUIDB4MDAwMDAwLTB4MDAwNGZmIGF0 IDB4ZmZmZmZmMDAwMDAwMDAwMAp4ODZiaW9zOiAgU1NFRyAweDAxMDAwMC0weDAxZmZmZiBhdCAw eGZmZmZmZjgwMDAwMTYwMDAKeDg2YmlvczogIEVCREEgMHgwOWMwMDAtMHgwOWZmZmYgYXQgMHhm ZmZmZmYwMDAwMDljMDAwCng4NmJpb3M6ICAgUk9NIDB4MGEwMDAwLTB4MGVmZmZmIGF0IDB4ZmZm ZmZmMDAwMDBhMDAwMApXQVJOSU5HOiBWSU1BR0UgKHZpcnR1YWxpemVkIG5ldHdvcmsgc3RhY2sp IGlzIGEgaGlnaGx5IGV4cGVyaW1lbnRhbCBmZWF0dXJlLgpVTEU6IHNldHVwIGNwdSAwClVMRTog c2V0dXAgY3B1IDEKQUNQSTogUlNEUCAweGY3OGUwIDAwMDI0ICh2MiBQVExURCApCkFDUEk6IFhT RFQgMHhiZDlmNzZjNSAwMDA3QyAodjEgREVMTCAgICBRQTA5ICAgIDA2MDQwMDAwICBMVFAgMDAw MDAwMDApCkFDUEk6IEZBQ1AgMHhiZDllNzAwMCAwMDBGNCAodjMgSU5URUwgIENSRVNUTE5FIDA2 MDQwMDAwIEFMQU4gMDAwMDAwMDEpCkFDUEk6IERTRFQgMHhiZDllODAwMCAwNzQwQyAodjIgSW50 ZWwgIENBTlRJR0EgIDA2MDQwMDAwIElOVEwgMjAwNTA2MjQpCkFDUEk6IEZBQ1MgMHhiZDk5ZWZj MCAwMDA0MApBQ1BJOiBIUEVUIDB4YmQ5ZmVkMTYgMDAwMzggKHYxIElOVEVMICBDUkVTVExORSAw NjA0MDAwMCBMT0hSIDAwMDAwMDVBKQpBQ1BJOiBNQ0ZHIDB4YmQ5ZmVkNGUgMDAwM0MgKHYxIElO VEVMICBDUkVTVExORSAwNjA0MDAwMCBMT0hSIDAwMDAwMDVBKQpBQ1BJOiBBUElDIDB4YmQ5ZmVk OGEgMDAwNjggKHYxIFBUTFREICA/IEFQSUMgICAwNjA0MDAwMCAgTFRQIDAwMDAwMDAwKQpBQ1BJ OiBCT09UIDB4YmQ5ZmVkZjIgMDAwMjggKHYxIFBUTFREICAkU0JGVEJMJCAwNjA0MDAwMCAgTFRQ IDAwMDAwMDAxKQpBQ1BJOiBTTElDIDB4YmQ5ZmVlMWEgMDAxNzYgKHYxIERFTEwgICAgUUEwOSAg ICAwNjA0MDAwMCAgTFRQIDAwMDAwMDAwKQpBQ1BJOiBPU0ZSIDB4YmQ5ZmVmOTAgMDAwNzAgKHYx IERFTEwgICBERUxMICAgICAwNjA0MDAwMCBBU0wgIDAwMDAwMDYxKQpBQ1BJOiBTU0RUIDB4YmQ5 Zjc3NjkgMDAwMzkgKHYxIEJydFJlZiAgREQwMUJSVCAwMDAwMTAwMCBJTlRMIDIwMDUwNjI0KQpB Q1BJOiBTU0RUIDB4YmQ5ZTYwMDAgMDA2NTUgKHYxICBQbVJlZiAgICBDcHVQbSAwMDAwMzAwMCBJ TlRMIDIwMDUwNjI0KQpBQ1BJOiBTU0RUIDB4YmQ5ZTUwMDAgMDAyNTkgKHYxICBQbVJlZiAgQ3B1 MFRzdCAwMDAwMzAwMCBJTlRMIDIwMDUwNjI0KQpBQ1BJOiBTU0RUIDB4YmQ5ZTQwMDAgMDAyMEYg KHYxICBQbVJlZiAgICBBcFRzdCAwMDAwMzAwMCBJTlRMIDIwMDUwNjI0KQpNQURUOiBGb3VuZCBJ TyBBUElDIElEIDIsIEludGVycnVwdCAwIGF0IDB4ZmVjMDAwMDAKaW9hcGljMDogUm91dGluZyBl eHRlcm5hbCA4MjU5QSdzIC0+IGludHBpbiAwCmxhcGljMDogUm91dGluZyBOTUkgLT4gTElOVDEK bGFwaWMwOiBMSU5UMSB0cmlnZ2VyOiBlZGdlCmxhcGljMDogTElOVDEgcG9sYXJpdHk6IGhpZ2gK bGFwaWMxOiBSb3V0aW5nIE5NSSAtPiBMSU5UMQpsYXBpYzE6IExJTlQxIHRyaWdnZXI6IGVkZ2UK bGFwaWMxOiBMSU5UMSBwb2xhcml0eTogaGlnaApNQURUOiBJbnRlcnJ1cHQgb3ZlcnJpZGU6IHNv dXJjZSAwLCBpcnEgMgppb2FwaWMwOiBSb3V0aW5nIElSUSAwIC0+IGludHBpbiAyCk1BRFQ6IElu dGVycnVwdCBvdmVycmlkZTogc291cmNlIDksIGlycSA5CmlvYXBpYzA6IGludHBpbiA5IHRyaWdn ZXI6IGxldmVsCmlvYXBpYzAgPFZlcnNpb24gMi4wPiBpcnFzIDAtMjMgb24gbW90aGVyYm9hcmQK Y3B1MCBCU1A6CiAgICAgSUQ6IDB4MDAwMDAwMDAgICBWRVI6IDB4MDAwNTAwMTQgTERSOiAweDAw MDAwMDAwIERGUjogMHhmZmZmZmZmZgogIGxpbnQwOiAweDAwMDEwNzAwIGxpbnQxOiAweDAwMDAw NDAwIFRQUjogMHgwMDAwMDAwMCBTVlI6IDB4MDAwMDAxZmYKICB0aW1lcjogMHgwMDAxMDBlZiB0 aGVybTogMHgwMDAxMDAwMCBlcnI6IDB4MDAwMDAwZjAgcG1jOiAweDAwMDEwNDAwCiAgIGNtY2k6 IDB4MDAwMDAwMDAKd2xhbjogPDgwMi4xMSBMaW5rIExheWVyPgpzbmRfdW5pdF9pbml0KCkgdT0w eDAwZmY4MDAwIFs1MTJdIGQ9MHgwMDAwN2MwMCBbMzJdIGM9MHgwMDAwMDNmZiBbMTAyNF0KZmVl ZGVyX3JlZ2lzdGVyOiBzbmRfdW5pdD0tMSBzbmRfbWF4YXV0b3ZjaGFucz0xNiBsYXRlbmN5PTUg ZmVlZGVyX3JhdGVfbWluPTEgZmVlZGVyX3JhdGVfbWF4PTIwMTYwMDAgZmVlZGVyX3JhdGVfcm91 bmQ9MjUKVkVTQTogaW5mb3JtYXRpb24gYmxvY2sKMDAwMCAgIDU2IDQ1IDUzIDQxIDAwIDAzIDAw IDAxIDAwIDAxIDAxIDAwIDAwIDAwIDQwIDAwCjAwMTAgICAwMCAwMSBmZiAwMSAwMCAwMSAzMyAw MSAwMCAwMSA0NSAwMSAwMCAwMSA2OSAwMQowMDIwICAgMDAgMDEgMDAgMDAgMDAgMDAgMDAgMDAg MDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAKMDAzMCAgIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAw IDAwIDAwIDAwIDAwIDAwIDAwIDAwCjAwNDAgICA2MCAwMSA2MSAwMSA2MiAwMSA2MyAwMSA2NCAw MSA2NSAwMSA2NiAwMSA2NyAwMQowMDUwICAgNjggMDEgNjkgMDEgNmEgMDEgNmIgMDEgNmMgMDEg NmQgMDEgNmUgMDEgNmYgMDEKMDA2MCAgIDcwIDAxIDcxIDAxIDNjIDAxIDRkIDAxIDVjIDAxIDNh IDAxIDRiIDAxIDVhIDAxCjAwNzAgICAwNyAwMSAxYSAwMSAxYiAwMSAwNSAwMSAxNyAwMSAxOCAw MSAxMiAwMSAxNCAwMQowMDgwICAgMTUgMDEgMDEgMDEgMDMgMDEgMTEgMDEgZmYgZmYgMDAgMDAg MDAgMDAgMDAgMDAKMDA5MCAgIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAw IDAwIDAwIDAwCjAwYTAgICAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAw MCAwMCAwMAowMGIwICAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAg MDAgMDAKMDBjMCAgIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAw IDAwCjAwZDAgICAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAw MAowMGUwICAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAK MDBmMCAgIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwCjAx MDAgICA0OSA2ZSA3NCA2NSA2YyAyOCA3MiAyOSA0MyA2MSA2ZSA3NCA2OSA2NyA2MSAyMAowMTEw ICAgNDcgNzIgNjEgNzAgNjggNjkgNjMgNzMgMjAgNDMgNjggNjkgNzAgMjAgNDEgNjMKMDEyMCAg IDYzIDY1IDZjIDY1IDcyIDYxIDc0IDY1IDY0IDIwIDU2IDQ3IDQxIDIwIDQyIDQ5CjAxMzAgICA0 ZiA1MyAwMCA0OSA2ZSA3NCA2NSA2YyAyMCA0MyA2ZiA3MiA3MCA2ZiA3MiA2MQowMTQwICAgNzQg NjkgNmYgNmUgMDAgNDkgNmUgNzQgNjUgNmMgMjggNzIgMjkgNDMgNjEgNmUKMDE1MCAgIDc0IDY5 IDY3IDYxIDIwIDQ3IDcyIDYxIDcwIDY4IDY5IDYzIDczIDIwIDQzIDZmCjAxNjAgICA2ZSA3NCA3 MiA2ZiA2YyA2YyA2NSA3MiAwMCA0OCA2MSA3MiA2NCA3NyA2MSA3MgowMTcwICAgNjUgMjAgNTYg NjUgNzIgNzMgNjkgNmYgNmUgMjAgMzAgMmUgMzAgMDAgMDAgMDAKMDE4MCAgIDAwIDAwIDAwIDAw IDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwCjAxOTAgICAwMCAwMCAwMCAwMCAw MCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMAowMWEwICAgMDAgMDAgMDAgMDAgMDAg MDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAKMDFiMCAgIDAwIDAwIDAwIDAwIDAwIDAw IDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwCjAxYzAgICAwMCAwMCAwMCAwMCAwMCAwMCAw MCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMAowMWQwICAgMDAgMDAgMDAgMDAgMDAgMDAgMDAg MDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAgMDAKMDFlMCAgIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAw IDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwCjAxZjAgICAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAw MCAwMCAwMCAwMCAwMCAwMCAwMCAwMApWRVNBOiA5IG1vZGUocykgZm91bmQKVkVTQTogdjMuMCwg MzI3MDRrIG1lbW9yeSwgZmxhZ3M6MHgxLCBtb2RlIHRhYmxlOjB4ZmZmZmZmODAwMDA2MjA0MCAo MTAwMDA0MCkKVkVTQTogSW50ZWwocilDYW50aWdhIEdyYXBoaWNzIENoaXAgQWNjZWxlcmF0ZWQg VkdBIEJJT1MKVkVTQTogSW50ZWwgQ29ycG9yYXRpb24gSW50ZWwocilDYW50aWdhIEdyYXBoaWNz IENvbnRyb2xsZXIgSGFyZHdhcmUgVmVyc2lvbiAwLjAKaW86IDxJL08+CmtiZDogbmV3IGFycmF5 IHNpemUgNAprYmQxIGF0IGtiZG11eDAKbWVtOiA8bWVtb3J5PgpudWxsOiA8bnVsbCBkZXZpY2Us IHplcm8gZGV2aWNlPgpuZnNsb2NrOiBwc2V1ZG8tZGV2aWNlCnJhbmRvbTogPGVudHJvcHkgc291 cmNlLCBTb2Z0d2FyZSwgWWFycm93PgpDUFUwOiBsb2NhbCBBUElDIGVycm9yIDB4ODAKYWNwaTA6 IDxERUxMIFFBMDkgICA+IG9uIG1vdGhlcmJvYXJkClBDSWU6IE1lbW9yeSBNYXBwZWQgY29uZmln dXJhdGlvbiBiYXNlIEAgMHhlMDAwMDAwMAppb2FwaWMwOiByb3V0aW5nIGludHBpbiA5IChJU0Eg SVJRIDkpIHRvIGxhcGljIDAgdmVjdG9yIDQ4CmFjcGkwOiBbTVBTQUZFXQphY3BpMDogW0lUSFJF QURdCkFjcGlPc0Rlcml2ZVBjaUlkOiBcXF9TQl8uUENJMC5IQlVTIC0+IGJ1cyAwIGRldiAwIGZ1 bmMgMApBY3BpT3NEZXJpdmVQY2lJZDogXFxfU0JfLlBDSTAuUlAwNC5QWENTIC0+IGJ1cyAwIGRl diAyOCBmdW5jIDMKYWNwaTA6IFBvd2VyIEJ1dHRvbiAoZml4ZWQpCkFjcGlPc0Rlcml2ZVBjaUlk OiBcXF9TQl8uUENJMC5MUENCLkxQQzAgLT4gYnVzIDAgZGV2IDMxIGZ1bmMgMApBY3BpT3NEZXJp dmVQY2lJZDogXFxfU0JfLlBDSTAuTFBDQi5MUEMxIC0+IGJ1cyAwIGRldiAzMSBmdW5jIDAKYWNw aV9ocGV0MDogdmVuZDogMHg4MDg2IHJldjogMHgxIG51bTogNCBoejogMTQzMTgxODAgb3B0czog bGVnYWN5X3JvdXRlIDY0LWJpdApUaW1lY291bnRlciAiSFBFVCIgZnJlcXVlbmN5IDE0MzE4MTgw IEh6IHF1YWxpdHkgOTAwCkFDUEkgdGltZXI6IDAvMyAwLzMgMS8xIDAvMyAwLzMgMS8yIDEvMiAw LzMgMC8zIDAvMyAtPiAzClRpbWVjb3VudGVyICJBQ1BJLXNhZmUiIGZyZXF1ZW5jeSAzNTc5NTQ1 IEh6IHF1YWxpdHkgODUwCmFjcGlfdGltZXIwOiA8MjQtYml0IHRpbWVyIGF0IDMuNTc5NTQ1TUh6 PiBwb3J0IDB4NDA4LTB4NDBiIG9uIGFjcGkwCmNwdTA6IDxBQ1BJIENQVT4gb24gYWNwaTAKQUNQ STogU1NEVCAweGJkOTFhYzIwIDAwMjY1ICh2MSAgUG1SZWYgIENwdTBJc3QgMDAwMDMwMDAgSU5U TCAyMDA1MDYyNCkKQUNQSTogRHluYW1pYyBPRU0gVGFibGUgTG9hZDoKQUNQSTogU1NEVCAwIDAw MjY1ICh2MSAgUG1SZWYgIENwdTBJc3QgMDAwMDMwMDAgSU5UTCAyMDA1MDYyNCkKQUNQSTogU1NE VCAweGJkOTE4NjIwIDAwNTc1ICh2MSAgUG1SZWYgIENwdTBDc3QgMDAwMDMwMDEgSU5UTCAyMDA1 MDYyNCkKQUNQSTogRHluYW1pYyBPRU0gVGFibGUgTG9hZDoKQUNQSTogU1NEVCAwIDAwNTc1ICh2 MSAgUG1SZWYgIENwdTBDc3QgMDAwMDMwMDEgSU5UTCAyMDA1MDYyNCkKY3B1MTogPEFDUEkgQ1BV PiBvbiBhY3BpMApBQ1BJOiBTU0RUIDB4YmQ5MTljYTAgMDAxQ0YgKHYxICBQbVJlZiAgICBBcElz dCAwMDAwMzAwMCBJTlRMIDIwMDUwNjI0KQpBQ1BJOiBEeW5hbWljIE9FTSBUYWJsZSBMb2FkOgpB Q1BJOiBTU0RUIDAgMDAxQ0YgKHYxICBQbVJlZiAgICBBcElzdCAwMDAwMzAwMCBJTlRMIDIwMDUw NjI0KQpBQ1BJOiBTU0RUIDB4YmQ5MTlmMjAgMDAwOEQgKHYxICBQbVJlZiAgICBBcENzdCAwMDAw MzAwMCBJTlRMIDIwMDUwNjI0KQpBQ1BJOiBEeW5hbWljIE9FTSBUYWJsZSBMb2FkOgpBQ1BJOiBT U0RUIDAgMDAwOEQgKHYxICBQbVJlZiAgICBBcENzdCAwMDAwMzAwMCBJTlRMIDIwMDUwNjI0KQph Y3BpX2VjMDogPEVtYmVkZGVkIENvbnRyb2xsZXI6IEdQRSAweDFjPiBwb3J0IDB4NjIsMHg2NiBv biBhY3BpMApwY2lfbGluazA6ICAgICAgICBJbmRleCAgSVJRICBSdGQgIFJlZiAgSVJRcwogIElu aXRpYWwgUHJvYmUgICAgICAgMCAgICA1ICAgTiAgICAgMCAgMSAzIDQgNSA2IDcgMTAgMTIgMTQg MTUKICBWYWxpZGF0aW9uICAgICAgICAgIDAgICAgNSAgIE4gICAgIDAgIDEgMyA0IDUgNiA3IDEw IDEyIDE0IDE1CiAgQWZ0ZXIgRGlzYWJsZSAgICAgICAwICAyNTUgICBOICAgICAwICAxIDMgNCA1 IDYgNyAxMCAxMiAxNCAxNQpwY2lfbGluazE6ICAgICAgICBJbmRleCAgSVJRICBSdGQgIFJlZiAg SVJRcwogIEluaXRpYWwgUHJvYmUgICAgICAgMCAgIDExICAgTiAgICAgMCAgMSAzIDQgNSA2IDcg MTEgMTIgMTQgMTUKICBWYWxpZGF0aW9uICAgICAgICAgIDAgICAxMSAgIE4gICAgIDAgIDEgMyA0 IDUgNiA3IDExIDEyIDE0IDE1CiAgQWZ0ZXIgRGlzYWJsZSAgICAgICAwICAyNTUgICBOICAgICAw ICAxIDMgNCA1IDYgNyAxMSAxMiAxNCAxNQpwY2lfbGluazI6ICAgICAgICBJbmRleCAgSVJRICBS dGQgIFJlZiAgSVJRcwogIEluaXRpYWwgUHJvYmUgICAgICAgMCAgIDEwICAgTiAgICAgMCAgMSAz IDQgNSA2IDcgMTAgMTIgMTQgMTUKICBWYWxpZGF0aW9uICAgICAgICAgIDAgICAxMCAgIE4gICAg IDAgIDEgMyA0IDUgNiA3IDEwIDEyIDE0IDE1CiAgQWZ0ZXIgRGlzYWJsZSAgICAgICAwICAyNTUg ICBOICAgICAwICAxIDMgNCA1IDYgNyAxMCAxMiAxNCAxNQpwY2lfbGluazM6ICAgICAgICBJbmRl eCAgSVJRICBSdGQgIFJlZiAgSVJRcwogIEluaXRpYWwgUHJvYmUgICAgICAgMCAgIDEwICAgTiAg ICAgMCAgMSAzIDQgNSA2IDcgMTEgMTIgMTQgMTUKICBWYWxpZGF0aW9uICAgICAgICAgIDAgIDI1 NSAgIE4gICAgIDAgIDEgMyA0IDUgNiA3IDExIDEyIDE0IDE1CiAgQWZ0ZXIgRGlzYWJsZSAgICAg ICAwICAyNTUgICBOICAgICAwICAxIDMgNCA1IDYgNyAxMSAxMiAxNCAxNQpwY2lfbGluazQ6ICAg ICAgICBJbmRleCAgSVJRICBSdGQgIFJlZiAgSVJRcwogIEluaXRpYWwgUHJvYmUgICAgICAgMCAg MjU1ICAgTiAgICAgMCAgMSAzIDQgNSA2IDcgMTAgMTIgMTQgMTUKICBWYWxpZGF0aW9uICAgICAg ICAgIDAgIDI1NSAgIE4gICAgIDAgIDEgMyA0IDUgNiA3IDEwIDEyIDE0IDE1CiAgQWZ0ZXIgRGlz YWJsZSAgICAgICAwICAyNTUgICBOICAgICAwICAxIDMgNCA1IDYgNyAxMCAxMiAxNCAxNQpwY2lf bGluazU6ICAgICAgICBJbmRleCAgSVJRICBSdGQgIFJlZiAgSVJRcwogIEluaXRpYWwgUHJvYmUg ICAgICAgMCAgIDExICAgTiAgICAgMCAgMSAzIDQgNSA2IDcgMTEgMTIgMTQgMTUKICBWYWxpZGF0 aW9uICAgICAgICAgIDAgICAxMSAgIE4gICAgIDAgIDEgMyA0IDUgNiA3IDExIDEyIDE0IDE1CiAg QWZ0ZXIgRGlzYWJsZSAgICAgICAwICAyNTUgICBOICAgICAwICAxIDMgNCA1IDYgNyAxMSAxMiAx NCAxNQpwY2lfbGluazY6ICAgICAgICBJbmRleCAgSVJRICBSdGQgIFJlZiAgSVJRcwogIEluaXRp YWwgUHJvYmUgICAgICAgMCAgIDEwICAgTiAgICAgMCAgMSAzIDQgNSA2IDcgMTAgMTIgMTQgMTUK ICBWYWxpZGF0aW9uICAgICAgICAgIDAgICAxMCAgIE4gICAgIDAgIDEgMyA0IDUgNiA3IDEwIDEy IDE0IDE1CiAgQWZ0ZXIgRGlzYWJsZSAgICAgICAwICAyNTUgICBOICAgICAwICAxIDMgNCA1IDYg NyAxMCAxMiAxNCAxNQpwY2lfbGluazc6ICAgICAgICBJbmRleCAgSVJRICBSdGQgIFJlZiAgSVJR cwogIEluaXRpYWwgUHJvYmUgICAgICAgMCAgICA3ICAgTiAgICAgMCAgMSAzIDQgNSA2IDcgMTEg MTIgMTQgMTUKICBWYWxpZGF0aW9uICAgICAgICAgIDAgICAgNyAgIE4gICAgIDAgIDEgMyA0IDUg NiA3IDExIDEyIDE0IDE1CiAgQWZ0ZXIgRGlzYWJsZSAgICAgICAwICAyNTUgICBOICAgICAwICAx IDMgNCA1IDYgNyAxMSAxMiAxNCAxNQpwY2liMDogPEFDUEkgSG9zdC1QQ0kgYnJpZGdlPiBwb3J0 IDB4Y2Y4LTB4Y2ZmIG9uIGFjcGkwCnBjaTA6IDxBQ1BJIFBDSSBidXM+IG9uIHBjaWIwCnBjaTA6 IGRvbWFpbj0wLCBwaHlzaWNhbCBidXM9MApmb3VuZC0+CXZlbmRvcj0weDgwODYsIGRldj0weDJh NDAsIHJldmlkPTB4MDcKCWRvbWFpbj0wLCBidXM9MCwgc2xvdD0wLCBmdW5jPTAKCWNsYXNzPTA2 LTAwLTAwLCBoZHJ0eXBlPTB4MDAsIG1mZGV2PTAKCWNtZHJlZz0weDAxMDYsIHN0YXRyZWc9MHgy MDkwLCBjYWNoZWxuc3o9MCAoZHdvcmRzKQoJbGF0dGltZXI9MHgwMCAoMCBucyksIG1pbmdudD0w eDAwICgwIG5zKSwgbWF4bGF0PTB4MDAgKDAgbnMpCmZvdW5kLT4JdmVuZG9yPTB4ODA4NiwgZGV2 PTB4MmE0MiwgcmV2aWQ9MHgwNwoJZG9tYWluPTAsIGJ1cz0wLCBzbG90PTIsIGZ1bmM9MAoJY2xh c3M9MDMtMDAtMDAsIGhkcnR5cGU9MHgwMCwgbWZkZXY9MQoJY21kcmVnPTB4MDAwNywgc3RhdHJl Zz0weDAwOTAsIGNhY2hlbG5zej0wIChkd29yZHMpCglsYXR0aW1lcj0weDAwICgwIG5zKSwgbWlu Z250PTB4MDAgKDAgbnMpLCBtYXhsYXQ9MHgwMCAoMCBucykKCWludHBpbj1hLCBpcnE9NQoJcG93 ZXJzcGVjIDMgIHN1cHBvcnRzIEQwIEQzICBjdXJyZW50IEQwCglNU0kgc3VwcG9ydHMgMSBtZXNz YWdlCgltYXBbMTBdOiB0eXBlIE1lbW9yeSwgcmFuZ2UgNjQsIGJhc2UgMHhmODAwMDAwMCwgc2l6 ZSAyMiwgZW5hYmxlZAoJbWFwWzE4XTogdHlwZSBQcmVmZXRjaGFibGUgTWVtb3J5LCByYW5nZSA2 NCwgYmFzZSAweGQwMDAwMDAwLCBzaXplIDI4LCBlbmFibGVkCgltYXBbMjBdOiB0eXBlIEkvTyBQ b3J0LCByYW5nZSAzMiwgYmFzZSAweDE4MDAsIHNpemUgIDMsIGVuYWJsZWQKcGNpYjA6IG1hdGNo ZWQgZW50cnkgZm9yIDAuMi5JTlRBCnBjaWIwOiBzbG90IDIgSU5UQSBoYXJkd2lyZWQgdG8gSVJR IDE2CmZvdW5kLT4JdmVuZG9yPTB4ODA4NiwgZGV2PTB4MmE0MywgcmV2aWQ9MHgwNwoJZG9tYWlu PTAsIGJ1cz0wLCBzbG90PTIsIGZ1bmM9MQoJY2xhc3M9MDMtODAtMDAsIGhkcnR5cGU9MHgwMCwg bWZkZXY9MQoJY21kcmVnPTB4MDAwNywgc3RhdHJlZz0weDAwOTAsIGNhY2hlbG5zej0wIChkd29y ZHMpCglsYXR0aW1lcj0weDAwICgwIG5zKSwgbWluZ250PTB4MDAgKDAgbnMpLCBtYXhsYXQ9MHgw MCAoMCBucykKCXBvd2Vyc3BlYyAzICBzdXBwb3J0cyBEMCBEMyAgY3VycmVudCBEMAoJbWFwWzEw XTogdHlwZSBNZW1vcnksIHJhbmdlIDY0LCBiYXNlIDB4Zjg0MDAwMDAsIHNpemUgMjAsIGVuYWJs ZWQKZm91bmQtPgl2ZW5kb3I9MHg4MDg2LCBkZXY9MHgyOTM3LCByZXZpZD0weDAzCglkb21haW49 MCwgYnVzPTAsIHNsb3Q9MjYsIGZ1bmM9MAoJY2xhc3M9MGMtMDMtMDAsIGhkcnR5cGU9MHgwMCwg bWZkZXY9MQoJY21kcmVnPTB4MDAwNSwgc3RhdHJlZz0weDAyOTAsIGNhY2hlbG5zej0wIChkd29y ZHMpCglsYXR0aW1lcj0weDAwICgwIG5zKSwgbWluZ250PTB4MDAgKDAgbnMpLCBtYXhsYXQ9MHgw MCAoMCBucykKCWludHBpbj1hLCBpcnE9NQoJbWFwWzIwXTogdHlwZSBJL08gUG9ydCwgcmFuZ2Ug MzIsIGJhc2UgMHgxODIwLCBzaXplICA1LCBlbmFibGVkCnBjaWIwOiBtYXRjaGVkIGVudHJ5IGZv ciAwLjI2LklOVEEKcGNpYjA6IHNsb3QgMjYgSU5UQSBoYXJkd2lyZWQgdG8gSVJRIDE2CmZvdW5k LT4JdmVuZG9yPTB4ODA4NiwgZGV2PTB4MjkzOCwgcmV2aWQ9MHgwMwoJZG9tYWluPTAsIGJ1cz0w LCBzbG90PTI2LCBmdW5jPTEKCWNsYXNzPTBjLTAzLTAwLCBoZHJ0eXBlPTB4MDAsIG1mZGV2PTAK CWNtZHJlZz0weDAwMDUsIHN0YXRyZWc9MHgwMjkwLCBjYWNoZWxuc3o9MCAoZHdvcmRzKQoJbGF0 dGltZXI9MHgwMCAoMCBucyksIG1pbmdudD0weDAwICgwIG5zKSwgbWF4bGF0PTB4MDAgKDAgbnMp CglpbnRwaW49YiwgaXJxPTExCgltYXBbMjBdOiB0eXBlIEkvTyBQb3J0LCByYW5nZSAzMiwgYmFz ZSAweDE4NDAsIHNpemUgIDUsIGVuYWJsZWQKcGNpYjA6IG1hdGNoZWQgZW50cnkgZm9yIDAuMjYu SU5UQgpwY2liMDogc2xvdCAyNiBJTlRCIGhhcmR3aXJlZCB0byBJUlEgMjEKZm91bmQtPgl2ZW5k b3I9MHg4MDg2LCBkZXY9MHgyOTM5LCByZXZpZD0weDAzCglkb21haW49MCwgYnVzPTAsIHNsb3Q9 MjYsIGZ1bmM9MgoJY2xhc3M9MGMtMDMtMDAsIGhkcnR5cGU9MHgwMCwgbWZkZXY9MAoJY21kcmVn PTB4MDAwNSwgc3RhdHJlZz0weDAyOTAsIGNhY2hlbG5zej0wIChkd29yZHMpCglsYXR0aW1lcj0w eDAwICgwIG5zKSwgbWluZ250PTB4MDAgKDAgbnMpLCBtYXhsYXQ9MHgwMCAoMCBucykKCWludHBp bj1jLCBpcnE9MTAKCW1hcFsyMF06IHR5cGUgSS9PIFBvcnQsIHJhbmdlIDMyLCBiYXNlIDB4MTg2 MCwgc2l6ZSAgNSwgZW5hYmxlZApwY2liMDogbWF0Y2hlZCBlbnRyeSBmb3IgMC4yNi5JTlRDCnBj aWIwOiBzbG90IDI2IElOVEMgaGFyZHdpcmVkIHRvIElSUSAxOQpmb3VuZC0+CXZlbmRvcj0weDgw ODYsIGRldj0weDI5M2MsIHJldmlkPTB4MDMKCWRvbWFpbj0wLCBidXM9MCwgc2xvdD0yNiwgZnVu Yz03CgljbGFzcz0wYy0wMy0yMCwgaGRydHlwZT0weDAwLCBtZmRldj0wCgljbWRyZWc9MHgwMTA2 LCBzdGF0cmVnPTB4MDI5MCwgY2FjaGVsbnN6PTAgKGR3b3JkcykKCWxhdHRpbWVyPTB4MDAgKDAg bnMpLCBtaW5nbnQ9MHgwMCAoMCBucyksIG1heGxhdD0weDAwICgwIG5zKQoJaW50cGluPWMsIGly cT0xMAoJcG93ZXJzcGVjIDIgIHN1cHBvcnRzIEQwIEQzICBjdXJyZW50IEQwCgltYXBbMTBdOiB0 eXBlIE1lbW9yeSwgcmFuZ2UgMzIsIGJhc2UgMHhmODgwNDgwMCwgc2l6ZSAxMCwgZW5hYmxlZApw Y2liMDogbWF0Y2hlZCBlbnRyeSBmb3IgMC4yNi5JTlRDCnBjaWIwOiBzbG90IDI2IElOVEMgaGFy ZHdpcmVkIHRvIElSUSAxOQpmb3VuZC0+CXZlbmRvcj0weDgwODYsIGRldj0weDI5M2UsIHJldmlk PTB4MDMKCWRvbWFpbj0wLCBidXM9MCwgc2xvdD0yNywgZnVuYz0wCgljbGFzcz0wNC0wMy0wMCwg aGRydHlwZT0weDAwLCBtZmRldj0wCgljbWRyZWc9MHgwMTA2LCBzdGF0cmVnPTB4MDAxMCwgY2Fj aGVsbnN6PTE2IChkd29yZHMpCglsYXR0aW1lcj0weDAwICgwIG5zKSwgbWluZ250PTB4MDAgKDAg bnMpLCBtYXhsYXQ9MHgwMCAoMCBucykKCWludHBpbj1hLCBpcnE9MTAKCXBvd2Vyc3BlYyAyICBz dXBwb3J0cyBEMCBEMyAgY3VycmVudCBEMAoJTVNJIHN1cHBvcnRzIDEgbWVzc2FnZSwgNjQgYml0 CgltYXBbMTBdOiB0eXBlIE1lbW9yeSwgcmFuZ2UgNjQsIGJhc2UgMHhmODYwMDAwMCwgc2l6ZSAx NCwgZW5hYmxlZApwY2liMDogbWF0Y2hlZCBlbnRyeSBmb3IgMC4yNy5JTlRBCnBjaWIwOiBzbG90 IDI3IElOVEEgaGFyZHdpcmVkIHRvIElSUSAyMgpmb3VuZC0+CXZlbmRvcj0weDgwODYsIGRldj0w eDI5NDAsIHJldmlkPTB4MDMKCWRvbWFpbj0wLCBidXM9MCwgc2xvdD0yOCwgZnVuYz0wCgljbGFz cz0wNi0wNC0wMCwgaGRydHlwZT0weDAxLCBtZmRldj0xCgljbWRyZWc9MHgwMTA3LCBzdGF0cmVn PTB4MDAxMCwgY2FjaGVsbnN6PTE2IChkd29yZHMpCglsYXR0aW1lcj0weDAwICgwIG5zKSwgbWlu Z250PTB4MDQgKDEwMDAgbnMpLCBtYXhsYXQ9MHgwMCAoMCBucykKCWludHBpbj1hLCBpcnE9MTEK CXBvd2Vyc3BlYyAyICBzdXBwb3J0cyBEMCBEMyAgY3VycmVudCBEMAoJTVNJIHN1cHBvcnRzIDEg bWVzc2FnZQpwY2liMDogbWF0Y2hlZCBlbnRyeSBmb3IgMC4yOC5JTlRBCnBjaWIwOiBzbG90IDI4 IElOVEEgaGFyZHdpcmVkIHRvIElSUSAxNwpmb3VuZC0+CXZlbmRvcj0weDgwODYsIGRldj0weDI5 NDIsIHJldmlkPTB4MDMKCWRvbWFpbj0wLCBidXM9MCwgc2xvdD0yOCwgZnVuYz0xCgljbGFzcz0w Ni0wNC0wMCwgaGRydHlwZT0weDAxLCBtZmRldj0xCgljbWRyZWc9MHgwMTA3LCBzdGF0cmVnPTB4 MDAxMCwgY2FjaGVsbnN6PTE2IChkd29yZHMpCglsYXR0aW1lcj0weDAwICgwIG5zKSwgbWluZ250 PTB4MDQgKDEwMDAgbnMpLCBtYXhsYXQ9MHgwMCAoMCBucykKCWludHBpbj1iLCBpcnE9NQoJcG93 ZXJzcGVjIDIgIHN1cHBvcnRzIEQwIEQzICBjdXJyZW50IEQwCglNU0kgc3VwcG9ydHMgMSBtZXNz YWdlCnBjaWIwOiBtYXRjaGVkIGVudHJ5IGZvciAwLjI4LklOVEIKcGNpYjA6IHNsb3QgMjggSU5U QiBoYXJkd2lyZWQgdG8gSVJRIDE2CmZvdW5kLT4JdmVuZG9yPTB4ODA4NiwgZGV2PTB4Mjk0YSwg cmV2aWQ9MHgwMwoJZG9tYWluPTAsIGJ1cz0wLCBzbG90PTI4LCBmdW5jPTUKCWNsYXNzPTA2LTA0 LTAwLCBoZHJ0eXBlPTB4MDEsIG1mZGV2PTEKCWNtZHJlZz0weDAxMDcsIHN0YXRyZWc9MHgwMDEw LCBjYWNoZWxuc3o9MTYgKGR3b3JkcykKCWxhdHRpbWVyPTB4MDAgKDAgbnMpLCBtaW5nbnQ9MHgw NCAoMTAwMCBucyksIG1heGxhdD0weDAwICgwIG5zKQoJaW50cGluPWIsIGlycT01Cglwb3dlcnNw ZWMgMiAgc3VwcG9ydHMgRDAgRDMgIGN1cnJlbnQgRDAKCU1TSSBzdXBwb3J0cyAxIG1lc3NhZ2UK cGNpYjA6IG1hdGNoZWQgZW50cnkgZm9yIDAuMjguSU5UQgpwY2liMDogc2xvdCAyOCBJTlRCIGhh cmR3aXJlZCB0byBJUlEgMTYKZm91bmQtPgl2ZW5kb3I9MHg4MDg2LCBkZXY9MHgyOTM0LCByZXZp ZD0weDAzCglkb21haW49MCwgYnVzPTAsIHNsb3Q9MjksIGZ1bmM9MAoJY2xhc3M9MGMtMDMtMDAs IGhkcnR5cGU9MHgwMCwgbWZkZXY9MQoJY21kcmVnPTB4MDAwNSwgc3RhdHJlZz0weDAyOTAsIGNh Y2hlbG5zej0wIChkd29yZHMpCglsYXR0aW1lcj0weDAwICgwIG5zKSwgbWluZ250PTB4MDAgKDAg bnMpLCBtYXhsYXQ9MHgwMCAoMCBucykKCWludHBpbj1hLCBpcnE9NwoJbWFwWzIwXTogdHlwZSBJ L08gUG9ydCwgcmFuZ2UgMzIsIGJhc2UgMHgxODgwLCBzaXplICA1LCBlbmFibGVkCnBjaWIwOiBt YXRjaGVkIGVudHJ5IGZvciAwLjI5LklOVEEKcGNpYjA6IHNsb3QgMjkgSU5UQSBoYXJkd2lyZWQg dG8gSVJRIDIzCmZvdW5kLT4JdmVuZG9yPTB4ODA4NiwgZGV2PTB4MjkzNSwgcmV2aWQ9MHgwMwoJ ZG9tYWluPTAsIGJ1cz0wLCBzbG90PTI5LCBmdW5jPTEKCWNsYXNzPTBjLTAzLTAwLCBoZHJ0eXBl PTB4MDAsIG1mZGV2PTAKCWNtZHJlZz0weDAwMDUsIHN0YXRyZWc9MHgwMjkwLCBjYWNoZWxuc3o9 MCAoZHdvcmRzKQoJbGF0dGltZXI9MHgwMCAoMCBucyksIG1pbmdudD0weDAwICgwIG5zKSwgbWF4 bGF0PTB4MDAgKDAgbnMpCglpbnRwaW49YiwgaXJxPTEwCgltYXBbMjBdOiB0eXBlIEkvTyBQb3J0 LCByYW5nZSAzMiwgYmFzZSAweDE4YTAsIHNpemUgIDUsIGVuYWJsZWQKcGNpYjA6IG1hdGNoZWQg ZW50cnkgZm9yIDAuMjkuSU5UQgpwY2liMDogc2xvdCAyOSBJTlRCIGhhcmR3aXJlZCB0byBJUlEg MTkKZm91bmQtPgl2ZW5kb3I9MHg4MDg2LCBkZXY9MHgyOTM2LCByZXZpZD0weDAzCglkb21haW49 MCwgYnVzPTAsIHNsb3Q9MjksIGZ1bmM9MgoJY2xhc3M9MGMtMDMtMDAsIGhkcnR5cGU9MHgwMCwg bWZkZXY9MAoJY21kcmVnPTB4MDAwNSwgc3RhdHJlZz0weDAyOTAsIGNhY2hlbG5zej0wIChkd29y ZHMpCglsYXR0aW1lcj0weDAwICgwIG5zKSwgbWluZ250PTB4MDAgKDAgbnMpLCBtYXhsYXQ9MHgw MCAoMCBucykKCWludHBpbj1jLCBpcnE9MTAKCW1hcFsyMF06IHR5cGUgSS9PIFBvcnQsIHJhbmdl IDMyLCBiYXNlIDB4MThjMCwgc2l6ZSAgNSwgZW5hYmxlZApwY2liMDogbWF0Y2hlZCBlbnRyeSBm b3IgMC4yOS5JTlRDCnBjaWIwOiBzbG90IDI5IElOVEMgaGFyZHdpcmVkIHRvIElSUSAxOApmb3Vu ZC0+CXZlbmRvcj0weDgwODYsIGRldj0weDI5M2EsIHJldmlkPTB4MDMKCWRvbWFpbj0wLCBidXM9 MCwgc2xvdD0yOSwgZnVuYz03CgljbGFzcz0wYy0wMy0yMCwgaGRydHlwZT0weDAwLCBtZmRldj0w CgljbWRyZWc9MHgwMTA2LCBzdGF0cmVnPTB4MDI5MCwgY2FjaGVsbnN6PTAgKGR3b3JkcykKCWxh dHRpbWVyPTB4MDAgKDAgbnMpLCBtaW5nbnQ9MHgwMCAoMCBucyksIG1heGxhdD0weDAwICgwIG5z KQoJaW50cGluPWEsIGlycT03Cglwb3dlcnNwZWMgMiAgc3VwcG9ydHMgRDAgRDMgIGN1cnJlbnQg RDAKCW1hcFsxMF06IHR5cGUgTWVtb3J5LCByYW5nZSAzMiwgYmFzZSAweGY4ODA0YzAwLCBzaXpl IDEwLCBlbmFibGVkCnBjaWIwOiBtYXRjaGVkIGVudHJ5IGZvciAwLjI5LklOVEEKcGNpYjA6IHNs b3QgMjkgSU5UQSBoYXJkd2lyZWQgdG8gSVJRIDIzCmZvdW5kLT4JdmVuZG9yPTB4ODA4NiwgZGV2 PTB4MjQ0OCwgcmV2aWQ9MHg5MwoJZG9tYWluPTAsIGJ1cz0wLCBzbG90PTMwLCBmdW5jPTAKCWNs YXNzPTA2LTA0LTAxLCBoZHJ0eXBlPTB4MDEsIG1mZGV2PTAKCWNtZHJlZz0weDAxMDcsIHN0YXRy ZWc9MHgwMDEwLCBjYWNoZWxuc3o9MCAoZHdvcmRzKQoJbGF0dGltZXI9MHgwMCAoMCBucyksIG1p bmdudD0weDA0ICgxMDAwIG5zKSwgbWF4bGF0PTB4MDAgKDAgbnMpCmZvdW5kLT4JdmVuZG9yPTB4 ODA4NiwgZGV2PTB4MjkxNywgcmV2aWQ9MHgwMwoJZG9tYWluPTAsIGJ1cz0wLCBzbG90PTMxLCBm dW5jPTAKCWNsYXNzPTA2LTAxLTAwLCBoZHJ0eXBlPTB4MDAsIG1mZGV2PTEKCWNtZHJlZz0weDAw MDcsIHN0YXRyZWc9MHgwMjEwLCBjYWNoZWxuc3o9MCAoZHdvcmRzKQoJbGF0dGltZXI9MHgwMCAo MCBucyksIG1pbmdudD0weDAwICgwIG5zKSwgbWF4bGF0PTB4MDAgKDAgbnMpCmZvdW5kLT4JdmVu ZG9yPTB4ODA4NiwgZGV2PTB4MjkyOSwgcmV2aWQ9MHgwMwoJZG9tYWluPTAsIGJ1cz0wLCBzbG90 PTMxLCBmdW5jPTIKCWNsYXNzPTAxLTA2LTAxLCBoZHJ0eXBlPTB4MDAsIG1mZGV2PTAKCWNtZHJl Zz0weDAwMDcsIHN0YXRyZWc9MHgwMmIwLCBjYWNoZWxuc3o9MCAoZHdvcmRzKQoJbGF0dGltZXI9 MHgwMCAoMCBucyksIG1pbmdudD0weDAwICgwIG5zKSwgbWF4bGF0PTB4MDAgKDAgbnMpCglpbnRw aW49YiwgaXJxPTEwCglwb3dlcnNwZWMgMyAgc3VwcG9ydHMgRDAgRDMgIGN1cnJlbnQgRDAKCU1T SSBzdXBwb3J0cyAxNiBtZXNzYWdlcwoJbWFwWzEwXTogdHlwZSBJL08gUG9ydCwgcmFuZ2UgMzIs IGJhc2UgMHgxODE4LCBzaXplICAzLCBlbmFibGVkCgltYXBbMTRdOiB0eXBlIEkvTyBQb3J0LCBy YW5nZSAzMiwgYmFzZSAweDE4MGMsIHNpemUgIDIsIGVuYWJsZWQKCW1hcFsxOF06IHR5cGUgSS9P IFBvcnQsIHJhbmdlIDMyLCBiYXNlIDB4MTgxMCwgc2l6ZSAgMywgZW5hYmxlZAoJbWFwWzFjXTog dHlwZSBJL08gUG9ydCwgcmFuZ2UgMzIsIGJhc2UgMHgxODA4LCBzaXplICAyLCBlbmFibGVkCglt YXBbMjBdOiB0eXBlIEkvTyBQb3J0LCByYW5nZSAzMiwgYmFzZSAweDE4ZTAsIHNpemUgIDUsIGVu YWJsZWQKCW1hcFsyNF06IHR5cGUgTWVtb3J5LCByYW5nZSAzMiwgYmFzZSAweGY4ODA0MDAwLCBz aXplIDExLCBlbmFibGVkCnBjaWIwOiBtYXRjaGVkIGVudHJ5IGZvciAwLjMxLklOVEIKcGNpYjA6 IHNsb3QgMzEgSU5UQiBoYXJkd2lyZWQgdG8gSVJRIDE5CmZvdW5kLT4JdmVuZG9yPTB4ODA4Niwg ZGV2PTB4MjkzMCwgcmV2aWQ9MHgwMwoJZG9tYWluPTAsIGJ1cz0wLCBzbG90PTMxLCBmdW5jPTMK CWNsYXNzPTBjLTA1LTAwLCBoZHJ0eXBlPTB4MDAsIG1mZGV2PTAKCWNtZHJlZz0weDAxMDMsIHN0 YXRyZWc9MHgwMjgwLCBjYWNoZWxuc3o9MCAoZHdvcmRzKQoJbGF0dGltZXI9MHgwMCAoMCBucyks IG1pbmdudD0weDAwICgwIG5zKSwgbWF4bGF0PTB4MDAgKDAgbnMpCglpbnRwaW49YywgaXJxPTEw CgltYXBbMTBdOiB0eXBlIE1lbW9yeSwgcmFuZ2UgNjQsIGJhc2UgMCwgc2l6ZSAgOCwgZW5hYmxl ZAoJbWFwWzIwXTogdHlwZSBJL08gUG9ydCwgcmFuZ2UgMzIsIGJhc2UgMHgxYzAwLCBzaXplICA1 LCBlbmFibGVkCnBjaWIwOiBtYXRjaGVkIGVudHJ5IGZvciAwLjMxLklOVEMKcGNpYjA6IHNsb3Qg MzEgSU5UQyBoYXJkd2lyZWQgdG8gSVJRIDE5CnZnYXBjaTA6IDxWR0EtY29tcGF0aWJsZSBkaXNw bGF5PiBwb3J0IDB4MTgwMC0weDE4MDcgbWVtIDB4ZjgwMDAwMDAtMHhmODNmZmZmZiwweGQwMDAw MDAwLTB4ZGZmZmZmZmYgaXJxIDE2IGF0IGRldmljZSAyLjAgb24gcGNpMAphY3BpX3ZpZGVvMDog PEFDUEkgdmlkZW8gZXh0ZW5zaW9uPiBvbiB2Z2FwY2kwCmZvdW5kIFZHQSBDUlQgb3IgVkVTQSBD b21wYXRpYmxlIEFuYWxvZyBNb25pdG9yKDEwMCksIGlkeCMwLCBwb3J0IzAsIGhlYWQgIzAKZm91 bmQgSW50ZXJuYWwvSW50ZWdyYXRlZCBEaWdpdGFsIEZsYXQgUGFuZWwoNDAwKSwgaWR4IzAsIHBv cnQjMCwgaGVhZCAjMApmb3VuZCBFeHRlcm5hbCBEaWdpdGFsIE1vbml0b3IoMzAwKSwgaWR4IzAs IHBvcnQjMCwgaGVhZCAjMApmb3VuZCBFeHRlcm5hbCBEaWdpdGFsIE1vbml0b3IoMzAxKSwgaWR4 IzEsIHBvcnQjMCwgaGVhZCAjMApmb3VuZCBFeHRlcm5hbCBEaWdpdGFsIE1vbml0b3IoMzAyKSwg aWR4IzIsIHBvcnQjMCwgaGVhZCAjMAphZ3AwOiA8SW50ZWwgR000NSBTVkdBIGNvbnRyb2xsZXI+ IG9uIHZnYXBjaTAKYWdwMDogYXBlcnR1cmUgc2l6ZSBpcyAyNTZNLCBkZXRlY3RlZCAzMjc2NGsg c3RvbGVuIG1lbW9yeQpkcm0wOiA8TW9iaWxlIEludGVsXE0tQlxNLS4gR000NSBFeHByZXNzIENo aXBzZXQ+IG9uIHZnYXBjaTAKdmdhcGNpMDogYXR0ZW1wdGluZyB0byBhbGxvY2F0ZSAxIE1TSSB2 ZWN0b3JzICgxIHN1cHBvcnRlZCkKbXNpOiByb3V0aW5nIE1TSSBJUlEgMjU2IHRvIGxvY2FsIEFQ SUMgMCB2ZWN0b3IgNDkKdmdhcGNpMDogdXNpbmcgSVJRIDI1NiBmb3IgTVNJCmluZm86IFtkcm1d IE1TSSBlbmFibGVkIDEgbWVzc2FnZShzKQp2Z2FwY2kwOiBjaGlsZCBkcm0wIHJlcXVlc3RlZCBw Y2lfZW5hYmxlX2J1c21hc3RlcgppbmZvOiBbZHJtXSBBR1AgYXQgMHhkMDAwMDAwMCAyNTZNQgpp bmZvOiBbZHJtXSBJbml0aWFsaXplZCBpOTE1IDEuNi4wIDIwMDgwNzMwCnZnYXBjaTE6IDxWR0Et Y29tcGF0aWJsZSBkaXNwbGF5PiBtZW0gMHhmODQwMDAwMC0weGY4NGZmZmZmIGF0IGRldmljZSAy LjEgb24gcGNpMAp1aGNpMDogPEludGVsIDgyODAxSSAoSUNIOSkgVVNCIGNvbnRyb2xsZXI+IHBv cnQgMHgxODIwLTB4MTgzZiBpcnEgMTYgYXQgZGV2aWNlIDI2LjAgb24gcGNpMAppb2FwaWMwOiBy b3V0aW5nIGludHBpbiAxNiAoUENJIElSUSAxNikgdG8gbGFwaWMgMCB2ZWN0b3IgNTAKdWhjaTA6 IFtNUFNBRkVdCnVoY2kwOiBbSVRIUkVBRF0KdXNidXMwOiA8SW50ZWwgODI4MDFJIChJQ0g5KSBV U0IgY29udHJvbGxlcj4gb24gdWhjaTAKdWhjaTE6IDxJbnRlbCA4MjgwMUkgKElDSDkpIFVTQiBj b250cm9sbGVyPiBwb3J0IDB4MTg0MC0weDE4NWYgaXJxIDIxIGF0IGRldmljZSAyNi4xIG9uIHBj aTAKaW9hcGljMDogcm91dGluZyBpbnRwaW4gMjEgKFBDSSBJUlEgMjEpIHRvIGxhcGljIDAgdmVj dG9yIDUxCnVoY2kxOiBbTVBTQUZFXQp1aGNpMTogW0lUSFJFQURdCnVzYnVzMTogPEludGVsIDgy ODAxSSAoSUNIOSkgVVNCIGNvbnRyb2xsZXI+IG9uIHVoY2kxCnVoY2kyOiA8SW50ZWwgODI4MDFJ IChJQ0g5KSBVU0IgY29udHJvbGxlcj4gcG9ydCAweDE4NjAtMHgxODdmIGlycSAxOSBhdCBkZXZp Y2UgMjYuMiBvbiBwY2kwCmlvYXBpYzA6IHJvdXRpbmcgaW50cGluIDE5IChQQ0kgSVJRIDE5KSB0 byBsYXBpYyAwIHZlY3RvciA1Mgp1aGNpMjogW01QU0FGRV0KdWhjaTI6IFtJVEhSRUFEXQp1c2J1 czI6IDxJbnRlbCA4MjgwMUkgKElDSDkpIFVTQiBjb250cm9sbGVyPiBvbiB1aGNpMgplaGNpMDog PEludGVsIDgyODAxSSAoSUNIOSkgVVNCIDIuMCBjb250cm9sbGVyPiBtZW0gMHhmODgwNDgwMC0w eGY4ODA0YmZmIGlycSAxOSBhdCBkZXZpY2UgMjYuNyBvbiBwY2kwCmVoY2kwOiBbTVBTQUZFXQpl aGNpMDogW0lUSFJFQURdCnVzYnVzMzogRUhDSSB2ZXJzaW9uIDEuMAp1c2J1czM6IDxJbnRlbCA4 MjgwMUkgKElDSDkpIFVTQiAyLjAgY29udHJvbGxlcj4gb24gZWhjaTAKaGRhYzA6IDxJbnRlbCA4 MjgwMUkgSGlnaCBEZWZpbml0aW9uIEF1ZGlvIENvbnRyb2xsZXI+IG1lbSAweGY4NjAwMDAwLTB4 Zjg2MDNmZmYgaXJxIDIyIGF0IGRldmljZSAyNy4wIG9uIHBjaTAKaGRhYzA6IEhEQSBEcml2ZXIg UmV2aXNpb246IDIwMTAwMjI2XzAxNDIKaGRhYzA6IGF0dGVtcHRpbmcgdG8gYWxsb2NhdGUgMSBN U0kgdmVjdG9ycyAoMSBzdXBwb3J0ZWQpCm1zaTogcm91dGluZyBNU0kgSVJRIDI1NyB0byBsb2Nh bCBBUElDIDAgdmVjdG9yIDUzCmhkYWMwOiB1c2luZyBJUlEgMjU3IGZvciBNU0kKaGRhYzA6IFtN UFNBRkVdCmhkYWMwOiBbSVRIUkVBRF0KaGRhYzA6IENhcHM6IE9TUyA0LCBJU1MgNCwgQlNTIDAs IE5TRE8gMSwgNjRiaXQsIENPUkIgMjU2LCBSSVJCIDI1NgpwY2liMTogPEFDUEkgUENJLVBDSSBi cmlkZ2U+IGlycSAxNyBhdCBkZXZpY2UgMjguMCBvbiBwY2kwCnBjaWIxOiAgIGRvbWFpbiAgICAg ICAgICAgIDAKcGNpYjE6ICAgc2Vjb25kYXJ5IGJ1cyAgICAgMgpwY2liMTogICBzdWJvcmRpbmF0 ZSBidXMgICAzCnBjaWIxOiAgIEkvTyBkZWNvZGUgICAgICAgIDB4MjAwMC0weDJmZmYKcGNpYjE6 ICAgbWVtb3J5IGRlY29kZSAgICAgMHhmNDAwMDAwMC0weGY1ZmZmZmZmCnBjaWIxOiAgIHByZWZl dGNoZWQgZGVjb2RlIDB4ZjAwMDAwMDAtMHhmMWZmZmZmZgpwY2kyOiA8QUNQSSBQQ0kgYnVzPiBv biBwY2liMQpwY2kyOiBkb21haW49MCwgcGh5c2ljYWwgYnVzPTIKcGNpYjI6IDxBQ1BJIFBDSS1Q Q0kgYnJpZGdlPiBpcnEgMTYgYXQgZGV2aWNlIDI4LjEgb24gcGNpMApwY2liMjogICBkb21haW4g ICAgICAgICAgICAwCnBjaWIyOiAgIHNlY29uZGFyeSBidXMgICAgIDQKcGNpYjI6ICAgc3Vib3Jk aW5hdGUgYnVzICAgNQpwY2liMjogICBJL08gZGVjb2RlICAgICAgICAweDMwMDAtMHgzZmZmCnBj aWIyOiAgIG1lbW9yeSBkZWNvZGUgICAgIDB4ZjYwMDAwMDAtMHhmN2ZmZmZmZgpwY2liMjogICBw cmVmZXRjaGVkIGRlY29kZSAweGYyMDAwMDAwLTB4ZjNmZmZmZmYKcGNpNDogPEFDUEkgUENJIGJ1 cz4gb24gcGNpYjIKcGNpNDogZG9tYWluPTAsIHBoeXNpY2FsIGJ1cz00CmZvdW5kLT4JdmVuZG9y PTB4ODA4NiwgZGV2PTB4NDIzNSwgcmV2aWQ9MHgwMAoJZG9tYWluPTAsIGJ1cz00LCBzbG90PTAs IGZ1bmM9MAoJY2xhc3M9MDItODAtMDAsIGhkcnR5cGU9MHgwMCwgbWZkZXY9MAoJY21kcmVnPTB4 MDEwNiwgc3RhdHJlZz0weDAwMTAsIGNhY2hlbG5zej0xNiAoZHdvcmRzKQoJbGF0dGltZXI9MHgw MCAoMCBucyksIG1pbmdudD0weDAwICgwIG5zKSwgbWF4bGF0PTB4MDAgKDAgbnMpCglpbnRwaW49 YSwgaXJxPTExCglwb3dlcnNwZWMgMyAgc3VwcG9ydHMgRDAgRDMgIGN1cnJlbnQgRDAKCU1TSSBz dXBwb3J0cyAxIG1lc3NhZ2UsIDY0IGJpdAoJbWFwWzEwXTogdHlwZSBNZW1vcnksIHJhbmdlIDY0 LCBiYXNlIDB4ZjYwMDAwMDAsIHNpemUgMTMsIGVuYWJsZWQKcGNpYjI6IHJlcXVlc3RlZCBtZW1v cnkgcmFuZ2UgMHhmNjAwMDAwMC0weGY2MDAxZmZmOiBnb29kCnBjaWIyOiBtYXRjaGVkIGVudHJ5 IGZvciA0LjAuSU5UQQpwY2liMjogc2xvdCAwIElOVEEgaGFyZHdpcmVkIHRvIElSUSAxNwppd24w OiA8SW50ZWwoUikgUFJPL1dpcmVsZXNzIDUzMDA+IG1lbSAweGY2MDAwMDAwLTB4ZjYwMDFmZmYg aXJxIDE3IGF0IGRldmljZSAwLjAgb24gcGNpNAppd24wOiBhdHRlbXB0aW5nIHRvIGFsbG9jYXRl IDEgTVNJIHZlY3RvcnMgKDEgc3VwcG9ydGVkKQptc2k6IHJvdXRpbmcgTVNJIElSUSAyNTggdG8g bG9jYWwgQVBJQyAwIHZlY3RvciA1NAppd24wOiB1c2luZyBJUlEgMjU4IGZvciBNU0kKaXduMDog TUlNTyAzVDNSLCBNb1csIGFkZHJlc3MgMDA6MjE6NmE6Nzc6Y2Q6OTIKaXduMDogW01QU0FGRV0K aXduMDogW0lUSFJFQURdCml3bjA6IDExYSByYXRlczogNk1icHMgOU1icHMgMTJNYnBzIDE4TWJw cyAyNE1icHMgMzZNYnBzIDQ4TWJwcyA1NE1icHMKaXduMDogMTFiIHJhdGVzOiAxTWJwcyAyTWJw cyA1LjVNYnBzIDExTWJwcwppd24wOiAxMWcgcmF0ZXM6IDFNYnBzIDJNYnBzIDUuNU1icHMgMTFN YnBzIDZNYnBzIDlNYnBzIDEyTWJwcyAxOE1icHMgMjRNYnBzIDM2TWJwcyA0OE1icHMgNTRNYnBz CnBjaWIzOiA8QUNQSSBQQ0ktUENJIGJyaWRnZT4gaXJxIDE2IGF0IGRldmljZSAyOC41IG9uIHBj aTAKcGNpYjM6ICAgZG9tYWluICAgICAgICAgICAgMApwY2liMzogICBzZWNvbmRhcnkgYnVzICAg ICA2CnBjaWIzOiAgIHN1Ym9yZGluYXRlIGJ1cyAgIDYKcGNpYjM6ICAgSS9PIGRlY29kZSAgICAg ICAgMHhmMDAwLTB4ZmZmCnBjaWIzOiAgIG1lbW9yeSBkZWNvZGUgICAgIDB4Zjg1MDAwMDAtMHhm ODVmZmZmZgpwY2liMzogICBubyBwcmVmZXRjaGVkIGRlY29kZQpwY2k2OiA8QUNQSSBQQ0kgYnVz PiBvbiBwY2liMwpwY2k2OiBkb21haW49MCwgcGh5c2ljYWwgYnVzPTYKZm91bmQtPgl2ZW5kb3I9 MHgxNGU0LCBkZXY9MHgxNjk4LCByZXZpZD0weDEwCglkb21haW49MCwgYnVzPTYsIHNsb3Q9MCwg ZnVuYz0wCgljbGFzcz0wMi0wMC0wMCwgaGRydHlwZT0weDAwLCBtZmRldj0wCgljbWRyZWc9MHgw MTA2LCBzdGF0cmVnPTB4MDAxMCwgY2FjaGVsbnN6PTE2IChkd29yZHMpCglsYXR0aW1lcj0weDAw ICgwIG5zKSwgbWluZ250PTB4MDAgKDAgbnMpLCBtYXhsYXQ9MHgwMCAoMCBucykKCWludHBpbj1h LCBpcnE9MTEKCXBvd2Vyc3BlYyAzICBzdXBwb3J0cyBEMCBEMyAgY3VycmVudCBEMAoJTVNJIHN1 cHBvcnRzIDEgbWVzc2FnZSwgNjQgYml0CgltYXBbMTBdOiB0eXBlIE1lbW9yeSwgcmFuZ2UgNjQs IGJhc2UgMHhmODUwMDAwMCwgc2l6ZSAxNiwgZW5hYmxlZApwY2liMzogcmVxdWVzdGVkIG1lbW9y eSByYW5nZSAweGY4NTAwMDAwLTB4Zjg1MGZmZmY6IGdvb2QKcGNpYjM6IG1hdGNoZWQgZW50cnkg Zm9yIDYuMC5JTlRBCnBjaWIzOiBzbG90IDAgSU5UQSBoYXJkd2lyZWQgdG8gSVJRIDE3CmJnZTA6 IDxCcm9hZGNvbSBOZXRMaW5rIEdpZ2FiaXQgRXRoZXJuZXQgQ29udHJvbGxlciAgICAsIEFTSUMg cmV2LiAweDU3ODQxMDA+IG1lbSAweGY4NTAwMDAwLTB4Zjg1MGZmZmYgaXJxIDE3IGF0IGRldmlj ZSAwLjAgb24gcGNpNgpiZ2UwOiBhdHRlbXB0aW5nIHRvIGFsbG9jYXRlIDEgTVNJIHZlY3RvcnMg KDEgc3VwcG9ydGVkKQptc2k6IHJvdXRpbmcgTVNJIElSUSAyNTkgdG8gbG9jYWwgQVBJQyAwIHZl Y3RvciA1NQpiZ2UwOiB1c2luZyBJUlEgMjU5IGZvciBNU0kKYmdlMDogQ0hJUCBJRCAweDA1Nzg0 MTAwOyBBU0lDIFJFViAweDU3ODQ7IENISVAgUkVWIDB4NTc4NDE7IFBDSS1FCmJnZTA6IERpc2Fi bGluZyBmYXN0Ym9vdApiZ2UwOiBEaXNhYmxpbmcgZmFzdGJvb3QKbWlpYnVzMDogPE1JSSBidXM+ IG9uIGJnZTAKYnJncGh5MDogPEJDTTU3ODQgMTAvMTAwLzEwMDBiYXNlVFggUEhZPiBQSFkgMSBv biBtaWlidXMwCmJyZ3BoeTA6IE9VSSAweDAwNTBlZiwgbW9kZWwgMHgwMDNhLCByZXYuIDQKYnJn cGh5MDogIDEwYmFzZVQsIDEwYmFzZVQtRkRYLCAxMDBiYXNlVFgsIDEwMGJhc2VUWC1GRFgsIDEw MDBiYXNlVCwgMTAwMGJhc2VULUZEWCwgYXV0bwpiZ2UwOiBicGYgYXR0YWNoZWQKYmdlMDogRXRo ZXJuZXQgYWRkcmVzczogMDA6MjI6MTk6ZTU6Y2E6NTEKYmdlMDogW01QU0FGRV0KYmdlMDogW0ZJ TFRFUl0KdWhjaTM6IDxJbnRlbCA4MjgwMUkgKElDSDkpIFVTQiBjb250cm9sbGVyPiBwb3J0IDB4 MTg4MC0weDE4OWYgaXJxIDIzIGF0IGRldmljZSAyOS4wIG9uIHBjaTAKaW9hcGljMDogcm91dGlu ZyBpbnRwaW4gMjMgKFBDSSBJUlEgMjMpIHRvIGxhcGljIDAgdmVjdG9yIDU2CnVoY2kzOiBbTVBT QUZFXQp1aGNpMzogW0lUSFJFQURdCnVzYnVzNDogPEludGVsIDgyODAxSSAoSUNIOSkgVVNCIGNv bnRyb2xsZXI+IG9uIHVoY2kzCnVoY2k0OiA8SW50ZWwgODI4MDFJIChJQ0g5KSBVU0IgY29udHJv bGxlcj4gcG9ydCAweDE4YTAtMHgxOGJmIGlycSAxOSBhdCBkZXZpY2UgMjkuMSBvbiBwY2kwCnVo Y2k0OiBbTVBTQUZFXQp1aGNpNDogW0lUSFJFQURdCnVzYnVzNTogPEludGVsIDgyODAxSSAoSUNI OSkgVVNCIGNvbnRyb2xsZXI+IG9uIHVoY2k0CnVoY2k1OiA8SW50ZWwgODI4MDFJIChJQ0g5KSBV U0IgY29udHJvbGxlcj4gcG9ydCAweDE4YzAtMHgxOGRmIGlycSAxOCBhdCBkZXZpY2UgMjkuMiBv biBwY2kwCmlvYXBpYzA6IHJvdXRpbmcgaW50cGluIDE4IChQQ0kgSVJRIDE4KSB0byBsYXBpYyAw IHZlY3RvciA1Nwp1aGNpNTogW01QU0FGRV0KdWhjaTU6IFtJVEhSRUFEXQp1c2J1czY6IDxJbnRl bCA4MjgwMUkgKElDSDkpIFVTQiBjb250cm9sbGVyPiBvbiB1aGNpNQplaGNpMTogPEludGVsIDgy ODAxSSAoSUNIOSkgVVNCIDIuMCBjb250cm9sbGVyPiBtZW0gMHhmODgwNGMwMC0weGY4ODA0ZmZm IGlycSAyMyBhdCBkZXZpY2UgMjkuNyBvbiBwY2kwCmVoY2kxOiBbTVBTQUZFXQplaGNpMTogW0lU SFJFQURdCnVzYnVzNzogRUhDSSB2ZXJzaW9uIDEuMAp1c2J1czc6IDxJbnRlbCA4MjgwMUkgKElD SDkpIFVTQiAyLjAgY29udHJvbGxlcj4gb24gZWhjaTEKcGNpYjQ6IDxBQ1BJIFBDSS1QQ0kgYnJp ZGdlPiBhdCBkZXZpY2UgMzAuMCBvbiBwY2kwCnBjaWI0OiAgIGRvbWFpbiAgICAgICAgICAgIDAK cGNpYjQ6ICAgc2Vjb25kYXJ5IGJ1cyAgICAgNwpwY2liNDogICBzdWJvcmRpbmF0ZSBidXMgICA3 CnBjaWI0OiAgIEkvTyBkZWNvZGUgICAgICAgIDB4ZjAwMC0weGZmZgpwY2liNDogICBubyBwcmVm ZXRjaGVkIGRlY29kZQpwY2liNDogICBTdWJ0cmFjdGl2ZWx5IGRlY29kZWQgYnJpZGdlLgpwY2li NDogY291bGQgbm90IGdldCBQQ0kgaW50ZXJydXB0IHJvdXRpbmcgdGFibGUgZm9yIFxcX1NCXy5Q Q0kwLlAwUDEgLSBBRV9OT1RfRk9VTkQKcGNpNzogPEFDUEkgUENJIGJ1cz4gb24gcGNpYjQKcGNp NzogZG9tYWluPTAsIHBoeXNpY2FsIGJ1cz03CmlzYWIwOiA8UENJLUlTQSBicmlkZ2U+IGF0IGRl dmljZSAzMS4wIG9uIHBjaTAKaXNhMDogPElTQSBidXM+IG9uIGlzYWIwCmF0YXBjaTA6IDxJbnRl bCAoSUQ9MjkyOTgwODYpIEFIQ0kgY29udHJvbGxlcj4gcG9ydCAweDE4MTgtMHgxODFmLDB4MTgw Yy0weDE4MGYsMHgxODEwLTB4MTgxNywweDE4MDgtMHgxODBiLDB4MThlMC0weDE4ZmYgbWVtIDB4 Zjg4MDQwMDAtMHhmODgwNDdmZiBpcnEgMTkgYXQgZGV2aWNlIDMxLjIgb24gcGNpMAphdGFwY2kw OiBbTVBTQUZFXQphdGFwY2kwOiBbSVRIUkVBRF0KYXRhcGNpMDogQUhDSSB2MS4yMCBjb250cm9s bGVyIHdpdGggNCAzR2JwcyBwb3J0cywgUE0gc3VwcG9ydGVkCmF0YXBjaTA6IENhcHM6IDY0Yml0 IE5DUSBTTlRGIEFMUCBBTCBDTE8gM0dicHMgUE0gUE1EIFNTQyBQU0MgMzJjbWQgQ0NDIGVTQVRB IDRwb3J0cwphdGEyOiA8QVRBIGNoYW5uZWwgMD4gb24gYXRhcGNpMAphdGEyOiBbTVBTQUZFXQph dGEyOiBbSVRIUkVBRF0KYXRhMzogPEFUQSBjaGFubmVsIDE+IG9uIGF0YXBjaTAKYXRhMzogW01Q U0FGRV0KYXRhMzogW0lUSFJFQURdCnBjaTA6IDxzZXJpYWwgYnVzLCBTTUJ1cz4gYXQgZGV2aWNl IDMxLjMgKG5vIGRyaXZlciBhdHRhY2hlZCkKYWNwaV9idXR0b24wOiA8UG93ZXIgQnV0dG9uPiBv biBhY3BpMAphY3BpX2J1dHRvbjE6IDxTbGVlcCBCdXR0b24+IG9uIGFjcGkwCmFjcGlfbGlkMDog PENvbnRyb2wgTWV0aG9kIExpZCBTd2l0Y2g+IG9uIGFjcGkwCmFjcGlfbGlkMDogZW5hYmxlIHdh a2UgZmFpbGVkCmFjcGlfYWNhZDA6IDxBQyBBZGFwdGVyPiBvbiBhY3BpMApiYXR0ZXJ5MDogPEFD UEkgQ29udHJvbCBNZXRob2QgQmF0dGVyeT4gb24gYWNwaTAKYWNwaV90ejA6IDxUaGVybWFsIFpv bmU+IG9uIGFjcGkwCmFjcGlfdHoxOiA8VGhlcm1hbCBab25lPiBvbiBhY3BpMAphY3BpX3R6Mjog PFRoZXJtYWwgWm9uZT4gb24gYWNwaTAKYXRydGMwOiA8QVQgcmVhbHRpbWUgY2xvY2s+IHBvcnQg MHg3MC0weDc3IGlycSA4IG9uIGFjcGkwCmF0cnRjMDogV2FybmluZzogQ291bGRuJ3QgbWFwIEkv Ty4KYXRydGMwOiByZWdpc3RlcmVkIGFzIGEgdGltZS1vZi1kYXkgY2xvY2sgKHJlc29sdXRpb24g MTAwMDAwMHVzKQphdGtiZGMwOiA8S2V5Ym9hcmQgY29udHJvbGxlciAoaTgwNDIpPiBwb3J0IDB4 NjAsMHg2NCBpcnEgMSBvbiBhY3BpMAphdGtiZDA6IDxBVCBLZXlib2FyZD4gaXJxIDEgb24gYXRr YmRjMAphdGtiZDogdGhlIGN1cnJlbnQga2JkIGNvbnRyb2xsZXIgY29tbWFuZCBieXRlIDAwNDcK YXRrYmQ6IGtleWJvYXJkIElEIDB4NDFhYiAoMikKa2JkMCBhdCBhdGtiZDAKa2JkMDogYXRrYmQw LCBBVCAxMDEvMTAyICgyKSwgY29uZmlnOjB4MCwgZmxhZ3M6MHgzZDAwMDAKaW9hcGljMDogcm91 dGluZyBpbnRwaW4gMSAoSVNBIElSUSAxKSB0byBsYXBpYyAwIHZlY3RvciA1OAphdGtiZDA6IFtH SUFOVC1MT0NLRURdCmF0a2JkMDogW0lUSFJFQURdCnBzbTA6IHVuYWJsZSB0byBhbGxvY2F0ZSBJ UlEKcHNtY3BucDA6IDxQUy8yIG1vdXNlIHBvcnQ+IGlycSAxMiBvbiBhY3BpMApwc20wOiBjdXJy ZW50IGNvbW1hbmQgYnl0ZTowMDQ3CnBzbTA6IDxQUy8yIE1vdXNlPiBpcnEgMTIgb24gYXRrYmRj MAppb2FwaWMwOiByb3V0aW5nIGludHBpbiAxMiAoSVNBIElSUSAxMikgdG8gbGFwaWMgMCB2ZWN0 b3IgNTkKcHNtMDogW0dJQU5ULUxPQ0tFRF0KcHNtMDogW0lUSFJFQURdCnBzbTA6IG1vZGVsIFN5 bmFwdGljcyBUb3VjaHBhZCwgZGV2aWNlIElEIDAtMDAsIDMgYnV0dG9ucwpwc20wOiBjb25maWc6 MDAwMDYwMDAsIGZsYWdzOjAwMDAwMDA4LCBwYWNrZXQgc2l6ZTo2CnBzbTA6IHN5bmNtYXNrOmMw LCBzeW5jYml0czowMAphY3BpMDogd2FrZXVwIGNvZGUgdmEgMHhmZmZmZmY4MDc0ZGViMDAwIHBh IDB4NDAwMAppc2FfcHJvYmVfY2hpbGRyZW46IGRpc2FibGluZyBQblAgZGV2aWNlcwphdGtiZGM6 IGF0a2JkYzAgYWxyZWFkeSBleGlzdHM7IHNraXBwaW5nIGl0CmF0cnRjOiBhdHJ0YzAgYWxyZWFk eSBleGlzdHM7IHNraXBwaW5nIGl0CnNjOiBzYzAgYWxyZWFkeSBleGlzdHM7IHNraXBwaW5nIGl0 CmlzYV9wcm9iZV9jaGlsZHJlbjogcHJvYmluZyBub24tUG5QIGRldmljZXMKc2MwOiA8U3lzdGVt IGNvbnNvbGU+IGF0IGZsYWdzIDB4MTAwIG9uIGlzYTAKc2MwOiBWR0EgPDE2IHZpcnR1YWwgY29u c29sZXMsIGZsYWdzPTB4MzAwPgpzYzA6IGZiMCwga2JkMSwgdGVybWluYWwgZW11bGF0b3I6IHNj dGVrZW4gKHRla2VuIHRlcm1pbmFsKQp2Z2EwOiA8R2VuZXJpYyBJU0EgVkdBPiBhdCBwb3J0IDB4 M2MwLTB4M2RmIGlvbWVtIDB4YTAwMDAtMHhiZmZmZiBvbiBpc2EwCmZkYzAgZmFpbGVkIHRvIHBy b2JlIGF0IHBvcnQgMHgzZjAgaXJxIDYgZHJxIDIgb24gaXNhMApwcGMwIGZhaWxlZCB0byBwcm9i ZSBhdCBpcnEgNyBvbiBpc2EwCnVhcnQwIGZhaWxlZCB0byBwcm9iZSBhdCBwb3J0IDB4M2Y4IGly cSA0IG9uIGlzYTAKdWFydDEgZmFpbGVkIHRvIHByb2JlIGF0IHBvcnQgMHgyZjggaXJxIDMgb24g aXNhMAppc2FfcHJvYmVfY2hpbGRyZW46IHByb2JpbmcgUG5QIGRldmljZXMKZXN0MDogPEVuaGFu Y2VkIFNwZWVkU3RlcCBGcmVxdWVuY3kgQ29udHJvbD4gb24gY3B1MAplc3QwOiBJbnZhbGlkIGlk MTYgKHNldCwgY3VyKSA9ICgyMDc1LCAxODEwKQplc3QwOiBDYW4ndCBjaGVjayBmcmVxIDE0MDEs IGl0IG1heSBiZSBpbnZhbGlkCmVzdDE6IDxFbmhhbmNlZCBTcGVlZFN0ZXAgRnJlcXVlbmN5IENv bnRyb2w+IG9uIGNwdTEKZXN0MTogSW52YWxpZCBpZDE2IChzZXQsIGN1cikgPSAoMjA3NSwgMTgx MCkKZXN0MTogQ2FuJ3QgY2hlY2sgZnJlcSAxNDAxLCBpdCBtYXkgYmUgaW52YWxpZApEZXZpY2Ug Y29uZmlndXJhdGlvbiBmaW5pc2hlZC4KUmVkdWNpbmcga2Vybi5tYXh2bm9kZXMgMjU1MjYwIC0+ IDEwMDAwMApwcm9jZnMgcmVnaXN0ZXJlZAppb2FwaWMwOiByb3V0aW5nIGludHBpbiAyIChJU0Eg SVJRIDApIHRvIGxhcGljIDAgdmVjdG9yIDYwClRpbWVjb3VudGVyICJUU0MiIGZyZXF1ZW5jeSAx NDAwMDYwNTU3IEh6IHF1YWxpdHkgLTEwMApUaW1lY291bnRlcnMgdGljayBldmVyeSAxMC4wMDAg bXNlYwp2bGFuOiBpbml0aWFsaXplZCwgdXNpbmcgaGFzaCB0YWJsZXMgd2l0aCBjaGFpbmluZwpp cGZ3MiAoK2lwdjYpIGluaXRpYWxpemVkLCBkaXZlcnQgZW5hYmxlZCwgbmF0IGVuYWJsZWQsIHJ1 bGUtYmFzZWQgZm9yd2FyZGluZyBlbmFibGVkLCBkZWZhdWx0IHRvIGFjY2VwdCwgbG9nZ2luZyBk aXNhYmxlZAppcGZ3MDogYnBmIGF0dGFjaGVkCkRVTU1ZTkVUIDB4ZmZmZmZmMDAwMTM5YzE4MCB3 aXRoIElQdjYgaW5pdGlhbGl6ZWQgKDEwMDQwOSkKbG9hZF9kbl9zY2hlZCBkbl9zY2hlZCBGSUZP IGxvYWRlZApsb2FkX2RuX3NjaGVkIGRuX3NjaGVkIFBSSU8gbG9hZGVkCmxvYWRfZG5fc2NoZWQg ZG5fc2NoZWQgUUZRIGxvYWRlZApsb2FkX2RuX3NjaGVkIGRuX3NjaGVkIFJSIGxvYWRlZApsb2Fk X2RuX3NjaGVkIGRuX3NjaGVkIFdGMlErIGxvYWRlZApsbzA6IGJwZiBhdHRhY2hlZApoZGFjMDog UHJvYmluZyBjb2RlYyAjMC4uLgpoZGFjMDogSERBIENvZGVjICMwOiBJRFQgOTJIRDczQzEKaGRh YzA6ICBIREEgQ29kZWMgSUQ6IDB4MTExZDc2NzUKaGRhYzA6ICAgICAgICBWZW5kb3I6IDB4MTEx ZApoZGFjMDogICAgICAgIERldmljZTogMHg3Njc1CmhkYWMwOiAgICAgIFJldmlzaW9uOiAweDAy CmhkYWMwOiAgICAgIFN0ZXBwaW5nOiAweDAyCmhkYWMwOiBQQ0kgU3VidmVuZG9yOiAweDAyYjkx MDI4CmhkYWMwOiAJRm91bmQgYXVkaW8gRkcgbmlkPTEgc3RhcnRub2RlPTEwIGVuZG5vZGU9NDQg dG90YWw9MzQKaGRhYzA6IFByb2JpbmcgY29kZWMgIzEuLi4KaGRhYzA6IEhEQSBDb2RlYyAjMTog SW50ZWwgRzQ1IEhETUkKaGRhYzA6ICBIREEgQ29kZWMgSUQ6IDB4ODA4NjI4MDIKaGRhYzA6ICAg ICAgICBWZW5kb3I6IDB4ODA4NgpoZGFjMDogICAgICAgIERldmljZTogMHgyODAyCmhkYWMwOiAg ICAgIFJldmlzaW9uOiAweDAwCmhkYWMwOiAgICAgIFN0ZXBwaW5nOiAweDAwCmhkYWMwOiBQQ0kg U3VidmVuZG9yOiAweDAyYjkxMDI4CmhkYWMwOiAJRm91bmQgYXVkaW8gRkcgbmlkPTEgc3RhcnRu b2RlPTIgZW5kbm9kZT00IHRvdGFsPTIKaGRhYzA6IApoZGFjMDogUHJvY2Vzc2luZyBhdWRpbyBG RyBjYWQ9MCBuaWQ9MS4uLgpoZGFjMDogR1BJTzogMHhjMDAwMDAwOCBOdW1HUElPPTggTnVtR1BP PTAgTnVtR1BJPTAgR1BJV2FrZT0xIEdQSVVuc29sPTEKaGRhYzA6ICBuaWQgMTAgMHgwNDIxMTAx ZiBhcyAgMSBzZXEgMTUgICAgSGVhZHBob25lcyAgSmFjayBqYWNrICAxIGxvYyAgNCBjb2xvciAg IEJsYWNrIG1pc2MgMApoZGFjMDogIG5pZCAxMSAweDQwMDAwMWYxIGFzIDE1IHNlcSAgMSAgICAg IExpbmUtb3V0ICBOb25lIGphY2sgIDAgbG9jICAwIGNvbG9yIFVua25vd24gbWlzYyAxCmhkYWMw OiAgbmlkIDEyIDB4NDAwMDAxZjIgYXMgMTUgc2VxICAyICAgICAgTGluZS1vdXQgIE5vbmUgamFj ayAgMCBsb2MgIDAgY29sb3IgVW5rbm93biBtaXNjIDEKaGRhYzA6ICBuaWQgMTMgMHg5MDE3MDEx MCBhcyAgMSBzZXEgIDAgICAgICAgU3BlYWtlciBGaXhlZCBqYWNrICA3IGxvYyAxNiBjb2xvciBV bmtub3duIG1pc2MgMQpoZGFjMDogIG5pZCAxNCAweDQwMDAwMWYzIGFzIDE1IHNlcSAgMyAgICAg IExpbmUtb3V0ICBOb25lIGphY2sgIDAgbG9jICAwIGNvbG9yIFVua25vd24gbWlzYyAxCmhkYWMw OiAgbmlkIDE1IDB4NDAwMDAxZjAgYXMgMTUgc2VxICAwICAgICAgTGluZS1vdXQgIE5vbmUgamFj ayAgMCBsb2MgIDAgY29sb3IgVW5rbm93biBtaXNjIDEKaGRhYzA6ICBuaWQgMTYgMHg0MDAwMDFm NCBhcyAxNSBzZXEgIDQgICAgICBMaW5lLW91dCAgTm9uZSBqYWNrICAwIGxvYyAgMCBjb2xvciBV bmtub3duIG1pc2MgMQpoZGFjMDogIG5pZCAxNyAweDQwMDAwMWY1IGFzIDE1IHNlcSAgNSAgICAg IExpbmUtb3V0ICBOb25lIGphY2sgIDAgbG9jICAwIGNvbG9yIFVua25vd24gbWlzYyAxCmhkYWMw OiAgbmlkIDE4IDB4NDAwMDAxZjYgYXMgMTUgc2VxICA2ICAgICAgTGluZS1vdXQgIE5vbmUgamFj ayAgMCBsb2MgIDAgY29sb3IgVW5rbm93biBtaXNjIDEKaGRhYzA6ICBuaWQgMTkgMHg5MGE2MDE2 MCBhcyAgNiBzZXEgIDAgICAgICAgICAgIE1pYyBGaXhlZCBqYWNrICA2IGxvYyAxNiBjb2xvciBV bmtub3duIG1pc2MgMQpoZGFjMDogIG5pZCAyMCAweDQwMDAwMWY3IGFzIDE1IHNlcSAgNyAgICAg IExpbmUtb3V0ICBOb25lIGphY2sgIDAgbG9jICAwIGNvbG9yIFVua25vd24gbWlzYyAxCmhkYWMw OiAgbmlkIDM0IDB4NDAwMDAxZjggYXMgMTUgc2VxICA4ICAgICAgTGluZS1vdXQgIE5vbmUgamFj ayAgMCBsb2MgIDAgY29sb3IgVW5rbm93biBtaXNjIDEKaGRhYzA6ICBuaWQgMzUgMHg0MDAwMDFm OSBhcyAxNSBzZXEgIDkgICAgICBMaW5lLW91dCAgTm9uZSBqYWNrICAwIGxvYyAgMCBjb2xvciBV bmtub3duIG1pc2MgMQpoZGFjMDogIG5pZCAzNiAweDQwMDAwMWZhIGFzIDE1IHNlcSAxMCAgICAg IExpbmUtb3V0ICBOb25lIGphY2sgIDAgbG9jICAwIGNvbG9yIFVua25vd24gbWlzYyAxCmhkYWMw OiBQYXRjaGVkIHBpbnMgY29uZmlndXJhdGlvbjoKaGRhYzA6ICBuaWQgMTAgMHgwNDIxMTAxZiBh cyAgMSBzZXEgMTUgICAgSGVhZHBob25lcyAgSmFjayBqYWNrICAxIGxvYyAgNCBjb2xvciAgIEJs YWNrIG1pc2MgMApoZGFjMDogIG5pZCAxMSAweDQwMDAwMWYxIGFzIDE1IHNlcSAgMSAgICAgIExp bmUtb3V0ICBOb25lIGphY2sgIDAgbG9jICAwIGNvbG9yIFVua25vd24gbWlzYyAxIFtESVNBQkxF RF0KaGRhYzA6ICBuaWQgMTIgMHg0MDAwMDFmMiBhcyAxNSBzZXEgIDIgICAgICBMaW5lLW91dCAg Tm9uZSBqYWNrICAwIGxvYyAgMCBjb2xvciBVbmtub3duIG1pc2MgMSBbRElTQUJMRURdCmhkYWMw OiAgbmlkIDEzIDB4OTAxNzAxMTAgYXMgIDEgc2VxICAwICAgICAgIFNwZWFrZXIgRml4ZWQgamFj ayAgNyBsb2MgMTYgY29sb3IgVW5rbm93biBtaXNjIDEKaGRhYzA6ICBuaWQgMTQgMHg0MDAwMDFm MyBhcyAxNSBzZXEgIDMgICAgICBMaW5lLW91dCAgTm9uZSBqYWNrICAwIGxvYyAgMCBjb2xvciBV bmtub3duIG1pc2MgMSBbRElTQUJMRURdCmhkYWMwOiAgbmlkIDE1IDB4NDAwMDAxZjAgYXMgMTUg c2VxICAwICAgICAgTGluZS1vdXQgIE5vbmUgamFjayAgMCBsb2MgIDAgY29sb3IgVW5rbm93biBt aXNjIDEgW0RJU0FCTEVEXQpoZGFjMDogIG5pZCAxNiAweDQwMDAwMWY0IGFzIDE1IHNlcSAgNCAg ICAgIExpbmUtb3V0ICBOb25lIGphY2sgIDAgbG9jICAwIGNvbG9yIFVua25vd24gbWlzYyAxIFtE SVNBQkxFRF0KaGRhYzA6ICBuaWQgMTcgMHg0MDAwMDFmNSBhcyAxNSBzZXEgIDUgICAgICBMaW5l LW91dCAgTm9uZSBqYWNrICAwIGxvYyAgMCBjb2xvciBVbmtub3duIG1pc2MgMSBbRElTQUJMRURd CmhkYWMwOiAgbmlkIDE4IDB4NDAwMDAxZjYgYXMgMTUgc2VxICA2ICAgICAgTGluZS1vdXQgIE5v bmUgamFjayAgMCBsb2MgIDAgY29sb3IgVW5rbm93biBtaXNjIDEgW0RJU0FCTEVEXQpoZGFjMDog IG5pZCAxOSAweDkwYTYwMTYwIGFzICA2IHNlcSAgMCAgICAgICAgICAgTWljIEZpeGVkIGphY2sg IDYgbG9jIDE2IGNvbG9yIFVua25vd24gbWlzYyAxCmhkYWMwOiAgbmlkIDIwIDB4NDAwMDAxZjcg YXMgMTUgc2VxICA3ICAgICAgTGluZS1vdXQgIE5vbmUgamFjayAgMCBsb2MgIDAgY29sb3IgVW5r bm93biBtaXNjIDEgW0RJU0FCTEVEXQpoZGFjMDogIG5pZCAzNCAweDQwMDAwMWY4IGFzIDE1IHNl cSAgOCAgICAgIExpbmUtb3V0ICBOb25lIGphY2sgIDAgbG9jICAwIGNvbG9yIFVua25vd24gbWlz YyAxIFtESVNBQkxFRF0KaGRhYzA6ICBuaWQgMzUgMHg0MDAwMDFmOSBhcyAxNSBzZXEgIDkgICAg ICBMaW5lLW91dCAgTm9uZSBqYWNrICAwIGxvYyAgMCBjb2xvciBVbmtub3duIG1pc2MgMSBbRElT QUJMRURdCmhkYWMwOiAgbmlkIDM2IDB4NDAwMDAxZmEgYXMgMTUgc2VxIDEwICAgICAgTGluZS1v dXQgIE5vbmUgamFjayAgMCBsb2MgIDAgY29sb3IgVW5rbm93biBtaXNjIDEgW0RJU0FCTEVEXQpo ZGFjMDogMiBhc3NvY2lhdGlvbnMgZm91bmQ6CmhkYWMwOiBBc3NvY2lhdGlvbiAwICgxKSBvdXQ6 CmhkYWMwOiAgUGluIG5pZD0xMyBzZXE9MApoZGFjMDogIFBpbiBuaWQ9MTAgc2VxPTE1CmhkYWMw OiBBc3NvY2lhdGlvbiAxICg2KSBpbjoKaGRhYzA6ICBQaW4gbmlkPTE5IHNlcT0wCmhkYWMwOiBU cmFjaW5nIGFzc29jaWF0aW9uIDAgKDEpCmhkYWMwOiAgUGluIDEzIHRyYWNlZCB0byBEQUMgMjEK aGRhYzA6ICBQaW4gMTAgdHJhY2VkIHRvIERBQyAyMSBhbmQgaHByZWRpciAwCmhkYWMwOiBBc3Nv Y2lhdGlvbiAwICgxKSB0cmFjZSBzdWNjZWVkZWQKaGRhYzA6IFRyYWNpbmcgYXNzb2NpYXRpb24g MSAoNikKaGRhYzA6ICBQaW4gMTkgdHJhY2VkIHRvIEFEQyAyNgpoZGFjMDogQXNzb2NpYXRpb24g MSAoNikgdHJhY2Ugc3VjY2VlZGVkCmhkYWMwOiBUcmFjaW5nIGlucHV0IG1vbml0b3IKaGRhYzA6 IFRyYWNpbmcgb3RoZXIgaW5wdXQgbW9uaXRvcnMKaGRhYzA6ICBUcmFjaW5nIG5pZCAxOSB0byBv dXQKaGRhYzA6IFRyYWNpbmcgYmVlcGVyCmhkYWMwOiBFbmFibGluZyBoZWFkcGhvbmUvc3BlYWtl ciBhdWRpbyByb3V0aW5nIHN3aXRjaGluZzoKaGRhYzA6IAlhcz0wIHNlbnNlIG5pZD0xMCBbVU5T T0xdCmhkYWMwOiBQaW4gc2Vuc2U6IG5pZD0xMCByZXM9MHg3ZmZmZmZmZgpoZGFjMDogRkcgY29u ZmlnL3F1aXJrczogZm9yY2VzdGVyZW8gaXZyZWY1MCBpdnJlZjgwIGl2cmVmMTAwIGl2cmVmCmhk YWMwOiAKaGRhYzA6ICstLS0tLS0tLS0tLS0tLS0tLS0tKwpoZGFjMDogfCBEVU1QSU5HIEhEQSBO T0RFUyB8CmhkYWMwOiArLS0tLS0tLS0tLS0tLS0tLS0tLSsKaGRhYzA6IApoZGFjMDogRGVmYXVs dCBQYXJhbWV0ZXIKaGRhYzA6IC0tLS0tLS0tLS0tLS0tLS0tCmhkYWMwOiAgICAgIFN0cmVhbSBj YXA6IDB4MDAwMDAwMDEKaGRhYzA6ICAgICAgICAgICAgICAgICAgUENNCmhkYWMwOiAgICAgICAg IFBDTSBjYXA6IDB4MDAwZTA1ZTAKaGRhYzA6ICAgICAgICAgICAgICAgICAgMTYgMjAgMjQgYml0 cywgNDQgNDggODggOTYgMTkyIEtIegpoZGFjMDogICAgICAgICAgSU4gYW1wOiAweDAwMjcwMzAw CmhkYWMwOiAgICAgICAgIE9VVCBhbXA6IDB4ODAwMjdmN2YKaGRhYzA6IApoZGFjMDogICAgICAg ICAgICAgbmlkOiAxMApoZGFjMDogICAgICAgICAgICBOYW1lOiBwaW46IEhlYWRwaG9uZXMgKEJs YWNrIEphY2spCmhkYWMwOiAgICAgIFdpZGdldCBjYXA6IDB4MDA0MDAxODMKaGRhYzA6ICAgICAg ICAgICAgICAgICAgVU5TT0wgU1RFUkVPCmhkYWMwOiAgICAgQXNzb2NpYXRpb246IDAgKDB4MDAw MDgwMDApCmhkYWMwOiAgICAgICAgIFBpbiBjYXA6IDB4MDAwMDE3M2YKaGRhYzA6ICAgICAgICAg ICAgICAgICAgSVNDIFRSUUQgUERDIEhQIE9VVCBJTiBWUkVGWyA1MCA4MCBHUk9VTkQgSElaIF0K aGRhYzA6ICAgICAgUGluIGNvbmZpZzogMHgwNDIxMTAxZgpoZGFjMDogICAgIFBpbiBjb250cm9s OiAweDAwMDAwMDgwIEhQCmhkYWMwOiAgICAgICBJbnB1dCBhbXA6IDB4MDAyNzAzMDAKaGRhYzA6 ICAgICAgICAgICAgICAgICAgbXV0ZT0wIHN0ZXA9MyBzaXplPTM5IG9mZnNldD0wCmhkYWMwOiAg ICAgY29ubmVjdGlvbnM6IDQKaGRhYzA6ICAgICAgICAgICB8CmhkYWMwOiAgICAgICAgICAgKyA8 LSBuaWQ9MjEgW2F1ZGlvIG91dHB1dF0gKHNlbGVjdGVkKQpoZGFjMDogICAgICAgICAgICsgW0RJ U0FCTEVEXSA8LSBuaWQ9MjIgW2F1ZGlvIG91dHB1dF0gW0RJU0FCTEVEXQpoZGFjMDogICAgICAg ICAgICsgW0RJU0FCTEVEXSA8LSBuaWQ9MjMgW2F1ZGlvIG91dHB1dF0gW0RJU0FCTEVEXQpoZGFj MDogICAgICAgICAgICsgW0RJU0FCTEVEXSA8LSBuaWQ9MzAgW2F1ZGlvIHNlbGVjdG9yXSBbRElT QUJMRURdCmhkYWMwOiAKaGRhYzA6ICAgICAgICAgICAgIG5pZDogMTEgW0RJU0FCTEVEXQpoZGFj MDogICAgICAgICAgICBOYW1lOiBwaW46IExpbmUtb3V0IChOb25lKQpoZGFjMDogICAgICBXaWRn ZXQgY2FwOiAweDAwNDAwMTgzCmhkYWMwOiAgICAgICAgICAgICAgICAgIFVOU09MIFNURVJFTwpo ZGFjMDogICAgICAgICBQaW4gY2FwOiAweDAwMDAxNzNmCmhkYWMwOiAgICAgICAgICAgICAgICAg IElTQyBUUlFEIFBEQyBIUCBPVVQgSU4gVlJFRlsgNTAgODAgR1JPVU5EIEhJWiBdCmhkYWMwOiAg ICAgIFBpbiBjb25maWc6IDB4NDAwMDAxZjEKaGRhYzA6ICAgICBQaW4gY29udHJvbDogMHgwMDAw MDAwMApoZGFjMDogICAgICAgSW5wdXQgYW1wOiAweDAwMjcwMzAwCmhkYWMwOiAgICAgICAgICAg ICAgICAgIG11dGU9MCBzdGVwPTMgc2l6ZT0zOSBvZmZzZXQ9MApoZGFjMDogICAgIGNvbm5lY3Rp b25zOiA0CmhkYWMwOiAgICAgICAgICAgfApoZGFjMDogICAgICAgICAgICsgPC0gbmlkPTIxIFth dWRpbyBvdXRwdXRdIChzZWxlY3RlZCkKaGRhYzA6ICAgICAgICAgICArIDwtIG5pZD0yMiBbYXVk aW8gb3V0cHV0XSBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgKyA8LSBuaWQ9MjMgW2F1ZGlv IG91dHB1dF0gW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICsgPC0gbmlkPTMwIFthdWRpbyBz ZWxlY3Rvcl0gW0RJU0FCTEVEXQpoZGFjMDogCmhkYWMwOiAgICAgICAgICAgICBuaWQ6IDEyIFtE SVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICAgTmFtZTogcGluOiBMaW5lLW91dCAoTm9uZSkKaGRh YzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDQwMDE4MwpoZGFjMDogICAgICAgICAgICAgICAgICBV TlNPTCBTVEVSRU8KaGRhYzA6ICAgICAgICAgUGluIGNhcDogMHgwMDAwMTczNwpoZGFjMDogICAg ICAgICAgICAgICAgICBJU0MgVFJRRCBQREMgT1VUIElOIFZSRUZbIDUwIDgwIEdST1VORCBISVog XQpoZGFjMDogICAgICBQaW4gY29uZmlnOiAweDQwMDAwMWYyCmhkYWMwOiAgICAgUGluIGNvbnRy b2w6IDB4MDAwMDAwMDAKaGRhYzA6ICAgICAgIElucHV0IGFtcDogMHgwMDI3MDMwMApoZGFjMDog ICAgICAgICAgICAgICAgICBtdXRlPTAgc3RlcD0zIHNpemU9Mzkgb2Zmc2V0PTAKaGRhYzA6ICAg ICBjb25uZWN0aW9uczogNApoZGFjMDogICAgICAgICAgIHwKaGRhYzA6ICAgICAgICAgICArIDwt IG5pZD0yMSBbYXVkaW8gb3V0cHV0XSAoc2VsZWN0ZWQpCmhkYWMwOiAgICAgICAgICAgKyA8LSBu aWQ9MjIgW2F1ZGlvIG91dHB1dF0gW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICsgPC0gbmlk PTIzIFthdWRpbyBvdXRwdXRdIFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICArIDwtIG5pZD0z MCBbYXVkaW8gc2VsZWN0b3JdIFtESVNBQkxFRF0KaGRhYzA6IApoZGFjMDogICAgICAgICAgICAg bmlkOiAxMwpoZGFjMDogICAgICAgICAgICBOYW1lOiBwaW46IFNwZWFrZXIgKEZpeGVkKQpoZGFj MDogICAgICBXaWRnZXQgY2FwOiAweDAwNDAwMTgzCmhkYWMwOiAgICAgICAgICAgICAgICAgIFVO U09MIFNURVJFTwpoZGFjMDogICAgIEFzc29jaWF0aW9uOiAwICgweDAwMDAwMDAxKQpoZGFjMDog ICAgICAgICBQaW4gY2FwOiAweDAwMDAwMDNmCmhkYWMwOiAgICAgICAgICAgICAgICAgIElTQyBU UlFEIFBEQyBIUCBPVVQgSU4KaGRhYzA6ICAgICAgUGluIGNvbmZpZzogMHg5MDE3MDExMApoZGFj MDogICAgIFBpbiBjb250cm9sOiAweDAwMDAwMDQwIE9VVApoZGFjMDogICAgICAgSW5wdXQgYW1w OiAweDAwMjcwMzAwCmhkYWMwOiAgICAgICAgICAgICAgICAgIG11dGU9MCBzdGVwPTMgc2l6ZT0z OSBvZmZzZXQ9MApoZGFjMDogICAgIGNvbm5lY3Rpb25zOiA0CmhkYWMwOiAgICAgICAgICAgfApo ZGFjMDogICAgICAgICAgICsgPC0gbmlkPTIxIFthdWRpbyBvdXRwdXRdIChzZWxlY3RlZCkKaGRh YzA6ICAgICAgICAgICArIFtESVNBQkxFRF0gPC0gbmlkPTIyIFthdWRpbyBvdXRwdXRdIFtESVNB QkxFRF0KaGRhYzA6ICAgICAgICAgICArIFtESVNBQkxFRF0gPC0gbmlkPTIzIFthdWRpbyBvdXRw dXRdIFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICArIFtESVNBQkxFRF0gPC0gbmlkPTMwIFth dWRpbyBzZWxlY3Rvcl0gW0RJU0FCTEVEXQpoZGFjMDogCmhkYWMwOiAgICAgICAgICAgICBuaWQ6 IDE0IFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICAgTmFtZTogcGluOiBMaW5lLW91dCAoTm9u ZSkKaGRhYzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDQwMDE4MwpoZGFjMDogICAgICAgICAgICAg ICAgICBVTlNPTCBTVEVSRU8KaGRhYzA6ICAgICAgICAgUGluIGNhcDogMHgwMDAwMTczNwpoZGFj MDogICAgICAgICAgICAgICAgICBJU0MgVFJRRCBQREMgT1VUIElOIFZSRUZbIDUwIDgwIEdST1VO RCBISVogXQpoZGFjMDogICAgICBQaW4gY29uZmlnOiAweDQwMDAwMWYzCmhkYWMwOiAgICAgUGlu IGNvbnRyb2w6IDB4MDAwMDAwMDAKaGRhYzA6ICAgICAgIElucHV0IGFtcDogMHgwMDI3MDMwMApo ZGFjMDogICAgICAgICAgICAgICAgICBtdXRlPTAgc3RlcD0zIHNpemU9Mzkgb2Zmc2V0PTAKaGRh YzA6ICAgICBjb25uZWN0aW9uczogNApoZGFjMDogICAgICAgICAgIHwKaGRhYzA6ICAgICAgICAg ICArIDwtIG5pZD0yMSBbYXVkaW8gb3V0cHV0XSAoc2VsZWN0ZWQpCmhkYWMwOiAgICAgICAgICAg KyA8LSBuaWQ9MjIgW2F1ZGlvIG91dHB1dF0gW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICsg PC0gbmlkPTIzIFthdWRpbyBvdXRwdXRdIFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICArIDwt IG5pZD0zMCBbYXVkaW8gc2VsZWN0b3JdIFtESVNBQkxFRF0KaGRhYzA6IApoZGFjMDogICAgICAg ICAgICAgbmlkOiAxNSBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgIE5hbWU6IHBpbjogTGlu ZS1vdXQgKE5vbmUpCmhkYWMwOiAgICAgIFdpZGdldCBjYXA6IDB4MDA0MDAxODMKaGRhYzA6ICAg ICAgICAgICAgICAgICAgVU5TT0wgU1RFUkVPCmhkYWMwOiAgICAgICAgIFBpbiBjYXA6IDB4MDAw MDAwMzcKaGRhYzA6ICAgICAgICAgICAgICAgICAgSVNDIFRSUUQgUERDIE9VVCBJTgpoZGFjMDog ICAgICBQaW4gY29uZmlnOiAweDQwMDAwMWYwCmhkYWMwOiAgICAgUGluIGNvbnRyb2w6IDB4MDAw MDAwMDAKaGRhYzA6ICAgICAgIElucHV0IGFtcDogMHgwMDI3MDMwMApoZGFjMDogICAgICAgICAg ICAgICAgICBtdXRlPTAgc3RlcD0zIHNpemU9Mzkgb2Zmc2V0PTAKaGRhYzA6ICAgICBjb25uZWN0 aW9uczogNApoZGFjMDogICAgICAgICAgIHwKaGRhYzA6ICAgICAgICAgICArIDwtIG5pZD0yMSBb YXVkaW8gb3V0cHV0XSAoc2VsZWN0ZWQpCmhkYWMwOiAgICAgICAgICAgKyA8LSBuaWQ9MjIgW2F1 ZGlvIG91dHB1dF0gW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICsgPC0gbmlkPTIzIFthdWRp byBvdXRwdXRdIFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICArIDwtIG5pZD0zMCBbYXVkaW8g c2VsZWN0b3JdIFtESVNBQkxFRF0KaGRhYzA6IApoZGFjMDogICAgICAgICAgICAgbmlkOiAxNiBb RElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgIE5hbWU6IHBpbjogTGluZS1vdXQgKE5vbmUpCmhk YWMwOiAgICAgIFdpZGdldCBjYXA6IDB4MDA0MDAxODMKaGRhYzA6ICAgICAgICAgICAgICAgICAg VU5TT0wgU1RFUkVPCmhkYWMwOiAgICAgICAgIFBpbiBjYXA6IDB4MDAwMDAwMzcKaGRhYzA6ICAg ICAgICAgICAgICAgICAgSVNDIFRSUUQgUERDIE9VVCBJTgpoZGFjMDogICAgICBQaW4gY29uZmln OiAweDQwMDAwMWY0CmhkYWMwOiAgICAgUGluIGNvbnRyb2w6IDB4MDAwMDAwMDAKaGRhYzA6ICAg ICAgIElucHV0IGFtcDogMHgwMDI3MDMwMApoZGFjMDogICAgICAgICAgICAgICAgICBtdXRlPTAg c3RlcD0zIHNpemU9Mzkgb2Zmc2V0PTAKaGRhYzA6ICAgICBjb25uZWN0aW9uczogNApoZGFjMDog ICAgICAgICAgIHwKaGRhYzA6ICAgICAgICAgICArIDwtIG5pZD0yMSBbYXVkaW8gb3V0cHV0XSAo c2VsZWN0ZWQpCmhkYWMwOiAgICAgICAgICAgKyA8LSBuaWQ9MjIgW2F1ZGlvIG91dHB1dF0gW0RJ U0FCTEVEXQpoZGFjMDogICAgICAgICAgICsgPC0gbmlkPTIzIFthdWRpbyBvdXRwdXRdIFtESVNB QkxFRF0KaGRhYzA6ICAgICAgICAgICArIDwtIG5pZD0zMCBbYXVkaW8gc2VsZWN0b3JdIFtESVNB QkxFRF0KaGRhYzA6IApoZGFjMDogICAgICAgICAgICAgbmlkOiAxNyBbRElTQUJMRURdCmhkYWMw OiAgICAgICAgICAgIE5hbWU6IHBpbjogTGluZS1vdXQgKE5vbmUpCmhkYWMwOiAgICAgIFdpZGdl dCBjYXA6IDB4MDA0MDAxODMKaGRhYzA6ICAgICAgICAgICAgICAgICAgVU5TT0wgU1RFUkVPCmhk YWMwOiAgICAgICAgIFBpbiBjYXA6IDB4MDAwMDAwMzcKaGRhYzA6ICAgICAgICAgICAgICAgICAg SVNDIFRSUUQgUERDIE9VVCBJTgpoZGFjMDogICAgICBQaW4gY29uZmlnOiAweDQwMDAwMWY1Cmhk YWMwOiAgICAgUGluIGNvbnRyb2w6IDB4MDAwMDAwMDAKaGRhYzA6ICAgICAgIElucHV0IGFtcDog MHgwMDI3MDMwMApoZGFjMDogICAgICAgICAgICAgICAgICBtdXRlPTAgc3RlcD0zIHNpemU9Mzkg b2Zmc2V0PTAKaGRhYzA6ICAgICBjb25uZWN0aW9uczogNApoZGFjMDogICAgICAgICAgIHwKaGRh YzA6ICAgICAgICAgICArIDwtIG5pZD0yMSBbYXVkaW8gb3V0cHV0XSAoc2VsZWN0ZWQpCmhkYWMw OiAgICAgICAgICAgKyA8LSBuaWQ9MjIgW2F1ZGlvIG91dHB1dF0gW0RJU0FCTEVEXQpoZGFjMDog ICAgICAgICAgICsgPC0gbmlkPTIzIFthdWRpbyBvdXRwdXRdIFtESVNBQkxFRF0KaGRhYzA6ICAg ICAgICAgICArIDwtIG5pZD0zMCBbYXVkaW8gc2VsZWN0b3JdIFtESVNBQkxFRF0KaGRhYzA6IApo ZGFjMDogICAgICAgICAgICAgbmlkOiAxOCBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgIE5h bWU6IHBpbjogTGluZS1vdXQgKE5vbmUpCmhkYWMwOiAgICAgIFdpZGdldCBjYXA6IDB4MDA0MDAw ODEKaGRhYzA6ICAgICAgICAgICAgICAgICAgVU5TT0wgU1RFUkVPCmhkYWMwOiAgICAgICAgIFBp biBjYXA6IDB4MDAwMDAwMjQKaGRhYzA6ICAgICAgICAgICAgICAgICAgUERDIElOCmhkYWMwOiAg ICAgIFBpbiBjb25maWc6IDB4NDAwMDAxZjYKaGRhYzA6ICAgICBQaW4gY29udHJvbDogMHgwMDAw MDAwMApoZGFjMDogCmhkYWMwOiAgICAgICAgICAgICBuaWQ6IDE5CmhkYWMwOiAgICAgICAgICAg IE5hbWU6IHBpbjogTWljIChGaXhlZCkKaGRhYzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDQwMDAw MwpoZGFjMDogICAgICAgICAgICAgICAgICBTVEVSRU8KaGRhYzA6ICAgICBBc3NvY2lhdGlvbjog MSAoMHgwMDAwMDAwMSkKaGRhYzA6ICAgICAgICAgICAgIE9TUzogbW9uaXRvciAobW9uaXRvcikK aGRhYzA6ICAgICAgICAgUGluIGNhcDogMHgwMDAwMDAyMApoZGFjMDogICAgICAgICAgICAgICAg ICBJTgpoZGFjMDogICAgICBQaW4gY29uZmlnOiAweDkwYTYwMTYwCmhkYWMwOiAgICAgUGluIGNv bnRyb2w6IDB4MDAwMDAwMjAgSU4KaGRhYzA6ICAgICAgIElucHV0IGFtcDogMHgwMDI3MDMwMApo ZGFjMDogICAgICAgICAgICAgICAgICBtdXRlPTAgc3RlcD0zIHNpemU9Mzkgb2Zmc2V0PTAKaGRh YzA6IApoZGFjMDogICAgICAgICAgICAgbmlkOiAyMCBbRElTQUJMRURdCmhkYWMwOiAgICAgICAg ICAgIE5hbWU6IHBpbjogTGluZS1vdXQgKE5vbmUpCmhkYWMwOiAgICAgIFdpZGdldCBjYXA6IDB4 MDA0MDAwMDMKaGRhYzA6ICAgICAgICAgICAgICAgICAgU1RFUkVPCmhkYWMwOiAgICAgICAgIFBp biBjYXA6IDB4MDAwMDAwMjAKaGRhYzA6ICAgICAgICAgICAgICAgICAgSU4KaGRhYzA6ICAgICAg UGluIGNvbmZpZzogMHg0MDAwMDFmNwpoZGFjMDogICAgIFBpbiBjb250cm9sOiAweDAwMDAwMDAw CmhkYWMwOiAgICAgICBJbnB1dCBhbXA6IDB4MDAyNzAzMDAKaGRhYzA6ICAgICAgICAgICAgICAg ICAgbXV0ZT0wIHN0ZXA9MyBzaXplPTM5IG9mZnNldD0wCmhkYWMwOiAKaGRhYzA6ICAgICAgICAg ICAgIG5pZDogMjEKaGRhYzA6ICAgICAgICAgICAgTmFtZTogYXVkaW8gb3V0cHV0CmhkYWMwOiAg ICAgIFdpZGdldCBjYXA6IDB4MDAwZDBjMDUKaGRhYzA6ICAgICAgICAgICAgICAgICAgTFJTV0FQ IFBXUiBTVEVSRU8KaGRhYzA6ICAgICBBc3NvY2lhdGlvbjogMCAoMHgwMDAwODAwMSkKaGRhYzA6 ICAgICAgICAgICAgIE9TUzogcGNtIChwY20pCmhkYWMwOiAgICAgIFN0cmVhbSBjYXA6IDB4MDAw MDAwMDEKaGRhYzA6ICAgICAgICAgICAgICAgICAgUENNCmhkYWMwOiAgICAgICAgIFBDTSBjYXA6 IDB4MDAwZTA1ZTAKaGRhYzA6ICAgICAgICAgICAgICAgICAgMTYgMjAgMjQgYml0cywgNDQgNDgg ODggOTYgMTkyIEtIegpoZGFjMDogICAgICBPdXRwdXQgYW1wOiAweDgwMDI3ZjdmCmhkYWMwOiAg ICAgICAgICAgICAgICAgIG11dGU9MSBzdGVwPTEyNyBzaXplPTIgb2Zmc2V0PTEyNwpoZGFjMDog CmhkYWMwOiAgICAgICAgICAgICBuaWQ6IDIyIFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICAg TmFtZTogYXVkaW8gb3V0cHV0CmhkYWMwOiAgICAgIFdpZGdldCBjYXA6IDB4MDAwZDBjMDUKaGRh YzA6ICAgICAgICAgICAgICAgICAgTFJTV0FQIFBXUiBTVEVSRU8KaGRhYzA6ICAgICAgU3RyZWFt IGNhcDogMHgwMDAwMDAwMQpoZGFjMDogICAgICAgICAgICAgICAgICBQQ00KaGRhYzA6ICAgICAg ICAgUENNIGNhcDogMHgwMDBlMDVlMApoZGFjMDogICAgICAgICAgICAgICAgICAxNiAyMCAyNCBi aXRzLCA0NCA0OCA4OCA5NiAxOTIgS0h6CmhkYWMwOiAgICAgIE91dHB1dCBhbXA6IDB4ODAwMjdm N2YKaGRhYzA6ICAgICAgICAgICAgICAgICAgbXV0ZT0xIHN0ZXA9MTI3IHNpemU9MiBvZmZzZXQ9 MTI3CmhkYWMwOiAKaGRhYzA6ICAgICAgICAgICAgIG5pZDogMjMgW0RJU0FCTEVEXQpoZGFjMDog ICAgICAgICAgICBOYW1lOiBhdWRpbyBvdXRwdXQKaGRhYzA6ICAgICAgV2lkZ2V0IGNhcDogMHgw MDBkMGMwNQpoZGFjMDogICAgICAgICAgICAgICAgICBMUlNXQVAgUFdSIFNURVJFTwpoZGFjMDog ICAgICBTdHJlYW0gY2FwOiAweDAwMDAwMDAxCmhkYWMwOiAgICAgICAgICAgICAgICAgIFBDTQpo ZGFjMDogICAgICAgICBQQ00gY2FwOiAweDAwMGUwNWUwCmhkYWMwOiAgICAgICAgICAgICAgICAg IDE2IDIwIDI0IGJpdHMsIDQ0IDQ4IDg4IDk2IDE5MiBLSHoKaGRhYzA6ICAgICAgT3V0cHV0IGFt cDogMHg4MDAyN2Y3ZgpoZGFjMDogICAgICAgICAgICAgICAgICBtdXRlPTEgc3RlcD0xMjcgc2l6 ZT0yIG9mZnNldD0xMjcKaGRhYzA6IApoZGFjMDogICAgICAgICAgICAgbmlkOiAyNCBbRElTQUJM RURdCmhkYWMwOiAgICAgICAgICAgIE5hbWU6IHZlbmRvciB3aWRnZXQKaGRhYzA6ICAgICAgV2lk Z2V0IGNhcDogMHgwMGZkMGMwNQpoZGFjMDogICAgICAgICAgICAgICAgICBMUlNXQVAgUFdSIFNU RVJFTwpoZGFjMDogICAgICBPdXRwdXQgYW1wOiAweDgwMDI3ZjdmCmhkYWMwOiAgICAgICAgICAg ICAgICAgIG11dGU9MSBzdGVwPTEyNyBzaXplPTIgb2Zmc2V0PTEyNwpoZGFjMDogCmhkYWMwOiAg ICAgICAgICAgICBuaWQ6IDI1IFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICAgTmFtZTogdmVu ZG9yIHdpZGdldApoZGFjMDogICAgICBXaWRnZXQgY2FwOiAweDAwZmQwYzA1CmhkYWMwOiAgICAg ICAgICAgICAgICAgIExSU1dBUCBQV1IgU1RFUkVPCmhkYWMwOiAgICAgIE91dHB1dCBhbXA6IDB4 ODAwMjdmN2YKaGRhYzA6ICAgICAgICAgICAgICAgICAgbXV0ZT0xIHN0ZXA9MTI3IHNpemU9MiBv ZmZzZXQ9MTI3CmhkYWMwOiAKaGRhYzA6ICAgICAgICAgICAgIG5pZDogMjYKaGRhYzA6ICAgICAg ICAgICAgTmFtZTogYXVkaW8gaW5wdXQKaGRhYzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDFkMDU0 MQpoZGFjMDogICAgICAgICAgICAgICAgICBQV1IgUFJPQyBTVEVSRU8KaGRhYzA6ICAgICBBc3Nv Y2lhdGlvbjogMSAoMHgwMDAwMDAwMSkKaGRhYzA6ICAgICAgU3RyZWFtIGNhcDogMHgwMDAwMDAw MQpoZGFjMDogICAgICAgICAgICAgICAgICBQQ00KaGRhYzA6ICAgICAgICAgUENNIGNhcDogMHgw MDBlMDVlMApoZGFjMDogICAgICAgICAgICAgICAgICAxNiAyMCAyNCBiaXRzLCA0NCA0OCA4OCA5 NiAxOTIgS0h6CmhkYWMwOiAgICAgY29ubmVjdGlvbnM6IDEKaGRhYzA6ICAgICAgICAgICB8Cmhk YWMwOiAgICAgICAgICAgKyA8LSBuaWQ9MzIgW2F1ZGlvIHNlbGVjdG9yXQpoZGFjMDogCmhkYWMw OiAgICAgICAgICAgICBuaWQ6IDI3IFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICAgTmFtZTog YXVkaW8gaW5wdXQKaGRhYzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDFkMDU0MQpoZGFjMDogICAg ICAgICAgICAgICAgICBQV1IgUFJPQyBTVEVSRU8KaGRhYzA6ICAgICAgU3RyZWFtIGNhcDogMHgw MDAwMDAwMQpoZGFjMDogICAgICAgICAgICAgICAgICBQQ00KaGRhYzA6ICAgICAgICAgUENNIGNh cDogMHgwMDBlMDVlMApoZGFjMDogICAgICAgICAgICAgICAgICAxNiAyMCAyNCBiaXRzLCA0NCA0 OCA4OCA5NiAxOTIgS0h6CmhkYWMwOiAgICAgY29ubmVjdGlvbnM6IDEKaGRhYzA6ICAgICAgICAg ICB8CmhkYWMwOiAgICAgICAgICAgKyA8LSBuaWQ9MzMgW2F1ZGlvIHNlbGVjdG9yXSBbRElTQUJM RURdCmhkYWMwOiAKaGRhYzA6ICAgICAgICAgICAgIG5pZDogMjgKaGRhYzA6ICAgICAgICAgICAg TmFtZTogYmVlcCB3aWRnZXQKaGRhYzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDcwMDAwYwpoZGFj MDogICAgIEFzc29jaWF0aW9uOiAtMiAoMHgwMDAwMDAwMCkKaGRhYzA6ICAgICAgICAgICAgIE9T Uzogc3BlYWtlciAoc3BlYWtlcikKaGRhYzA6ICAgICAgT3V0cHV0IGFtcDogMHg4MDE3MDMwMwpo ZGFjMDogICAgICAgICAgICAgICAgICBtdXRlPTEgc3RlcD0zIHNpemU9MjMgb2Zmc2V0PTMKaGRh YzA6IApoZGFjMDogICAgICAgICAgICAgbmlkOiAyOSBbRElTQUJMRURdCmhkYWMwOiAgICAgICAg ICAgIE5hbWU6IGF1ZGlvIG1peGVyCmhkYWMwOiAgICAgIFdpZGdldCBjYXA6IDB4MDAyMDAxMGIK aGRhYzA6ICAgICAgICAgICAgICAgICAgU1RFUkVPCmhkYWMwOiAgICAgICBJbnB1dCBhbXA6IDB4 ODAwNTFmMTcKaGRhYzA6ICAgICAgICAgICAgICAgICAgbXV0ZT0xIHN0ZXA9MzEgc2l6ZT01IG9m ZnNldD0yMwpoZGFjMDogICAgIGNvbm5lY3Rpb25zOiA1CmhkYWMwOiAgICAgICAgICAgfApoZGFj MDogICAgICAgICAgICsgW0RJU0FCTEVEXSA8LSBuaWQ9NDAgW2F1ZGlvIHNlbGVjdG9yXSBbRElT QUJMRURdCmhkYWMwOiAgICAgICAgICAgKyBbRElTQUJMRURdIDwtIG5pZD00MSBbYXVkaW8gc2Vs ZWN0b3JdIFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICArIFtESVNBQkxFRF0gPC0gbmlkPTQy IFthdWRpbyBzZWxlY3Rvcl0gW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICsgW0RJU0FCTEVE XSA8LSBuaWQ9NDMgW2F1ZGlvIHNlbGVjdG9yXSBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAg KyBbRElTQUJMRURdIDwtIG5pZD0xOCBbcGluOiBMaW5lLW91dCAoTm9uZSldIFtESVNBQkxFRF0K aGRhYzA6IApoZGFjMDogICAgICAgICAgICAgbmlkOiAzMCBbRElTQUJMRURdCmhkYWMwOiAgICAg ICAgICAgIE5hbWU6IGF1ZGlvIHNlbGVjdG9yCmhkYWMwOiAgICAgIFdpZGdldCBjYXA6IDB4MDAz MDAxMGQKaGRhYzA6ICAgICAgICAgICAgICAgICAgU1RFUkVPCmhkYWMwOiAgICAgIE91dHB1dCBh bXA6IDB4ODAwNTFmMWYKaGRhYzA6ICAgICAgICAgICAgICAgICAgbXV0ZT0xIHN0ZXA9MzEgc2l6 ZT01IG9mZnNldD0zMQpoZGFjMDogICAgIGNvbm5lY3Rpb25zOiAxCmhkYWMwOiAgICAgICAgICAg fApoZGFjMDogICAgICAgICAgICsgPC0gbmlkPTI5IFthdWRpbyBtaXhlcl0gW0RJU0FCTEVEXQpo ZGFjMDogCmhkYWMwOiAgICAgICAgICAgICBuaWQ6IDMxIFtESVNBQkxFRF0KaGRhYzA6ICAgICAg ICAgICAgTmFtZTogdm9sdW1lIHdpZGdldApoZGFjMDogICAgICBXaWRnZXQgY2FwOiAweDAwNjAw MDAwCmhkYWMwOiAgICAgY29ubmVjdGlvbnM6IDMKaGRhYzA6ICAgICAgICAgICB8CmhkYWMwOiAg ICAgICAgICAgKyA8LSBuaWQ9MjEgW2F1ZGlvIG91dHB1dF0gKHNlbGVjdGVkKQpoZGFjMDogICAg ICAgICAgICsgPC0gbmlkPTIyIFthdWRpbyBvdXRwdXRdIFtESVNBQkxFRF0KaGRhYzA6ICAgICAg ICAgICArIDwtIG5pZD0yMyBbYXVkaW8gb3V0cHV0XSBbRElTQUJMRURdCmhkYWMwOiAKaGRhYzA6 ICAgICAgICAgICAgIG5pZDogMzIKaGRhYzA6ICAgICAgICAgICAgTmFtZTogYXVkaW8gc2VsZWN0 b3IKaGRhYzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDMwMDkwZApoZGFjMDogICAgICAgICAgICAg ICAgICBMUlNXQVAgU1RFUkVPCmhkYWMwOiAgICAgQXNzb2NpYXRpb246IDEgKDB4MDAwMDAwMDEp CmhkYWMwOiAgICAgICAgICAgICBPU1M6IG1vbml0b3IKaGRhYzA6ICAgICAgT3V0cHV0IGFtcDog MHg4MDA1MGYwMApoZGFjMDogICAgICAgICAgICAgICAgICBtdXRlPTEgc3RlcD0xNSBzaXplPTUg b2Zmc2V0PTAKaGRhYzA6ICAgICBjb25uZWN0aW9uczogMTIKaGRhYzA6ICAgICAgICAgICB8Cmhk YWMwOiAgICAgICAgICAgKyBbRElTQUJMRURdIDwtIG5pZD0xMCBbcGluOiBIZWFkcGhvbmVzIChC bGFjayBKYWNrKV0KaGRhYzA6ICAgICAgICAgICArIFtESVNBQkxFRF0gPC0gbmlkPTExIFtwaW46 IExpbmUtb3V0IChOb25lKV0gW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICsgW0RJU0FCTEVE XSA8LSBuaWQ9MTIgW3BpbjogTGluZS1vdXQgKE5vbmUpXSBbRElTQUJMRURdCmhkYWMwOiAgICAg ICAgICAgKyBbRElTQUJMRURdIDwtIG5pZD0xMyBbcGluOiBTcGVha2VyIChGaXhlZCldCmhkYWMw OiAgICAgICAgICAgKyBbRElTQUJMRURdIDwtIG5pZD0xNCBbcGluOiBMaW5lLW91dCAoTm9uZSld IFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICArIFtESVNBQkxFRF0gPC0gbmlkPTE1IFtwaW46 IExpbmUtb3V0IChOb25lKV0gW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICsgW0RJU0FCTEVE XSA8LSBuaWQ9MTYgW3BpbjogTGluZS1vdXQgKE5vbmUpXSBbRElTQUJMRURdCmhkYWMwOiAgICAg ICAgICAgKyBbRElTQUJMRURdIDwtIG5pZD0xNyBbcGluOiBMaW5lLW91dCAoTm9uZSldIFtESVNB QkxFRF0KaGRhYzA6ICAgICAgICAgICArIFtESVNBQkxFRF0gPC0gbmlkPTE4IFtwaW46IExpbmUt b3V0IChOb25lKV0gW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICsgPC0gbmlkPTE5IFtwaW46 IE1pYyAoRml4ZWQpXSAoc2VsZWN0ZWQpCmhkYWMwOiAgICAgICAgICAgKyBbRElTQUJMRURdIDwt IG5pZD0yMCBbcGluOiBMaW5lLW91dCAoTm9uZSldIFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAg ICArIFtESVNBQkxFRF0gPC0gbmlkPTI5IFthdWRpbyBtaXhlcl0gW0RJU0FCTEVEXQpoZGFjMDog CmhkYWMwOiAgICAgICAgICAgICBuaWQ6IDMzIFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICAg TmFtZTogYXVkaW8gc2VsZWN0b3IKaGRhYzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDMwMDkwZApo ZGFjMDogICAgICAgICAgICAgICAgICBMUlNXQVAgU1RFUkVPCmhkYWMwOiAgICAgIE91dHB1dCBh bXA6IDB4ODAwNTBmMDAKaGRhYzA6ICAgICAgICAgICAgICAgICAgbXV0ZT0xIHN0ZXA9MTUgc2l6 ZT01IG9mZnNldD0wCmhkYWMwOiAgICAgY29ubmVjdGlvbnM6IDEyCmhkYWMwOiAgICAgICAgICAg fApoZGFjMDogICAgICAgICAgICsgPC0gbmlkPTEwIFtwaW46IEhlYWRwaG9uZXMgKEJsYWNrIEph Y2spXSAoc2VsZWN0ZWQpCmhkYWMwOiAgICAgICAgICAgKyBbRElTQUJMRURdIDwtIG5pZD0xMSBb cGluOiBMaW5lLW91dCAoTm9uZSldIFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICArIFtESVNB QkxFRF0gPC0gbmlkPTEyIFtwaW46IExpbmUtb3V0IChOb25lKV0gW0RJU0FCTEVEXQpoZGFjMDog ICAgICAgICAgICsgPC0gbmlkPTEzIFtwaW46IFNwZWFrZXIgKEZpeGVkKV0KaGRhYzA6ICAgICAg ICAgICArIFtESVNBQkxFRF0gPC0gbmlkPTE0IFtwaW46IExpbmUtb3V0IChOb25lKV0gW0RJU0FC TEVEXQpoZGFjMDogICAgICAgICAgICsgW0RJU0FCTEVEXSA8LSBuaWQ9MTUgW3BpbjogTGluZS1v dXQgKE5vbmUpXSBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgKyBbRElTQUJMRURdIDwtIG5p ZD0xNiBbcGluOiBMaW5lLW91dCAoTm9uZSldIFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICAr IFtESVNBQkxFRF0gPC0gbmlkPTE3IFtwaW46IExpbmUtb3V0IChOb25lKV0gW0RJU0FCTEVEXQpo ZGFjMDogICAgICAgICAgICsgW0RJU0FCTEVEXSA8LSBuaWQ9MTggW3BpbjogTGluZS1vdXQgKE5v bmUpXSBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgKyA8LSBuaWQ9MTkgW3BpbjogTWljIChG aXhlZCldCmhkYWMwOiAgICAgICAgICAgKyBbRElTQUJMRURdIDwtIG5pZD0yMCBbcGluOiBMaW5l LW91dCAoTm9uZSldIFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICArIDwtIG5pZD0yOSBbYXVk aW8gbWl4ZXJdIFtESVNBQkxFRF0KaGRhYzA6IApoZGFjMDogICAgICAgICAgICAgbmlkOiAzNCBb RElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgIE5hbWU6IHBpbjogTGluZS1vdXQgKE5vbmUpCmhk YWMwOiAgICAgIFdpZGdldCBjYXA6IDB4MDA0MDAzMDEKaGRhYzA6ICAgICAgICAgICAgICAgICAg RElHSVRBTCBTVEVSRU8KaGRhYzA6ICAgICAgICAgUGluIGNhcDogMHgwMDAwMDAxMApoZGFjMDog ICAgICAgICAgICAgICAgICBPVVQKaGRhYzA6ICAgICAgUGluIGNvbmZpZzogMHg0MDAwMDFmOApo ZGFjMDogICAgIFBpbiBjb250cm9sOiAweDAwMDAwMDAwCmhkYWMwOiAgICAgY29ubmVjdGlvbnM6 IDMKaGRhYzA6ICAgICAgICAgICB8CmhkYWMwOiAgICAgICAgICAgKyA8LSBuaWQ9MzcgW2F1ZGlv IG91dHB1dF0gW0RJU0FCTEVEXSAoc2VsZWN0ZWQpCmhkYWMwOiAgICAgICAgICAgKyA8LSBuaWQ9 MzIgW2F1ZGlvIHNlbGVjdG9yXQpoZGFjMDogICAgICAgICAgICsgPC0gbmlkPTMzIFthdWRpbyBz ZWxlY3Rvcl0gW0RJU0FCTEVEXQpoZGFjMDogCmhkYWMwOiAgICAgICAgICAgICBuaWQ6IDM1IFtE SVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICAgTmFtZTogcGluOiBMaW5lLW91dCAoTm9uZSkKaGRh YzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDQwMDMwMQpoZGFjMDogICAgICAgICAgICAgICAgICBE SUdJVEFMIFNURVJFTwpoZGFjMDogICAgICAgICBQaW4gY2FwOiAweDAwMDAwMDEwCmhkYWMwOiAg ICAgICAgICAgICAgICAgIE9VVApoZGFjMDogICAgICBQaW4gY29uZmlnOiAweDQwMDAwMWY5Cmhk YWMwOiAgICAgUGluIGNvbnRyb2w6IDB4MDAwMDAwMDAKaGRhYzA6ICAgICBjb25uZWN0aW9uczog MwpoZGFjMDogICAgICAgICAgIHwKaGRhYzA6ICAgICAgICAgICArIDwtIG5pZD0zOCBbYXVkaW8g b3V0cHV0XSBbRElTQUJMRURdIChzZWxlY3RlZCkKaGRhYzA6ICAgICAgICAgICArIDwtIG5pZD0z MiBbYXVkaW8gc2VsZWN0b3JdCmhkYWMwOiAgICAgICAgICAgKyA8LSBuaWQ9MzMgW2F1ZGlvIHNl bGVjdG9yXSBbRElTQUJMRURdCmhkYWMwOiAKaGRhYzA6ICAgICAgICAgICAgIG5pZDogMzYgW0RJ U0FCTEVEXQpoZGFjMDogICAgICAgICAgICBOYW1lOiBwaW46IExpbmUtb3V0IChOb25lKQpoZGFj MDogICAgICBXaWRnZXQgY2FwOiAweDAwNDAwNjgxCmhkYWMwOiAgICAgICAgICAgICAgICAgIFBX UiBESUdJVEFMIFVOU09MIFNURVJFTwpoZGFjMDogICAgICAgICBQaW4gY2FwOiAweDAwMDEwMDI0 CmhkYWMwOiAgICAgICAgICAgICAgICAgIFBEQyBJTiBFQVBECmhkYWMwOiAgICAgIFBpbiBjb25m aWc6IDB4NDAwMDAxZmEKaGRhYzA6ICAgICBQaW4gY29udHJvbDogMHgwMDAwMDAwMApoZGFjMDog ICAgICAgICAgICBFQVBEOiAweDAwMDAwMDAyCmhkYWMwOiAKaGRhYzA6ICAgICAgICAgICAgIG5p ZDogMzcgW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICBOYW1lOiBhdWRpbyBvdXRwdXQKaGRh YzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDA0MDIxZApoZGFjMDogICAgICAgICAgICAgICAgICBE SUdJVEFMIFNURVJFTwpoZGFjMDogICAgICBTdHJlYW0gY2FwOiAweDAwMDAwMDA1CmhkYWMwOiAg ICAgICAgICAgICAgICAgIEFDMyBQQ00KaGRhYzA6ICAgICAgICAgUENNIGNhcDogMHgwMDBlMDVl MApoZGFjMDogICAgICAgICAgICAgICAgICAxNiAyMCAyNCBiaXRzLCA0NCA0OCA4OCA5NiAxOTIg S0h6CmhkYWMwOiAgICAgIE91dHB1dCBhbXA6IDB4ODAwMDAwMDAKaGRhYzA6ICAgICAgICAgICAg ICAgICAgbXV0ZT0xIHN0ZXA9MCBzaXplPTAgb2Zmc2V0PTAKaGRhYzA6IApoZGFjMDogICAgICAg ICAgICAgbmlkOiAzOCBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgIE5hbWU6IGF1ZGlvIG91 dHB1dApoZGFjMDogICAgICBXaWRnZXQgY2FwOiAweDAwMDQwMjFkCmhkYWMwOiAgICAgICAgICAg ICAgICAgIERJR0lUQUwgU1RFUkVPCmhkYWMwOiAgICAgIFN0cmVhbSBjYXA6IDB4MDAwMDAwMDUK aGRhYzA6ICAgICAgICAgICAgICAgICAgQUMzIFBDTQpoZGFjMDogICAgICAgICBQQ00gY2FwOiAw eDAwMGUwNWUwCmhkYWMwOiAgICAgICAgICAgICAgICAgIDE2IDIwIDI0IGJpdHMsIDQ0IDQ4IDg4 IDk2IDE5MiBLSHoKaGRhYzA6ICAgICAgT3V0cHV0IGFtcDogMHg4MDAwMDAwMApoZGFjMDogICAg ICAgICAgICAgICAgICBtdXRlPTEgc3RlcD0wIHNpemU9MCBvZmZzZXQ9MApoZGFjMDogCmhkYWMw OiAgICAgICAgICAgICBuaWQ6IDM5IFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICAgTmFtZTog YXVkaW8gaW5wdXQKaGRhYzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDE0MDMxYgpoZGFjMDogICAg ICAgICAgICAgICAgICBESUdJVEFMIFNURVJFTwpoZGFjMDogICAgICBTdHJlYW0gY2FwOiAweDAw MDAwMDA1CmhkYWMwOiAgICAgICAgICAgICAgICAgIEFDMyBQQ00KaGRhYzA6ICAgICAgICAgUENN IGNhcDogMHgwMDBlMDE2MApoZGFjMDogICAgICAgICAgICAgICAgICAxNiAyMCAyNCBiaXRzLCA0 NCA0OCA5NiBLSHoKaGRhYzA6ICAgICAgIElucHV0IGFtcDogMHg4MDAwMDAwMApoZGFjMDogICAg ICAgICAgICAgICAgICBtdXRlPTEgc3RlcD0wIHNpemU9MCBvZmZzZXQ9MApoZGFjMDogICAgIGNv bm5lY3Rpb25zOiAxCmhkYWMwOiAgICAgICAgICAgfApoZGFjMDogICAgICAgICAgICsgW0RJU0FC TEVEXSA8LSBuaWQ9MzYgW3BpbjogTGluZS1vdXQgKE5vbmUpXSBbRElTQUJMRURdCmhkYWMwOiAK aGRhYzA6ICAgICAgICAgICAgIG5pZDogNDAgW0RJU0FCTEVEXQpoZGFjMDogICAgICAgICAgICBO YW1lOiBhdWRpbyBzZWxlY3RvcgpoZGFjMDogICAgICBXaWRnZXQgY2FwOiAweDAwMzAwMTAxCmhk YWMwOiAgICAgICAgICAgICAgICAgIFNURVJFTwpoZGFjMDogICAgIGNvbm5lY3Rpb25zOiA0Cmhk YWMwOiAgICAgICAgICAgfApoZGFjMDogICAgICAgICAgICsgPC0gbmlkPTEwIFtwaW46IEhlYWRw aG9uZXMgKEJsYWNrIEphY2spXSAoc2VsZWN0ZWQpCmhkYWMwOiAgICAgICAgICAgKyBbRElTQUJM RURdIDwtIG5pZD0xMSBbcGluOiBMaW5lLW91dCAoTm9uZSldIFtESVNBQkxFRF0KaGRhYzA6ICAg ICAgICAgICArIDwtIG5pZD0xMyBbcGluOiBTcGVha2VyIChGaXhlZCldCmhkYWMwOiAgICAgICAg ICAgKyBbRElTQUJMRURdIDwtIG5pZD0xNSBbcGluOiBMaW5lLW91dCAoTm9uZSldIFtESVNBQkxF RF0KaGRhYzA6IApoZGFjMDogICAgICAgICAgICAgbmlkOiA0MSBbRElTQUJMRURdCmhkYWMwOiAg ICAgICAgICAgIE5hbWU6IGF1ZGlvIHNlbGVjdG9yCmhkYWMwOiAgICAgIFdpZGdldCBjYXA6IDB4 MDAzMDAxMDEKaGRhYzA6ICAgICAgICAgICAgICAgICAgU1RFUkVPCmhkYWMwOiAgICAgY29ubmVj dGlvbnM6IDQKaGRhYzA6ICAgICAgICAgICB8CmhkYWMwOiAgICAgICAgICAgKyA8LSBuaWQ9MTAg W3BpbjogSGVhZHBob25lcyAoQmxhY2sgSmFjayldIChzZWxlY3RlZCkKaGRhYzA6ICAgICAgICAg ICArIFtESVNBQkxFRF0gPC0gbmlkPTE0IFtwaW46IExpbmUtb3V0IChOb25lKV0gW0RJU0FCTEVE XQpoZGFjMDogICAgICAgICAgICsgW0RJU0FCTEVEXSA8LSBuaWQ9MTYgW3BpbjogTGluZS1vdXQg KE5vbmUpXSBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgKyBbRElTQUJMRURdIDwtIG5pZD0x NyBbcGluOiBMaW5lLW91dCAoTm9uZSldIFtESVNBQkxFRF0KaGRhYzA6IApoZGFjMDogICAgICAg ICAgICAgbmlkOiA0MiBbRElTQUJMRURdCmhkYWMwOiAgICAgICAgICAgIE5hbWU6IGF1ZGlvIHNl bGVjdG9yCmhkYWMwOiAgICAgIFdpZGdldCBjYXA6IDB4MDAzMDAxMDEKaGRhYzA6ICAgICAgICAg ICAgICAgICAgU1RFUkVPCmhkYWMwOiAgICAgY29ubmVjdGlvbnM6IDQKaGRhYzA6ICAgICAgICAg ICB8CmhkYWMwOiAgICAgICAgICAgKyBbRElTQUJMRURdIDwtIG5pZD0xMSBbcGluOiBMaW5lLW91 dCAoTm9uZSldIFtESVNBQkxFRF0gKHNlbGVjdGVkKQpoZGFjMDogICAgICAgICAgICsgW0RJU0FC TEVEXSA8LSBuaWQ9MTIgW3BpbjogTGluZS1vdXQgKE5vbmUpXSBbRElTQUJMRURdCmhkYWMwOiAg ICAgICAgICAgKyBbRElTQUJMRURdIDwtIG5pZD0xNiBbcGluOiBMaW5lLW91dCAoTm9uZSldIFtE SVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICArIFtESVNBQkxFRF0gPC0gbmlkPTE3IFtwaW46IExp bmUtb3V0IChOb25lKV0gW0RJU0FCTEVEXQpoZGFjMDogCmhkYWMwOiAgICAgICAgICAgICBuaWQ6 IDQzIFtESVNBQkxFRF0KaGRhYzA6ICAgICAgICAgICAgTmFtZTogYXVkaW8gc2VsZWN0b3IKaGRh YzA6ICAgICAgV2lkZ2V0IGNhcDogMHgwMDMwMDEwMQpoZGFjMDogICAgICAgICAgICAgICAgICBT VEVSRU8KaGRhYzA6ICAgICBjb25uZWN0aW9uczogMwpoZGFjMDogICAgICAgICAgIHwKaGRhYzA6 ICAgICAgICAgICArIDwtIG5pZD0yMSBbYXVkaW8gb3V0cHV0XSAoc2VsZWN0ZWQpCmhkYWMwOiAg ICAgICAgICAgKyA8LSBuaWQ9MjIgW2F1ZGlvIG91dHB1dF0gW0RJU0FCTEVEXQpoZGFjMDogICAg ICAgICAgICsgPC0gbmlkPTIzIFthdWRpbyBvdXRwdXRdIFtESVNBQkxFRF0KaGRhYzA6IApoZGFj MDogUHJvY2Vzc2luZyBhdWRpbyBGRyBjYWQ9MSBuaWQ9MS4uLgpoZGFjMDogR1BJTzogMHgwMDAw MDAwMCBOdW1HUElPPTAgTnVtR1BPPTAgTnVtR1BJPTAgR1BJV2FrZT0wIEdQSVVuc29sPTAKaGRh YzA6ICBuaWQgMyAweDE4NTYwMDEwIGFzICAxIHNlcSAgMCAgIERpZ2l0YWwtb3V0ICBKYWNrIGph Y2sgIDYgbG9jIDI0IGNvbG9yIFVua25vd24gbWlzYyAwCmhkYWMwOiBQYXRjaGVkIHBpbnMgY29u ZmlndXJhdGlvbjoKaGRhYzA6ICBuaWQgMyAweDE4NTYwMDEwIGFzICAxIHNlcSAgMCAgIERpZ2l0 YWwtb3V0ICBKYWNrIGphY2sgIDYgbG9jIDI0IGNvbG9yIFVua25vd24gbWlzYyAwCmhkYWMwOiAx IGFzc29jaWF0aW9ucyBmb3VuZDoKaGRhYzA6IEFzc29jaWF0aW9uIDAgKDEpIG91dDoKaGRhYzA6 ICBQaW4gbmlkPTMgc2VxPTAKaGRhYzA6IFRyYWNpbmcgYXNzb2NpYXRpb24gMCAoMSkKaGRhYzA6 ICBQaW4gMyB0cmFjZWQgdG8gREFDIDIKaGRhYzA6IEFzc29jaWF0aW9uIDAgKDEpIHRyYWNlIHN1 Y2NlZWRlZApoZGFjMDogVHJhY2luZyBpbnB1dCBtb25pdG9yCmhkYWMwOiBUcmFjaW5nIG90aGVy IGlucHV0IG1vbml0b3JzCmhkYWMwOiBUcmFjaW5nIGJlZXBlcgpoZGFjMDogRkcgY29uZmlnL3F1 aXJrczogZm9yY2VzdGVyZW8gaXZyZWY1MCBpdnJlZjgwIGl2cmVmMTAwIGl2cmVmCmhkYWMwOiAK aGRhYzA6ICstLS0tLS0tLS0tLS0tLS0tLS0tKwpoZGFjMDogfCBEVU1QSU5HIEhEQSBOT0RFUyB8 CmhkYWMwOiArLS0tLS0tLS0tLS0tLS0tLS0tLSsKaGRhYzA6IApoZGFjMDogRGVmYXVsdCBQYXJh bWV0ZXIKaGRhYzA6IC0tLS0tLS0tLS0tLS0tLS0tCmhkYWMwOiAgICAgICAgICBJTiBhbXA6IDB4 MDAwMDAwMDAKaGRhYzA6ICAgICAgICAgT1VUIGFtcDogMHgwMDAwMDAwMApoZGFjMDogCmhkYWMw OiAgICAgICAgICAgICBuaWQ6IDIKaGRhYzA6ICAgICAgICAgICAgTmFtZTogYXVkaW8gb3V0cHV0 CmhkYWMwOiAgICAgIFdpZGdldCBjYXA6IDB4MDAwMDYyMTEKaGRhYzA6ICAgICAgICAgICAgICAg ICAgRElHSVRBTCA4Q0gKaGRhYzA6ICAgICBBc3NvY2lhdGlvbjogMCAoMHgwMDAwMDAwMSkKaGRh YzA6ICAgICAgICAgICAgIE9TUzogcGNtIChwY20pCmhkYWMwOiAgICAgIFN0cmVhbSBjYXA6IDB4 MDAwMDAwMDUKaGRhYzA6ICAgICAgICAgICAgICAgICAgQUMzIFBDTQpoZGFjMDogICAgICAgICBQ Q00gY2FwOiAweDAwMWUwN2YwCmhkYWMwOiAgICAgICAgICAgICAgICAgIDE2IDIwIDI0IDMyIGJp dHMsIDMyIDQ0IDQ4IDg4IDk2IDE3NiAxOTIgS0h6CmhkYWMwOiAKaGRhYzA6ICAgICAgICAgICAg IG5pZDogMwpoZGFjMDogICAgICAgICAgICBOYW1lOiBwaW46IERpZ2l0YWwtb3V0IChKYWNrKQpo ZGFjMDogICAgICBXaWRnZXQgY2FwOiAweDAwNDA3MzlkCmhkYWMwOiAgICAgICAgICAgICAgICAg IERJR0lUQUwgVU5TT0wgOENICmhkYWMwOiAgICAgQXNzb2NpYXRpb246IDAgKDB4MDAwMDAwMDEp CmhkYWMwOiAgICAgICAgIFBpbiBjYXA6IDB4MDAwMDAwOTQKaGRhYzA6ICAgICAgICAgICAgICAg ICAgUERDIE9VVCBIRE1JCmhkYWMwOiAgICAgIFBpbiBjb25maWc6IDB4MTg1NjAwMTAKaGRhYzA6 ICAgICBQaW4gY29udHJvbDogMHgwMDAwMDA0MCBPVVQKaGRhYzA6ICAgICAgT3V0cHV0IGFtcDog MHg4MDAwMDAwMApoZGFjMDogICAgICAgICAgICAgICAgICBtdXRlPTEgc3RlcD0wIHNpemU9MCBv ZmZzZXQ9MApoZGFjMDogICAgIGNvbm5lY3Rpb25zOiAxCmhkYWMwOiAgICAgICAgICAgfApoZGFj MDogICAgICAgICAgICsgPC0gbmlkPTIgW2F1ZGlvIG91dHB1dF0KaGRhYzA6IApwY20wOiA8SERB IElEVCA5MkhENzNDMSBQQ00gIzAgQW5hbG9nPiBhdCBjYWQgMCBuaWQgMSBvbiBoZGFjMApwY20w OiArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0rCnBjbTA6IHwgRFVNUElO RyBQQ00gUGxheWJhY2svUmVjb3JkIENoYW5uZWxzIHwKcGNtMDogKy0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tKwpwY20wOiAKcGNtMDogUGxheWJhY2s6CnBjbTA6IApwY20w OiAgICAgIFN0cmVhbSBjYXA6IDB4MDAwMDAwMDEKcGNtMDogICAgICAgICAgICAgICAgICBQQ00K cGNtMDogICAgICAgICBQQ00gY2FwOiAweDAwMGUwNWUwCnBjbTA6ICAgICAgICAgICAgICAgICAg MTYgMjAgMjQgYml0cywgNDQgNDggODggOTYgMTkyIEtIegpwY20wOiAgICAgICAgICAgICBEQUM6 IDIxCnBjbTA6IApwY20wOiBSZWNvcmQ6CnBjbTA6IApwY20wOiAgICAgIFN0cmVhbSBjYXA6IDB4 MDAwMDAwMDEKcGNtMDogICAgICAgICAgICAgICAgICBQQ00KcGNtMDogICAgICAgICBQQ00gY2Fw OiAweDAwMGUwNWUwCnBjbTA6ICAgICAgICAgICAgICAgICAgMTYgMjAgMjQgYml0cywgNDQgNDgg ODggOTYgMTkyIEtIegpwY20wOiAgICAgICAgICAgICBBREM6IDI2CnBjbTA6IApwY20wOiArLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSsKcGNtMDogfCBEVU1QSU5HIFBsYXliYWNrL1Jl Y29yZCBQYXRocyB8CnBjbTA6ICstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tKwpwY20w OiAKcGNtMDogUGxheWJhY2s6CnBjbTA6IApwY20wOiAgICAgbmlkPTEzIFtwaW46IFNwZWFrZXIg KEZpeGVkKV0KcGNtMDogICAgICAgfApwY20wOiAgICAgICArIDwtIG5pZD0yMSBbYXVkaW8gb3V0 cHV0XSBbc3JjOiBwY21dCnBjbTA6IApwY20wOiAgICAgbmlkPTEwIFtwaW46IEhlYWRwaG9uZXMg KEJsYWNrIEphY2spXQpwY20wOiAgICAgICB8CnBjbTA6ICAgICAgICsgPC0gbmlkPTIxIFthdWRp byBvdXRwdXRdIFtzcmM6IHBjbV0KcGNtMDogCnBjbTA6IFJlY29yZDoKcGNtMDogCnBjbTA6ICAg ICBuaWQ9MjYgW2F1ZGlvIGlucHV0XQpwY20wOiAgICAgICB8CnBjbTA6ICAgICAgICsgPC0gbmlk PTMyIFthdWRpbyBzZWxlY3Rvcl0gW3NyYzogbW9uaXRvcl0KcGNtMDogICAgICAgICAgICAgIHwK cGNtMDogICAgICAgICAgICAgICsgPC0gbmlkPTE5IFtwaW46IE1pYyAoRml4ZWQpXSBbc3JjOiBt b25pdG9yXQpwY20wOiAKcGNtMDogKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0rCnBjbTA6IHwg RFVNUElORyBWb2x1bWUgQ29udHJvbHMgfApwY20wOiArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LSsKcGNtMDogCnBjbTA6IE1hc3RlciBWb2x1bWUgKE9TUzogdm9sKQpwY20wOiAgICB8CnBjbTA6 ICAgICstIGN0bCAxMSAobmlkICAyMSBvdXQpOiAgICAtOTUvMGRCICgxMjggc3RlcHMpICsgbXV0 ZQpwY20wOiAKcGNtMDogUENNIFZvbHVtZSAoT1NTOiBwY20pCnBjbTA6ICAgIHwKcGNtMDogICAg Ky0gY3RsIDExIChuaWQgIDIxIG91dCk6ICAgIC05NS8wZEIgKDEyOCBzdGVwcykgKyBtdXRlCnBj bTA6IApwY20wOiBNaWNyb3Bob25lMiBWb2x1bWUgKE9TUzogbW9uaXRvcikKcGNtMDogICAgfApw Y20wOiAgICArLSBjdGwgIDkgKG5pZCAgMTkgb3V0KTogICAgMC8zMGRCICg0IHN0ZXBzKQpwY20w OiAKcGNtMDogU3BlYWtlci9CZWVwIFZvbHVtZSAoT1NTOiBzcGVha2VyKQpwY20wOiAgICB8CnBj bTA6ICAgICstIGN0bCAxNiAobmlkICAyOCBvdXQpOiAgICAtMTgvMGRCICg0IHN0ZXBzKSArIG11 dGUKcGNtMDogCnBjbTA6IFJlY29yZGluZyBMZXZlbCAoT1NTOiByZWMpCnBjbTA6ICAgIHwKcGNt MDogICAgKy0gY3RsIDIzIChuaWQgIDMyIG91dCk6ICAgIDAvMjJkQiAoMTYgc3RlcHMpICsgbXV0 ZQpwY20wOiAKcGNtMDogTWl4ZXIgInZvbCI6CnBjbTA6IE1peGVyICJiYXNzIjoKcGNtMDogTWl4 ZXIgInRyZWJsZSI6CnBjbTA6IE1peGVyICJwY20iOgpwY20wOiBNaXhlciAic3BlYWtlciI6CnBj bTA6IE1peGVyICJyZWMiOgpwY20wOiBNaXhlciAibW9uaXRvciI6CnBjbTA6IEVRIFRyZWJsZS9C YXNzIEVOQUJMRUQKcGNtMDogY2xvbmUgbWFuYWdlcjogZGVhZGxpbmU9NzUwbXMgZmxhZ3M9MHg4 MDAwMDAxZQpwY20wOiBzbmRidWZfc2V0bWFwIDEzZmZhMDAwMCwgNDAwMDsgMHhmZmZmZmY4MDc0 ZTAzMDAwIC0+IDEzZmZhMDAwMApwY20wOiBzbmRidWZfc2V0bWFwIDEzZmZiMDAwMCwgNDAwMDsg MHhmZmZmZmY4MDc0ZTEzMDAwIC0+IDEzZmZiMDAwMApwY20xOiA8SERBIEludGVsIEc0NSBIRE1J IFBDTSAjMCBIRE1JPiBhdCBjYWQgMSBuaWQgMSBvbiBoZGFjMApwY20xOiArLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0rCnBjbTE6IHwgRFVNUElORyBQQ00gUGxheWJhY2sv UmVjb3JkIENoYW5uZWxzIHwKcGNtMTogKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tKwpwY20xOiAKcGNtMTogUGxheWJhY2s6CnBjbTE6IApwY20xOiAgICAgIFN0cmVhbSBj YXA6IDB4MDAwMDAwMDUKcGNtMTogICAgICAgICAgICAgICAgICBBQzMgUENNCnBjbTE6ICAgICAg ICAgUENNIGNhcDogMHgwMDFlMDdmMApwY20xOiAgICAgICAgICAgICAgICAgIDE2IDIwIDI0IDMy IGJpdHMsIDMyIDQ0IDQ4IDg4IDk2IDE3NiAxOTIgS0h6CnBjbTE6ICAgICAgICAgICAgIERBQzog MgpwY20xOiAKcGNtMTogKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0rCnBjbTE6IHwg RFVNUElORyBQbGF5YmFjay9SZWNvcmQgUGF0aHMgfApwY20xOiArLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLSsKcGNtMTogCnBjbTE6IFBsYXliYWNrOgpwY20xOiAKcGNtMTogICAgIG5p ZD0zIFtwaW46IERpZ2l0YWwtb3V0IChKYWNrKV0KcGNtMTogICAgICAgfApwY20xOiAgICAgICAr IDwtIG5pZD0yIFthdWRpbyBvdXRwdXRdIFtzcmM6IHBjbV0KcGNtMTogCnBjbTE6ICstLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tKwpwY20xOiB8IERVTVBJTkcgVm9sdW1lIENvbnRyb2xzIHwKcGNt MTogKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0rCnBjbTE6IApwY20xOiBNYXN0ZXIgVm9sdW1l IChPU1M6IHZvbCkKcGNtMTogICAgfApwY20xOiAgICArLSBjdGwgIDEgKG5pZCAgIDMgaW4gKTog ICAgbXV0ZQpwY20xOiAKcGNtMTogUENNIFZvbHVtZSAoT1NTOiBwY20pCnBjbTE6ICAgIHwKcGNt MTogICAgKy0gY3RsICAxIChuaWQgICAzIGluICk6ICAgIG11dGUKcGNtMTogCnBjbTE6IEVuYWJs aW5nIFNvZnQgUENNIHZvbHVtZQpwY20xOiBNaXhlciAidm9sIjoKcGNtMTogTWl4ZXIgInBjbSI6 CnBjbTE6IFNvZnQgUENNIG1peGVyIEVOQUJMRUQKcGNtMTogY2xvbmUgbWFuYWdlcjogZGVhZGxp bmU9NzUwbXMgZmxhZ3M9MHg4MDAwMDAxZQpwY20xOiBzbmRidWZfc2V0bWFwIDJlYjAwMDAsIDQw MDA7IDB4ZmZmZmZmODA3NGUyMzAwMCAtPiAyZWIwMDAwCmF0YTI6IEFIQ0kgcmVzZXQuLi4KYXRh MjogaGFyZHdhcmUgcmVzZXQgLi4uCmF0YTI6IFNBVEEgY29ubmVjdCB0aW1lPTBtcyBzdGF0dXM9 MDAwMDAxMjMKYXRhMjogcmVhZHkgd2FpdCB0aW1lPTdtcwphdGEyOiBzb2Z0d2FyZSByZXNldCBw b3J0IDE1Li4uCmF0YTI6IHJlYWR5IHdhaXQgdGltZT0wbXMKYXRhMjogU0lHTkFUVVJFOiAwMDAw MDEwMQphdGEyOiBBSENJIHJlc2V0IGRvbmU6IGRldmljZXM9MDAwMDAwMDEKYXRhMzogQUhDSSBy ZXNldC4uLgphdGEzOiBoYXJkd2FyZSByZXNldCAuLi4KYXRhMzogU0FUQSBjb25uZWN0IHRpbWVv dXQgc3RhdHVzPTAwMDAwMDAwCmF0YTM6IEFIQ0kgcmVzZXQgZG9uZTogcGh5IHJlc2V0IGZvdW5k IG5vIGRldmljZQooYXByb2JlMDphdGEyOjA6MDowKTogU0lHTkFUVVJFOiAwMDAwCnVzYnVzMDog MTJNYnBzIEZ1bGwgU3BlZWQgVVNCIHYxLjAKdXNidXMxOiAxMk1icHMgRnVsbCBTcGVlZCBVU0Ig djEuMAp1c2J1czI6IDEyTWJwcyBGdWxsIFNwZWVkIFVTQiB2MS4wCnVzYnVzMzogNDgwTWJwcyBI aWdoIFNwZWVkIFVTQiB2Mi4wCnVzYnVzNDogMTJNYnBzIEZ1bGwgU3BlZWQgVVNCIHYxLjAKdXNi dXM1OiAxMk1icHMgRnVsbCBTcGVlZCBVU0IgdjEuMAp1c2J1czY6IDEyTWJwcyBGdWxsIFNwZWVk IFVTQiB2MS4wCnVzYnVzNzogNDgwTWJwcyBIaWdoIFNwZWVkIFVTQiB2Mi4wCmFjcGlfYWNhZDA6 IGFjbGluZSBpbml0aWFsaXphdGlvbiBzdGFydApiYXR0ZXJ5MDogYmF0dGVyeSBpbml0aWFsaXph dGlvbiBzdGFydAphZGEwIGF0IGF0YTIgYnVzIDAgc2NidXMwIHRhcmdldCAwIGx1biAwCmFkYTA6 IDxTQU1TVU5HIFNTRCBQQjIyLUNTMyBUTSAyNTZHQiBWQk0yM0QxUT4gQVRBLTdHRU9NOiBuZXcg ZGlzayBhZGEwCiBTQVRBIDIueCBkZXZpY2UKYWRhMDogU2VyaWFsIE51bWJlciBZRjMwRjBLOTM5 U1k5MzlCODMzNAphZGEwOiAzMDAuMDAwTUIvcyB0cmFuc2ZlcnMgKFNBVEEgMi54LCBVRE1BNSwg UElPIDgxOTJieXRlcykKYWRhMDogMjQ0MTk4TUIgKDUwMDExODE5MiA1MTIgYnl0ZSBzZWN0b3Jz OiAxNkggNjNTL1QgMTYzODNDKQpwYXNzMCBhdCBhdGEyIGJ1cyAwIHNjYnVzMCB0YXJnZXQgMCBs dW4gMApwYXNzMDogPFNBTVNVTkcgU1NEIFBCMjItQ1MzIFRNIDI1NkdCIFZCTTIzRDFRPiBBVEEt NyBTQVRBIDIueCBkZXZpY2UKcGFzczA6IFNlcmlhbCBOdW1iZXIgWUYzMEYwSzkzOVNZOTM5Qjgz MzQKcGFzczA6IDMwMC4wMDBNQi9zIHRyYW5zZmVycyAoU0FUQSAyLngsIFVETUE1LCBQSU8gODE5 MmJ5dGVzKQpTTVA6IEFQIENQVSAjMSBMYXVuY2hlZCEKY3B1MSBBUDoKICAgICBJRDogMHgwMTAw MDAwMCAgIFZFUjogMHgwMDA1MDAxNCBMRFI6IDB4MDAwMDAwMDAgREZSOiAweGZmZmZmZmZmCiAg bGludDA6IDB4MDAwMTA3MDAgbGludDE6IDB4MDAwMDA0MDAgVFBSOiAweDAwMDAwMDAwIFNWUjog MHgwMDAwMDFmZgogIHRpbWVyOiAweDAwMDEwMGVmIHRoZXJtOiAweDAwMDEwMDAwIGVycjogMHgw MDAwMDBmMCBwbWM6IDB4MDAwMTA0MDAKICAgY21jaTogMHgwMDAwMDAwMApDUFUxOmkgbG9vY2Fh cGwgaUFQY0lDIGUwcjpyIG9yciAwb3h1OHRpMG5nIGludHBpbiAxICgKSVNBIElSUSAxKSB0byBs YXBpYyAxIHZlY3RvciA0OAppb2FwaWMwOiByb3V0aW5nIGludHBpbiAxMiAoSVNBIElSUSAxMikg dG8gbGFwaWMgMSB2ZWN0b3IgNDkKaW9hcGljMDogcm91dGluZyBpbnRwaW4gMTggKFBDSSBJUlEg MTgpIHRvIGxhcGljIDEgdmVjdG9yIDUwCmlvYXBpYzA6IHJvdXRpbmcgaW50cGluIDIxIChQQ0kg SVJRIDIxKSB0byBsYXBpYyAxIHZlY3RvciA1MQptc2k6IEFzc2lnbmluZyBNU0kgSVJRIDI1NyB0 byBsb2NhbCBBUElDIDEgdmVjdG9yIDUyCm1zaTogQXNzaWduaW5nIE1TSSBJUlEgMjU5IHRvIGxv Y2FsIEFQSUMgMSB2ZWN0b3IgNTMKV0FSTklORzogV0lUTkVTUyBvcHRpb24gZW5hYmxlZCwgZXhw ZWN0IHJlZHVjZWQgcGVyZm9ybWFuY2UuCnVnZW4wLjE6IDxJbnRlbD4gYXQgdXNidXMwdWdlbjEu MTogPEludGVsPiBhdCB1c2J1czEKCnVodWIwOiA8SW50ZWwgVUhDSSByb290IEhVQiwgY2xhc3Mg OS8wLCByZXYgMS4wMC8xLjAwLCBhZGRyIDE+IG9uIHVzYnVzMAp1aHViMTogPEludGVsIFVIQ0kg cm9vdCBIVUIsIGNsYXNzIDkvMCwgcmV2IDEuMDAvMS4wMCwgYWRkciAxPiBvbiB1c2J1czEKdWdl bjIuMTogPEludGVsPiBhdCB1c2J1czIKdWh1YjI6IDxJbnRlbCBVSENJIHJvb3QgSFVCLCBjbGFz cyA5LzAsIHJldiAxLjAwLzEuMDAsIGFkZHIgMT4gb24gdXNidXMyCnVnZW4zLjE6IDxJbnRlbD4g YXQgdXNidXMzdWdlbjQuMTogPEludGVsPiBhdCB1c2J1czQKCnVodWIzOiA8SW50ZWwgRUhDSSBy b290IEhVQiwgY2xhc3MgOS8wLCByZXYgMi4wMC8xLjAwLCBhZGRyIDE+IG9uIHVzYnVzMwp1aHVi NDogPEludGVsIFVIQ0kgcm9vdCBIVUIsIGNsYXNzIDkvMCwgcmV2IDEuMDAvMS4wMCwgYWRkciAx PiBvbiB1c2J1czQKdWdlbjUuMTogPEludGVsPiBhdCB1c2J1czV1Z2VuNi4xOiA8SW50ZWw+IGF0 IHVzYnVzNgoKdWh1YjU6IDxJbnRlbCBVSENJIHJvb3QgSFVCLCBjbGFzcyA5LzAsIHJldiAxLjAw LzEuMDAsIGFkZHIgMT4gb24gdXNidXM1CnVodWI2OiA8SW50ZWwgVUhDSSByb290IEhVQiwgY2xh c3MgOS8wLCByZXYgMS4wMC8xLjAwLCBhZGRyIDE+IG9uIHVzYnVzNgp1Z2VuNy4xOiA8SW50ZWw+ IGF0IHVzYnVzNwp1aHViNzogPEludGVsIEVIQ0kgcm9vdCBIVUIsIGNsYXNzIDkvMCwgcmV2IDIu MDAvMS4wMCwgYWRkciAxPiBvbiB1c2J1czcKQWNwaU9zRGVyaXZlUGNpSWQ6IFxcX1NCXy5QQ0kw LlJQMDEuUFhDUyAtPiBidXMgMCBkZXYgMjggZnVuYyAwCkFjcGlPc0Rlcml2ZVBjaUlkOiBcXF9T Ql8uUENJMC5SUDAyLlBYQ1MgLT4gYnVzIDAgZGV2IDI4IGZ1bmMgMQpiYXR0ZXJ5MDogYmF0dGVy eSBpbml0aWFsaXphdGlvbiBkb25lLCB0cmllZCAxIHRpbWVzCmFjcGlfbGlkMDogTGlkIG9wZW5l ZAphY3BpX2xpZDA6IExpZCBvcGVuZWQKUm9vdCBtb3VudCB3YWl0aW5nIGZvcjogdXNidXM3IHVz YnVzNiB1c2J1czUgdXNidXM0IHVzYnVzMyB1c2J1czIgdXNidXMxIHVzYnVzMAphY3BpX2FjYWQw OiBPbiBMaW5lCmFjcGlfYWNhZDA6IGFjbGluZSBpbml0aWFsaXphdGlvbiBkb25lLCB0cmllZCAx IHRpbWVzCkFjcGlPc0Rlcml2ZVBjaUlkOiBcXF9TQl8uUENJMC5SUDAzLlBYQ1MgLT4gYnVzIDAg ZGV2IDI4IGZ1bmMgMgpBY3BpT3NEZXJpdmVQY2lJZDogXFxfU0JfLlBDSTAuUlAwNi5QWENTIC0+ IGJ1cyAwIGRldiAyOCBmdW5jIDUKdWh1YjE6IDIgcG9ydHMgd2l0aCAyIHJlbW92YWJsZSwgc2Vs ZiBwb3dlcmVkCnVodWIwOiAyIHBvcnRzIHdpdGggMiByZW1vdmFibGUsIHNlbGYgcG93ZXJlZAp1 aHViMjogMiBwb3J0cyB3aXRoIDIgcmVtb3ZhYmxlLCBzZWxmIHBvd2VyZWQKdWh1YjQ6IDIgcG9y dHMgd2l0aCAyIHJlbW92YWJsZSwgc2VsZiBwb3dlcmVkCnVodWI1OiAyIHBvcnRzIHdpdGggMiBy ZW1vdmFibGUsIHNlbGYgcG93ZXJlZAp1aHViNjogMiBwb3J0cyB3aXRoIDIgcmVtb3ZhYmxlLCBz ZWxmIHBvd2VyZWQKUm9vdCBtb3VudCB3YWl0aW5nIGZvcjogdXNidXM3IHVzYnVzMwpSb290IG1v dW50IHdhaXRpbmcgZm9yOiB1c2J1czcgdXNidXMzCnVodWI3OiA2IHBvcnRzIHdpdGggNiByZW1v dmFibGUsIHNlbGYgcG93ZXJlZAp1aHViMzogNiBwb3J0cyB3aXRoIDYgcmVtb3ZhYmxlLCBzZWxm IHBvd2VyZWQKUm9vdCBtb3VudCB3YWl0aW5nIGZvcjogdXNidXM3ClJvb3QgbW91bnQgd2FpdGlu ZyBmb3I6IHVzYnVzNwpSb290IG1vdW50IHdhaXRpbmcgZm9yOiB1c2J1czcKUm9vdCBtb3VudCB3 YWl0aW5nIGZvcjogdXNidXM3ClJvb3QgbW91bnQgd2FpdGluZyBmb3I6IHVzYnVzNwp1Z2VuNy4y OiA8KG51bGwpPiBhdCB1c2J1czcgKGRpc2Nvbm5lY3RlZCkKUm9vdCBtb3VudCB3YWl0aW5nIGZv cjogdXNidXM3ClRyeWluZyB0byBtb3VudCByb290IGZyb20gdWZzOi9kZXYvZ3B0L3BhcnQwCmN0 X3RvX3RzKFsyMDEwLTA2LTE5IDA1OjIwOjE0XSkgPSAxMjc2OTI0ODE0LjAwMDAwMDAwMApzdGFy dF9pbml0OiB0cnlpbmcgL3NiaW4vaW5pdAphY3BpX2xpZDA6IExpZCBvcGVuZWQKYWNwaV9saWQw OiBMaWQgb3BlbmVkCkxpbnV4IEVMRiBleGVjIGhhbmRsZXIgaW5zdGFsbGVkCmxpbnByb2NmcyBy ZWdpc3RlcmVkCnVnZW42LjI6IDxCcm9hZGNvbT4gYXQgdXNidXM2CnVodWI4OiA8QnJvYWRjb20g QkNNMjA0NkIxLCBjbGFzcyA5LzAsIHJldiAyLjAwLzEuMDAsIGFkZHIgMj4gb24gdXNidXM2Cmxh Z2cwOiBicGYgYXR0YWNoZWQKdWh1Yjg6IDMgcG9ydHMgd2l0aCAwIHJlbW92YWJsZSwgc2VsZiBw b3dlcmVkCnVnZW42LjM6IDx2ZW5kb3IgMHg0MTNjPiBhdCB1c2J1czYKdWtiZDA6IDx2ZW5kb3Ig MHg0MTNjIHByb2R1Y3QgMHg4MTU3LCBjbGFzcyAwLzAsIHJldiAyLjAwLzEuMDAsIGFkZHIgMz4g b24gdXNidXM2CmtiZDIgYXQgdWtiZDAKa2JkMjogdWtiZDAsIGdlbmVyaWMgKDApLCBjb25maWc6 MHgwLCBmbGFnczoweDNkMDAwMAp1Z2VuNi40OiA8dmVuZG9yIDB4NDEzYz4gYXQgdXNidXM2CnVt czA6IDx2ZW5kb3IgMHg0MTNjIHByb2R1Y3QgMHg4MTU4LCBjbGFzcyAwLzAsIHJldiAyLjAwLzEu MDAsIGFkZHIgND4gb24gdXNidXM2CnVtczA6IDMgYnV0dG9ucyBhbmQgW1hZXSBjb29yZGluYXRl cyBJRD0yCmZpcm13YXJlOiAnaXduNTAwMGZ3JyB2ZXJzaW9uIDA6IDM1MzI0MCBieXRlcyBsb2Fk ZWQgYXQgMHhmZmZmZmZmZjgwZTM0MGIwCndsYW4wOiBicGYgYXR0YWNoZWQKd2xhbjA6IGJwZiBh dHRhY2hlZAp3bGFuMDogRXRoZXJuZXQgYWRkcmVzczogMDA6MjI6MTk6ZTU6Y2E6NTEKYmdlMDog RGlzYWJsaW5nIGZhc3Rib290CmJnZTA6IERpc2FibGluZyBmYXN0Ym9vdAo= --002215048d0bca851504896ab298--