[Pkg-voip-commits] r2545 - in wengophone/trunk/debian: . patches
patches/generic
Marco Nenciarini
mnencia at costa.debian.org
Tue Oct 10 11:25:21 UTC 2006
Author: mnencia
Date: 2006-10-10 11:25:21 +0000 (Tue, 10 Oct 2006)
New Revision: 2545
Added:
wengophone/trunk/debian/patches/generic/fix-implicit-pointer-functions.patch
Modified:
wengophone/trunk/debian/changelog
wengophone/trunk/debian/patches/generic/stun-fix-non-i386.patch
wengophone/trunk/debian/patches/series
Log:
Added fix-implicit-pointer-functions to fix segfault on 64bit arches
Fix sparc FTBFS error in stun and netlib
Prepared for upload
Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog 2006-10-10 04:51:07 UTC (rev 2544)
+++ wengophone/trunk/debian/changelog 2006-10-10 11:25:21 UTC (rev 2545)
@@ -1,3 +1,11 @@
+wengophone (2.0.0~rc4-svn7960-3) unstable; urgency=low
+
+ * Updated patch stun-fix-non-i386 to fix even similar code in netlib
+ (Closes: #365557)
+ * New patch fix-implicit-pointer-functions (Closes: #392008)
+
+ -- Marco Nenciarini <mnencia at debian.org> Tue, 10 Oct 2006 13:14:43 +0200
+
wengophone (2.0.0~rc4-svn7960-2) unstable; urgency=low
* New patch stun-fix-non-i386 (Closes: 391907)
Added: wengophone/trunk/debian/patches/generic/fix-implicit-pointer-functions.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/fix-implicit-pointer-functions.patch (rev 0)
+++ wengophone/trunk/debian/patches/generic/fix-implicit-pointer-functions.patch 2006-10-10 11:25:21 UTC (rev 2545)
@@ -0,0 +1,12 @@
+Index: wengophone-2.0.0~rc4-svn7960/wifo/phapi/phaudiodriver.c
+===================================================================
+--- wengophone-2.0.0~rc4-svn7960.orig/wifo/phapi/phaudiodriver.c 2006-10-10 13:20:15.000000000 +0200
++++ wengophone-2.0.0~rc4-svn7960/wifo/phapi/phaudiodriver.c 2006-10-10 13:20:55.000000000 +0200
+@@ -18,6 +18,7 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++#include <stdlib.h>
+ #include <string.h>
+ #include "phlog.h"
+ #include "phaudiodriver.h"
Modified: wengophone/trunk/debian/patches/generic/stun-fix-non-i386.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/stun-fix-non-i386.patch 2006-10-10 04:51:07 UTC (rev 2544)
+++ wengophone/trunk/debian/patches/generic/stun-fix-non-i386.patch 2006-10-10 11:25:21 UTC (rev 2545)
@@ -1,13 +1,45 @@
Index: wengophone-2.0.0~rc4-svn7960/wifo/phapi/stun/stun.c
===================================================================
---- wengophone-2.0.0~rc4-svn7960.orig/wifo/phapi/stun/stun.c 2006-10-09 15:02:17.000000000 +0200
-+++ wengophone-2.0.0~rc4-svn7960/wifo/phapi/stun/stun.c 2006-10-09 15:04:30.000000000 +0200
-@@ -782,7 +782,7 @@
- #elif defined(EMBED)
- tick = rand();
+--- wengophone-2.0.0~rc4-svn7960.orig/wifo/phapi/stun/stun.c 2006-03-13 17:07:07.000000000 +0100
++++ wengophone-2.0.0~rc4-svn7960/wifo/phapi/stun/stun.c 2006-10-10 10:06:10.000000000 +0200
+@@ -773,16 +773,18 @@
+ }
+ #elif defined(__GNUC__) && ( defined(__i686__) || defined(__i386__) || defined(__x86_64__) )
+ asm("rdtsc" : "=A" (tick));
+-#elif defined (__SUNPRO_CC) || defined( __sparc__ )
+- tick = gethrtime();
+-#elif defined(__MACH__) || defined( __powerpc__ )
+- int fd=open("/dev/random",O_RDONLY);
+- read(fd,&tick,sizeof(tick));
+- closesocket(fd);
+-#elif defined(EMBED)
+- tick = rand();
#else
-# error Need some way to seed the random number generator
-+ tick = time(NULL);
++ int fd=open("/dev/random",O_RDONLY);
++ if (fd < 0)
++ fd=open("/dev/urandom",O_RDONLY);
++
++ if (fd >= 0)
++ {
++ read(fd,&tick,sizeof(tick));
++ close(fd);
++ }
++ else
++ tick = time(NULL);
#endif
seed = (tick);
#ifdef WIN32
+Index: wengophone-2.0.0~rc4-svn7960/wifo/netlib/src/stun_func.cpp
+===================================================================
+--- wengophone-2.0.0~rc4-svn7960.orig/wifo/netlib/src/stun_func.cpp 2006-10-10 09:52:14.000000000 +0200
++++ wengophone-2.0.0~rc4-svn7960/wifo/netlib/src/stun_func.cpp 2006-10-10 10:02:33.000000000 +0200
+@@ -668,8 +668,6 @@
+ tick |= lowtick;
+ #elif defined(__GNUC__) && ( defined(__i686__) || defined(__i386__) || defined(__x86_64__) )
+ asm("rdtsc" : "=A" (tick));
+-#elif defined (__SUNPRO_CC) || defined( __sparc__ )
+- tick = gethrtime();
+ #else
+ int fd=open("/dev/random",O_RDONLY);
+ if (fd < 0)
Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series 2006-10-10 04:51:07 UTC (rev 2544)
+++ wengophone/trunk/debian/patches/series 2006-10-10 11:25:21 UTC (rev 2545)
@@ -3,5 +3,6 @@
generic/cmake-fix-static-sfp-plugin.patch
generic/cmake-amrplugin-pic-code.patch
generic/stun-fix-non-i386.patch
+generic/fix-implicit-pointer-functions.patch
debian/disable-crashreport.patch
debian/cmake-svnrelease-from-debian-changelog.patch
More information about the Pkg-voip-commits
mailing list