[ortp] ortp-0.16.5 add BR: libsrtp-devel openssl-devel

[nucleo]

commit 743686c3d7bfa4f95019cca1f672997e06a29498
Author: nucleo <nucleo at fedoraproject.org>
Date:   Fri Sep 2 11:14:01 2011 +0300

    ortp-0.16.5
    add BR: libsrtp-devel openssl-devel

 .gitignore                  |    1 +
 ortp-0.16.1-unusedvar.patch |   42 -----------------------------
 ortp-0.16.5-unusedvar.patch |   62 +++++++++++++++++++++++++++++++++++++++++++
 ortp.spec                   |   17 ++++++++---
 sources                     |    2 +-
 5 files changed, 76 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 931a153..9e6e9ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 ortp-0.16.1.tar.gz
+/ortp-0.16.5.tar.gz
diff --git a/ortp-0.16.5-unusedvar.patch b/ortp-0.16.5-unusedvar.patch
new file mode 100644
index 0000000..d168e43
--- /dev/null
+++ b/ortp-0.16.5-unusedvar.patch
@@ -0,0 +1,62 @@
+diff --git a/src/stun.c b/src/stun.c
+index ccac58f..e0d7c80 100644
+--- a/src/stun.c
++++ b/src/stun.c
+@@ -1993,7 +1993,6 @@ stunSendTest( Socket myFd, StunAddress4 *dest,
+ 	
+    bool_t changePort=FALSE;
+    bool_t changeIP=FALSE;
+-   bool_t discard=FALSE;
+ 
+    StunMessage req;
+    char buf[STUN_MAX_MESSAGE_SIZE];
+@@ -2015,9 +2014,10 @@ stunSendTest( Socket myFd, StunAddress4 *dest,
+       case 4:
+          changeIP=TRUE;
+          break;
+-      case 5:
++     /* case 5:
+          discard=TRUE;
+          break;
++			*/
+       default:
+          ortp_error("stun: Test %i is unkown\n", testNum);
+          return ; /* error */
+@@ -2162,7 +2162,7 @@ stunNatType( StunAddress4 *dest,
+ 
+    bool_t respTestI=FALSE;
+    bool_t isNat=TRUE;
+-   StunAddress4 testIchangedAddr;
++   /*StunAddress4 testIchangedAddr;*/
+    StunAddress4 testImappedAddr;
+    bool_t respTestI2=FALSE; 
+    bool_t mappedIpSame = TRUE;
+@@ -2345,8 +2345,8 @@ stunNatType( StunAddress4 *dest,
+                         if ( !respTestI )
+                         {
+ 									
+-                           testIchangedAddr.addr = resp.changedAddress.ipv4.addr;
+-                           testIchangedAddr.port = resp.changedAddress.ipv4.port;
++                           /*testIchangedAddr.addr = resp.changedAddress.ipv4.addr;
++                           testIchangedAddr.port = resp.changedAddress.ipv4.port;*/
+                            testImappedAddr.addr = resp.mappedAddress.ipv4.addr;
+                            testImappedAddr.port = resp.mappedAddress.ipv4.port;
+ 									
+diff --git a/src/tests/rtprecv.c b/src/tests/rtprecv.c
+index 1861592..5eee649 100644
+--- a/src/tests/rtprecv.c
++++ b/src/tests/rtprecv.c
+@@ -163,8 +163,12 @@ int main(int argc, char*argv[])
+ 			/* this is to avoid to write to disk some silence before the first RTP packet is returned*/	
+ 			if ((stream_received) && (err>0)) {
+ 				size_t ret = fwrite(buffer,1,err,outfile);
+-				if (sound_fd>0)
++				if (sound_fd>0){
+ 					ret = write(sound_fd,buffer,err);
++					if (ret==-1){
++						fprintf(stderr,"write to sound card failed (%s)",strerror(errno));
++					}
++				}
+ 			}
+ 		}
+ 		ts+=160;
diff --git a/ortp.spec b/ortp.spec
index fea6cd8..612f5d2 100644
--- a/ortp.spec
+++ b/ortp.spec
@@ -1,15 +1,15 @@
 Name:           ortp
-Version:        0.16.1
-Release:        3.1%{?dist}
+Version:        0.16.5
+Release:        1%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 Epoch:          1
 
 Group:          System Environment/Libraries
 License:        LGPLv2+ and VSL
-URL:            http://www.linphone.org/index.php/code_review/ortp
-Source:         http://nongnu.askapache.com/linphone/ortp/sources/ortp-%{version}.tar.gz
+URL:            http://www.linphone.org/eng/documentation/dev/ortp.html
+Source:         http://download.savannah.gnu.org/releases/linphone/ortp/sources/%{name}-%{version}.tar.gz
 Patch0:         %{name}-0.16.1-retval.patch
-Patch1:         %{name}-0.16.1-unusedvar.patch
+Patch1:         %{name}-0.16.5-unusedvar.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -19,6 +19,8 @@ BuildRequires:  graphviz
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
+BuildRequires:  libsrtp-devel
+BuildRequires:  openssl-devel
 
 %description
 oRTP is a C library that implements RTP (RFC3550).
@@ -28,6 +30,7 @@ Summary:        Development libraries for ortp
 Group:          Development/Libraries
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 Requires:       pkgconfig
+Requires:       libsrtp-devel
 
 %description    devel
 Libraries and headers required to develop software with ortp.
@@ -69,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/ortp.pc
 
 %changelog
+* Fri Sep  2 2011 Alexey Kurov <nucleo at fedoraproject.org> - 0.16.5-1
+- ortp-0.16.5
+- add BR: libsrtp-devel openssl-devel
+
 * Tue Mar 15 2011 Karsten Hopp <karsten at redhat.com> 0.16.1-3.1
 - fix build error (unused variable)
 
diff --git a/sources b/sources
index 0850d56..c976276 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bc96cdcb9c139d366a720a94200f92dd  ortp-0.16.1.tar.gz
+94546901d14b85f97342f4ecf39489b1  ortp-0.16.5.tar.gz