Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

asterisk-15.x: drop support for asterisk-15.x

Browse source 
This commit drops support for asterisk-15.x in favor
of asterisk-16.x.

Signed-off-by: Jiri Slachta <jiri@slachta.eu>
This commit is contained in:
Jiri Slachta 2019-05-05 22:10:53 +02:00
parent 0dd32f9d51
commit cf51b9b0ff
18 changed files with 0 additions and 1370 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
net/asterisk-15.x-chan-lantiq/Makefile
View file

@ -1,77 +0,0 @@
#
# Copyright (C) 2018 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk15-chan-lantiq
PKG_VERSION:=20180215
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/kochstefan/asterisk_channel_lantiq.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=c9d68dd06fcd46ac7985df45f8c2b8833e658f8e
PKG_MIRROR_HASH:=8666c18b24adf9da3ddf12306fcf0a8b4f56860c256b172bd0ba5c2a7a3ab25e
PKG_SOURCE_PROTO:=git
PKG_LICENSE:=GPL-2.0
PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
PKG_FLAGS:=nonshared
include $(INCLUDE_DIR)/package.mk
define Package/$(PKG_NAME)
SUBMENU:=Telephony Lantiq
SECTION:=net
CATEGORY:=Network
TITLE:=Lantiq channel driver
URL:=https://github.com/kochstefan/asterisk_channel_lantiq
DEPENDS:=+asterisk15 +kmod-ltq-vmmc
endef
define Package/$(PKG_NAME)/description
An implementation of a Lantiq TAPI channel driver for Asterisk 15.
endef
define Package/$(PKG_NAME)/conffiles
/etc/asterisk/lantiq.conf
endef
define Build/Prepare
$(call Build/Prepare/Default)
$(INSTALL_DATA) ./files/default.exports \
$(PKG_BUILD_DIR)/src/channels/chan_lantiq.exports
endef
define Build/Compile
cd $(PKG_BUILD_DIR)/src/channels && \
$(TARGET_CC) -o chan_lantiq.o -c chan_lantiq.c -MD -MT chan_lantiq.o \
-MF .chan_lantiq.o.d -MP -pthread \
$(TARGET_CFLAGS) -DAST_MODULE_SELF_SYM=__internal_chan_lantiq_self \
-I$(STAGING_DIR)/usr/include/asterisk-15/include \
$(TARGET_CPPFLAGS) \
-Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations $(FPIC) -DAST_MODULE=\"chan_lantiq\" && \
$(TARGET_CC) -o chan_lantiq.so -pthread $(TARGET_LDFLAGS) -shared \
-Wl,--version-script,chan_lantiq.exports,--warn-common \
chan_lantiq.o
endef
define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/etc/asterisk
$(INSTALL_CONF) \
$(PKG_BUILD_DIR)/src/configs/samples/lantiq.conf.sample \
$(1)/etc/asterisk/lantiq.conf
$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
$(INSTALL_BIN) \
$(PKG_BUILD_DIR)/src/channels/chan_lantiq.so \
$(1)/usr/lib/asterisk/modules
endef
$(eval $(call BuildPackage,$(PKG_NAME)))

8
net/asterisk-15.x-chan-lantiq/files/default.exports
View file

@ -1,8 +0,0 @@
{
global:
/* See main/asterisk.exports.in for an explanation why this is
* needed. */
_IO_stdin_used;
local:
*;
};

11
net/asterisk-15.x/Config.in
View file

@ -1,11 +0,0 @@
menu "Advanced configuration"
depends on PACKAGE_asterisk15
config ASTERISK15_LOW_MEMORY
bool "Optimize Asterisk 15 for low memory usage"
default n
help
Warning: this feature is known to cause problems with some modules.
Disable it if you experience problems like segmentation faults.
endmenu

1024
net/asterisk-15.x/Makefile
View file

File diff suppressed because it is too large Load diff

4
net/asterisk-15.x/files/asterisk.default
View file

@ -1,4 +0,0 @@
## startup options for /etc/init.d/asterisk
ENABLE_ASTERISK="yes"
OPTIONS=""

33
net/asterisk-15.x/files/asterisk.init
View file

@ -1,33 +0,0 @@
#!/bin/sh /etc/rc.common
# Copyright (C) 2014 OpenWrt.org
START=99
APP=asterisk
OPTIONS=
DEST=
DEFAULT=$DEST/etc/default/$APP
BIN_FILE=$DEST/usr/sbin/$APP
PID_FILE=$DEST/var/run/$APP/$APP.pid
start() {
[ -f $DEFAULT ] && . $DEFAULT
[ -d $DEST/var/run/asterisk ] || mkdir -p $DEST/var/run/asterisk
[ -d $DEST/var/log/asterisk ] || mkdir -p $DEST/var/log/asterisk
[ -d $DEST/var/spool/asterisk ] || mkdir -p $DEST/var/spool/asterisk
[ -d $DEST/var/lib/asterisk ] || mkdir -p $DEST/var/lib/asterisk
[ -d $DEST/var/lib/asterisk/keys ] || mkdir -p $DEST/var/lib/asterisk/keys
[ -d $DEST/var/log/asterisk/cdr-csv ] || mkdir -p $DEST/var/log/asterisk/cdr-csv
SERVICE_PID_FILE="/var/run/asterisk/asterisk.pid" \
service_start $BIN_FILE $OPTIONS
}
stop() {
SERVICE_PID_FILE="/var/run/asterisk/asterisk.pid" \
service_stop $BIN_FILE
}
reload() {
SERVICE_PID_FILE="/var/run/asterisk/asterisk.pid" \
service_reload $BIN_FILE
}

22
net/asterisk-15.x/patches/001-disable-semaphores-check.patch
View file

@ -1,22 +0,0 @@
--- a/configure.ac
+++ b/configure.ac
@@ -1062,19 +1062,6 @@ AC_LINK_IFELSE(
]
)
-# Some platforms define sem_init(), but only support sem_open(). joyous.
-AC_MSG_CHECKING(for working unnamed semaphores)
-AC_RUN_IFELSE(
- [AC_LANG_PROGRAM([#include <semaphore.h>],
- [sem_t sem; return sem_init(&sem, 0, 0);])],
- AC_MSG_RESULT(yes)
- AC_DEFINE([HAS_WORKING_SEMAPHORE], 1, [Define to 1 if anonymous semaphores work.]),
- AC_MSG_RESULT(no),
- AC_MSG_RESULT(cross-compile)
- AC_MSG_NOTICE([WARNING: result yes guessed because of cross compilation])
- AC_DEFINE([HAS_WORKING_SEMAPHORE], 1, [Define to 1 if anonymous semaphores work.])
-)
-
LIBS="$save_LIBS"
CFLAGS="$save_CFLAGS"
if test "${ac_cv_pthread_rwlock_timedwrlock}" = "yes"; then

10
net/asterisk-15.x/patches/002-undef-res-ninit.patch
View file

@ -1,10 +0,0 @@
--- a/configure.ac
+++ b/configure.ac
@@ -1409,7 +1409,6 @@ AC_LINK_IFELSE(
#include <resolv.h>],
[int foo = res_ninit(NULL);])],
AC_MSG_RESULT(yes)
- AC_DEFINE([HAVE_RES_NINIT], 1, [Define to 1 if your system has the re-entrant resolver functions.])
AC_SEARCH_LIBS(res_9_ndestroy, resolv)
AC_MSG_CHECKING(for res_ndestroy)
AC_LINK_IFELSE(

11
net/asterisk-15.x/patches/004-disable-check-for-hrirs.patch
View file

@ -1,11 +0,0 @@
--- a/configure.ac
+++ b/configure.ac
@@ -2809,7 +2809,7 @@ else
fi
# conf_bridge (binaural rendering): check if HRIRs are available
-AC_CHECK_FILES([bridges/bridge_softmix/include/hrirs.h])
+# AC_CHECK_FILES([bridges/bridge_softmix/include/hrirs.h])
AC_CONFIG_FILES([build_tools/menuselect-deps makeopts])
AST_CHECK_MANDATORY

22
net/asterisk-15.x/patches/030-GNU-GLOB-exts-only-on-glibc.patch
View file

@ -1,22 +0,0 @@
--- a/res/ael/ael.flex
+++ b/res/ael/ael.flex
@@ -601,7 +601,7 @@ includes { STORE_POS; return KW_INCLUDES
snprintf(fnamebuf2,sizeof(fnamebuf2), "%s/%s", (char *)ast_config_AST_CONFIG_DIR, fnamebuf);
ast_copy_string(fnamebuf,fnamebuf2,sizeof(fnamebuf));
}
-#ifdef SOLARIS
+#if !defined(HAVE_GLOB_NOMAGIC) || !defined(HAVE_GLOB_BRACE) || defined(DEBUG_NONGNU)
glob_ret = glob(fnamebuf, GLOB_NOCHECK, NULL, &globbuf);
#else
glob_ret = glob(fnamebuf, GLOB_NOMAGIC|GLOB_BRACE, NULL, &globbuf);
--- a/res/ael/ael_lex.c
+++ b/res/ael/ael_lex.c
@@ -1982,7 +1982,7 @@ YY_RULE_SETUP
snprintf(fnamebuf2,sizeof(fnamebuf2), "%s/%s", (char *)ast_config_AST_CONFIG_DIR, fnamebuf);
ast_copy_string(fnamebuf,fnamebuf2,sizeof(fnamebuf));
}
-#ifdef SOLARIS
+#if !defined(HAVE_GLOB_NOMAGIC) || !defined(HAVE_GLOB_BRACE) || defined(DEBUG_NONGNU)
glob_ret = glob(fnamebuf, GLOB_NOCHECK, NULL, &globbuf);
#else
glob_ret = glob(fnamebuf, GLOB_NOMAGIC|GLOB_BRACE, NULL, &globbuf);

11
net/asterisk-15.x/patches/053-musl-mutex-init.patch
View file

@ -1,11 +0,0 @@
--- a/include/asterisk/lock.h
+++ b/include/asterisk/lock.h
@@ -66,7 +66,7 @@
#define AST_PTHREADT_NULL (pthread_t) -1
#define AST_PTHREADT_STOP (pthread_t) -2
-#if (defined(SOLARIS) || defined(BSD))
+#if (defined(SOLARIS) || defined(BSD) || !defined(HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP))
#define AST_MUTEX_INIT_W_CONSTRUCTORS
#endif /* SOLARIS || BSD */

10
net/asterisk-15.x/patches/056-fix-check_expr2-build.patch
View file

@ -1,10 +0,0 @@
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -183,7 +183,6 @@ check_expr2: $(ASTTOPDIR)/main/ast_expr2
$(CC) -g -o check_expr2 ast_expr2fz.o ast_expr2z.o -lm $(_ASTLDFLAGS)
$(ECHO_PREFIX) echo " [RM] ast_expr2fz.o ast_expr2z.o"
rm ast_expr2z.o ast_expr2fz.o
- ./check_expr2 expr2.testinput
smsq: smsq.o strcompat.o
smsq: LIBS+=$(POPT_LIB)

28
net/asterisk-15.x/patches/100-build-reproducibly.patch
View file

@ -1,28 +0,0 @@
--- a/build_tools/make_build_h
+++ b/build_tools/make_build_h
@@ -5,6 +5,14 @@ MACHINE=`uname -m | sed 's/\\\\/\\\\\\\
OS=`uname -s`
USER=`id | awk -F")" '{print $1}'| awk -F"(" '{print $2}' | sed 's/\\\\/\\\\\\\\/g'`
DATE=`date -u "+%Y-%m-%d %H:%M:%S"`
+if [ -n "${SOURCE_DATE_EPOCH}" ]; then
+ # building reproducibly, faking some data
+ HOSTNAME='buildd.debian.org'
+ KERNEL='unknown'
+ MACHINE='unknown'
+ USER='nobody'
+ DATE=`date -u "+%Y-%m-%d %H:%M:%S" -d @${SOURCE_DATE_EPOCH}`
+fi
cat << END
/*
* build.h
--- a/Makefile
+++ b/Makefile
@@ -487,7 +487,7 @@ doc/core-en_US.xml: makeopts .lastclean
@echo "<docs xmlns:xi=\"http://www.w3.org/2001/XInclude\">" >> $@
@for x in $(MOD_SUBDIRS); do \
printf "$$x " ; \
- for i in `find $$x -name '*.c'`; do \
+ for i in `find $$x -name '*.c' | LC_ALL=C sort`; do \
$(AWK) -f build_tools/get_documentation $$i >> $@ ; \
done ; \
done

34
net/asterisk-15.x/patches/110-AST-2019-001-15.diff
View file

@ -1,34 +0,0 @@
From 476d60f850c75ca9142aaf783992db74efea6a49 Mon Sep 17 00:00:00 2001
From: George Joseph <gjoseph@digium.com>
Date: Wed, 30 Jan 2019 12:25:55 -0700
Subject: [PATCH] res_pjsip_sdp_rtp: Fix return code from apply_negotiated_sdp_stream
apply_negotiated_sdp_stream was returning a "1" when no joint
capabilities were found on an outgoing call instead of a "-1".
This indicated to res_pjsip_session that the handler DID handle
the sdp when in fact it didn't. Without the appropriate setup,
a subsequent media frame coming in would have an invalid stream_num
and cause a seg fault when the stream was attempted to be retrieved.
apply_negotiated_sdp_stream now returns the correct "-1" and any
media is now discarded before it reaches the core stream processing.
ASTERISK-28620
Reported by: Sotiris Ganouris
Change-Id: Ia095cb16b4862f2f6ad6d2d2a77453fa2542371f
---
diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c
index e2067cc..7f5a859 100644
--- a/res/res_pjsip_sdp_rtp.c
+++ b/res/res_pjsip_sdp_rtp.c
@@ -1941,7 +1941,7 @@
}
if (set_caps(session, session_media, session_media_transport, remote_stream, 0, asterisk_stream)) {
- return 1;
+ return -1;
}
/* Set the channel uniqueid on the RTP instance now that it is becoming active */

16
net/asterisk-chan-dongle/Makefile
View file

@ -47,12 +47,6 @@ $(call Package/asterisk-chan-dongle/Default)
VARIANT:=asterisk13
endef
define Package/asterisk15-chan-dongle
$(call Package/asterisk-chan-dongle/Default)
DEPENDS+=asterisk15
VARIANT:=asterisk15
endef
define Package/asterisk16-chan-dongle
$(call Package/asterisk-chan-dongle/Default)
DEPENDS+=asterisk16
@ -64,7 +58,6 @@ define Package/description/Default
endef
Package/asterisk13-chan-dongle/description = $(Package/description/Default)
Package/asterisk15-chan-dongle/description = $(Package/description/Default)
Package/asterisk16-chan-dongle/description = $(Package/description/Default)
ifeq ($(BUILD_VARIANT),asterisk13)
@ -73,12 +66,6 @@ ifeq ($(BUILD_VARIANT),asterisk13)
--with-astversion=13
endif
ifeq ($(BUILD_VARIANT),asterisk15)
CHAN_DONGLE_AST_HEADERS:=$(STAGING_DIR)/usr/include/asterisk-15/include
CONFIGURE_ARGS+= \
--with-astversion=15
endif
ifeq ($(BUILD_VARIANT),asterisk16)
CHAN_DONGLE_AST_HEADERS:=$(STAGING_DIR)/usr/include/asterisk-16/include
CONFIGURE_ARGS+= \
@ -103,7 +90,6 @@ define Package/conffiles/Default
endef
Package/asterisk13-chan-dongle/conffiles = $(Package/conffiles/Default)
Package/asterisk15-chan-dongle/conffiles = $(Package/conffiles/Default)
Package/asterisk16-chan-dongle/conffiles = $(Package/conffiles/Default)
define Package/Install/Default
@ -114,9 +100,7 @@ define Package/Install/Default
endef
Package/asterisk13-chan-dongle/install = $(Package/Install/Default)
Package/asterisk15-chan-dongle/install = $(Package/Install/Default)
Package/asterisk16-chan-dongle/install = $(Package/Install/Default)
$(eval $(call BuildPackage,asterisk13-chan-dongle))
$(eval $(call BuildPackage,asterisk15-chan-dongle))
$(eval $(call BuildPackage,asterisk16-chan-dongle))

21
net/asterisk-chan-sccp/Makefile
View file

@ -55,19 +55,6 @@ $(call Package/chan-sccp/Default)
CONFLICTS:=asterisk13-chan-skinny
endef
define Package/asterisk15-chan-sccp
$(call Package/chan-sccp/Default)
DEPENDS += asterisk15 \
+asterisk15-bridge-holding \
+asterisk15-bridge-native-rtp \
+asterisk15-bridge-simple \
+asterisk15-bridge-softmix \
+asterisk15-res-stasis-device-state \
+asterisk15-voicemail
VARIANT:=asterisk15
CONFLICTS:=asterisk15-chan-skinny
endef
define Package/asterisk16-chan-sccp
$(call Package/chan-sccp/Default)
DEPENDS += asterisk16 \
@ -88,7 +75,6 @@ feature buttons and custom device state.
endef
Package/asterisk13-chan-sccp/description = $(Package/description/Default)
Package/asterisk15-chan-sccp/description = $(Package/description/Default)
Package/asterisk16-chan-sccp/description = $(Package/description/Default)
CONFIGURE_ARGS += \
@ -101,10 +87,6 @@ ifeq ($(BUILD_VARIANT),asterisk13)
CONFIGURE_ARGS += --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-13
endif
ifeq ($(BUILD_VARIANT),asterisk15)
CONFIGURE_ARGS += --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-15
endif
ifeq ($(BUILD_VARIANT),asterisk16)
CONFIGURE_ARGS += --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-16
endif
@ -114,7 +96,6 @@ define Package/conffiles/Default
endef
Package/asterisk13-chan-sccp/conffiles = $(Package/conffiles/Default)
Package/asterisk15-chan-sccp/conffiles = $(Package/conffiles/Default)
Package/asterisk16-chan-sccp/conffiles = $(Package/conffiles/Default)
define Package/Install/Default
@ -125,9 +106,7 @@ define Package/Install/Default
endef
Package/asterisk13-chan-sccp/install = $(Package/Install/Default)
Package/asterisk15-chan-sccp/install = $(Package/Install/Default)
Package/asterisk16-chan-sccp/install = $(Package/Install/Default)
$(eval $(call BuildPackage,asterisk13-chan-sccp))
$(eval $(call BuildPackage,asterisk15-chan-sccp))
$(eval $(call BuildPackage,asterisk16-chan-sccp))

15
net/asterisk-g72x/Makefile
View file

@ -42,12 +42,6 @@ $(call Package/asterisk-g72x/Default)
VARIANT:=asterisk13
endef
define Package/asterisk15-codec-g729
$(call Package/asterisk-g72x/Default)
DEPENDS+=asterisk15
VARIANT:=asterisk15
endef
define Package/asterisk16-codec-g729
$(call Package/asterisk-g72x/Default)
DEPENDS+=asterisk16
@ -59,7 +53,6 @@ define Package/description/Default
endef
Package/asterisk13-codec-g729/description = $(Package/description/Default)
Package/asterisk15-codec-g729/description = $(Package/description/Default)
Package/asterisk16-codec-g729/description = $(Package/description/Default)
CONFIGURE_ARGS+= \
@ -72,12 +65,6 @@ CONFIGURE_ARGS+= \
--with-asterisk130
endif
ifeq ($(BUILD_VARIANT),asterisk15)
CONFIGURE_ARGS+= \
--with-asterisk-includes=$(STAGING_DIR)/usr/include/asterisk-15/include \
--with-asterisk150
endif
ifeq ($(BUILD_VARIANT),asterisk16)
CONFIGURE_ARGS+= \
--with-asterisk-includes=$(STAGING_DIR)/usr/include/asterisk-16/include \
@ -91,9 +78,7 @@ define Package/Install/Default
endef
Package/asterisk13-codec-g729/install = $(Package/Install/Default)
Package/asterisk15-codec-g729/install = $(Package/Install/Default)
Package/asterisk16-codec-g729/install = $(Package/Install/Default)
$(eval $(call BuildPackage,asterisk13-codec-g729))
$(eval $(call BuildPackage,asterisk15-codec-g729))
$(eval $(call BuildPackage,asterisk16-codec-g729))

13
net/asterisk-opus/Makefile
View file

@ -47,12 +47,6 @@ $(call Package/$(PKG_NAME)/Default)
VARIANT:=asterisk13
endef
define Package/asterisk15-codec-opus
$(call Package/$(PKG_NAME)/Default)
DEPENDS+=asterisk15
VARIANT:=asterisk15
endef
define Package/asterisk16-codec-opus
$(call Package/$(PKG_NAME)/Default)
DEPENDS+=asterisk16
@ -74,17 +68,12 @@ define Package/description/Default
endef
Package/asterisk13-codec-opus/description = $(Package/description/Default)
Package/asterisk15-codec-opus/description = $(Package/description/Default)
Package/asterisk16-codec-opus/description = $(Package/description/Default)
ifeq ($(BUILD_VARIANT),asterisk13)
TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/asterisk-13/include
endif
ifeq ($(BUILD_VARIANT),asterisk15)
TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/asterisk-15/include
endif
ifeq ($(BUILD_VARIANT),asterisk16)
TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/asterisk-16/include
endif
@ -96,12 +85,10 @@ define Package/Install/Default
endef
Package/asterisk13-codec-opus/install = $(Package/Install/Default)
Package/asterisk15-codec-opus/install = $(Package/Install/Default)
Package/asterisk16-codec-opus/install = $(Package/Install/Default)
define Build/Configure
endef
$(eval $(call BuildPackage,asterisk13-codec-opus))
$(eval $(call BuildPackage,asterisk15-codec-opus))
$(eval $(call BuildPackage,asterisk16-codec-opus))