[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/pwlib/devel pwlib-1.8.7-gcc4.patch, NONE, 1.1 pwlib.spec, 1.23, 1.24



Author: harald

Update of /cvs/dist/rpms/pwlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8368

Modified Files:
	pwlib.spec 
Added Files:
	pwlib-1.8.7-gcc4.patch 
Log Message:
make pwlib compile with new ldap and openssl

pwlib-1.8.7-gcc4.patch:
 pssl.cxx |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE pwlib-1.8.7-gcc4.patch ---
--- pwlib-1.8.7/src/ptclib/pssl.cxx.gcc4	2005-11-15 04:11:31.000000000 -0500
+++ pwlib-1.8.7/src/ptclib/pssl.cxx	2005-11-15 04:11:43.000000000 -0500
@@ -297,14 +297,14 @@
 
 PSSLPrivateKey::PSSLPrivateKey(const BYTE * keyData, PINDEX keySize)
 {
-  key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyData, keySize);
+  key = d2i_AutoPrivateKey(NULL, (const BYTE **)&keyData, keySize);
 }
 
 
 PSSLPrivateKey::PSSLPrivateKey(const PBYTEArray & keyData)
 {
   const BYTE * keyPtr = keyData;
-  key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyPtr, keyData.GetSize());
+  key = d2i_AutoPrivateKey(NULL, (const BYTE **)&keyPtr, keyData.GetSize());
 }
 
 
@@ -472,14 +472,14 @@
 
 PSSLCertificate::PSSLCertificate(const BYTE * certData, PINDEX certSize)
 {
-  certificate = d2i_X509(NULL, (unsigned char **)&certData, certSize);
+  certificate = d2i_X509(NULL, (const unsigned char **)&certData, certSize);
 }
 
 
 PSSLCertificate::PSSLCertificate(const PBYTEArray & certData)
 {
   const BYTE * certPtr = certData;
-  certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize());
+  certificate = d2i_X509(NULL, (const unsigned char **)&certPtr, certData.GetSize());
 }
 
 
@@ -489,7 +489,7 @@
   PBase64::Decode(certStr, certData);
   if (certData.GetSize() > 0) {
     const BYTE * certPtr = certData;
-    certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize());
+    certificate = d2i_X509(NULL, (const unsigned char **)&certPtr, certData.GetSize());
   }
   else
     certificate = NULL;


Index: pwlib.spec
===================================================================
RCS file: /cvs/dist/rpms/pwlib/devel/pwlib.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pwlib.spec	6 Sep 2005 09:25:30 -0000	1.23
+++ pwlib.spec	15 Nov 2005 10:16:46 -0000	1.24
@@ -1,7 +1,7 @@
 Summary:	Portable Windows Libary
 Name:		pwlib
 Version:	1.8.7
-Release:	1
+Release:	2
 URL:		http://www.openh323.org/
 Source0:	http://www.seconix.com/pwlib-%{version}.tar.gz
 #We still need this for ppc64 it was not updated in 1.8.4
@@ -10,6 +10,7 @@
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
 Patch0:		pwlib-1.6.5-debuginfo.patch
+Patch1: 	pwlib-1.8.7-gcc4.patch
 BuildPrereq:	expat  openssl-devel pkgconfig
 
 %ifnarch  s390 s390x
@@ -41,9 +42,11 @@
 %prep
 %setup -q
 %patch0 -p1 -b .debuginfo
+%patch1 -p1 -b .gcc4
 cp -f %{SOURCE1} .
 
 %build
+export CFLAGS="$CFLAGS -DLDAP_DEPRECATED"
 %configure --enable-plugins 
 make
 
@@ -91,6 +94,10 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Nov 15 2005 Harald Hoyer <harald redhat com> 1.8.6-2
+- make pwlib compile with new ldap and openssl
+- -DLDAP_DEPRECATED should be removed ASAP
+
 * Tue Sep  6 2005 Daniel Veillard <veillard redhat com> 1.8.6-1
 - new upstream release, previous gcc4 patch is not needed anymore
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]