diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/kiax/distinfo | 4 | ||||
-rw-r--r-- | net/kiax/patches/patch-ae | 39 |
2 files changed, 29 insertions, 14 deletions
diff --git a/net/kiax/distinfo b/net/kiax/distinfo index f31062cf04c..c2537a872be 100644 --- a/net/kiax/distinfo +++ b/net/kiax/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2006/07/07 16:50:35 reinoud Exp $ +$NetBSD: distinfo,v 1.6 2007/08/05 18:37:01 joerg Exp $ SHA1 (kiax-0.8.51-src.tar.gz) = 5a67df17d478f4f1f5d802e126e6c38fb0834a6b RMD160 (kiax-0.8.51-src.tar.gz) = 8019d742867d0af339210363c42f1c46df422dd2 @@ -7,6 +7,6 @@ SHA1 (patch-aa) = eadfd5525e7f1c18de8c9178905ec40dd7bb651f SHA1 (patch-ab) = 0c0ef51b9f4b0e26e354b15568359022a5cf7db0 SHA1 (patch-ac) = f3f98e74209ab6a5a06e387cae494c08ad7e3238 SHA1 (patch-ad) = 358978a9999d5ab268c65da5bee812d449dc2f92 -SHA1 (patch-ae) = 73fb5cfb29ca3e5fa08729b958671dd102b39fb2 +SHA1 (patch-ae) = 8f3602be15c121172fc555159a139d1635129c8b SHA1 (patch-af) = b2492a4aff367ec1330948bb4c7dc093152da59c SHA1 (patch-ai) = 8c3505f160526145204bdc4fed2cc17dafcf6ad4 diff --git a/net/kiax/patches/patch-ae b/net/kiax/patches/patch-ae index f1b3f41b98a..f4dbaa0e61f 100644 --- a/net/kiax/patches/patch-ae +++ b/net/kiax/patches/patch-ae @@ -1,8 +1,16 @@ -$NetBSD: patch-ae,v 1.4 2006/07/07 16:50:35 reinoud Exp $ +$NetBSD: patch-ae,v 1.5 2007/08/05 18:37:01 joerg Exp $ ---- lib/libiax2/src/iax.c.orig 2006-06-08 00:03:53.000000000 +0200 +--- lib/libiax2/src/iax.c.orig 2006-06-07 22:03:53.000000000 +0000 +++ lib/libiax2/src/iax.c -@@ -38,6 +38,7 @@ void gettimeofday(struct timeval *tv, vo +@@ -18,7 +18,6 @@ + #include <winsock.h> + #include <time.h> + #include <stdlib.h> +-#include <malloc.h> + #include <stdarg.h> + #include <stdio.h> + #include <fcntl.h> +@@ -38,6 +37,7 @@ void gettimeofday(struct timeval *tv, vo #else @@ -10,16 +18,23 @@ $NetBSD: patch-ae,v 1.4 2006/07/07 16:50:35 reinoud Exp $ #include <netdb.h> #include <sys/socket.h> #include <netinet/in.h> -@@ -62,7 +63,7 @@ void gettimeofday(struct timeval *tv, vo - #if !defined(MACOSX) && !defined(__FreeBSD__) - #include <malloc.h> - #ifndef SOLARIS +@@ -59,15 +59,6 @@ void gettimeofday(struct timeval *tv, vo + #include <arpa/inet.h> + #include <time.h> + +-#if !defined(MACOSX) && !defined(__FreeBSD__) +-#include <malloc.h> +-#ifndef SOLARIS -#if !defined(__NetBSD__) && !defined(__FreeBSD__) -+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) - #include <error.h> - #endif - #endif -@@ -97,7 +98,7 @@ void gettimeofday(struct timeval *tv, vo +-#include <error.h> +-#endif +-#endif +-#endif +- + #endif + + #ifdef NEWJB +@@ -97,7 +88,7 @@ void gettimeofday(struct timeval *tv, vo #ifdef SOLARIS #define IAX_SOCKOPTS MSG_DONTWAIT #else |