diff -r 3fd4e37e5e52 -r 5330447b83a3 mozilla-shared-nss-db.patch
--- a/mozilla-shared-nss-db.patch	Sat Jul 23 15:16:24 2011 +0200
+++ b/mozilla-shared-nss-db.patch	Sat Jul 23 15:31:44 2011 +0200
@@ -7,7 +7,7 @@
 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
 --- a/config/autoconf.mk.in
 +++ b/config/autoconf.mk.in
-@@ -582,16 +582,20 @@ MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS
+@@ -579,16 +579,20 @@ MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS
  
  GLIB_CFLAGS	= @GLIB_CFLAGS@
  GLIB_LIBS	= @GLIB_LIBS@
@@ -31,7 +31,7 @@
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8507,16 +8507,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8625,16 +8625,31 @@ AC_SUBST(QCMS_LIBS)
  
  dnl ========================================================
  dnl HarfBuzz
@@ -66,7 +66,7 @@
 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
 --- a/security/manager/ssl/src/Makefile.in
 +++ b/security/manager/ssl/src/Makefile.in
-@@ -114,19 +114,20 @@ CSRCS += md4.c
+@@ -114,12 +114,14 @@ CSRCS += md4.c
  
  
  EXTRA_DEPS = $(NSS_DEP_LIBS)
@@ -77,14 +77,8 @@
  # so that Mozilla's nss.h is used, not glibc's
 -LOCAL_INCLUDES += $(NSS_CFLAGS)
 +LOCAL_INCLUDES += $(NSS_CFLAGS) $(NSSHELPER_CFLAGS)
- 
- EXTRA_DSO_LDOPTS += \
- 		$(MOZ_UNICHARUTIL_LIBS) \
- 		$(MOZ_COMPONENT_LIBS) \
- 		$(MOZ_JS_LIBS) \
-+		$(NSSHELPER_LIBS) \
- 		$(NSS_LIBS) \
- 		$(NULL)
++
++EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS)
  
  include $(topsrcdir)/config/rules.mk
  
@@ -115,7 +109,7 @@
  
  #include "nsNetUtil.h"
  #include "nsAppDirectoryServiceDefs.h"
-@@ -1733,18 +1740,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
+@@ -1761,18 +1768,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
      ConfigureInternalPKCS11Token();
  
      // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs