Index: head/net/asterisk16/Makefile =================================================================== --- head/net/asterisk16/Makefile (revision 542416) +++ head/net/asterisk16/Makefile (revision 542417) @@ -1,301 +1,299 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 16.11.1 -PORTREVISION= 1 +PORTVERSION= 16.12.0 CATEGORIES= net -MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 \ - http://www.pjsip.org/release/${PJSIP_VERSION}/:PJSIP +MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ asterisk/old-releases/ \ sounds/releases/:g729 PKGNAMESUFFIX= 16 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - pjproject-${PJSIP_VERSION}.tar.bz2:PJSIP +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= ${PORTNAME} MAINTAINER= madpilot@FreeBSD.org COMMENT= Open Source PBX and telephony toolkit LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE +ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc powerpc64 sparc64 + LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ libjansson.so:devel/jansson -ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc powerpc64 sparc64 - -EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX} - USES= bison compiler:c11 cpe gmake gnome iconv libedit localbase \ shebangfix sqlite ssl ncurses USE_GNOME= libxml2 USE_LDCONFIG= yes USE_RC_SUBR= asterisk USE_GITHUB= nodefault -PJSIP_VERSION= 2.9 +EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX} + +PJSIP_VERSION= 2.10 GNU_CONFIGURE= yes CONFIGURE_ARGS= --datarootdir=${DATADIR} \ --with-ilbc=internal \ --with-crypto=${OPENSSLBASE} \ --with-ssl=${OPENSSLBASE} \ --with-externals-cache=${DISTDIR}/${DIST_SUBDIR} CPE_VENDOR= digium SHEBANG_FILES= agi/agi-test.agi \ agi/jukebox.agi \ contrib/scripts/astversion LDFLAGS+= -L. MAKE_ENV= PTHREAD_LIBS="-lpthread" \ MKDIR="${MKDIR}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OSVERSION=${OSVERSION} \ DOCSDIR=${DOCSDIR} \ ASTCFLAGS="${CFLAGS}" \ ASTLDFLAGS="${LDFLAGS}" MAKE_ARGS+= NOISY_BUILD=yes \ ASTDATADIR=${DATADIR} CONFLICTS= ossp-uuid-[0-9]* CONFLICTS_BUILD= linuxthreads-* CONFLICTS_INSTALL= asterisk13 OPTIONS_DEFINE= ASTVERSION BACKTRACE CURL EXCHANGE FREETDS G729 LDAP LUA MACRO \ MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \ SPANDSP SRTP SYSINFO URIPARSER XMPP OPTIONS_DEFAULT= CURL FREETDS GSM LUA MACRO MP3PLAYER NEWT ODBC OPUS MYSQL PGSQL \ PJSIP PORTAUDIO RADIUS SNMP SPANDSP SPEEX SRTP URIPARSER \ VORBIS OPTIONS_DEFINE_i386= DAHDI OPTIONS_DEFINE_amd64= DAHDI OPTIONS_DEFINE_sparc64= DAHDI OPTIONS_DEFAULT_i386= DAHDI XMPP OPTIONS_DEFAULT_amd64= DAHDI XMPP OPTIONS_DEFAULT_sparc64= DAHDI XMPP OPTIONS_DEFAULT_powerpc= XMPP OPTIONS_GROUP= CODECS OPTIONS_GROUP_CODECS= GSM NEWG711 OPUS SPEEX VORBIS CODECS_DESC= Encoder/Decoder (Codec) Support OPTIONS_GROUP+= DATABASE OPTIONS_GROUP_DATABASE= MYSQL ODBC PGSQL DATABASE_DESC= Database Support OPTIONS_MULTI= MENU OPTIONS_MULTI_MENU= NCURSES NEWT MENU_DESC= Menuselect Interface Backend NEWT_DESC= Newt User Interface ASTERISK_CORE_G729_SOUNDS= asterisk-core-sounds-en-g729-1.5.tar.gz ASTERISK_MOH_G729_SOUNDS= asterisk-moh-opsound-g729-2.03.tar.gz G729_DISTFILES= ${ASTERISK_CORE_G729_SOUNDS}:g729 \ ${ASTERISK_MOH_G729_SOUNDS}:g729 ASTVERSION_DESC?= Install astversion (requires bash) BACKTRACE_DESC?= Stack backtrace support via (lib)execinfo DAHDI_DESC?= DAHDI support EXCHANGE_DESC?= Exchange calendar support G729_DESC?= Install G.729 format sounds for Music-on-Hold (MoH) MACRO_DESC?= Enable app_macro (deprecated) MP3PLAYER_DESC= Install MP3 Player for Music-On-Hold (mpg123) NEWG711_DESC?= New G711 Codec OOH323_DESC?= ooh323 support OPUS_DESC?= Opus Codec PJSIP_DESC?= Build the PJSIP based SIP channel SRTP_DESC?= SecureRTP support SYSINFO_DESC?= Use devel/libsysinfo to get system information URIPARSER_DESC?= Use RFC 3986 compliant uriparser library XMPP_DESC?= XMPP/GTALK support OPTIONS_SUB= yes ASTVERSION_RUN_DEPENDS= bash:shells/bash BACKTRACE_CONFIGURE_WITH= execinfo CURL_CONFIGURE_WITH= libcurl CURL_LIB_DEPENDS= libcurl.so:ftp/curl DAHDI_CONFIGURE_WITH= dahdi openr2 DAHDI_LIB_DEPENDS= libpri.so:misc/libpri \ libopenr2.so:misc/openr2 \ libtonezone.so:misc/dahdi EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 EXCHANGE_LIB_DEPENDS= libneon.so:www/neon \ libexpat.so:textproc/expat2 EXCHANGE_USES= gettext-runtime FREETDS_CONFIGURE_ON= --with-tds=${LOCALBASE} FREETDS_CONFIGURE_OFF= --without-tds FREETDS_LIB_DEPENDS= libsybdb.so:databases/freetds GSM_CONFIGURE_WITH= gsm GSM_LIB_DEPENDS= libgsm.so:audio/gsm LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes LUA_CONFIGURE_WITH= lua LUA_USES= lua LUA_CFLAGS= -I${LUA_INCDIR} LUA_LDFLAGS= -L${LUA_LIBDIR} MYSQL_CONFIGURE_WITH= mysqlclient MYSQL_USES= mysql MP3PLAYER_RUN_DEPENDS= mpg123:audio/mpg123 NCURSES_USES= ncurses NEWT_LIB_DEPENDS= libnewt.so:devel/newt ODBC_CONFIGURE_WITH= unixodbc ODBC_CONFIGURE_ON= --with-ltdl ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC \ libltdl.so:devel/libltdl OPUS_LIB_DEPENDS= libopus.so:audio/opus OPUS_EXTRACT_ONLY= ${DISTFILE_opus} OPUS_GH_TUPLE= traud:asterisk-opus:83e1b458c77e0e287adeca494eeb79edb077b0ff:opus PGSQL_CONFIGURE_WITH= postgres PGSQL_USES= pgsql PJSIP_CONFIGURE_WITH= pjproject pjproject-bundled PJSIP_USES= pkgconfig PJSIP_LIB_DEPENDS= libsrtp2.so:net/libsrtp2 \ libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp +PJSIP_GH_TUPLE= pjsip:pjproject:${PJSIP_VERSION}:pjsip PORTAUDIO_CONFIGURE_WITH= portaudio PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio RADIUS_CONFIGURE_WITH= radius RADIUS_LIB_DEPENDS= libradiusclient-ng.so:net/radiusclient SNMP_CONFIGURE_WITH= netsnmp SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp \ libpkg.so:${PKG_ORIGIN} SPANDSP_CONFIGURE_WITH= spandsp SPANDSP_LIB_DEPENDS= libspandsp.so:comms/spandsp \ libtiff.so:graphics/tiff SPEEX_CONFIGURE_WITH= speex SPEEX_LIB_DEPENDS= libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp SRTP_CONFIGURE_WITH= srtp SRTP_LIB_DEPENDS= libsrtp2.so:net/libsrtp2 SYSINFO_LIB_DEPENDS= libsysinfo.so:devel/libsysinfo URIPARSER_CONFIGURE_WITH= uriparser URIPARSER_LIB_DEPENDS= liburiparser.so:net/uriparser VORBIS_CONFIGURE_WITH= ogg VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg XMPP_CONFIGURE_WITH= iksemel XMPP_LIB_DEPENDS= libiksemel.so:textproc/iksemel ASTERISK_USER?= asterisk ASTERISK_GROUP?= asterisk USERS= ${ASTERISK_USER} GROUPS= ${ASTERISK_GROUP} dahdi .include .if empty(ICONV_LIB) CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no \ ac_cv_lib_iconv_libiconv_open=no .endif .if ${PREFIX} == ${LOCALBASE} VARDIR=/var .else VARDIR=${PREFIX}/var .endif SUB_LIST+= ASTERISK_USER=${ASTERISK_USER} PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER} \ ASTERISK_GROUP=${ASTERISK_GROUP} \ VARDIR=${VARDIR} post-extract: @${FIND} ${WRKSRC} -name '*.d' -delete post-extract-G729-on: ${CP} ${DISTDIR}/${DIST_SUBDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds ${CP} ${DISTDIR}/${DIST_SUBDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds post-extract-OPUS-on: ${CP} ${WRKSRC_opus}/include/asterisk/* ${WRKSRC}/include/asterisk ${CP} ${WRKSRC_opus}/codecs/* ${WRKSRC}/codecs ${CP} ${WRKSRC_opus}/res/* ${WRKSRC}/res post-patch: @${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample .if exists(${FILESDIR}/.asterisk.makeopts) ${CP} ${FILESDIR}/.asterisk.makeopts ${WRKSRC}/menuselect.makeopts .endif post-patch-SYSINFO-on: @${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile post-patch-SYSINFO-off: @${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile post-configure: @cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_mgcp menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable res_pktccops menuselect.makeopts post-configure-MACRO-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable app_macro menuselect.makeopts post-configure-MYSQL-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable cdr_mysql menuselect.makeopts post-configure-OOH323-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_ooh323 menuselect.makeopts post-configure-NEWG711-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts post-configure-OPTIMIZED_CFLAGS-off: @cd ${WRKSRC} && ./menuselect/menuselect --disable BUILD_NATIVE menuselect.makeopts post-configure-OPUS-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable codec_opus_open_source menuselect.makeopts post-install: @${RM} ${STAGEDIR}${ETCDIR}/*.conf ${STAGEDIR}${ETCDIR}/extensions.ael ${STAGEDIR}${ETCDIR}/extensions.lua @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/ast[a-f]* ${STAGEDIR}${PREFIX}/lib/*.so.* ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/*.so ${STAGEDIR}${DATADIR}/agi-bin/eagi-* ${FIND} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules -type f -name '*.so' | ${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST} ${FIND} ${STAGEDIR}${DATADIR}/sounds -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST} ${FIND} ${STAGEDIR}${DATADIR}/moh -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST} (cd ${STAGEDIR} && \ ${ECHO} "@owner ${ASTERISK_USER}" >> ${TMPPLIST} && \ ${ECHO} "@group ${ASTERISK_GROUP}" >> ${TMPPLIST} && \ ${FIND} var/spool/${PORTNAME}/voicemail/default -type f | ${SED} "s,^,/," >> ${TMPPLIST} && \ ${FIND} var/spool/${PORTNAME}/voicemail/ -type d | ${SED} "s,^,@dir /," >> ${TMPPLIST} && \ ${ECHO} "@owner" >> ${TMPPLIST} && \ ${ECHO} "@group" >> ${TMPPLIST}); post-install-ASTVERSION-off: @${RM} ${STAGEDIR}${PREFIX}/sbin/astversion .include Index: head/net/asterisk16/distinfo =================================================================== --- head/net/asterisk16/distinfo (revision 542416) +++ head/net/asterisk16/distinfo (revision 542417) @@ -1,11 +1,11 @@ -TIMESTAMP = 1592336962 -SHA256 (asterisk/asterisk-16.11.1.tar.gz) = f1be317774066c825ae872b2382903ae7ba1e765b3b567bd814b82cb66bfced9 -SIZE (asterisk/asterisk-16.11.1.tar.gz) = 27703143 -SHA256 (asterisk/pjproject-2.9.tar.bz2) = d185ef7855c8ec07191dde92f54b65a7a4b7a6f7bf8c46f7af35ceeb1da2a636 -SIZE (asterisk/pjproject-2.9.tar.bz2) = 5009546 +TIMESTAMP = 1594922513 +SHA256 (asterisk/asterisk-16.12.0.tar.gz) = b576a6f151115257f3d8200a97f53612a30dcbeb1a907e1f54d34b0027325dea +SIZE (asterisk/asterisk-16.12.0.tar.gz) = 27727347 SHA256 (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9 SIZE (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123 SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585 SIZE (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000 SHA256 (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 572a3c956371ed62b44a4bcd973db10eb4c84f3040cf7156e3acfad3b6bf3ded SIZE (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 24044 +SHA256 (asterisk/pjsip-pjproject-2.10_GH0.tar.gz) = 936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de +SIZE (asterisk/pjsip-pjproject-2.10_GH0.tar.gz) = 8768705 Index: head/net/asterisk16/files/patch-channels__sip__include__sip.h =================================================================== --- head/net/asterisk16/files/patch-channels__sip__include__sip.h (revision 542416) +++ head/net/asterisk16/files/patch-channels__sip__include__sip.h (nonexistent) @@ -1,11 +0,0 @@ ---- channels/sip/include/sip.h.orig 2014-07-24 17:47:29 UTC -+++ channels/sip/include/sip.h -@@ -192,7 +192,7 @@ - #define DEFAULT_MOHINTERPRET "default" /*!< The default music class */ - #define DEFAULT_MOHSUGGEST "" - #define DEFAULT_VMEXTEN "asterisk" /*!< Default voicemail extension */ --#define DEFAULT_CALLERID "asterisk" /*!< Default caller ID */ -+#define DEFAULT_CALLERID "Unknown" /*!< Default caller ID */ - #define DEFAULT_MWI_FROM "" - #define DEFAULT_NOTIFYMIME "application/simple-message-summary" - #define DEFAULT_ALLOWGUEST TRUE Property changes on: head/net/asterisk16/files/patch-channels__sip__include__sip.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/asterisk16/files/patch-main__http.c =================================================================== --- head/net/asterisk16/files/patch-main__http.c (revision 542416) +++ head/net/asterisk16/files/patch-main__http.c (nonexistent) @@ -1,11 +0,0 @@ ---- main/http.c.orig 2017-12-20 20:39:39 UTC -+++ main/http.c -@@ -2044,7 +2044,7 @@ static int __ast_http_load(int reload) - struct http_uri_redirect *redirect; - struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; - uint32_t bindport = DEFAULT_PORT; -- RAII_VAR(struct ast_sockaddr *, addrs, NULL, ast_free); -+ struct ast_sockaddr *addrs = NULL; - int num_addrs = 0; - int http_tls_was_enabled = 0; - Property changes on: head/net/asterisk16/files/patch-main__http.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/asterisk16/files/patch-agi__Makefile =================================================================== --- head/net/asterisk16/files/patch-agi__Makefile (revision 542416) +++ head/net/asterisk16/files/patch-agi__Makefile (nonexistent) @@ -1,13 +0,0 @@ ---- agi/Makefile.orig 2012-10-14 21:56:13 UTC -+++ agi/Makefile -@@ -16,7 +16,9 @@ ASTTOPDIR?=.. - - .PHONY: clean all uninstall - --AGIS=$(MENUSELECT_AGIS) -+AGIS_BIN=eagi-test eagi-sphinx-test -+AGIS_SCR=agi-test.agi jukebox.agi -+AGIS=$(AGIS_SCR) $(AGIS_BIN) - - ifeq ($(OSARCH),SunOS) - LIBS+=-lsocket -lnsl Property changes on: head/net/asterisk16/files/patch-agi__Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/asterisk16/files/patch-channels-chan_dahdi.c =================================================================== --- head/net/asterisk16/files/patch-channels-chan_dahdi.c (revision 542416) +++ head/net/asterisk16/files/patch-channels-chan_dahdi.c (nonexistent) @@ -1,46 +0,0 @@ ---- channels/chan_dahdi.c.orig 2020-06-16 14:39:16 UTC -+++ channels/chan_dahdi.c -@@ -4649,6 +4649,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p) - return; - } - if (p->echocancel.head.tap_length) { -+ struct dahdi_echocanparams *pecp; -+ - #if defined(HAVE_PRI) || defined(HAVE_SS7) - switch (p->sig) { - #if defined(HAVE_PRI) -@@ -4679,7 +4681,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p) - break; - } - #endif /* defined(HAVE_PRI) || defined(HAVE_SS7) */ -- res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &p->echocancel); -+ -+ pecp = &p->echocancel.head; -+ res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp); - if (res) { - ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno)); - } else { -@@ -4713,8 +4717,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p) - - if (p->echocanon) { - struct dahdi_echocanparams ecp = { .tap_length = 0 }; -+ struct dahdi_echocanparams *pecp = &ecp; - -- res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &ecp); -+ res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp); - - if (res) - ast_log(LOG_WARNING, "Unable to disable echo cancellation on channel %d: %s\n", p->channel, strerror(errno)); -@@ -18147,8 +18152,10 @@ static int process_dahdi(struct dahdi_chan_conf *confp - if ((varval = strchr(varname, '='))) { - *varval++ = '\0'; - if ((tmpvar = ast_variable_new(varname, varval, ""))) { -- tmpvar->next = confp->chan.vars; -- confp->chan.vars = tmpvar; -+ if (ast_variable_list_replace(&confp->chan.vars, tmpvar)) { -+ tmpvar->next = confp->chan.vars; -+ confp->chan.vars = tmpvar; -+ } - } - } - } Property changes on: head/net/asterisk16/files/patch-channels-chan_dahdi.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/asterisk16/files/patch-main__Makefile =================================================================== --- head/net/asterisk16/files/patch-main__Makefile (revision 542416) +++ head/net/asterisk16/files/patch-main__Makefile (nonexistent) @@ -1,16 +0,0 @@ ---- main/Makefile.orig 2018-08-08 16:02:31 UTC -+++ main/Makefile -@@ -80,9 +80,12 @@ endif - - ifeq ($(OSARCH),FreeBSD) - # -V is understood by BSD Make, not by GNU make. -- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) -+ BSDVERSION=$(OSVERSION) -+ BSDVERSION?=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) - AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) -+ CRYPT_LIB=$(shell if test $(BSDVERSION) -ge 1200001 ; then echo "-lcrypt"; fi) - AST_LIBS+=-lcrypto -+ AST_LIBS+=%%LIBSYSINFO%% - endif - - ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) Property changes on: head/net/asterisk16/files/patch-main__Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/asterisk16/files/patch-main__asterisk.exports.in =================================================================== --- head/net/asterisk16/files/patch-main__asterisk.exports.in (revision 542416) +++ head/net/asterisk16/files/patch-main__asterisk.exports.in (nonexistent) @@ -1,11 +0,0 @@ ---- main/asterisk.exports.in.orig 2018-08-08 16:02:31 UTC -+++ main/asterisk.exports.in -@@ -63,6 +63,8 @@ - - */ - LINKER_SYMBOL_PREFIX_IO_stdin_used; -+ LINKER_SYMBOL_PREFIX__progname; -+ LINKER_SYMBOL_PREFIXenviron; - local: - *; - }; Property changes on: head/net/asterisk16/files/patch-main__asterisk.exports.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/asterisk16/files/patch-main__lock.c =================================================================== --- head/net/asterisk16/files/patch-main__lock.c (revision 542416) +++ head/net/asterisk16/files/patch-main__lock.c (nonexistent) @@ -1,12 +0,0 @@ ---- main/lock.c.orig 2018-08-08 16:02:31 UTC -+++ main/lock.c -@@ -692,9 +692,6 @@ int __ast_rwlock_init(int tracking, const char *filena - #endif /* DEBUG_THREADS */ - - pthread_rwlockattr_init(&attr); --#ifdef HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP -- pthread_rwlockattr_setkind_np(&attr, PTHREAD_RWLOCK_PREFER_WRITER_NP); --#endif - res = pthread_rwlock_init(&t->lock, &attr); - pthread_rwlockattr_destroy(&attr); - Property changes on: head/net/asterisk16/files/patch-main__lock.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/asterisk16/files/patch-Makefile =================================================================== --- head/net/asterisk16/files/patch-Makefile (revision 542416) +++ head/net/asterisk16/files/patch-Makefile (revision 542417) @@ -1,122 +1,122 @@ ---- Makefile.orig 2018-12-04 00:03:56 UTC +--- Makefile.orig 2020-07-09 15:39:17 UTC +++ Makefile @@ -138,7 +138,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR)) OVERWRITE=y # Include debug and macro symbols in the executables (-g) and profiling info (-pg) -DEBUG=-g3 +#DEBUG=-g3 # Asterisk.conf is located in ASTETCDIR or by using the -C flag # when starting Asterisk @@ -162,7 +162,7 @@ LINKER_SYMBOL_PREFIX= #_ASTCFLAGS+=-DOLD_DSP_ROUTINES # Default install directory for DAHDI hooks. -DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d +#DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d # If the file .asterisk.makeopts is present in your home directory, you can # include all of your favorite menuselect options so that every time you download @@ -222,7 +222,7 @@ endif ifeq ($(OSARCH),FreeBSD) # -V is understood by BSD Make, not by GNU make. - BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) + BSDVERSION=$(OSVERSION) _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) endif -@@ -462,8 +462,12 @@ endif +@@ -466,8 +466,12 @@ endif $(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \ done \ fi + if [ ! -d $(DESTDIR)$(DOCSDIR)/images ]; then \ + $(MKDIR) $(DESTDIR)$(DOCSDIR)/images; \ + fi + for x in images/*.jpg; do \ - $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/images" ; \ + $(INSTALL) -m 644 $$x "$(DESTDIR)$(DOCSDIR)/images" ; \ done $(MAKE) -C sounds install find rest-api -name "*.json" | while read x; do \ -@@ -562,7 +566,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI +@@ -565,7 +569,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI "$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \ "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \ "$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" \ - "$(ASTDATADIR)/third-party" + "$(ASTDATADIR)/third-party" "$(ASTSPOOLDIR)/outgoing" installdirs: @for i in $(INSTALLDIRS); do \ -@@ -601,10 +605,10 @@ endif +@@ -598,10 +602,10 @@ endif if [ -f contrib/firmware/iax/iaxy.bin ] ; then \ $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \ fi -ifeq ($(HAVE_DAHDI),1) - $(INSTALL) -d $(DESTDIR)/$(DAHDI_UDEV_HOOK_DIR) - $(INSTALL) -m 644 contrib/scripts/dahdi_span_config_hook $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk -endif +#ifeq ($(HAVE_DAHDI),1) +# $(INSTALL) -d $(DESTDIR)/$(DAHDI_UDEV_HOOK_DIR) +# $(INSTALL) -m 644 contrib/scripts/dahdi_span_config_hook $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk +#endif $(SUBDIRS_INSTALL): +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTDATADIR="$(ASTDATADIR)" $(SUBMAKE) -C $(@:-install=) install -@@ -719,7 +723,7 @@ ifneq ($(filter ~%,$(DESTDIR)),) +@@ -716,7 +720,7 @@ ifneq ($(filter ~%,$(DESTDIR)),) @exit 1 endif -install: badshell bininstall datafiles +install: badshell bininstall datafiles samples @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \ fi -@@ -764,23 +768,10 @@ upgrade: bininstall +@@ -761,23 +765,10 @@ upgrade: bininstall # (2) the extension to strip off define INSTALL_CONFIGS @for x in $(1)/*$(2); do \ - dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x $(2)`"; \ - if [ -f "$${dst}" ]; then \ - if [ "$(OVERWRITE)" = "y" ]; then \ - if cmp -s "$${dst}" "$$x" ; then \ - echo "Config file $$x is unchanged"; \ - continue; \ - fi ; \ - mv -f "$${dst}" "$${dst}.old" ; \ - else \ - echo "Skipping config file $$x"; \ - continue; \ - fi ;\ - fi ; \ echo "Installing file $$x"; \ - $(INSTALL) -m 644 "$$x" "$${dst}" ;\ + $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.sample ; \ done ; \ - if [ "$(OVERWRITE)" = "y" ]; then \ + if true; then \ echo "Updating asterisk.conf" ; \ sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ -e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \ -@@ -793,8 +784,8 @@ define INSTALL_CONFIGS +@@ -790,8 +781,8 @@ define INSTALL_CONFIGS -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \ -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \ - "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ - $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \ + "$(DESTDIR)$(ASTCONFPATH).sample" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ + $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH).sample" ; \ rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ fi endef -@@ -818,7 +809,7 @@ adsi: +@@ -825,7 +816,7 @@ adsi: else \ echo "Installing $$x" ; \ fi ; \ - $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \ + $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`.sample ; \ done samples: adsi Index: head/net/asterisk16/files/patch-agi_Makefile =================================================================== --- head/net/asterisk16/files/patch-agi_Makefile (nonexistent) +++ head/net/asterisk16/files/patch-agi_Makefile (revision 542417) @@ -0,0 +1,13 @@ +--- agi/Makefile.orig 2020-07-09 15:39:17 UTC ++++ agi/Makefile +@@ -16,7 +16,9 @@ ASTTOPDIR?=.. + + .PHONY: clean all uninstall + +-AGIS=$(MENUSELECT_AGIS) ++AGIS_BIN=eagi-test eagi-sphinx-test ++AGIS_SCR=agi-test.agi jukebox.agi ++AGIS=$(AGIS_SCR) $(AGIS_BIN) + + ifeq ($(OSARCH),SunOS) + LIBS+=-lsocket -lnsl Property changes on: head/net/asterisk16/files/patch-agi_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/asterisk16/files/patch-channels_chan__dahdi.c =================================================================== --- head/net/asterisk16/files/patch-channels_chan__dahdi.c (nonexistent) +++ head/net/asterisk16/files/patch-channels_chan__dahdi.c (revision 542417) @@ -0,0 +1,33 @@ +--- channels/chan_dahdi.c.orig 2020-07-09 15:39:17 UTC ++++ channels/chan_dahdi.c +@@ -4649,6 +4649,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p) + return; + } + if (p->echocancel.head.tap_length) { ++ struct dahdi_echocanparams *pecp; ++ + #if defined(HAVE_PRI) || defined(HAVE_SS7) + switch (p->sig) { + #if defined(HAVE_PRI) +@@ -4679,7 +4681,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p) + break; + } + #endif /* defined(HAVE_PRI) || defined(HAVE_SS7) */ +- res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &p->echocancel); ++ ++ pecp = &p->echocancel.head; ++ res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp); + if (res) { + ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno)); + } else { +@@ -4713,8 +4717,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p) + + if (p->echocanon) { + struct dahdi_echocanparams ecp = { .tap_length = 0 }; ++ struct dahdi_echocanparams *pecp = &ecp; + +- res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &ecp); ++ res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp); + + if (res) + ast_log(LOG_WARNING, "Unable to disable echo cancellation on channel %d: %s\n", p->channel, strerror(errno)); Property changes on: head/net/asterisk16/files/patch-channels_chan__dahdi.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/asterisk16/files/patch-channels_sip_include_sip.h =================================================================== --- head/net/asterisk16/files/patch-channels_sip_include_sip.h (nonexistent) +++ head/net/asterisk16/files/patch-channels_sip_include_sip.h (revision 542417) @@ -0,0 +1,11 @@ +--- channels/sip/include/sip.h.orig 2020-07-09 15:39:17 UTC ++++ channels/sip/include/sip.h +@@ -192,7 +192,7 @@ + #define DEFAULT_MOHINTERPRET "default" /*!< The default music class */ + #define DEFAULT_MOHSUGGEST "" + #define DEFAULT_VMEXTEN "asterisk" /*!< Default voicemail extension */ +-#define DEFAULT_CALLERID "asterisk" /*!< Default caller ID */ ++#define DEFAULT_CALLERID "Unknown" /*!< Default caller ID */ + #define DEFAULT_MWI_FROM "" + #define DEFAULT_NOTIFYMIME "application/simple-message-summary" + #define DEFAULT_ALLOWGUEST TRUE Property changes on: head/net/asterisk16/files/patch-channels_sip_include_sip.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/asterisk16/files/patch-configure =================================================================== --- head/net/asterisk16/files/patch-configure (revision 542416) +++ head/net/asterisk16/files/patch-configure (revision 542417) @@ -1,78 +1,78 @@ ---- configure.orig 2020-04-30 14:11:40 UTC +--- configure.orig 2020-07-09 15:39:17 UTC +++ configure @@ -4687,8 +4687,6 @@ case "${host_os}" in ;; dragonfly*|freebsd*) ac_default_prefix=/usr/local - CPPFLAGS=-I/usr/local/include - LDFLAGS=-L/usr/local/lib ;; openbsd*) ac_default_prefix=/usr/local -@@ -20351,6 +20349,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6 +@@ -20355,6 +20353,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6 cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include + #include #include int main () -@@ -29510,6 +29510,8 @@ fi +@@ -29514,6 +29514,8 @@ fi for ver in 5.3 5.2 5.1; do +vernodot=`echo ${ver} | sed 's/\.//'` + if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then pbxlibdir="" # if --with-LUA=DIR has been specified, use it. -@@ -29524,13 +29526,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; +@@ -29528,13 +29530,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " as_ac_Lib=`$as_echo "ac_cv_lib_lua${ver}''_luaL_newstate" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua${ver}" >&5 -$as_echo_n "checking for luaL_newstate in -llua${ver}... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-${ver}" >&5 +$as_echo_n "checking for luaL_newstate in -llua-${ver}... " >&6; } if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-llua${ver} ${pbxlibdir} -lm $LIBS" +LIBS="-llua-${ver} ${pbxlibdir} -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -29572,7 +29574,7 @@ fi +@@ -29576,7 +29578,7 @@ fi # now check for the header. if test "${AST_LUA_FOUND}" = "yes"; then - LUA_LIB="${pbxlibdir} -llua${ver} -lm" + LUA_LIB="${pbxlibdir} -llua-${ver} -lm" # if --with-LUA=DIR has been specified, use it. if test "x${LUA_DIR}" != "x"; then LUA_INCLUDE="-I${LUA_DIR}/include" -@@ -29582,8 +29584,8 @@ fi +@@ -29586,8 +29588,8 @@ fi # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" - as_ac_Header=`$as_echo "ac_cv_header_lua${ver}/lua.h" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "lua${ver}/lua.h" "$as_ac_Header" "$ac_includes_default" + as_ac_Header=`$as_echo "ac_cv_header_lua${vernodot}/lua.h" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "lua${vernodot}/lua.h" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : LUA_HEADER_FOUND=1 else -@@ -29610,9 +29612,9 @@ fi +@@ -29614,9 +29616,9 @@ fi if test "x${PBX_LUA}" = "x1" ; then if test x"${LUA_DIR}" = x; then - LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua${ver}" + LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua${vernodot}" else - LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua${ver}" + LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua${vernodot}" fi break; fi Index: head/net/asterisk16/files/patch-contrib_Makefile =================================================================== --- head/net/asterisk16/files/patch-contrib_Makefile (revision 542416) +++ head/net/asterisk16/files/patch-contrib_Makefile (revision 542417) @@ -1,23 +1,23 @@ ---- contrib/Makefile.orig 2018-12-04 00:03:56 UTC +--- contrib/Makefile.orig 2020-07-09 15:39:17 UTC +++ contrib/Makefile @@ -24,14 +24,14 @@ install: $(INSTALL) -m 755 scripts/ast_logescalator "$(DESTDIR)$(ASTDATADIR)/scripts/ast_logescalator" $(INSTALL) -m 755 scripts/ast_loggrabber "$(DESTDIR)$(ASTDATADIR)/scripts/ast_loggrabber" $(INSTALL) -m 755 scripts/ast_coredumper "$(DESTDIR)$(ASTDATADIR)/scripts/ast_coredumper" - $(INSTALL) -m 755 scripts/refcounter.py "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py" - $(INSTALL) -m 755 scripts/refstats.py "$(DESTDIR)$(ASTDATADIR)/scripts/refstats.py" - $(INSTALL) -m 755 scripts/reflocks.py "$(DESTDIR)$(ASTDATADIR)/scripts/reflocks.py" +# $(INSTALL) -m 755 scripts/refcounter.py "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py" +# $(INSTALL) -m 755 scripts/refstats.py "$(DESTDIR)$(ASTDATADIR)/scripts/refstats.py" +# $(INSTALL) -m 755 scripts/reflocks.py "$(DESTDIR)$(ASTDATADIR)/scripts/reflocks.py" uninstall: -rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/ast_logescalator" -rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/ast_loggrabber" -rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/ast_coredumper" - -rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py" - -rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/refstats.py" - -rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/reflocks.py" +# -rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py" +# -rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/refstats.py" +# -rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/reflocks.py" Index: head/net/asterisk16/files/patch-main_Makefile =================================================================== --- head/net/asterisk16/files/patch-main_Makefile (nonexistent) +++ head/net/asterisk16/files/patch-main_Makefile (revision 542417) @@ -0,0 +1,16 @@ +--- main/Makefile.orig 2020-07-09 15:39:17 UTC ++++ main/Makefile +@@ -80,9 +80,12 @@ endif + + ifeq ($(OSARCH),FreeBSD) + # -V is understood by BSD Make, not by GNU make. +- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) ++ BSDVERSION=$(OSVERSION) ++ BSDVERSION?=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) + AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) ++ CRYPT_LIB=$(shell if test $(BSDVERSION) -ge 1200001 ; then echo "-lcrypt"; fi) + AST_LIBS+=-lcrypto ++ AST_LIBS+=%%LIBSYSINFO%% + endif + + ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) Property changes on: head/net/asterisk16/files/patch-main_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/asterisk16/files/patch-main_asterisk.exports.in =================================================================== --- head/net/asterisk16/files/patch-main_asterisk.exports.in (nonexistent) +++ head/net/asterisk16/files/patch-main_asterisk.exports.in (revision 542417) @@ -0,0 +1,11 @@ +--- main/asterisk.exports.in.orig 2020-07-09 15:39:17 UTC ++++ main/asterisk.exports.in +@@ -65,6 +65,8 @@ + + */ + LINKER_SYMBOL_PREFIX_IO_stdin_used; ++ LINKER_SYMBOL_PREFIX__progname; ++ LINKER_SYMBOL_PREFIXenviron; + local: + *; + }; Property changes on: head/net/asterisk16/files/patch-main_asterisk.exports.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/asterisk16/files/patch-main_http.c =================================================================== --- head/net/asterisk16/files/patch-main_http.c (nonexistent) +++ head/net/asterisk16/files/patch-main_http.c (revision 542417) @@ -0,0 +1,11 @@ +--- main/http.c.orig 2020-07-09 15:39:17 UTC ++++ main/http.c +@@ -2086,7 +2086,7 @@ static int __ast_http_load(int reload) + struct http_uri_redirect *redirect; + struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; + uint32_t bindport = DEFAULT_PORT; +- RAII_VAR(struct ast_sockaddr *, addrs, NULL, ast_free); ++ struct ast_sockaddr *addrs = NULL; + int num_addrs = 0; + int http_tls_was_enabled = 0; + Property changes on: head/net/asterisk16/files/patch-main_http.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/asterisk16/files/patch-main_lock.c =================================================================== --- head/net/asterisk16/files/patch-main_lock.c (nonexistent) +++ head/net/asterisk16/files/patch-main_lock.c (revision 542417) @@ -0,0 +1,12 @@ +--- main/lock.c.orig 2020-07-09 15:39:17 UTC ++++ main/lock.c +@@ -689,9 +689,6 @@ int __ast_rwlock_init(int tracking, const char *filena + #endif /* DEBUG_THREADS */ + + pthread_rwlockattr_init(&attr); +-#ifdef HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP +- pthread_rwlockattr_setkind_np(&attr, PTHREAD_RWLOCK_PREFER_WRITER_NP); +-#endif + res = pthread_rwlock_init(&t->lock, &attr); + pthread_rwlockattr_destroy(&attr); + Property changes on: head/net/asterisk16/files/patch-main_lock.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/asterisk16/files/patch-third-party_pjproject_Makefile =================================================================== --- head/net/asterisk16/files/patch-third-party_pjproject_Makefile (revision 542416) +++ head/net/asterisk16/files/patch-third-party_pjproject_Makefile (revision 542417) @@ -1,28 +1,28 @@ ---- third-party/pjproject/Makefile.orig 2020-04-30 14:11:40 UTC +--- third-party/pjproject/Makefile.orig 2020-07-09 15:39:17 UTC +++ third-party/pjproject/Makefile @@ -88,14 +88,10 @@ _all: $(TARGETS) .DELETE_ON_ERROR: -$(DOWNLOAD_DIR)/$(TARBALL_FILE): ../versions.mak - $(CMD_PREFIX) ($(TARBALL_EXISTS) && $(TARBALL_VERIFY) && touch $@) || (rm -rf $@ ;\ - $(TARBALL_DOWNLOAD)) || (rm -rf $@ ;\ - $(SHELL_ECHO_PREFIX) Retrying download ; $(TARBALL_DOWNLOAD)) +$(DOWNLOAD_DIR)/$(TARBALL_FILE): + @true source/.unpacked: $(DOWNLOAD_DIR)/$(TARBALL_FILE) - $(CMD_PREFIX) $(TARBALL_VERIFY) || (rm -rf $@ ;\ - $(SHELL_ECHO_PREFIX) Retrying download ; $(TARBALL_DOWNLOAD)) $(ECHO_PREFIX) Unpacking $< -@rm -rf source pjproject-*/ >/dev/null 2>&1 $(CMD_PREFIX) $(TAR) -xjf $< @@ -155,7 +151,7 @@ $(PJSIP_LIB_FILES): $(PJLIB_UTIL_LIB_FILES) pjproject.symbols: $(ALL_LIB_FILES) $(ECHO_PREFIX) Generating symbols - $(CMD_PREFIX) $(NM) -Pog $(ALL_LIB_FILES) | $(SED) -n -r -e "s/.+: ([pP][jJ][^ ]+) .+/\1/gp" | sort -u > pjproject.symbols + $(CMD_PREFIX) $(NM) -Pog $(ALL_LIB_FILES) | $(SED) -n -r -e "s/^([pP][jJ][^ ]+) .+/\1/gp" | sort -u > pjproject.symbols source/pjsip-apps/src/asterisk_malloc_debug.c: patches/asterisk_malloc_debug.c $(ECHO_PREFIX) Copying $< to $@ Index: head/net/asterisk16/files/patch-third-party_pjproject_Makefile.rules =================================================================== --- head/net/asterisk16/files/patch-third-party_pjproject_Makefile.rules (revision 542416) +++ head/net/asterisk16/files/patch-third-party_pjproject_Makefile.rules (revision 542417) @@ -1,11 +1,20 @@ ---- third-party/pjproject/Makefile.rules.orig 2020-03-12 14:44:05 UTC +--- third-party/pjproject/Makefile.rules.orig 2020-07-09 15:39:17 UTC +++ third-party/pjproject/Makefile.rules +@@ -7,7 +7,7 @@ + # PACKAGE_URL ?= http://www.pjsip.org/release/$(PJPROJECT_VERSION) + + PACKAGE_URL ?= https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/$(PJPROJECT_VERSION) +-TARBALL_FILE = pjproject-$(PJPROJECT_VERSION).tar.bz2 ++TARBALL_FILE = pjsip-pjproject-$(PJPROJECT_VERSION)_GH0.tar.gz + + # PJPROJECT_CONFIGURE_OPTS could come from the command line or could be + # set/modified by configure.m4 if the build or host tuples aren't the same @@ -37,7 +37,7 @@ PJPROJECT_CONFIG_OPTS = $(PJPROJECT_CONFIGURE_OPTS) -- --disable-ipp \ --disable-libwebrtc \ --without-external-pa \ - --without-external-srtp + --with-external-srtp ifneq ($(AST_DEVMODE),yes) PJPROJECT_CONFIG_OPTS += --disable-resample --disable-g711-codec