From e1a9546f0d0c30379d8cf6139439dbd22b084d24 Mon Sep 17 00:00:00 2001
From: John A. Khvatov <ivaxer@fedoraproject.org>
Date: Dec 22 2009 19:54:29 +0000
Subject: - Updated to 1.6.1

- Dropped upstreamed patches

---

diff --git a/.cvsignore b/.cvsignore
index 86ce3ac..692d22b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-opensips-1.6.0-tls_src.tar.gz
+opensips-1.6.1-tls_src.tar.gz
diff --git a/import.log b/import.log
index 94e1d10..bc16290 100644
--- a/import.log
+++ b/import.log
@@ -1,3 +1,4 @@
 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
 opensips-1_6_0-4_fc11:F-12:opensips-1.6.0-4.fc11.src.rpm:1257353265
+opensips-1_6_1-1_fc12:F-12:opensips-1.6.1-1.fc12.src.rpm:1261511588
diff --git a/opensips--init.patch b/opensips--init.patch
deleted file mode 100644
index 0e48feb..0000000
--- a/opensips--init.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur opensips-1.6.0-tls/packaging/fedora/opensips.init opensips-1.6.0-tls_patched/packaging/fedora/opensips.init
---- opensips-1.6.0-tls/packaging/fedora/opensips.init	2009-10-16 04:37:55.000000000 +0400
-+++ opensips-1.6.0-tls_patched/packaging/fedora/opensips.init	2009-10-29 14:05:56.211918358 +0300
-@@ -14,8 +14,7 @@
- # Required-Start: $local_fs $network $named
- # Should-Start: mysqld postgresql
- # Short-Description: start, stop OpenSIPS
--# Description: OpenSIPS or OpenSIPS is a very fast and flexible
--# 	SIP (RFC3261) server.
-+# Description: OpenSIPS is a very fast and flexible SIP (RFC3261) server.
- ### END INIT INFO
- 
- # Source function library.
diff --git a/opensips--openssl10.patch b/opensips--openssl10.patch
deleted file mode 100644
index bf7b1aa..0000000
--- a/opensips--openssl10.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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 c8196b9..7272cab 100644
--- a/opensips.spec
+++ b/opensips.spec
@@ -9,14 +9,12 @@
 
 Summary:  Open Source SIP Server
 Name:     opensips
-Version:  1.6.0
-Release:  4%{?dist}
+Version:  1.6.1
+Release:  1%{?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,8 +500,6 @@ clients.
 
 %prep
 %setup -q -n %{name}-%{version}-tls
-%patch1 -p1
-%patch2 -p1
 
 %build
 LOCALBASE=/usr CFLAGS="%{optflags}" %{__make} all %{?_smp_mflags} TLS=1 \
@@ -990,6 +986,10 @@ fi
 %doc docdir/README.xmpp
 
 %changelog
+* Thu Dec 22 2009 John Khvatov <ivaxer@fedoraproject.org> - 1.6.1-1:
+- Updated to 1.6.1
+- Dropped upstreamed patches
+
 * Wed Nov 04 2009 John Khvatov <ivaxer@fedoraproject.org> - 1.6.0-4:
 - Fixed typo: pia_mi to pua_mi in presence_xcapdiff dependencies
 
diff --git a/sources b/sources
index 5b59211..5c01a53 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c9dbca1dc74e0a3a383f61e3dc4844df  opensips-1.6.0-tls_src.tar.gz
+ac2b6cda151ee9dca7b6e3d7e5527a42  opensips-1.6.1-tls_src.tar.gz