Date: Thu, 04 Aug 2005 18:40:44 -0500 From: "Jeremy Messenger" <mezz7@cox.net> To: "Mikhail Teterin" <mi+mx@aldan.algebra.com> Cc: gnome@freebsd.org Subject: Re: leaner and even meaner firefox Message-ID: <op.su0b16ad9aq2h7@mezz.mezzweb.com> In-Reply-To: <200508041929.18245.mi%2Bmx@aldan.algebra.com> References: <200508041742.33580.mi%2Bmx@aldan.algebra.com> <200508041912.20472.mi%2Bmx@aldan.algebra.com> <op.su0bariu9aq2h7@mezz.mezzweb.com> <200508041929.18245.mi%2Bmx@aldan.algebra.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 04 Aug 2005 18:29:18 -0500, Mikhail Teterin
<mi+mx@aldan.algebra.com> 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 <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+
#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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?op.su0b16ad9aq2h7>