Index: Makefile =================================================================== RCS file: /cvsroot/pkgsrc/comms/asterisk/Makefile,v retrieving revision 1.128 diff -u -p -r1.128 Makefile --- Makefile 10 Oct 2015 01:58:01 -0000 1.128 +++ Makefile 11 Oct 2015 02:49:44 -0000 @@ -38,8 +38,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSC CONFIGURE_ARGS+= --without-gtk2 # XXX remove when lang/lua gets builtin.mk CONFIGURE_ARGS+= --without-lua -#JMN doesn't build properly on NetBSD, remove when -current is fixed -CONFIGURE_ARGS+= --without-srtp +CONFIGURE_ARGS+= --without-postgres INSTALL_TARGET= install samples INSTALLATION_DIRS+= lib/pkgconfig share/doc/${PKGBASE} @@ -178,6 +177,7 @@ CONF_FILES_PERMS= # empty CONF_FILES_PERMS+= ${ASTEXAMPLEDIR}/${f:Q} ${PKG_SYSCONFDIR}/${f:Q} ${ASTERISK_USER} ${ASTERISK_GROUP} 0644 .endfor +.if !empty(PKG_OPTIONS:Masterisk-config) # if we put all the files in $CONF_FILES, the message is _way_ too long. .for f in acl.conf adsi.conf agents.conf alarmreceiver.conf alsa.conf \ amd.conf app_mysql.conf asterisk.adsi calendar.conf ccss.conf \ @@ -205,6 +205,7 @@ CONF_FILES_PERMS+= ${ASTEXAMPLEDIR}/${f: voicemail.conf vpb.conf xmpp.conf CONF_FILES_PERMS+= ${ASTEXAMPLEDIR}/${f:Q} ${PKG_SYSCONFDIR}/${f:Q} ${ASTERISK_USER} ${ASTERISK_GROUP} 0644 .endfor +.endif PTHREAD_OPTS+= require native @@ -240,6 +241,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/api-1.6.2-changes.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} cp -r ${WRKSRC}/doc/Asterisk-Admin-Guide ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/Asterisk-Admin-Guide +.include "../../comms/srtp/buildlink3.mk" .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/libuuid/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" Index: PLIST =================================================================== RCS file: /cvsroot/pkgsrc/comms/asterisk/PLIST,v retrieving revision 1.10 diff -u -p -r1.10 PLIST --- PLIST 9 Aug 2015 04:07:13 -0000 1.10 +++ PLIST 11 Oct 2015 02:49:45 -0000 @@ -356,6 +356,7 @@ lib/asterisk/modules/res_security_log.so lib/asterisk/modules/res_smdi.so ${PLIST.snmp}lib/asterisk/modules/res_snmp.so lib/asterisk/modules/res_speech.so +lib/asterisk/modules/res_srtp.so lib/asterisk/modules/res_stun_monitor.so ${PLIST.kqueue}lib/asterisk/modules/res_timing_kqueue.so lib/asterisk/modules/res_timing_pthread.so Index: distinfo =================================================================== RCS file: /cvsroot/pkgsrc/comms/asterisk/distinfo,v retrieving revision 1.74 diff -u -p -r1.74 distinfo --- distinfo 9 Aug 2015 04:07:13 -0000 1.74 +++ distinfo 11 Oct 2015 02:49:45 -0000 @@ -28,6 +28,7 @@ SHA1 (patch-channels_chan__sip.c) = e711 SHA1 (patch-configure) = 88619fe9072ff69ed8da0a1917ac3852d10998a4 SHA1 (patch-configure.ac) = 2fdae524cfc95f152b86a32405b80f6edae6fa20 SHA1 (patch-contrib_scripts_vmail.cgi) = 650b9bbf3e322d1ad351932cfe6f747baa8f35e4 +SHA1 (patch-funcs_func__env.c) = 62129953548806c05f9a284f8c9f2da283a089b9 SHA1 (patch-funcs_func__strings.c) = 4c1db693d845691492b77bbf489764d362de2087 SHA1 (patch-include_asterisk_autoconfig.h.in) = 09a8f8d5398612fdadba25f221b16c19429f81e2 SHA1 (patch-include_asterisk_endian.h) = 41c1a9a9e02fe394bc9261f5559e931b1378ea28 @@ -38,7 +39,7 @@ SHA1 (patch-main_Makefile) = 5f9238a528d SHA1 (patch-main_acl.c) = 1eac532a15127c25981d2db9462a8ccce2c58620 SHA1 (patch-main_asterisk.c) = bfdbd5299b7279ef080a015a9a10627aa929dd49 SHA1 (patch-main_astmm.c) = 27ff06a6eae9396bde2babeff53d004202d0632a -SHA1 (patch-main_cdr.c) = 3d98a342bdbde81109cccd18943b48168768be77 +SHA1 (patch-main_cdr.c) = bafe6818135db5fba567cb429991dd4942578565 SHA1 (patch-main_cel.c) = 909ace2328c15cda2934dadac35889351be7c4f7 SHA1 (patch-main_config__options.c) = e49a946da99546684e8988ca4301bcacbb415987 SHA1 (patch-main_features.c) = 1c11207c60ce53c1101141e07ae04d0ddb838450 @@ -48,9 +49,10 @@ SHA1 (patch-main_logger.c) = 3c64602c945 SHA1 (patch-main_manager.c) = 6700814350f6960ac7543f587ba6c27a443eeef2 SHA1 (patch-main_named__acl.c) = 48c23ed0e558299679bbfc9e564383f9f7dd181f SHA1 (patch-main_netsock.c) = 015796266b9806425180c9bb05a1907116ef086d -SHA1 (patch-main_pbx.c) = a3151ae6c09ed69c588dc67cf39c862e10a15bf2 +SHA1 (patch-main_pbx.c) = 9977b297332b60c7fcc22481693ea206a89423bd +SHA1 (patch-main_poll.c) = 7a82109ce5291cebbc6e78aef46b53178b1bd145 SHA1 (patch-main_sched.c) = 73759369470b575e73ca78f9cff096ebb477c9b1 -SHA1 (patch-main_stdtime_localtime.c) = 4b01b34cc2a541487f744b3901c536419c95b394 +SHA1 (patch-main_stdtime_localtime.c) = 512467a69942e39102e117c3f2a2f2b9b8ba5ccc SHA1 (patch-main_test.c) = 3f239ed7611facbd937057f056ebc7495403dbaf SHA1 (patch-main_udptl.c) = 260586e4203b4bf51737ba171cbfe57621de8728 SHA1 (patch-main_utils.c) = df8bfd592f82b9b5c2c95a6860d2dca7003f66ca @@ -59,6 +61,9 @@ SHA1 (patch-res_Makefile) = 2b3fa69b155a SHA1 (patch-res_pjproject_aconfigure) = 0095894c5daac2dec6a9ec745c0ecb8d46c0b73a SHA1 (patch-res_pjproject_aconfigure.ac) = cbabe4a5f1888e180c93404324ddb96728dc20b9 SHA1 (patch-res_pjproject_build.symbian_makedef.sh) = 37781fe307564ad827e9be67f507f84230ebf299 +SHA1 (patch-res_pjproject_pjlib_include_pj_config.h) = 82bc3d4f79215987c1ff80edba4be702a2ff01ff +SHA1 (patch-res_pjproject_pjlib_include_pj_sock__select.h) = 1fe7fa27d02841ca2f47af6b34c69291e2632474 +SHA1 (patch-res_pjproject_pjlib_src_pj_sock__select.c) = ff2418a41b578b45b3334a4263b3028527a533a4 SHA1 (patch-res_res__calendar.c) = a4c491d8c77f88d0834d0eb52622f7c6e4f3428b SHA1 (patch-res_res__calendar__caldav.c) = 673e8a256fc748338f35c7deddbf283809d19904 SHA1 (patch-res_res__calendar__icalendar.c) = 3258522abbdc5c0cfe76868f73f16931118983e5 Index: options.mk =================================================================== RCS file: /cvsroot/pkgsrc/comms/asterisk/options.mk,v retrieving revision 1.7 diff -u -p -r1.7 options.mk --- options.mk 9 Aug 2015 04:07:13 -0000 1.7 +++ options.mk 11 Oct 2015 02:49:45 -0000 @@ -2,9 +2,9 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk PKG_SUPPORTED_OPTIONS= zaptel x11 unixodbc ilbc webvmail ldap spandsp -PKG_SUPPORTED_OPTIONS+= jabber speex snmp pgsql +PKG_SUPPORTED_OPTIONS+= jabber speex snmp pgsql asterisk-config PKG_OPTIONS_LEGACY_OPTS+= gtk:x11 -PKG_SUGGESTED_OPTIONS= ldap jabber speex +PKG_SUGGESTED_OPTIONS= ldap jabber speex asterisk-config .include "../../mk/bsd.options.mk" Index: files/smf/manifest.xml =================================================================== RCS file: files/smf/manifest.xml diff -N files/smf/manifest.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/smf/manifest.xml 11 Oct 2015 02:49:45 -0000 @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: patches/patch-funcs_func__env.c =================================================================== RCS file: patches/patch-funcs_func__env.c diff -N patches/patch-funcs_func__env.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-funcs_func__env.c 11 Oct 2015 02:49:45 -0000 @@ -0,0 +1,13 @@ +$NetBSD$ + +--- funcs/func_env.c.orig 2015-08-28 19:48:46.107028177 +0000 ++++ funcs/func_env.c +@@ -309,7 +309,7 @@ static int stat_read(struct ast_channel + snprintf(buf, len, "%d", (int) s.st_ctime); + break; + case 'm': +- snprintf(buf, len, "%o", s.st_mode); ++ snprintf(buf, len, "%o", (unsigned int)s.st_mode); + break; + } + } Index: patches/patch-main_cdr.c =================================================================== RCS file: /cvsroot/pkgsrc/comms/asterisk/patches/patch-main_cdr.c,v retrieving revision 1.1 diff -u -p -r1.1 patch-main_cdr.c --- patches/patch-main_cdr.c 19 May 2015 07:52:14 -0000 1.1 +++ patches/patch-main_cdr.c 11 Oct 2015 02:49:45 -0000 @@ -23,7 +23,7 @@ $NetBSD: patch-main_cdr.c,v 1.1 2015/05/ } else if (!strcasecmp(name, "disposition")) { if (raw) { - snprintf(workspace, workspacelen, "%ld", cdr->disposition); -+ snprintf(workspace, workspacelen, "%jd", cdr->disposition); ++ snprintf(workspace, workspacelen, "%jd", (intmax_t)cdr->disposition); } else { ast_copy_string(workspace, ast_cdr_disp2str(cdr->disposition), workspacelen); } Index: patches/patch-main_pbx.c =================================================================== RCS file: /cvsroot/pkgsrc/comms/asterisk/patches/patch-main_pbx.c,v retrieving revision 1.1 diff -u -p -r1.1 patch-main_pbx.c --- patches/patch-main_pbx.c 19 May 2015 07:52:14 -0000 1.1 +++ patches/patch-main_pbx.c 11 Oct 2015 02:49:45 -0000 @@ -11,6 +11,15 @@ $NetBSD: patch-main_pbx.c,v 1.1 2015/05/ pbx_builtin_setvar_helper(chan, "__TESTTIME", result); return 0; } +@@ -11220,7 +11220,7 @@ static int pbx_builtin_gotoiftime(struct + struct ast_timing timing; + const char *ctime; + struct timeval tv = ast_tvnow(); +- long timesecs; ++ intmax_t timesecs; + + if (!chan) { + ast_log(LOG_WARNING, "GotoIfTime requires a channel on which to operate\n"); @@ -11235,7 +11235,7 @@ static int pbx_builtin_gotoiftime(struct ts = s = ast_strdupa(data); Index: patches/patch-main_poll.c =================================================================== RCS file: patches/patch-main_poll.c diff -N patches/patch-main_poll.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-main_poll.c 11 Oct 2015 02:49:45 -0000 @@ -0,0 +1,12 @@ +$NetBSD$ + +--- main/poll.c.orig 2015-08-28 20:04:35.590619180 +0000 ++++ main/poll.c +@@ -79,6 +79,7 @@ + #include /* assertion macros */ + #include /* string functions */ + #include ++#include + + #include "asterisk/utils.h" /* this package */ + #include "asterisk/poll-compat.h" /* this package */ Index: patches/patch-main_stdtime_localtime.c =================================================================== RCS file: /cvsroot/pkgsrc/comms/asterisk/patches/patch-main_stdtime_localtime.c,v retrieving revision 1.2 diff -u -p -r1.2 patch-main_stdtime_localtime.c --- patches/patch-main_stdtime_localtime.c 19 May 2015 07:52:14 -0000 1.2 +++ patches/patch-main_stdtime_localtime.c 11 Oct 2015 02:49:45 -0000 @@ -2,7 +2,19 @@ $NetBSD: patch-main_stdtime_localtime.c, --- main/stdtime/localtime.c.orig 2015-03-10 17:42:57.000000000 +0000 +++ main/stdtime/localtime.c -@@ -733,7 +733,7 @@ static void *notify_daemon(void *data) +@@ -67,7 +67,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi + #include + #include + #endif +- ++#ifdef __sun ++#include ++#include ++#endif + #include "private.h" + #include "tzfile.h" + +@@ -733,7 +736,7 @@ static void *notify_daemon(void *data) if (st.st_mtime > cur->mtime[0] || lst.st_mtime > cur->mtime[1]) { #ifdef TEST_FRAMEWORK if (test) { @@ -11,7 +23,7 @@ $NetBSD: patch-main_stdtime_localtime.c, } else #endif { -@@ -2417,6 +2417,23 @@ static struct locale_entry *find_by_name +@@ -2417,6 +2420,23 @@ static struct locale_entry *find_by_name return NULL; } @@ -35,7 +47,7 @@ $NetBSD: patch-main_stdtime_localtime.c, static const char *store_by_locale(locale_t prevlocale) { struct locale_entry *cur; -@@ -2474,6 +2491,7 @@ const char *ast_setlocale(const char *lo +@@ -2474,6 +2494,7 @@ const char *ast_setlocale(const char *lo AST_LIST_UNLOCK(&localelist); return store_by_locale(prevlocale); } @@ -43,7 +55,7 @@ $NetBSD: patch-main_stdtime_localtime.c, #else const char *ast_setlocale(const char *unused) { -@@ -2487,7 +2505,9 @@ int ast_strftime_locale(char *buf, size_ +@@ -2487,7 +2508,9 @@ int ast_strftime_locale(char *buf, size_ char *format = ast_calloc(1, fmtlen), *fptr = format, *newfmt; int decimals = -1, i, res; long fraction; @@ -53,7 +65,7 @@ $NetBSD: patch-main_stdtime_localtime.c, buf[0] = '\0';/* Ensure the buffer is initialized. */ if (!format) { -@@ -2542,6 +2562,14 @@ defcase: *fptr++ = *tmp; +@@ -2542,6 +2565,14 @@ defcase: *fptr++ = *tmp; } *fptr = '\0'; #undef strftime @@ -68,7 +80,7 @@ $NetBSD: patch-main_stdtime_localtime.c, if (locale) { prevlocale = ast_setlocale(locale); } -@@ -2549,6 +2577,7 @@ defcase: *fptr++ = *tmp; +@@ -2549,6 +2580,7 @@ defcase: *fptr++ = *tmp; if (locale) { ast_setlocale(prevlocale); } @@ -76,7 +88,7 @@ $NetBSD: patch-main_stdtime_localtime.c, ast_free(format); return res; } -@@ -2562,11 +2591,22 @@ char *ast_strptime_locale(const char *s, +@@ -2562,11 +2594,22 @@ char *ast_strptime_locale(const char *s, { struct tm tm2 = { 0, }; char *res; Index: patches/patch-res_pjproject_pjlib_include_pj_config.h =================================================================== RCS file: patches/patch-res_pjproject_pjlib_include_pj_config.h diff -N patches/patch-res_pjproject_pjlib_include_pj_config.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-res_pjproject_pjlib_include_pj_config.h 11 Oct 2015 02:49:45 -0000 @@ -0,0 +1,32 @@ +$NetBSD$ + +--- res/pjproject/pjlib/include/pj/config.h.orig 2015-07-10 11:21:00.456344530 +0000 ++++ res/pjproject/pjlib/include/pj/config.h +@@ -555,7 +555,7 @@ + * the underlying implementation changes. + */ + #ifndef PJ_IOQUEUE_MAX_HANDLES +-# define PJ_IOQUEUE_MAX_HANDLES (64) ++# define PJ_IOQUEUE_MAX_HANDLES 1024 + #endif + + +@@ -622,16 +622,10 @@ + + /** + * Determine if FD_SETSIZE is changeable/set-able. If so, then we will +- * set it to PJ_IOQUEUE_MAX_HANDLES. Currently we detect this by checking +- * for Winsock. ++ * set it to PJ_IOQUEUE_MAX_HANDLES. Assumed to be supported by default + */ + #ifndef PJ_FD_SETSIZE_SETABLE +-# if (defined(PJ_HAS_WINSOCK_H) && PJ_HAS_WINSOCK_H!=0) || \ +- (defined(PJ_HAS_WINSOCK2_H) && PJ_HAS_WINSOCK2_H!=0) +-# define PJ_FD_SETSIZE_SETABLE 1 +-# else +-# define PJ_FD_SETSIZE_SETABLE 0 +-# endif ++#define PJ_FD_SETSIZE_SETABLE 1 + #endif + + /** Index: patches/patch-res_pjproject_pjlib_include_pj_sock__select.h =================================================================== RCS file: patches/patch-res_pjproject_pjlib_include_pj_sock__select.h diff -N patches/patch-res_pjproject_pjlib_include_pj_sock__select.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-res_pjproject_pjlib_include_pj_sock__select.h 11 Oct 2015 02:49:45 -0000 @@ -0,0 +1,21 @@ +$NetBSD$ + +--- res/pjproject/pjlib/include/pj/sock_select.h.orig 2015-07-10 11:23:58.291965207 +0000 ++++ res/pjproject/pjlib/include/pj/sock_select.h +@@ -25,6 +25,7 @@ + * @brief Socket select(). + */ + ++#include + #include + + PJ_BEGIN_DECL +@@ -55,7 +56,7 @@ PJ_BEGIN_DECL + */ + typedef struct pj_fd_set_t + { +- pj_sock_t data[PJ_IOQUEUE_MAX_HANDLES+ 4]; /**< Opaque buffer for fd_set */ ++ pj_sock_t data[PJ_IOQUEUE_MAX_HANDLES / sizeof(pj_sock_t) / CHAR_BIT + 4]; /**< Opaque buffer for fd_set */ + } pj_fd_set_t; + + Index: patches/patch-res_pjproject_pjlib_src_pj_sock__select.c =================================================================== RCS file: patches/patch-res_pjproject_pjlib_src_pj_sock__select.c diff -N patches/patch-res_pjproject_pjlib_src_pj_sock__select.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-res_pjproject_pjlib_src_pj_sock__select.c 11 Oct 2015 02:49:45 -0000 @@ -0,0 +1,52 @@ +$NetBSD$ + +--- res/pjproject/pjlib/src/pj/sock_select.c.orig 2012-07-01 17:28:57.000000000 +0000 ++++ res/pjproject/pjlib/src/pj/sock_select.c +@@ -40,10 +40,11 @@ + #define PART_FDSET_OR_NULL(ps) (ps ? PART_FDSET(ps) : NULL) + #define PART_COUNT(ps) (ps->data[0]) + ++typedef char pj_assert_fd_set_t[(sizeof(pj_fd_set_t)-sizeof(pj_sock_t) >= sizeof(fd_set)) ? 1 : -1]; ++ + PJ_DEF(void) PJ_FD_ZERO(pj_fd_set_t *fdsetp) + { + PJ_CHECK_STACK(); +- pj_assert(sizeof(pj_fd_set_t)-sizeof(pj_sock_t) >= sizeof(fd_set)); + + FD_ZERO(PART_FDSET(fdsetp)); + PART_COUNT(fdsetp) = 0; +@@ -53,7 +54,6 @@ PJ_DEF(void) PJ_FD_ZERO(pj_fd_set_t *fds + PJ_DEF(void) PJ_FD_SET(pj_sock_t fd, pj_fd_set_t *fdsetp) + { + PJ_CHECK_STACK(); +- pj_assert(sizeof(pj_fd_set_t)-sizeof(pj_sock_t) >= sizeof(fd_set)); + + if (!PJ_FD_ISSET(fd, fdsetp)) + ++PART_COUNT(fdsetp); +@@ -64,7 +64,6 @@ PJ_DEF(void) PJ_FD_SET(pj_sock_t fd, pj_ + PJ_DEF(void) PJ_FD_CLR(pj_sock_t fd, pj_fd_set_t *fdsetp) + { + PJ_CHECK_STACK(); +- pj_assert(sizeof(pj_fd_set_t)-sizeof(pj_sock_t) >= sizeof(fd_set)); + + if (PJ_FD_ISSET(fd, fdsetp)) + --PART_COUNT(fdsetp); +@@ -75,8 +74,6 @@ PJ_DEF(void) PJ_FD_CLR(pj_sock_t fd, pj_ + PJ_DEF(pj_bool_t) PJ_FD_ISSET(pj_sock_t fd, const pj_fd_set_t *fdsetp) + { + PJ_CHECK_STACK(); +- PJ_ASSERT_RETURN(sizeof(pj_fd_set_t)-sizeof(pj_sock_t) >= sizeof(fd_set), +- 0); + + return FD_ISSET(fd, PART_FDSET(fdsetp)); + } +@@ -96,9 +93,6 @@ PJ_DEF(int) pj_sock_select( int n, + + PJ_CHECK_STACK(); + +- PJ_ASSERT_RETURN(sizeof(pj_fd_set_t)-sizeof(pj_sock_t) >= sizeof(fd_set), +- PJ_EBUG); +- + if (timeout) { + os_timeout.tv_sec = timeout->sec; + os_timeout.tv_usec = timeout->msec * 1000;