rpms/xulrunner/devel mozilla-462919.patch, NONE, 1.1 .cvsignore, 1.80, 1.81 xulrunner.spec, 1.194, 1.195

[Jan Horak]

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23941

Modified Files:
	.cvsignore xulrunner.spec 
Added Files:
	mozilla-462919.patch 
Log Message:
Fixed mozbz#462919

mozilla-462919.patch:
 nsNSSComponent.cpp |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE mozilla-462919.patch ---
Index: mozilla/security/manager/ssl/src/nsNSSComponent.cpp
===================================================================
RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsNSSComponent.cpp,v
retrieving revision 1.167
diff -u -u -r1.167 nsNSSComponent.cpp
--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp	16 Sep 2008 20:44:53 -0000	1.167
+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp	29 Oct 2008 06:11:27 -0000
@@ -1516,9 +1516,15 @@
       return rv;
   #endif
 
-    rv = profilePath->GetNativePath(profileStr);
-    if (NS_FAILED(rv)) 
-      return rv;
+    const char *dbdir_override = getenv("MOZPSM_NSSDBDIR_OVERRIDE");
+    if (dbdir_override && strlen(dbdir_override)) {
+      profileStr = dbdir_override;
+    }
+    else {
+      rv = profilePath->GetNativePath(profileStr);
+      if (NS_FAILED(rv)) 
+        return rv;
+    }
 
   #if defined(XP_MACOSX)
     // function may modify the parameters


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- .cvsignore	22 Jan 2010 09:38:00 -0000	1.80
+++ .cvsignore	18 Feb 2010 15:31:39 -0000	1.81
@@ -10,3 +10,4 @@ xulrunner-1.9.2.1b5.source.tar.bz2
 xulrunner-1.9.2.1rc1.source.tar.bz2
 xulrunner-1.9.2.1rc2.source.tar.bz2
 xulrunner-1.9.2.1.source.tar.bz2
+xulrunner-1.9.1.8.source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- xulrunner.spec	17 Feb 2010 14:39:52 -0000	1.194
+++ xulrunner.spec	18 Feb 2010 15:31:39 -0000	1.195
@@ -41,6 +41,7 @@ Patch10:        mozilla-192-pkgconfig.pa
 
 # Upstream patches
 Patch100:       mozilla-ps-pdf-simplify-operators.patch
+Patch101:       mozilla-462919.patch
 
 # ---------------------------------------------------
 
@@ -136,6 +137,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ver
 %patch10 -p1 -b .pk
 
 %patch100 -p1 -b .ps-pdf-simplify-operators
+%patch101 -p1 -b .462919
 
 
 %{__rm} -f .mozconfig
@@ -410,6 +412,10 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Feb 18 2010 Jan Horak <jhorak at redhat.com> - 1.9.2.1-3
+- Added fix for mozbz#462919 - Override NSS database path 
+  for xulrunner application
+       
 * Wed Feb 17 2010 Martin Stransky <stransky at redhat.com> 1.9.2.1-2
 - Added fix for #564184 - xulrunner-devel multilib conflict