rpms/openoffice.org/devel openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch, 1.2, 1.3 openoffice.org.spec, 1.1588, 1.1589

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14836

Modified Files:
	openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch 
	openoffice.org.spec 
Log Message:
Resolves: rhbz#451708 ensure root certs are available for document signing

openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch:

Index: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch	20 Jun 2008 13:02:46 -0000	1.2
+++ openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch	23 Jul 2008 15:47:03 -0000	1.3
@@ -560,3 +560,31 @@
  	gid_File_Lib_Mysql_2,
  	gid_File_Lib_Odbc_2,
  	gid_File_Lib_Officebean,
+Index: source/xmlsec/nss/seinitializer_nssimpl.cxx
+===================================================================
+RCS file: /cvs/xml/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx,v
+retrieving revision 1.21
+diff -u -r1.21 seinitializer_nssimpl.cxx
+--- openoffice.org.orig/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx	11 Apr 2008 00:38:31 -0000	1.21
++++ openoffice.org/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx	23 Jul 2008 15:36:20 -0000
+@@ -68,6 +68,7 @@
+ #include "pk11func.h"
+ #ifdef SYSTEM_MOZILLA
+ #include "nssrenam.h"
++#include "secmod.h"        
+ #endif
+ #include "cert.h"
+ #include "cryptohi.h"
+@@ -104,6 +107,12 @@
+                         printf("%s",error);
+                     return false ;
+                 }
++
++#if SYSTEM_MOZILLA
++		if (!SECMOD_HasRootCerts())
++			SECMOD_AddNewModule("Root Certs", "libnssckbi.so", 0, 0);
++#endif
++
+ 		initialized = 1 ;
+ 	}
+ 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1588
retrieving revision 1.1589
diff -u -r1.1588 -r1.1589
--- openoffice.org.spec	23 Jul 2008 09:51:27 -0000	1.1588
+++ openoffice.org.spec	23 Jul 2008 15:47:03 -0000	1.1589
@@ -3574,6 +3574,7 @@
 %changelog
 * Wed Jul 23 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.26-2
 - Resolves: rhbz#456292 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
+- Resolves: rhbz#451708 ensure root certs are available for document signing
 
 * Tue Jul 22 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.26-1
 - next version