rpms/bro/devel bro-20080804-openssl.patch, NONE, 1.1 bro.spec, 1.6, 1.7

[Tomáš Mráz]

Author: tmraz

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

Modified Files:
	bro.spec 
Added Files:
	bro-20080804-openssl.patch 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 1.4-0.6.20080804svn
- rebuilt with new openssl


bro-20080804-openssl.patch:
 X509.cc |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE bro-20080804-openssl.patch ---
diff -up bro-20080804/src/X509.cc.openssl bro-20080804/src/X509.cc
--- bro-20080804/src/X509.cc.openssl	2006-10-07 04:20:48.000000000 +0200
+++ bro-20080804/src/X509.cc	2009-08-25 12:28:10.000000000 +0200
@@ -191,7 +191,7 @@ int X509_Cert::verifyChain(Contents_SSL*
 	// but in chain format).
 
 	// Init the stack.
-	STACK_OF(X509)* untrustedCerts = sk_new_null();
+	STACK_OF(X509)* untrustedCerts = sk_X509_new_null();
 	if ( ! untrustedCerts )
 		{
 		// Internal error allocating stack of untrusted certs.
@@ -232,7 +232,7 @@ int X509_Cert::verifyChain(Contents_SSL*
 		else
 			// The remaining certificates (if any) are put into
 			// the list of untrusted certificates
-			sk_push(untrustedCerts, (char*) pTemp);
+			sk_X509_push(untrustedCerts, pTemp);
 
 		tempLength += certLength + 3;
 		}
@@ -258,7 +258,7 @@ int X509_Cert::verifyChain(Contents_SSL*
 	// Free the stack, incuding. contents.
 
 	// FIXME: could this break Bro's memory tracking?
-	sk_pop_free(untrustedCerts, free);
+	sk_X509_pop_free(untrustedCerts, ((void (*)(X509 *))free);
 
 	return ret;
 	}


Index: bro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bro/devel/bro.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- bro.spec	21 Aug 2009 12:40:28 -0000	1.6
+++ bro.spec	25 Aug 2009 10:29:59 -0000	1.7
@@ -19,6 +19,7 @@ Source2: bro-%{snapshot}.rc
 Patch0: bro-%{snapshot}-installpolicy.patch
 Patch1: bro-%{snapshot}-configurein.patch
 Patch2: bro-20080804-configure-opt-check.patch
+Patch3: bro-20080804-openssl.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libpcap-devel openssl-devel zlib-devel ncurses-devel automake autoconf libtool flex bison file-devel bind-devel
@@ -42,6 +43,7 @@ connecting to certain services, or patte
 %patch0 -p1 -b .installpolicy
 %patch1 -p1 -b .configurein
 %patch2 -p1 -b .optcheck
+%patch3 -p1 -b .openssl
 
 %build
 ./autogen.sh
@@ -115,7 +117,7 @@ fi
 %{_localstatedir}/lib/bro
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4-0.6.20080804svn
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 1.4-0.6.20080804svn
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-0.5.20080804svn