Thu Jun 28 04:50:13 2012 UTC ()
Always use /dev/random to seed on NetBSD, instead of relying on a
configure test, which might arbitrarily fail if chrooted.


(dholland)
diff -r1.4 -r1.5 pkgsrc/net/ortp/distinfo
diff -r1.2 -r1.3 pkgsrc/net/ortp/patches/patch-src_stun.c
cvs diff -r1.4 -r1.5 pkgsrc/net/ortp/distinfo (switch to unified diff)

--- pkgsrc/net/ortp/distinfo 2012/06/25 11:49:10 1.4
+++ pkgsrc/net/ortp/distinfo 2012/06/28 04:50:12 1.5
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.4 2012/06/25 11:49:10 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2012/06/28 04:50:12 dholland Exp $
2 2
3SHA1 (ortp-0.16.1.tar.gz) = 4e6288745b066d51b58834e2e33d8bc48d50d94e 3SHA1 (ortp-0.16.1.tar.gz) = 4e6288745b066d51b58834e2e33d8bc48d50d94e
4RMD160 (ortp-0.16.1.tar.gz) = c1c85ebdf308de4b5be66707c56a156299f67b9e 4RMD160 (ortp-0.16.1.tar.gz) = c1c85ebdf308de4b5be66707c56a156299f67b9e
5Size (ortp-0.16.1.tar.gz) = 466365 bytes 5Size (ortp-0.16.1.tar.gz) = 466365 bytes
6SHA1 (patch-src_avprofile.c) = 1740714e00d22ed8cde08106a9e5f56d4c40abe7 6SHA1 (patch-src_avprofile.c) = 1740714e00d22ed8cde08106a9e5f56d4c40abe7
7SHA1 (patch-src_stun.c) = 487faca256c839d5b15cea7169f3fa14844bb338 7SHA1 (patch-src_stun.c) = 031c56685acc8061fa66ee06487f1855e45bd672
8SHA1 (patch-src_tests_rtprecv.c) = 5b42382fcd7ebcaf189fdadea893df42457029dd 8SHA1 (patch-src_tests_rtprecv.c) = 5b42382fcd7ebcaf189fdadea893df42457029dd
cvs diff -r1.2 -r1.3 pkgsrc/net/ortp/patches/patch-src_stun.c (switch to unified diff)

--- pkgsrc/net/ortp/patches/patch-src_stun.c 2012/06/25 11:49:10 1.2
+++ pkgsrc/net/ortp/patches/patch-src_stun.c 2012/06/28 04:50:12 1.3
@@ -1,51 +1,63 @@ @@ -1,51 +1,63 @@
1$NetBSD: patch-src_stun.c,v 1.2 2012/06/25 11:49:10 joerg Exp $ 1$NetBSD: patch-src_stun.c,v 1.3 2012/06/28 04:50:12 dholland Exp $
2 2
3Fix build with gcc 4.6 3- Fix a wrong memset call.
 4- Always seed with /dev/random on NetBSD instead of relying on a
 5configure test.
 6- Fix build with gcc 4.6
4 7
5--- src/stun.c.orig 2009-06-16 10:49:48.000000000 +0000 8--- src/stun.c.orig 2009-06-16 10:49:48.000000000 +0000
6+++ src/stun.c 9+++ src/stun.c
7@@ -398,7 +398,7 @@ stunParseMessage( char* buf, unsigned in 10@@ -398,7 +398,7 @@ stunParseMessage( char* buf, unsigned in
8 char* body; 11 char* body;
9 unsigned int size; 12 unsigned int size;
10 ortp_debug("stun: Received stun message: %i bytes\n", bufLen); 13 ortp_debug("stun: Received stun message: %i bytes\n", bufLen);
11- memset(msg, 0, sizeof(msg)); 14- memset(msg, 0, sizeof(msg));
12+ memset(msg, 0, sizeof(*msg)); 15+ memset(msg, 0, sizeof(*msg));
13  16
14 if (sizeof(StunMsgHdr) > bufLen) 17 if (sizeof(StunMsgHdr) > bufLen)
15 { 18 {
 19@@ -1185,7 +1185,7 @@ stunRand(void)
 20 read(fd,&tick,sizeof(tick));
 21 closesocket(fd);
 22 }
 23-#elif defined(__linux) || defined(HAVE_DEV_RANDOM)
 24+#elif defined(__linux) || defined(__NetBSD__) || defined(HAVE_DEV_RANDOM)
 25 {
 26 fd_set fdSet;
 27 int maxFd=0;
16@@ -1984,7 +1984,6 @@ stunSendTest( Socket myFd, StunAddress4  28@@ -1984,7 +1984,6 @@ stunSendTest( Socket myFd, StunAddress4
17  29
18 bool_t changePort=FALSE; 30 bool_t changePort=FALSE;
19 bool_t changeIP=FALSE; 31 bool_t changeIP=FALSE;
20- bool_t discard=FALSE; 32- bool_t discard=FALSE;
21  33
22 StunMessage req; 34 StunMessage req;
23 char buf[STUN_MAX_MESSAGE_SIZE]; 35 char buf[STUN_MAX_MESSAGE_SIZE];
24@@ -2007,7 +2006,6 @@ stunSendTest( Socket myFd, StunAddress4  36@@ -2007,7 +2006,6 @@ stunSendTest( Socket myFd, StunAddress4
25 changeIP=TRUE; 37 changeIP=TRUE;
26 break; 38 break;
27 case 5: 39 case 5:
28- discard=TRUE; 40- discard=TRUE;
29 break; 41 break;
30 default: 42 default:
31 ortp_error("stun: Test %i is unkown\n", testNum); 43 ortp_error("stun: Test %i is unkown\n", testNum);
32@@ -2153,7 +2151,7 @@ stunNatType( StunAddress4 *dest,  44@@ -2153,7 +2151,7 @@ stunNatType( StunAddress4 *dest,
33  45
34 bool_t respTestI=FALSE; 46 bool_t respTestI=FALSE;
35 bool_t isNat=TRUE; 47 bool_t isNat=TRUE;
36- StunAddress4 testIchangedAddr; 48- StunAddress4 testIchangedAddr;
37+ /* StunAddress4 testIchangedAddr; */ 49+ /* StunAddress4 testIchangedAddr; */
38 StunAddress4 testImappedAddr; 50 StunAddress4 testImappedAddr;
39 bool_t respTestI2=FALSE;  51 bool_t respTestI2=FALSE;
40 bool_t mappedIpSame = TRUE; 52 bool_t mappedIpSame = TRUE;
41@@ -2336,8 +2334,8 @@ stunNatType( StunAddress4 *dest,  53@@ -2336,8 +2334,8 @@ stunNatType( StunAddress4 *dest,
42 if ( !respTestI ) 54 if ( !respTestI )
43 { 55 {
44  56
45- testIchangedAddr.addr = resp.changedAddress.ipv4.addr; 57- testIchangedAddr.addr = resp.changedAddress.ipv4.addr;
46- testIchangedAddr.port = resp.changedAddress.ipv4.port; 58- testIchangedAddr.port = resp.changedAddress.ipv4.port;
47+ /* testIchangedAddr.addr = resp.changedAddress.ipv4.addr; */ 59+ /* testIchangedAddr.addr = resp.changedAddress.ipv4.addr; */
48+ /* testIchangedAddr.port = resp.changedAddress.ipv4.port; */ 60+ /* testIchangedAddr.port = resp.changedAddress.ipv4.port; */
49 testImappedAddr.addr = resp.mappedAddress.ipv4.addr; 61 testImappedAddr.addr = resp.mappedAddress.ipv4.addr;
50 testImappedAddr.port = resp.mappedAddress.ipv4.port; 62 testImappedAddr.port = resp.mappedAddress.ipv4.port;
51  63