I had these modules listed as being owned by me, but they are really owned by
wangke, correcting.
--- a/security/nss/lib/crmf/cmmfchal.c Thu May 21 15:04:02 2009
+++ b/security/nss/lib/crmf/cmmfchal.c Wed May 20 17:58:31 2009
@@ -38,7 +38,7 @@
#include "cmmf.h"
#include "cmmfi.h"
#include "sechash.h"
-#include "genname.h"
+#include "../certdb/genname.h"
#include "pk11func.h"
#include "cert.h"
#include "secitem.h"
--- a/security/manager/ssl/src/nsNSSComponent.cpp Thu May 21 18:39:37 2009
+++ b/security/manager/ssl/src/nsNSSComponent.cpp Thu May 21 18:52:06 2009
@@ -812,6 +812,7 @@
const char *possible_ckbi_locations[] = {
NS_XPCOM_CURRENT_PROCESS_DIR,
NS_GRE_DIR,
+ (const char *)-1, // This special value means: /usr/lib/mps
0 // This special value means:
// search for ckbi in the directories on the shared
// library/DLL search path
@@ -821,8 +822,12 @@
nsCOMPtr<nsILocalFile> mozFile;
char *fullLibraryPath = nsnull;
- if (!possible_ckbi_locations[il])
+ if (possible_ckbi_locations[il] == (const char *)-1)
{
+ fullLibraryPath = PR_GetLibraryName("/usr/lib/mps", "nssckbi");
+ }
+ else if (!possible_ckbi_locations[il])
+ {
fullLibraryPath = PR_GetLibraryName(nsnull, "nssckbi");
}
else
--- mozilla-1.9.2/security/manager/Makefile.in.orig 2009-11-25 16:48:09.391408928 +0800
+++ mozilla-1.9.2/security/manager/Makefile.in 2009-11-25 16:52:16.460391559 +0800
@@ -82,6 +82,11 @@
$(DIST)/lib/$(LIB_PREFIX)nssutil.$(LIB_SUFFIX) \
$(NULL)
endif
+else
+ifeq ($(OS_ARCH), SunOS)
+SDK_LIBS = \
+ $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX)
+endif
endif
# Default
@@ -292,6 +297,12 @@
$(NSSMAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
endif
touch $@
+else
+ifeq ($(OS_ARCH), SunOS)
+ $(NSSMAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+ $(NSSMAKE) -C $(topsrcdir)/security/nss/lib/crmf $(DEFAULT_GMAKE_FLAGS) clean
+ touch $@
+endif
endif
GARBAGE += .nss.cleaned
@@ -372,6 +383,12 @@
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
endif
+else
+ifeq ($(OS_ARCH), SunOS)
+ $(NSSMAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
+ $(NSSMAKE) -C $(topsrcdir)/security/nss/lib/crmf $(DEFAULT_GMAKE_FLAGS)
+ $(INSTALL) -m 755 $(SDK_LIBS) $(DIST)/sdk/lib
+endif
endif
ifndef MOZ_NATIVE_NSS
# NSS installs headers to dist/public and we want them in dist/include
@@ -454,6 +471,11 @@
$(NSSMAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
$(NSSMAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
endif
+else
+ifeq ($(OS_ARCH), SunOS)
+ $(NSSMAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+ $(NSSMAKE) -C $(topsrcdir)/security/nss/lib/crmf $(DEFAULT_GMAKE_FLAGS) clean
+endif
endif
echo-requires-recursive::
--- a/content/html/content/src/nsHTMLFrameSetElement.cpp 2010-09-08 15:29:01.729449155 +0800
+++ b/content/html/content/src/nsHTMLFrameSetElement.cpp 2010-09-08 15:29:42.927141361 +0800
@@ -34,6 +34,7 @@
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
+#include "prlog.h"
#include "nsIDOMHTMLFrameSetElement.h"
#include "nsIDOMEventTarget.h"
#include "nsGenericHTMLElement.h"