From ddb42fd3c60070a4e7533d76f341010911d9d4ab Mon Sep 17 00:00:00 2001
From: John A. Khvatov <ivaxer@fedoraproject.org>
Date: Nov 03 2009 12:19:27 +0000
Subject: Added patch for compatibility with new openssl


---

diff --git a/import.log b/import.log
index 2e93f34..051de83 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,2 @@
 opensips-1_6_0-2_fc11:F-12:opensips-1.6.0-2.fc11.src.rpm:1257244682
+opensips-1_6_0-3_fc11:F-12:opensips-1.6.0-3.fc11.src.rpm:1257250407
diff --git a/opensips--openssl10.patch b/opensips--openssl10.patch
new file mode 100644
index 0000000..bf7b1aa
--- /dev/null
+++ b/opensips--openssl10.patch
@@ -0,0 +1,14 @@
+diff -up opensips-1.6.0/tls/tls_init.c.openssl opensips-1.6.0/tls/tls_init.c
+--- opensips-1.6.0/tls/tls_init.c.openssl	2008-11-24 21:52:33.000000000 +0100
++++ opensips-1.6.0/tls/tls_init.c	2009-08-25 20:18:45.000000000 +0200
+@@ -468,8 +468,8 @@ static int check_for_krb(void)
+ 	if (xx==NULL)
+ 		return -1;
+ 
+-	for( j=0 ; j<M_sk_num(xx->cipher_list) ; j++) {
+-		SSL_CIPHER *yy = (SSL_CIPHER*)M_sk_value(xx->cipher_list,j);
++	for( j=0 ; j<sk_SSL_CIPHER_num(xx->cipher_list) ; j++) {
++		SSL_CIPHER *yy = sk_SSL_CIPHER_value(xx->cipher_list,j);
+ 		if ( yy->id>=SSL3_CK_KRB5_DES_64_CBC_SHA &&
+ 		 yy->id<=SSL3_CK_KRB5_RC4_40_MD5 ) {
+ 			LM_INFO("KRB5 cipher %s found\n", yy->name);
diff --git a/opensips.spec b/opensips.spec
index 0dda485..eafc244 100644
--- a/opensips.spec
+++ b/opensips.spec
@@ -10,12 +10,13 @@
 Summary:  Open Source SIP Server
 Name:     opensips
 Version:  1.6.0
-Release:  2%{?dist}
+Release:  3%{?dist}
 License:  GPLv2+
 Group:    System Environment/Daemons
 Source0:  http://opensips.org/pub/%{name}/%{version}/src/%{name}-%{version}-tls_src.tar.gz
 Source1:  %{name}.sysconfig
 Patch1:   opensips--init.patch
+Patch2:   opensips--openssl10.patch
 URL:      http://opensips.org
 
 BuildRequires:  expat-devel
@@ -502,6 +503,7 @@ clients.
 %prep
 %setup -q -n %{name}-%{version}-tls
 %patch1 -p1
+%patch2 -p1
 
 %build
 LOCALBASE=/usr CFLAGS="%{optflags}" %{__make} all %{?_smp_mflags} TLS=1 \
@@ -988,6 +990,9 @@ fi
 %doc docdir/README.xmpp
 
 %changelog
+* Thu Nov 03 2009 John Khvatov <ivaxer@fedoraproject.org> - 1.6.0-3
+- Added patch for compatibility with new openssl
+
 * Thu Oct 29 2009 John Khvatov <ivaxer@fedoraproject.org> - 1.6.0-2
 - Added patch for init script to fix malformed comment block
 - Added COPYING file