rpms/opensips/F-12 opensips--openssl10.patch, NONE, 1.1 import.log, 1.1, 1.2 opensips.spec, 1.1, 1.2

[John A. Khvatov]

Author: ivaxer

Update of /cvs/pkgs/rpms/opensips/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21176/F-12

Modified Files:
	import.log opensips.spec 
Added Files:
	opensips--openssl10.patch 
Log Message:
Added patch for compatibility with new openssl


opensips--openssl10.patch:
 tls_init.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE opensips--openssl10.patch ---
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);


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/opensips/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	3 Nov 2009 10:42:45 -0000	1.1
+++ import.log	3 Nov 2009 12:19:27 -0000	1.2
@@ -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


Index: opensips.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opensips/F-12/opensips.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- opensips.spec	3 Nov 2009 10:42:45 -0000	1.1
+++ opensips.spec	3 Nov 2009 12:19:27 -0000	1.2
@@ -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 at fedoraproject.org> - 1.6.0-3
+- Added patch for compatibility with new openssl
+
 * Thu Oct 29 2009 John Khvatov <ivaxer at fedoraproject.org> - 1.6.0-2
 - Added patch for init script to fix malformed comment block
 - Added COPYING file