diff --git a/audio/asterisk-espeak/Makefile b/audio/asterisk-espeak/Makefile index 95bb8a6d98cb..8247862a7333 100644 --- a/audio/asterisk-espeak/Makefile +++ b/audio/asterisk-espeak/Makefile @@ -14,19 +14,24 @@ LICENSE= GPLv2 LIB_DEPENDS= libespeak.so:audio/espeak \ libsamplerate.so:audio/libsamplerate -FLAVORS= asterisk16 asterisk13 +FLAVORS= asterisk16 asterisk18 asterisk13 FLAVOR?= ${FLAVORS:[1]} asterisk13_PKGNAMEPREFIX= asterisk13- -asterisk13_CONFLICTS_INSTALL= asterisk16-espeak +asterisk13_CONFLICTS_INSTALL= asterisk16-espeak asterisk18-espeak asterisk13_BUILD_DEPENDS= asterisk:net/asterisk13 asterisk13_RUN_DEPENDS= asterisk:net/asterisk13 asterisk16_PKGNAMEPREFIX= asterisk16- -asterisk16_CONFLICTS_INSTALL= asterisk13-espeak +asterisk16_CONFLICTS_INSTALL= asterisk13-espeak asterisk18-espeak asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16 asterisk16_RUN_DEPENDS= asterisk:net/asterisk16 +asterisk18_PKGNAMEPREFIX= asterisk18- +asterisk18_CONFLICTS_INSTALL= asterisk13-espeak asterisk16-espeak +asterisk18_BUILD_DEPENDS= asterisk:net/asterisk18 +asterisk18_RUN_DEPENDS= asterisk:net/asterisk18 + USES= compiler:c11 gmake localbase INSTALL_TARGET= install samples diff --git a/audio/asterisk-flite/Makefile b/audio/asterisk-flite/Makefile index 88f1d3b5fd3e..3217e74ac38d 100644 --- a/audio/asterisk-flite/Makefile +++ b/audio/asterisk-flite/Makefile @@ -13,19 +13,24 @@ LICENSE= GPLv2 LIB_DEPENDS= libflite.so:audio/flite -FLAVORS= asterisk16 asterisk13 +FLAVORS= asterisk16 asterisk18 asterisk13 FLAVOR?= ${FLAVORS:[1]} asterisk13_PKGNAMEPREFIX= asterisk13- -asterisk13_CONFLICTS_INSTALL= asterisk16-flite +asterisk13_CONFLICTS_INSTALL= asterisk16-flite asterisk18-flite asterisk13_BUILD_DEPENDS= asterisk:net/asterisk13 asterisk13_RUN_DEPENDS= asterisk:net/asterisk13 asterisk16_PKGNAMEPREFIX= asterisk16- -asterisk16_CONFLICTS_INSTALL= asterisk13-flite +asterisk16_CONFLICTS_INSTALL= asterisk13-flite asterisk18-flite asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16 asterisk16_RUN_DEPENDS= asterisk:net/asterisk16 +asterisk18_PKGNAMEPREFIX= asterisk18- +asterisk18_CONFLICTS_INSTALL= asterisk13-flite asterisk16-flite +asterisk18_BUILD_DEPENDS= asterisk:net/asterisk18 +asterisk18_RUN_DEPENDS= asterisk:net/asterisk18 + USES= compiler:c11 gmake localbase INSTALL_TARGET= install samples diff --git a/net/Makefile b/net/Makefile index a48d353623dc..c02b560a046f 100644 --- a/net/Makefile +++ b/net/Makefile @@ -38,6 +38,7 @@ SUBDIR += asterisk-g72x SUBDIR += asterisk13 SUBDIR += asterisk16 + SUBDIR += asterisk18 SUBDIR += avahi SUBDIR += avahi-app SUBDIR += avahi-autoipd diff --git a/net/asterisk-g72x/Makefile b/net/asterisk-g72x/Makefile index efe675f07ddb..6716ba707e25 100644 --- a/net/asterisk-g72x/Makefile +++ b/net/asterisk-g72x/Makefile @@ -12,11 +12,11 @@ COMMENT= G.729 codec for Asterisk PBX LIB_DEPENDS= libbcg729.so:audio/bcg729 -FLAVORS= asterisk16 asterisk13 +FLAVORS= asterisk16 asterisk18 asterisk13 FLAVOR?= ${FLAVORS:[1]} asterisk13_PKGNAMEPREFIX= asterisk13- -asterisk13_CONFLICTS_INSTALL= asterisk16-g72x +asterisk13_CONFLICTS_INSTALL= asterisk16-g72x asterisk18-g72x asterisk13_BUILD_DEPENDS= asterisk:net/asterisk13 asterisk13_RUN_DEPENDS= asterisk:net/asterisk13 .if ${FLAVOR} == asterisk13 @@ -24,13 +24,21 @@ CONFIGURE_ARGS+= --with-asterisk130 .endif asterisk16_PKGNAMEPREFIX= asterisk16- -asterisk16_CONFLICTS_INSTALL= asterisk13-g72x +asterisk16_CONFLICTS_INSTALL= asterisk13-g72x asterisk18-g72x asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16 asterisk16_RUN_DEPENDS= asterisk:net/asterisk16 .if ${FLAVOR} == asterisk16 CONFIGURE_ARGS+= --with-asterisk160 .endif +asterisk18_PKGNAMEPREFIX= asterisk18- +asterisk18_CONFLICTS_INSTALL= asterisk13-g72x asterisk16-g72x +asterisk18_BUILD_DEPENDS= asterisk:net/asterisk18 +asterisk18_RUN_DEPENDS= asterisk:net/asterisk18 +.if ${FLAVOR} == asterisk18 +CONFIGURE_ARGS+= --with-asterisk160 +.endif + GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-bcg729 USES= autoreconf compiler:c11 libtool localbase tar:bzip2 diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile index ad2e382550e1..5b32cf9c41d7 100644 --- a/net/asterisk13/Makefile +++ b/net/asterisk13/Makefile @@ -57,7 +57,7 @@ MAKE_ARGS+= NOISY_BUILD=yes \ CONFLICTS= ossp-uuid-[0-9]* CONFLICTS_BUILD= linuxthreads-* -CONFLICTS_INSTALL= asterisk16 +CONFLICTS_INSTALL= asterisk16 asterisk18 OPTIONS_DEFINE= ASTVERSION BACKTRACE CURL EXCHANGE FREETDS G729 LDAP LUA \ MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \ diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index ce3f4780e0fa..6d9c235f5dd0 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -57,7 +57,7 @@ MAKE_ARGS+= NOISY_BUILD=yes \ CONFLICTS= ossp-uuid-[0-9]* CONFLICTS_BUILD= linuxthreads-* -CONFLICTS_INSTALL= asterisk13 +CONFLICTS_INSTALL= asterisk13 asterisk18 OPTIONS_DEFINE= ASTVERSION BACKTRACE CURL EXCHANGE FREETDS G729 LDAP LUA MACRO \ MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \ diff --git a/net/asterisk18/Makefile b/net/asterisk18/Makefile new file mode 100644 index 000000000000..b64e5c4fd330 --- /dev/null +++ b/net/asterisk18/Makefile @@ -0,0 +1,302 @@ +# $FreeBSD$ + +PORTNAME= asterisk +PORTVERSION= 18.0.0 +CATEGORIES= net +MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 +MASTER_SITE_SUBDIR= asterisk/ \ + asterisk/old-releases/ \ + sounds/releases/:g729 +PKGNAMESUFFIX= 18 +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 powerpc64le sparc64 + +LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ + libjansson.so:devel/jansson + +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 + +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 asterisk16 + +OPTIONS_DEFINE= ASTVERSION BACKTRACE CURL EXCHANGE FREETDS G729 LDAP LUA MACRO \ + MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \ + SPANDSP SRTP SYSINFO URIPARSER XMLDOC XMPP +OPTIONS_DEFAULT= CURL FREETDS GSM LUA MACRO MP3PLAYER NEWT ODBC OPUS MYSQL PGSQL \ + PJSIP PORTAUDIO RADIUS SNMP SPANDSP SPEEX SRTP URIPARSER \ + VORBIS XMLDOC + +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 +XMLDOC_DESC?= Build and install XML documentation +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 + +XMLDOC_CONFIGURE_ENABLE= xmldoc + +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 diff --git a/net/asterisk18/distinfo b/net/asterisk18/distinfo new file mode 100644 index 000000000000..562d8eb321e3 --- /dev/null +++ b/net/asterisk18/distinfo @@ -0,0 +1,7 @@ +TIMESTAMP = 1603197429 +SHA256 (asterisk/asterisk-18.0.0.tar.gz) = 9b780297c6620d057ef83ada1a0ea13ca9bc2e617c93ef847f2a9f86ba569f9c +SIZE (asterisk/asterisk-18.0.0.tar.gz) = 27920458 +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 diff --git a/net/asterisk18/files/asterisk.in b/net/asterisk18/files/asterisk.in new file mode 100644 index 000000000000..80cfdb093737 --- /dev/null +++ b/net/asterisk18/files/asterisk.in @@ -0,0 +1,86 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: asterisk +# REQUIRE: LOGIN +# KEYWORD: shutdown +# +# Add the following lines to /etc/rc.conf to enable asterisk: +# +# asterisk_enable (bool): Set it to "YES" to enable asterisk +# Default is "NO" +# asterisk_user (string): User asterisk runs as +# Default is %%ASTERISK_USER%% +# asterisk_args (string): Extra argumeents to pass to asterisk at startup +# Default is "-n" +# asterisk_pidfile (string): Location of the asterisk pid file +# Default is /var/run/asterisk/asterisk.pid +# asterisk_stopsleep (int): Number of seconds to sleep before sending stop command +# Default is 0, which disables it +# asterisk_umask (string): File creation mode mask to run asterisk with +# + +. /etc/rc.subr + +name=asterisk +rcvar=asterisk_enable +desc="Asterisk PBX server" + +extra_commands=reload + +start_precmd=asterisk_precmd +stop_cmd=asterisk_stop +reload_cmd=asterisk_reload + +command="%%PREFIX%%/sbin/asterisk" + +asterisk_precmd() +{ + local rundir=${asterisk_pidfile%/*} + if [ ! -d $rundir ] ; then + install -d -m 0755 -o asterisk -g asterisk $rundir + fi + if [ -n "${asterisk_umask}" ]; then + umask ${asterisk_umask} + fi +} + +asterisk_stop() +{ + if [ -z "$rc_pid" ]; then + [ -n "$rc_fast" ] && return 0 + _run_rc_notrunning + return 1 + fi + echo 'Stopping asterisk.' + if [ ${asterisk_stopsleep} -gt 0 ]; then + sleep ${asterisk_stopsleep} + fi + $command -nqrx 'core stop now' + wait_for_pids $rc_pid +} + +asterisk_reload() +{ + if [ -z "$rc_pid" ]; then + _run_rc_notrunning + return 1 + fi + echo 'Reloading asterisk.' + $command -nqrx 'reload' +} + +load_rc_config $name + +: ${asterisk_enable:=NO} +: ${asterisk_user:=%%ASTERISK_USER%%} +: ${asterisk_args=-n} +: ${asterisk_pidfile:=/var/run/asterisk/asterisk.pid} +: ${asterisk_stopsleep:=0} + +command_args="${asterisk_args} -F -U ${asterisk_user}" +pidfile=${asterisk_pidfile} + +run_rc_command "$1" diff --git a/net/asterisk18/files/patch-Makefile b/net/asterisk18/files/patch-Makefile new file mode 100644 index 000000000000..8efa81789178 --- /dev/null +++ b/net/asterisk18/files/patch-Makefile @@ -0,0 +1,131 @@ +--- Makefile.orig 2020-09-09 15:43:27 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 + +@@ -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 \ +@@ -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}/keys/stir_shaken" ++ "$(ASTDATADIR)/third-party" "${ASTDATADIR}/keys/stir_shaken" "$(ASTSPOOLDIR)/outgoing" + + installdirs: + @for i in $(INSTALLDIRS); do \ +@@ -577,7 +581,7 @@ installdirs: + main-bininstall: + +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTLIBDIR="$(ASTLIBDIR)" $(SUBMAKE) -C main bininstall + +-bininstall: _all installdirs $(SUBDIRS_INSTALL) main-bininstall ++bininstall: _all installdirs $(SUBDIRS_INSTALL) main-bininstall install-headers + $(INSTALL) -m 755 contrib/scripts/astversion "$(DESTDIR)$(ASTSBINDIR)/" + $(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/" + $(INSTALL) -m 755 contrib/scripts/autosupport "$(DESTDIR)$(ASTSBINDIR)/" +@@ -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 +@@ -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 +@@ -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)|' \ +@@ -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 +@@ -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 diff --git a/net/asterisk18/files/patch-agi_Makefile b/net/asterisk18/files/patch-agi_Makefile new file mode 100644 index 000000000000..019ad10e1ef9 --- /dev/null +++ b/net/asterisk18/files/patch-agi_Makefile @@ -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 diff --git a/net/asterisk18/files/patch-channels_chan__dahdi.c b/net/asterisk18/files/patch-channels_chan__dahdi.c new file mode 100644 index 000000000000..cc294c5ba840 --- /dev/null +++ b/net/asterisk18/files/patch-channels_chan__dahdi.c @@ -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)); diff --git a/net/asterisk18/files/patch-channels_sip_include_sip.h b/net/asterisk18/files/patch-channels_sip_include_sip.h new file mode 100644 index 000000000000..d1668bf70598 --- /dev/null +++ b/net/asterisk18/files/patch-channels_sip_include_sip.h @@ -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 diff --git a/net/asterisk18/files/patch-configure b/net/asterisk18/files/patch-configure new file mode 100644 index 000000000000..423e14aad59a --- /dev/null +++ b/net/asterisk18/files/patch-configure @@ -0,0 +1,78 @@ +--- 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 +@@ -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 () +@@ -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. +@@ -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. */ + +@@ -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" +@@ -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 +@@ -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 diff --git a/net/asterisk18/files/patch-contrib_Makefile b/net/asterisk18/files/patch-contrib_Makefile new file mode 100644 index 000000000000..dc38a639baad --- /dev/null +++ b/net/asterisk18/files/patch-contrib_Makefile @@ -0,0 +1,23 @@ +--- 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" diff --git a/net/asterisk18/files/patch-main_Makefile b/net/asterisk18/files/patch-main_Makefile new file mode 100644 index 000000000000..dd0dcda5ce7f --- /dev/null +++ b/net/asterisk18/files/patch-main_Makefile @@ -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 ),) diff --git a/net/asterisk18/files/patch-main_asterisk.exports.in b/net/asterisk18/files/patch-main_asterisk.exports.in new file mode 100644 index 000000000000..23b2fde0de7a --- /dev/null +++ b/net/asterisk18/files/patch-main_asterisk.exports.in @@ -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: + *; + }; diff --git a/net/asterisk18/files/patch-main_http.c b/net/asterisk18/files/patch-main_http.c new file mode 100644 index 000000000000..555f3bb34887 --- /dev/null +++ b/net/asterisk18/files/patch-main_http.c @@ -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; + diff --git a/net/asterisk18/files/patch-main_lock.c b/net/asterisk18/files/patch-main_lock.c new file mode 100644 index 000000000000..019735f7079f --- /dev/null +++ b/net/asterisk18/files/patch-main_lock.c @@ -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); + diff --git a/net/asterisk18/files/patch-third-party_pjproject_Makefile b/net/asterisk18/files/patch-third-party_pjproject_Makefile new file mode 100644 index 000000000000..84f44591cb0e --- /dev/null +++ b/net/asterisk18/files/patch-third-party_pjproject_Makefile @@ -0,0 +1,28 @@ +--- third-party/pjproject/Makefile.orig 2020-09-09 15:43:27 UTC ++++ third-party/pjproject/Makefile +@@ -98,14 +98,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 $< +@@ -165,7 +161,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 -E -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 $@ diff --git a/net/asterisk18/files/patch-third-party_pjproject_Makefile.rules b/net/asterisk18/files/patch-third-party_pjproject_Makefile.rules new file mode 100644 index 000000000000..424b4f4a3740 --- /dev/null +++ b/net/asterisk18/files/patch-third-party_pjproject_Makefile.rules @@ -0,0 +1,20 @@ +--- 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 diff --git a/net/asterisk18/pkg-descr b/net/asterisk18/pkg-descr new file mode 100644 index 000000000000..9acc93a1d51a --- /dev/null +++ b/net/asterisk18/pkg-descr @@ -0,0 +1,5 @@ +Asterisk is an Open Source PBX and telephony toolkit. It is, in a +sense, middleware between Internet and telephony channels on the bottom, +and Internet and telephony applications at the top. + +WWW: https://www.asterisk.org diff --git a/net/asterisk18/pkg-message b/net/asterisk18/pkg-message new file mode 100644 index 000000000000..5b79202b6b21 --- /dev/null +++ b/net/asterisk18/pkg-message @@ -0,0 +1,38 @@ +[ +{ type: install + message: <