diff options
author | Guido Falsi <madpilot@FreeBSD.org> | 2018-10-31 23:42:52 +0000 |
---|---|---|
committer | Guido Falsi <madpilot@FreeBSD.org> | 2018-10-31 23:42:52 +0000 |
commit | 9b8e085afc2ee94e6ee30defae45bf8451ffec3b (patch) | |
tree | 413da38807a95d0404b44f2e81ccd45e61991b58 /net/asterisk16/files | |
parent | bce536374e3406f2cb6d798296aca6f4d521fce2 (diff) | |
download | ports-9b8e085afc2ee94e6ee30defae45bf8451ffec3b.tar.gz ports-9b8e085afc2ee94e6ee30defae45bf8451ffec3b.zip |
Notes
Diffstat (limited to 'net/asterisk16/files')
-rw-r--r-- | net/asterisk16/files/asterisk.in | 81 | ||||
-rw-r--r-- | net/asterisk16/files/patch-Makefile | 122 | ||||
-rw-r--r-- | net/asterisk16/files/patch-agi__Makefile | 13 | ||||
-rw-r--r-- | net/asterisk16/files/patch-channels-chan_dahdi.c | 33 | ||||
-rw-r--r-- | net/asterisk16/files/patch-channels__sip__include__sip.h | 11 | ||||
-rw-r--r-- | net/asterisk16/files/patch-configure | 78 | ||||
-rw-r--r-- | net/asterisk16/files/patch-contrib_Makefile | 15 | ||||
-rw-r--r-- | net/asterisk16/files/patch-main__Makefile | 16 | ||||
-rw-r--r-- | net/asterisk16/files/patch-main__asterisk.exports.in | 11 | ||||
-rw-r--r-- | net/asterisk16/files/patch-main__http.c | 11 | ||||
-rw-r--r-- | net/asterisk16/files/patch-main__lock.c | 12 | ||||
-rw-r--r-- | net/asterisk16/files/patch-res_res__pjsip_pjsip__cli.c | 11 |
12 files changed, 414 insertions, 0 deletions
diff --git a/net/asterisk16/files/asterisk.in b/net/asterisk16/files/asterisk.in new file mode 100644 index 000000000000..87127d3e9b32 --- /dev/null +++ b/net/asterisk16/files/asterisk.in @@ -0,0 +1,81 @@ +#!/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 +# + +. /etc/rc.subr + +name=asterisk +rcvar=asterisk_enable +desc="Asterisk PBX server" + +load_rc_config $name + +: ${asterisk_enable:=NO} +: ${asterisk_user:=%%ASTERISK_USER%%} +: ${asterisk_args=-n} +: ${asterisk_pidfile:=/var/run/asterisk/asterisk.pid} +: ${asterisk_stopsleep:=0} + +extra_commands=reload + +start_precmd=asterisk_precmd +stop_cmd=asterisk_stop +reload_cmd=asterisk_reload + +command="%%PREFIX%%/sbin/asterisk" +command_args="${asterisk_args} -F -U ${asterisk_user}" +pidfile=${asterisk_pidfile} + +asterisk_precmd() +{ + local rundir=${asterisk_pidfile%/*} + if [ ! -d $rundir ] ; then + install -d -m 0755 -o asterisk -g asterisk $rundir + 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' +} + +run_rc_command "$1" diff --git a/net/asterisk16/files/patch-Makefile b/net/asterisk16/files/patch-Makefile new file mode 100644 index 000000000000..e6a1050cfc17 --- /dev/null +++ b/net/asterisk16/files/patch-Makefile @@ -0,0 +1,122 @@ +--- Makefile.orig 2018-08-08 16:02:31 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 + $(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 + "$(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 + 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)),) + @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 + # (2) the extension to strip off + define INSTALL_CONFIGS + @for x in configs/$(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 + -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 +@@ -810,7 +801,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/asterisk16/files/patch-agi__Makefile b/net/asterisk16/files/patch-agi__Makefile new file mode 100644 index 000000000000..59d928b697b3 --- /dev/null +++ b/net/asterisk16/files/patch-agi__Makefile @@ -0,0 +1,13 @@ +--- 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 diff --git a/net/asterisk16/files/patch-channels-chan_dahdi.c b/net/asterisk16/files/patch-channels-chan_dahdi.c new file mode 100644 index 000000000000..06be04cc4886 --- /dev/null +++ b/net/asterisk16/files/patch-channels-chan_dahdi.c @@ -0,0 +1,33 @@ +--- channels/chan_dahdi.c.orig 2018-08-08 16:02:31 UTC ++++ channels/chan_dahdi.c +@@ -4599,6 +4599,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) +@@ -4629,7 +4631,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 { +@@ -4663,8 +4667,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/asterisk16/files/patch-channels__sip__include__sip.h b/net/asterisk16/files/patch-channels__sip__include__sip.h new file mode 100644 index 000000000000..a5ed190fc7c5 --- /dev/null +++ b/net/asterisk16/files/patch-channels__sip__include__sip.h @@ -0,0 +1,11 @@ +--- 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 diff --git a/net/asterisk16/files/patch-configure b/net/asterisk16/files/patch-configure new file mode 100644 index 000000000000..56755814c1c1 --- /dev/null +++ b/net/asterisk16/files/patch-configure @@ -0,0 +1,78 @@ +--- configure.orig 2018-08-08 16:02:31 UTC ++++ configure +@@ -4661,8 +4661,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 +@@ -20328,6 +20326,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6 + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ ++ #include <sys/types.h> ++ #include <sys/socket.h> + #include <ifaddrs.h> + int + main () +@@ -29156,6 +29156,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. +@@ -29170,13 +29172,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. */ + +@@ -29218,7 +29220,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" +@@ -29228,8 +29230,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 +@@ -29256,9 +29258,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/asterisk16/files/patch-contrib_Makefile b/net/asterisk16/files/patch-contrib_Makefile new file mode 100644 index 000000000000..1b2e67909406 --- /dev/null +++ b/net/asterisk16/files/patch-contrib_Makefile @@ -0,0 +1,15 @@ +--- contrib/Makefile.orig 2017-04-12 21:47:53 UTC ++++ contrib/Makefile +@@ -24,10 +24,10 @@ 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/refcounter.py "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.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/refcounter.py" diff --git a/net/asterisk16/files/patch-main__Makefile b/net/asterisk16/files/patch-main__Makefile new file mode 100644 index 000000000000..21f82c0fa065 --- /dev/null +++ b/net/asterisk16/files/patch-main__Makefile @@ -0,0 +1,16 @@ +--- 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 ),) diff --git a/net/asterisk16/files/patch-main__asterisk.exports.in b/net/asterisk16/files/patch-main__asterisk.exports.in new file mode 100644 index 000000000000..c2fe031398e2 --- /dev/null +++ b/net/asterisk16/files/patch-main__asterisk.exports.in @@ -0,0 +1,11 @@ +--- 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: + *; + }; diff --git a/net/asterisk16/files/patch-main__http.c b/net/asterisk16/files/patch-main__http.c new file mode 100644 index 000000000000..db0d1afd44ef --- /dev/null +++ b/net/asterisk16/files/patch-main__http.c @@ -0,0 +1,11 @@ +--- 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; + diff --git a/net/asterisk16/files/patch-main__lock.c b/net/asterisk16/files/patch-main__lock.c new file mode 100644 index 000000000000..c1111fa8bbac --- /dev/null +++ b/net/asterisk16/files/patch-main__lock.c @@ -0,0 +1,12 @@ +--- 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); + diff --git a/net/asterisk16/files/patch-res_res__pjsip_pjsip__cli.c b/net/asterisk16/files/patch-res_res__pjsip_pjsip__cli.c new file mode 100644 index 000000000000..1a03ed498b98 --- /dev/null +++ b/net/asterisk16/files/patch-res_res__pjsip_pjsip__cli.c @@ -0,0 +1,11 @@ +--- res/res_pjsip/pjsip_cli.c.orig 2017-12-20 20:39:39 UTC ++++ res/res_pjsip/pjsip_cli.c +@@ -163,7 +163,7 @@ char *ast_sip_cli_traverse_objects(struct ast_cli_entr + } + regex = a->argv[4]; + } else { +- regex = ""; ++ regex = "."; + } + + if (cmd == CLI_GENERATE |