cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update asterisk13 to 13.35.0

Browse Source 
- Asterisk project now embeds pjsip 2.10, get it's distribution
  from github and adapt port
- Remove patch merged upstream
- Refresh patches and rename to current naming scheme
- Reorder some variables to silnce portlint warning
This commit is contained in:
Guido Falsi 2020-07-17 08:21:24 +00:00
parent f9cb27aa85
commit dc0a2a9488
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=542416
14 changed files with 51 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
net/asterisk13/Makefile
View File

@ -1,17 +1,14 @@
# $FreeBSD$
PORTNAME= asterisk
PORTVERSION= 13.34.0
PORTREVISION= 1
PORTVERSION= 13.35.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= 13
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
pjproject-${PJSIP_VERSION}.tar.bz2:PJSIP
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= madpilot@FreeBSD.org
@ -20,12 +17,10 @@ COMMENT= Open Source PBX and telephony toolkit
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
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}
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
@ -34,7 +29,9 @@ 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 \
@ -169,6 +166,7 @@ PJSIP_CONFIGURE_WITH= pjproject pjproject-bundled
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

10
net/asterisk13/distinfo
View File

@ -1,11 +1,11 @@
TIMESTAMP = 1591868255
SHA256 (asterisk/asterisk-13.34.0.tar.gz) = 6f5e47372f7b02c77e435b20e1ef980e95ba9a9a56077c45bb473724bfc48de0
SIZE (asterisk/asterisk-13.34.0.tar.gz) = 33686020
SHA256 (asterisk/pjproject-2.9.tar.bz2) = d185ef7855c8ec07191dde92f54b65a7a4b7a6f7bf8c46f7af35ceeb1da2a636
SIZE (asterisk/pjproject-2.9.tar.bz2) = 5009546
TIMESTAMP = 1594922486
SHA256 (asterisk/asterisk-13.35.0.tar.gz) = ac9b54f2fa42000e9cb3445f59784de317c25f99818169d97cce4f9983005ae3
SIZE (asterisk/asterisk-13.35.0.tar.gz) = 33685340
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

16
net/asterisk13/files/patch-Makefile
View File

@ -1,4 +1,4 @@
--- Makefile.orig 2018-08-28 19:07:13 UTC
--- Makefile.orig 2020-07-09 15:33:47 UTC
+++ Makefile
@@ -141,7 +141,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
OVERWRITE=y
@ -27,7 +27,7 @@
_ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
endif
@@ -466,8 +466,12 @@ endif
@@ -470,8 +470,12 @@ endif
$(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
done \
fi
@ -41,7 +41,7 @@
done
$(MAKE) -C sounds install
find rest-api -name "*.json" | while read x; do \
@@ -566,7 +570,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI
@@ -569,7 +573,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)" \
@ -50,7 +50,7 @@
installdirs:
@for i in $(INSTALLDIRS); do \
@@ -605,10 +609,10 @@ endif
@@ -602,10 +606,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
@ -65,7 +65,7 @@
$(SUBDIRS_INSTALL):
+@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTDATADIR="$(ASTDATADIR)" $(SUBMAKE) -C $(@:-install=) install
@@ -723,7 +727,7 @@ ifneq ($(filter ~%,$(DESTDIR)),)
@@ -720,7 +724,7 @@ ifneq ($(filter ~%,$(DESTDIR)),)
@exit 1
endif
@ -74,7 +74,7 @@
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \
fi
@@ -768,23 +772,10 @@ upgrade: bininstall
@@ -765,23 +769,10 @@ upgrade: bininstall
# (2) the extension to strip off
define INSTALL_CONFIGS
@for x in $(1)/*$(2); do \
@ -100,7 +100,7 @@
echo "Updating asterisk.conf" ; \
sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
-e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \
@@ -797,8 +788,8 @@ define INSTALL_CONFIGS
@@ -794,8 +785,8 @@ define INSTALL_CONFIGS
-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
@ -111,7 +111,7 @@
rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
fi
endef
@@ -822,7 +813,7 @@ adsi:
@@ -829,7 +820,7 @@ adsi:
else \
echo "Installing $$x" ; \
fi ; \

2
net/asterisk13/files/patch-agi__Makefile → net/asterisk13/files/patch-agi_Makefile
View File

@ -1,4 +1,4 @@
--- agi/Makefile.orig 2012-10-14 21:56:13 UTC
--- agi/Makefile.orig 2020-07-09 15:33:47 UTC
+++ agi/Makefile
@@ -16,7 +16,9 @@ ASTTOPDIR?=..

15
net/asterisk13/files/patch-channels-chan_dahdi.c → net/asterisk13/files/patch-channels_chan__dahdi.c
View File

@ -1,4 +1,4 @@
--- channels/chan_dahdi.c.orig 2020-06-11 08:42:48 UTC
--- channels/chan_dahdi.c.orig 2020-07-09 15:33:47 UTC
+++ channels/chan_dahdi.c
@@ -4716,6 +4716,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
return;
@ -30,16 +30,3 @@
if (res)
ast_log(LOG_WARNING, "Unable to disable echo cancellation on channel %d: %s\n", p->channel, strerror(errno));
@@ -18271,8 +18275,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;
+ }
}
}
}

2
net/asterisk13/files/patch-channels__sip__include__sip.h → net/asterisk13/files/patch-channels_sip_include_sip.h
View File

@ -1,4 +1,4 @@
--- channels/sip/include/sip.h.orig 2014-07-24 17:47:29 UTC
--- channels/sip/include/sip.h.orig 2020-07-09 15:33:47 UTC
+++ channels/sip/include/sip.h
@@ -192,7 +192,7 @@
#define DEFAULT_MOHINTERPRET "default" /*!< The default music class */

14
net/asterisk13/files/patch-configure
View File

@ -1,4 +1,4 @@
--- configure.orig 2020-04-30 14:04:41 UTC
--- configure.orig 2020-07-09 15:33:47 UTC
+++ configure
@@ -4667,8 +4667,6 @@ case "${host_os}" in
;;
@ -9,7 +9,7 @@
;;
openbsd*)
ac_default_prefix=/usr/local
@@ -20566,6 +20564,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6
@@ -20570,6 +20568,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -18,7 +18,7 @@
#include <ifaddrs.h>
int
main ()
@@ -29281,6 +29281,8 @@ fi
@@ -29285,6 +29285,8 @@ fi
for ver in 5.3 5.2 5.1; do
@ -27,7 +27,7 @@
if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
pbxlibdir=""
# if --with-LUA=DIR has been specified, use it.
@@ -29296,12 +29298,12 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
@@ -29300,12 +29302,12 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
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
@ -42,7 +42,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -29343,7 +29345,7 @@ fi
@@ -29347,7 +29349,7 @@ fi
# now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then
@ -51,7 +51,7 @@
# if --with-LUA=DIR has been specified, use it.
if test "x${LUA_DIR}" != "x"; then
LUA_INCLUDE="-I${LUA_DIR}/include"
@@ -29354,7 +29356,7 @@ fi
@@ -29358,7 +29360,7 @@ fi
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`
@ -60,7 +60,7 @@
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
LUA_HEADER_FOUND=1
else
@@ -29381,9 +29383,9 @@ fi
@@ -29385,9 +29387,9 @@ fi
if test "x${PBX_LUA}" = "x1" ; then
if test x"${LUA_DIR}" = x; then

2
net/asterisk13/files/patch-contrib_Makefile
View File

@ -1,4 +1,4 @@
--- contrib/Makefile.orig 2017-04-12 21:47:53 UTC
--- contrib/Makefile.orig 2020-07-09 15:33:47 UTC
+++ contrib/Makefile
@@ -24,10 +24,10 @@ install:
$(INSTALL) -m 755 scripts/ast_logescalator "$(DESTDIR)$(ASTDATADIR)/scripts/ast_logescalator"

2
net/asterisk13/files/patch-main__Makefile → net/asterisk13/files/patch-main_Makefile
View File

@ -1,4 +1,4 @@
--- main/Makefile.orig 2017-10-13 17:46:56 UTC
--- main/Makefile.orig 2020-07-09 15:33:47 UTC
+++ main/Makefile
@@ -75,9 +75,12 @@ endif

4
net/asterisk13/files/patch-main__asterisk.exports.in → net/asterisk13/files/patch-main_asterisk.exports.in
View File

@ -1,6 +1,6 @@
--- main/asterisk.exports.in.orig 2017-10-13 17:46:56 UTC
--- main/asterisk.exports.in.orig 2020-07-09 15:33:47 UTC
+++ main/asterisk.exports.in
@@ -70,6 +70,8 @@
@@ -67,6 +67,8 @@
*/
LINKER_SYMBOL_PREFIX_IO_stdin_used;

4
net/asterisk13/files/patch-main__http.c → net/asterisk13/files/patch-main_http.c
View File

@ -1,6 +1,6 @@
--- main/http.c.orig 2017-10-13 17:46:56 UTC
--- main/http.c.orig 2020-07-09 15:33:47 UTC
+++ main/http.c
@@ -2098,7 +2098,7 @@ static int __ast_http_load(int reload)
@@ -2110,7 +2110,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;

4
net/asterisk13/files/patch-main__lock.c → net/asterisk13/files/patch-main_lock.c
View File

@ -1,6 +1,6 @@
--- main/lock.c.orig 2017-10-13 17:46:56 UTC
--- main/lock.c.orig 2020-07-09 15:33:47 UTC
+++ main/lock.c
@@ -703,9 +703,6 @@ int __ast_rwlock_init(int tracking, const char *filena
@@ -700,9 +700,6 @@ int __ast_rwlock_init(int tracking, const char *filena
#endif /* DEBUG_THREADS */
pthread_rwlockattr_init(&attr);

2
net/asterisk13/files/patch-third-party_pjproject_Makefile
View File

@ -1,4 +1,4 @@
--- third-party/pjproject/Makefile.orig 2020-04-30 14:04:41 UTC
--- third-party/pjproject/Makefile.orig 2020-07-09 15:33:47 UTC
+++ third-party/pjproject/Makefile
@@ -90,14 +90,10 @@ _all: $(TARGETS)

11
net/asterisk13/files/patch-third-party_pjproject_Makefile.rules
View File

@ -1,5 +1,14 @@
--- third-party/pjproject/Makefile.rules.orig 2020-03-12 14:37:03 UTC
--- third-party/pjproject/Makefile.rules.orig 2020-07-09 15:33:47 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 \