rpms/xca/devel xca-0.7.0-locale.patch, NONE, 1.1 xca-0.6.4-includes.patch, 1.1, 1.2 xca-0.6.4-openssl10.patch, 1.1, 1.2 xca-0.6.3-locale.patch, 1.1, NONE xca-0.6.4-newopenssl.patch, 1.1, NONE

[ensc]

Author: ensc

Update of /cvs/extras/rpms/xca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9715

Modified Files:
	xca-0.6.4-includes.patch xca-0.6.4-openssl10.patch 
Added Files:
	xca-0.7.0-locale.patch 
Removed Files:
	xca-0.6.3-locale.patch xca-0.6.4-newopenssl.patch 
Log Message:
rediffed patches


xca-0.7.0-locale.patch:
 main.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE xca-0.7.0-locale.patch ---
2007-03-17  Enrico Scholz  <enrico.scholz at informatik.tu-chemnitz.de>
	* lib/main.c: use correct locale for the xca.qm file
	* lib/main.c: [SECURITY] do not load qt.qm file from current
	  directory

Index: xca-0.7.0/lib/main.cpp
===================================================================
--- xca-0.7.0.orig/lib/main.cpp
+++ xca-0.7.0/lib/main.cpp
@@ -9,6 +9,7 @@
 #include <qtranslator.h>
 #include <qtextcodec.h>
 #include <qdir.h>
+#include <Qt/qlocale.h>
 #include <qtranslator.h>
 #include "widgets/MainWindow.h"
 #include "lib/func.h"
@@ -39,7 +40,7 @@ int main( int argc, char *argv[] )
 #else
 	locale = QLocale::system().name();
 #endif
-	qtTr.load( QString( "qt_" ) + locale, "." );
+	qtTr.load( QString( "qt_" ) + locale, XCA_DEFAULT_TRANSLATE);
 	xcaTr.load( QString( "xca_" ) + locale, getPrefix() );
 
 	a.installTranslator( &qtTr );

xca-0.6.4-includes.patch:
 db.h |    1 +
 1 file changed, 1 insertion(+)

Index: xca-0.6.4-includes.patch
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/xca-0.6.4-includes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xca-0.6.4-includes.patch	5 Mar 2009 19:51:29 -0000	1.1
+++ xca-0.6.4-includes.patch	13 Sep 2009 11:20:03 -0000	1.2
@@ -1,6 +1,7 @@
-diff -ru xca-0.6.4.orig/lib/db.h xca-0.6.4/lib/db.h
---- xca-0.6.4.orig/lib/db.h	2009-03-05 17:19:23.000000000 +0000
-+++ xca-0.6.4/lib/db.h	2009-03-05 17:19:41.000000000 +0000
+Index: xca-0.7.0/lib/db.h
+===================================================================
+--- xca-0.7.0.orig/lib/db.h
++++ xca-0.7.0/lib/db.h
 @@ -13,6 +13,7 @@
  #include <fcntl.h>
  #include <qstring.h>

xca-0.6.4-openssl10.patch:
 pki_x509req.cpp |    4 ++++
 1 file changed, 4 insertions(+)

Index: xca-0.6.4-openssl10.patch
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/xca-0.6.4-openssl10.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xca-0.6.4-openssl10.patch	26 Aug 2009 14:21:51 -0000	1.1
+++ xca-0.6.4-openssl10.patch	13 Sep 2009 11:20:03 -0000	1.2
@@ -1,7 +1,8 @@
-diff -up xca-0.6.4/lib/pki_x509req.cpp.openssl xca-0.6.4/lib/pki_x509req.cpp
---- xca-0.6.4/lib/pki_x509req.cpp.openssl	2007-08-13 20:55:50.000000000 +0200
-+++ xca-0.6.4/lib/pki_x509req.cpp	2009-08-26 16:18:58.000000000 +0200
-@@ -335,7 +335,11 @@ void pki_x509req::set_spki(NETSCAPE_SPKI
+Index: xca-0.7.0/lib/pki_x509req.cpp
+===================================================================
+--- xca-0.7.0.orig/lib/pki_x509req.cpp
++++ xca-0.7.0/lib/pki_x509req.cpp
+@@ -350,7 +350,11 @@ void pki_x509req::set_spki(NETSCAPE_SPKI
  void pki_x509req::load_spkac(const QString filename)
  {
  	STACK_OF(CONF_VALUE) *sk=NULL;


--- xca-0.6.3-locale.patch DELETED ---


--- xca-0.6.4-newopenssl.patch DELETED ---