Index: head/net/belle-sip/Makefile =================================================================== --- head/net/belle-sip/Makefile (revision 400844) +++ head/net/belle-sip/Makefile (revision 400845) @@ -1,46 +1,45 @@ # $FreeBSD$ PORTNAME= belle-sip -PORTVERSION= 1.4.1 -PORTREVISION= 1 +PORTVERSION= 1.4.2 CATEGORIES= net java MASTER_SITES= SAVANNAH/linphone/${PORTNAME}/ \ http://www.antlr3.org/download/:source2 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ antlr-3.4-complete.jar:source2 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= bofh@FreeBSD.org COMMENT= Belle-sip is a SIP (RFC3261) implementation written in C LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libantlr3c.so:${PORTSDIR}/devel/libantlr3c GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-silent-rules --disable-strict --disable-tests \ --with-antlr=${LOCALBASE} INSTALL_TARGET= install-strip USES= compiler:c11 gmake libtool pathfix USE_JAVA= yes JAVA_BUILD= jre JAVA_VERSION= 1.6+ USE_LDCONFIG= yes OPTIONS_DEFINE= POLARSSL OPTIONS_DEFAULT=POLARSSL POLARSSL_CONFIGURE_ENABLE= tls POLARSSL_LIB_DEPENDS= libmbedtls.so.9:${PORTSDIR}/security/polarssl13 post-extract: @${CP} ${DISTDIR}/antlr-3.4-complete.jar ${WRKDIR}/antlr-complete.jar post-patch: @${REINPLACE_CMD} -e 's|%%WRKDIR%%|${WRKDIR}|' -e 's|-lrt||' \ ${WRKSRC}/configure .include Index: head/net/belle-sip/distinfo =================================================================== --- head/net/belle-sip/distinfo (revision 400844) +++ head/net/belle-sip/distinfo (revision 400845) @@ -1,4 +1,4 @@ -SHA256 (belle-sip-1.4.1.tar.gz) = 4b1067ba14457c3e0a3b1506866c34b0082dcd19794526599f23f6acb11b2d60 -SIZE (belle-sip-1.4.1.tar.gz) = 748460 +SHA256 (belle-sip-1.4.2.tar.gz) = 822cb72608544cea526a03a076868380815eba8cc3d4d037d7a87c3907948830 +SIZE (belle-sip-1.4.2.tar.gz) = 765307 SHA256 (antlr-3.4-complete.jar) = 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SIZE (antlr-3.4-complete.jar) = 2388361 Index: head/net/belle-sip/files/patch-configure =================================================================== --- head/net/belle-sip/files/patch-configure (revision 400844) +++ head/net/belle-sip/files/patch-configure (revision 400845) @@ -1,44 +1,44 @@ ---- 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 LIBS_save=$LIBS -LIBS="$LIBS -lresolv" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include #include int main () @@ -16814,7 +16814,8 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -ac_fn_c_check_decl "$LINENO" "res_ndestroy" "ac_cv_have_decl_res_ndestroy" "#include +ac_fn_c_check_decl "$LINENO" "res_ndestroy" "ac_cv_have_decl_res_ndestroy" "#include +#include " if test "x$ac_cv_have_decl_res_ndestroy" = xyes; then : resolv_h_hav_res_ndestroy=yes @@ -16877,17 +16878,11 @@ fi if test $ANTLR = "no" ; then -antlr_java_prefixes="$antlr_prefix/share/java /usr/local/share/java /usr/share/java /opt/local/share/java" +antlr_java_prefixes="%%WRKDIR%%" for antlr_java_prefix in $antlr_java_prefixes do - antlr_jar=$antlr_java_prefix/antlr.jar - if test -f $antlr_jar ; then - break - else - antlr_jar=no - fi - antlr_jar=$antlr_java_prefix/antlr3.jar + antlr_jar=$antlr_java_prefix/antlr-complete.jar if test -f $antlr_jar ; then break else Index: head/net/belle-sip/files/patch-src-belle_sip_headers_impl.c =================================================================== --- head/net/belle-sip/files/patch-src-belle_sip_headers_impl.c (revision 400844) +++ head/net/belle-sip/files/patch-src-belle_sip_headers_impl.c (revision 400845) @@ -1,35 +1,39 @@ ---- 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; } BELLESIP_EXPORT void belle_sip_header_date_set_time(belle_sip_header_date_t *obj, const time_t *utc_time){ Index: head/net/belle-sip/files/patch-src_belle__sip__internal.h =================================================================== --- head/net/belle-sip/files/patch-src_belle__sip__internal.h (revision 400844) +++ head/net/belle-sip/files/patch-src_belle__sip__internal.h (revision 400845) @@ -1,10 +1,10 @@ ---- 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 #include #include +#include /* include all public headers*/ #include "belle-sip/belle-sip.h" Index: head/net/belle-sip/files/patch-src_dns.c =================================================================== --- head/net/belle-sip/files/patch-src_dns.c (revision 400844) +++ head/net/belle-sip/files/patch-src_dns.c (revision 400845) @@ -1,10 +1,10 @@ ---- 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; + memset(&res, 0, sizeof(res)); if ((error = res_ninit(&res))) { return error; }