[stun] Rebase to 0.97 upstream

Huzaifa Sidhpurwala huzaifas at fedoraproject.org
Fri Aug 8 16:29:11 UTC 2014


commit 458679ef122fcdbbed5c90f645925c8d78708a42
Author: Huzaifa Sidhpurwala <huzaifas at redhat.com>
Date:   Fri Aug 8 22:06:43 2014 +0530

    Rebase to 0.97 upstream

 .gitignore  |    1 +
 patch0.diff |   21 +++++----------------
 sources     |    2 +-
 stun.spec   |   10 ++++++----
 4 files changed, 13 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6e56ed9..2b96614 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 stund_0.96_Aug13.tgz
+/stund-0.97.tgz
diff --git a/patch0.diff b/patch0.diff
index 9059726..3da933f 100644
--- a/patch0.diff
+++ b/patch0.diff
@@ -1,22 +1,11 @@
---- stun.cxx	2005-08-14 06:09:03.000000000 +0530
-+++ stun.cxx.huzaifas	2008-04-09 15:11:29.000000000 +0530
-@@ -669,16 +669,16 @@
+--- stun.cxx	2012-01-26 16:32:46.000000000 +0530
++++ stun.cxx.huzaifas	2014-08-08 21:51:29.532523382 +0530
+@@ -669,7 +669,7 @@
        tick = hightick;
        tick <<= 32;
        tick |= lowtick;
 -#elif defined(__GNUC__) && ( defined(__i686__) || defined(__i386__) )
-+#elif defined(__GNUC__) && ( defined(__i686__) || defined(__i386__) || defined(__x86_64__)  )
++#elif defined(__GNUC__) && ( defined(__i686__) || defined(__i386__)  || defined(__x86_64__) )
        asm("rdtsc" : "=A" (tick));
--#elif defined (__SUNPRO_CC) || defined( __sparc__ )	
-+#elif defined (__SUNPRO_CC) || defined( __sparc__ )
+ #elif defined (__SUNPRO_CC) || defined( __sparc__ )	
        tick = gethrtime();
- #elif defined(__MACH__) 
-       int fd=open("/dev/random",O_RDONLY);
-       read(fd,&tick,sizeof(tick));
-       closesocket(fd);
- #else
--#     error Need some way to seed the random number generator 
-+/* #     error Need some way to seed the random number generator */
- #endif 
-       int seed = int(tick);
- #ifdef WIN32
diff --git a/sources b/sources
index 5c685b6..eed8a19 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-af23f5f19ed059269f0e29745353a069  stund_0.96_Aug13.tgz
+097fd27829e357c005afcafd51564bd1  stund-0.97.tgz
diff --git a/stun.spec b/stun.spec
index 85bd499..4790c34 100644
--- a/stun.spec
+++ b/stun.spec
@@ -1,14 +1,13 @@
 %define	download_name	stund
-%define download_version	_0.96_Aug13.tgz
 
 Name:		stun
-Version:	0.96    
-Release:	11%{?dist}
+Version:	0.97    
+Release:	1%{?dist}
 Summary:	Implements a simple Stun Client
 Group:		Applications/Communications
 License:	Vovida Software License 1.0
 URL:		http://sourceforge.net/projects/%{name}
-Source0:	http://downloads.sourceforge.net/%{name}/%{download_name}%{download_version}
+Source0:	http://downloads.sourceforge.net/%{name}/%{download_name}-%{version}.tgz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		patch0.diff
 
@@ -61,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 08 2014 Huzaifa Sidhpurwala <huzaifas at redhat.com> 0.97-1
+- Rebase to lastest upstream
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.96-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list