From owner-freebsd-gnome@FreeBSD.ORG Thu Aug 4 23:39:33 2005 Return-Path: X-Original-To: gnome@freebsd.org Delivered-To: freebsd-gnome@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 73CEF16A41F for ; Thu, 4 Aug 2005 23:39:33 +0000 (GMT) (envelope-from mezz7@cox.net) Received: from eastrmmtao01.cox.net (eastrmmtao01.cox.net [68.230.240.38]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0072743D46 for ; Thu, 4 Aug 2005 23:39:32 +0000 (GMT) (envelope-from mezz7@cox.net) Received: from mezz.mezzweb.com ([68.103.32.140]) by eastrmmtao01.cox.net (InterMail vM.6.01.04.00 201-2131-118-20041027) with ESMTP id <20050804233932.FBJF12912.eastrmmtao01.cox.net@mezz.mezzweb.com>; Thu, 4 Aug 2005 19:39:32 -0400 Date: Thu, 04 Aug 2005 18:40:44 -0500 To: "Mikhail Teterin" References: <200508041742.33580.mi+mx@aldan.algebra.com> <200508041912.20472.mi+mx@aldan.algebra.com> <200508041929.18245.mi+mx@aldan.algebra.com> From: "Jeremy Messenger" Content-Type: text/plain; format=flowed; delsp=yes; charset=us-ascii MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID: In-Reply-To: <200508041929.18245.mi+mx@aldan.algebra.com> User-Agent: Opera M2/8.02 (Linux, build 1272) Cc: gnome@freebsd.org Subject: Re: leaner and even meaner firefox X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Aug 2005 23:39:33 -0000 On Thu, 04 Aug 2005 18:29:18 -0500, Mikhail Teterin wrote: >> Ok, here they are: > > Yes, this is the same I was seeing before patching up the > security/manager/ssl/src/nsNSSComponent.cpp ... Are you sure, you are > using my diffs from today? Yeah, it's my first time to download your patch and patch it in firefox. > The files/patch-sysnss should contain patches for > nsNSSComponent.cpp at the end ======================================= [...] --- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004 +++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005 @@ -88,4 +88,8 @@ } +#include +#include +#include + #ifdef PR_LOGGING PRLogModuleInfo* gPIPNSSLog = nsnull; @@ -406,4 +410,5 @@ const char *possible_ckbi_locations[] = { NS_GRE_DIR, + NS_UNIX_LIB_DIR, NS_XPCOM_CURRENT_PROCESS_DIR }; @@ -419,5 +424,5 @@ } - char *fullModuleName = nsnull; + char *fullModuleName; #ifdef XP_MAC nsCAutoString nativePath; @@ -431,4 +436,12 @@ fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); #endif + if (fullModuleName == nsnull) + continue; + struct stat sb; + if (stat(fullModuleName, &sb)) { + if (errno != ENOENT) + perror(fullModuleName); + continue; + } /* If a module exists with the same name, delete it. */ NS_ConvertUCS2toUTF8 modNameUTF8(modName); ======================================= > _and_ the port's Makefile should apply > REINPLACE_CMD to SpecialSystemDirectory.cpp. ======================================= @${REINPLACE_CMD} -e 's|/usr/local/netscape|${PREFIX}|g' \ -e 's|/usr/local/lib/netscape|${PREFIX}/lib|g' \ ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp ======================================= Ummm, s/${PREFIX}/${LOCALBASE}/g? or need both to find anything in two prefixes? Cheers, Mezz > -mi > >> ============================================== >> 54484 firefox-bin RET read 4096/0x1000 >> 54484 firefox-bin CALL open(0x28921000,0,0x280637a6) >> 54484 firefox-bin NAMI >> "/usr/home/mezz/.mozilla/firefox/1d1f1lrh.default/libnssckbi.so" >> 54484 firefox-bin RET open -1 errno 2 No such file or directory >> 54484 firefox-bin CALL stat(0x8869780,0xbfbfb608) >> 54484 firefox-bin NAMI "/usr/X11R6/lib/firefox/libnssckbi.so" >> 54484 firefox-bin RET stat -1 errno 2 No such file or directory >> 54484 firefox-bin CALL stat(0x883f120,0xbfbfb608) >> 54484 firefox-bin NAMI "/usr/X11R6/lib/libnssckbi.so" >> 54484 firefox-bin RET stat -1 errno 2 No such file or directory >> 54484 firefox-bin CALL stat(0x88697c0,0xbfbfb608) >> 54484 firefox-bin NAMI "/usr/X11R6/lib/firefox/libnssckbi.so" >> 54484 firefox-bin RET stat -1 errno 2 No such file or directory >> 54484 firefox-bin CALL gettimeofday(0xbfbfb840,0) >> 54484 firefox-bin RET gettimeofday 0 >> 54484 firefox-bin CALL gettimeofday(0xbfbfbae0,0) >> 54484 firefox-bin RET gettimeofday 0 >> 54484 firefox-bin CALL write(0x3,0x8077000,0x1d0) >> 54484 firefox-bin GIO fd 3 wrote 464 bytes >> ============================================== >> >> ============================================== >> % find /usr -name libnssckbi\* >> /usr/local/lib/libnssckbi.so >> /usr/local/lib/libnssckbi.so.1 >> ============================================== >> >> Looks like it need to be teach to find in LOCALBASE instead X11BASE. >> >> Cheers, >> Mezz >> >> > Thanks! >> > >> > -mi -- mezz7@cox.net - mezz@FreeBSD.org FreeBSD GNOME Team http://www.FreeBSD.org/gnome/ - gnome@FreeBSD.org