diff options
Diffstat (limited to 'net/belle-sip/files')
| -rw-r--r-- | net/belle-sip/files/patch-configure | 2 | ||||
| -rw-r--r-- | net/belle-sip/files/patch-src-belle_sip_headers_impl.c | 24 | ||||
| -rw-r--r-- | net/belle-sip/files/patch-src_belle__sip__internal.h | 4 | ||||
| -rw-r--r-- | net/belle-sip/files/patch-src_dns.c | 6 |
4 files changed, 20 insertions, 16 deletions
diff --git a/net/belle-sip/files/patch-configure b/net/belle-sip/files/patch-configure index 1ccfa2118654..23888e984985 100644 --- a/net/belle-sip/files/patch-configure +++ b/net/belle-sip/files/patch-configure @@ -1,4 +1,4 @@ ---- configure.orig 2015-03-11 16:44:12 UTC +--- configure.orig 2015-11-02 13:36:49 UTC +++ configure @@ -16787,10 +16787,10 @@ libresolv_have_res_get_servers=no resolv_h_hav_res_ndestroy=no diff --git a/net/belle-sip/files/patch-src-belle_sip_headers_impl.c b/net/belle-sip/files/patch-src-belle_sip_headers_impl.c index c71bb9a5e56f..9a3f2fae30c2 100644 --- a/net/belle-sip/files/patch-src-belle_sip_headers_impl.c +++ b/net/belle-sip/files/patch-src-belle_sip_headers_impl.c @@ -1,34 +1,38 @@ ---- src/belle_sip_headers_impl.c.orig 2015-01-20 10:39:04 UTC +--- src/belle_sip_headers_impl.c.orig 2015-10-19 11:43:47 UTC +++ src/belle_sip_headers_impl.c -@@ -1663,7 +1663,6 @@ BELLESIP_EXPORT time_t belle_sip_header_ - char tmp2[16] ={0}; - int i,j; +@@ -1670,8 +1670,6 @@ BELLESIP_EXPORT time_t belle_sip_header_ time_t seconds; + #ifdef BELLE_SIP_WINDOWS_UNIVERSAL + long adjust_timezone; +-#else - time_t adjust_timezone; + #endif - /* time headers are in GMT as spec says */ -@@ -1685,22 +1684,12 @@ BELLESIP_EXPORT time_t belle_sip_header_ - return (time_t)-1; +@@ -1695,25 +1693,11 @@ BELLESIP_EXPORT time_t belle_sip_header_ success: ret.tm_isdst=0; -- + -#if TARGET_IPHONE_SIMULATOR - /* 'timezone' is buggy on iOS simulator, use the timegm() function to convert to UTC timestamp - and discard the adjust timezone value */ - seconds = timegm(&ret); +- seconds = timegm(&ret); - adjust_timezone = 0; -#else - seconds = mktime(&ret); +-#ifdef BELLE_SIP_WINDOWS_UNIVERSAL +- _get_timezone(&adjust_timezone); +-#else - adjust_timezone = timezone; -#endif +-#endif - if (seconds==(time_t)-1){ - belle_sip_error("mktime() failed: %s",strerror(errno)); + belle_sip_error("timegm() failed: %s",strerror(errno)); return (time_t)-1; } -- return seconds-adjust_timezone; +- return seconds-(time_t)adjust_timezone; + return seconds; } diff --git a/net/belle-sip/files/patch-src_belle__sip__internal.h b/net/belle-sip/files/patch-src_belle__sip__internal.h index 3f12d1d794b4..51f8eddcda66 100644 --- a/net/belle-sip/files/patch-src_belle__sip__internal.h +++ b/net/belle-sip/files/patch-src_belle__sip__internal.h @@ -1,5 +1,5 @@ ---- src/belle_sip_internal.h.orig 2014-06-30 16:50:46.873520744 +0600 -+++ src/belle_sip_internal.h 2014-06-30 16:51:05.264521071 +0600 +--- src/belle_sip_internal.h.orig 2015-10-19 11:43:47 UTC ++++ src/belle_sip_internal.h @@ -23,6 +23,7 @@ #include <stdio.h> #include <sys/types.h> diff --git a/net/belle-sip/files/patch-src_dns.c b/net/belle-sip/files/patch-src_dns.c index 1d489299c5cd..1b7070ae4b69 100644 --- a/net/belle-sip/files/patch-src_dns.c +++ b/net/belle-sip/files/patch-src_dns.c @@ -1,6 +1,6 @@ ---- src/dns.c.orig 2014-08-16 15:34:00.457977967 +0600 -+++ src/dns.c 2014-08-16 15:34:32.647973864 +0600 -@@ -4306,6 +4306,7 @@ +--- src/dns.c.orig 2015-10-19 11:43:47 UTC ++++ src/dns.c +@@ -4345,6 +4345,7 @@ int dns_resconf_loadfromresolv(struct dn union res_sockaddr_union addresses[3]; int i,error; |