rpms/qca-tls/devel qca-tls-1.0-ossl098.patch, 1.1, 1.2 qca-tls.spec, 1.12, 1.13

Aurelien Bompard (abompard) fedora-extras-commits at redhat.com
Sun Nov 13 21:23:35 UTC 2005


Author: abompard

Update of /cvs/extras/rpms/qca-tls/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30121

Modified Files:
	qca-tls-1.0-ossl098.patch qca-tls.spec 
Log Message:
fix patch1

qca-tls-1.0-ossl098.patch:

Index: qca-tls-1.0-ossl098.patch
===================================================================
RCS file: /cvs/extras/rpms/qca-tls/devel/qca-tls-1.0-ossl098.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qca-tls-1.0-ossl098.patch	13 Nov 2005 21:11:18 -0000	1.1
+++ qca-tls-1.0-ossl098.patch	13 Nov 2005 21:23:33 -0000	1.2
@@ -1,5 +1,5 @@
---- ./qca-tls.cpp.openssl	2005-11-13 21:58:48.000000000 +0100
-+++ ./qca-tls.cpp	2005-11-13 21:59:54.000000000 +0100
+--- ./qca-tls.cpp.ossl098	2003-12-10 17:53:57.000000000 +0100
++++ ./qca-tls.cpp	2005-11-13 22:21:50.000000000 +0100
 @@ -454,7 +454,11 @@
  			if(!r) {
  				// try this other public function, for whatever reason
@@ -17,7 +17,7 @@
  	bool createFromDER(const char *in, unsigned int len)
  	{
 +#ifdef OSSL_097
-+		unsigned char *p = (const unsigned char *)in;
++		const unsigned char *p = (const unsigned char *)in;
 +#else
  		unsigned char *p = (unsigned char *)in;
 +#endif


Index: qca-tls.spec
===================================================================
RCS file: /cvs/extras/rpms/qca-tls/devel/qca-tls.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qca-tls.spec	13 Nov 2005 21:11:18 -0000	1.12
+++ qca-tls.spec	13 Nov 2005 21:23:33 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		qca-tls
 Version:	1.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 
 Summary:	TLS plugin for the Qt Cryptographic Architecture
 License:	LGPL
@@ -14,7 +14,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	qt-devel >= 1:3.1.1
-# To build with openssl 0.9.7, remove patch1
+# To build with openssl 0.9.7, disable patch1
 BuildRequires:	openssl-devel >= 0.9.8
 
 
@@ -27,7 +27,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .mach
-%patch1 -p0 -b .openssl
+%patch1 -p0 -b .ossl098
 
 
 %build
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Sun Nov 13 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0-8
+- fix patch1
+
 * Sun Nov 13 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0-7
 - build for openssl 0.9.8
 




More information about the fedora-extras-commits mailing list