# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1334335703 -7200
# Node ID 680c3f7768b061968d1ece7e6299234702d489d4
# Parent  76ceb617f880335c2ff28cd1c11d67a896ec489c
Correct various structure and architecture problems in code including:
use functions from ISO C stdio requires cstdio header,
include sockio header only in platforms where it's present,
touch random number seeder logic on X86-64 platforms as well as IA-32,
and hopefully use all 64 bits of register as it would seem that more
like 'asm("rdtsc" : "=a" (lowtick), "=d" (hitick));' is needed instead.

diff -r 76ceb617f880 -r 680c3f7768b0 stun/stun.patch
--- a/stun/stun.patch	Fri Apr 13 17:49:04 2012 +0200
+++ b/stun/stun.patch	Fri Apr 13 18:48:23 2012 +0200
@@ -1,7 +1,16 @@
 Index: server.cxx
+diff -Nau server.cxx.orig server.cxx
 --- server.cxx.orig	2005-08-13 22:19:29 +0200
 +++ server.cxx	2005-11-16 10:33:51 +0100
-@@ -23,7 +23,7 @@
+@@ -2,6 +2,7 @@
+ #include <cstring>
+ #include <iostream>
+ #include <cstdlib>   
++#include <cstdio>   
+ 
+ #ifndef WIN32
+ #include <sys/time.h>
+@@ -23,7 +24,7 @@
  usage()
  {
     cerr << "Usage: " << endl
@@ -10,7 +19,7 @@
          << " " << endl
          << " If the IP addresses of your NIC are 10.0.1.150 and 10.0.1.151, run this program with" << endl
          << "    ./server -v  -h 10.0.1.150 -a 10.0.1.151" << endl
-@@ -32,7 +32,7 @@
+@@ -32,7 +33,7 @@
          << "  -a sets the secondary IP" << endl
          << "  -p sets the primary port and defaults to 3478" << endl
          << "  -o sets the secondary port and defaults to 3479" << endl
@@ -19,7 +28,7 @@
          << "  -m sets up a STERN server starting at port m" << endl
          << "  -v runs in verbose mode" << endl
        // in makefile too
-@@ -55,6 +55,7 @@
+@@ -55,6 +56,7 @@
     StunAddress4 altAddr;
     bool verbose=false;
     bool background=false;
@@ -27,7 +36,7 @@
     
     myAddr.addr = 0;
     altAddr.addr = 0;
-@@ -135,6 +136,16 @@
+@@ -135,6 +137,16 @@
           }
           myMediaPort = UInt16(strtol( argv[arg], NULL, 10));
        }
@@ -44,7 +53,7 @@
        else
        {
           usage();
-@@ -213,6 +224,19 @@
+@@ -213,6 +225,19 @@
  
     if (pid == 0) //child or not using background
     {
@@ -65,14 +74,16 @@
        bool ok = stunInitServer(info, myAddr, altAddr, myMediaPort, verbose);
        
 Index: stun.cxx
-diff -Nau stund.orig/stun.cxx stund/stun.cxx
+diff -Nau stun.cxx.orig stun.cxx
 --- stun.cxx.orig	2005-08-14 02:39:03.000000000 +0200
 +++ stun.cxx	2009-01-09 00:23:08.069498590 +0100
-@@ -16,6 +16,7 @@
+@@ -16,6 +16,9 @@
  #include <string.h>
  #include <sys/ioctl.h>
  #include <sys/socket.h>
++#if defined (__SVR4) && defined (__sun)
 +#include <sys/sockio.h>
++#endif
  #include <sys/time.h>
  #include <sys/types.h> 
  #include <arpa/inet.h>
diff -r 76ceb617f880 -r 680c3f7768b0 stun/stun.spec
--- a/stun/stun.spec	Fri Apr 13 17:49:04 2012 +0200
+++ b/stun/stun.spec	Fri Apr 13 18:48:23 2012 +0200
@@ -69,6 +69,9 @@
 %prep
     %setup -q -n stund
     %patch -p0
+    %{l_shtool} subst \
+        -e 's;\(|| defined(__i386__)\) );\1 || defined(__x86_64__) );' \
+        stun.cxx
     case "%{l_platform -t}" in
         *-sunos* )
             %{l_shtool} subst \