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

Merge pull request #186 from micmac1/master

Browse source 
New PR: asterisk 11 + 13 (cleanups, fixes and version bumps)
This commit is contained in:
Jiri Slachta 2017-09-11 21:37:34 +02:00 committed by GitHub
commit 426acb6421
5 changed files with 3242 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
net/asterisk-11.x/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2016 OpenWrt.org # Copyright (C) 2017 OpenWrt.org
# Copyright (C) 2016 Cesnet, z.s.p.o. # Copyright (C) 2016 Cesnet, z.s.p.o.
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk11 PKG_NAME:=asterisk11
PKG_VERSION:=11.25.1 PKG_VERSION:=11.25.2
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/
PKG_HASH:=dc9c282ca1142b286e5a5c391647d6be73f35524c8def37718de866e8384a57c PKG_HASH:=59fd3735546cb56bda15f39caf34636c113e68b79019554a007ad63cb6fc2d33
PKG_BUILD_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=libxml2/host PKG_BUILD_DEPENDS:=libxml2/host
@ -47,8 +47,8 @@ define Package/asterisk11/install/sbin
endef endef
define Package/asterisk11/install/sounds define Package/asterisk11/install/sounds
$(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/ $(INSTALL_DIR) $(1)/usr/share/asterisk/sounds/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/$(2) $(1)/usr/lib/asterisk/sounds/ $(CP) $(PKG_INSTALL_DIR)/usr/share/asterisk/sounds/en/$(2) $(1)/usr/share/asterisk/sounds/
endef endef
define Package/$(PKG_NAME)/config define Package/$(PKG_NAME)/config
@ -63,7 +63,7 @@ define BuildAsterisk11Module
endef endef
define Package/asterisk11-$(1)/conffiles define Package/asterisk11-$(1)/conffiles
$(5) $(subst $(space),$(newline),$(foreach c,$(5),$(c)))
endef endef
define Package/asterisk11-$(1)/description define Package/asterisk11-$(1)/description
@ -99,7 +99,7 @@ define Package/asterisk11
$(call Package/asterisk11/Default) $(call Package/asterisk11/Default)
TITLE:=Complete open source PBX, v$(PKG_VERSION) TITLE:=Complete open source PBX, v$(PKG_VERSION)
MENU:=1 MENU:=1
DEPENDS:=+libopenssl +libedit +libncurses +libpopt +libpthread +libsqlite3 +librt +libuuid +zlib @!TARGET_avr32 DEPENDS:=+libopenssl +libncurses +libpopt +libpthread +libsqlite3 +librt +libuuid +zlib @!TARGET_avr32
CONFLICTS:=asterisk13 CONFLICTS:=asterisk13
endef endef
@ -162,10 +162,10 @@ This package provides sounds for Asterisk11.
endef endef
define Package/asterisk11-sounds/install define Package/asterisk11-sounds/install
$(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/ $(INSTALL_DIR) $(1)/usr/share/asterisk/sounds/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/* $(1)/usr/lib/asterisk/sounds/ $(CP) $(PKG_INSTALL_DIR)/usr/share/asterisk/sounds/en/* $(1)/usr/share/asterisk/sounds/
rm -f $(1)/usr/lib/asterisk/sounds/vm-* rm -f $(1)/usr/share/asterisk/sounds/vm-*
rm -f $(1)/usr/lib/asterisk/sounds/conf-* rm -f $(1)/usr/share/asterisk/sounds/conf-*
endef endef
ifneq ($(CONFIG_PACKAGE_asterisk11-chan-dahdi),) ifneq ($(CONFIG_PACKAGE_asterisk11-chan-dahdi),)
@ -201,7 +201,6 @@ endif
ifneq ($(CONFIG_PACKAGE_asterisk11-pbx-lua),) ifneq ($(CONFIG_PACKAGE_asterisk11-pbx-lua),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-lua="$(STAGING_DIR)/usr" --with-lua="$(STAGING_DIR)/usr"
TARGET_LDFLAGS+=-ldl -lcrypt
else else
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--without-lua --without-lua
@ -234,15 +233,15 @@ endif
ifneq ($(CONFIG_PACKAGE_asterisk11-res-xmpp),) ifneq ($(CONFIG_PACKAGE_asterisk11-res-xmpp),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-iksemel="$(STAGING_DIR)/usr" --with-iksemel="$(STAGING_DIR)/usr"
SITE_VARS+= \ CONFIGURE_VARS+= \
ac_cv_lib_iksemel_iks_start_sasl=yes ac_cv_lib_iksemel_iks_start_sasl=yes
else else
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--without-iksemel --without-iksemel
endif endif
EXTRA_CFLAGS+= $(TARGET_CPPFLAGS) TARGET_CFLAGS+=$(TARGET_CPPFLAGS)
EXTRA_LDFLAGS+= $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--build=$(GNU_HOST_NAME) \ --build=$(GNU_HOST_NAME) \
--host=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \
@ -255,7 +254,7 @@ CONFIGURE_ARGS+= \
--with-ilbc=internal \ --with-ilbc=internal \
--without-isdnnet \ --without-isdnnet \
--without-libxml2 \ --without-libxml2 \
--with-libedit="$(STAGING_DIR)/usr" \ --with-libedit=internal \
--without-misdn \ --without-misdn \
--without-nbs \ --without-nbs \
--with-ncurses="$(STAGING_DIR)/usr" \ --with-ncurses="$(STAGING_DIR)/usr" \
@ -298,20 +297,14 @@ endif
endef endef
define Build/Configure define Build/Configure
(cd $(PKG_BUILD_DIR); \ cd $(PKG_BUILD_DIR); \
./bootstrap.sh; \ ./bootstrap.sh
); echo "export CFLAGS=-DNDEBUG=1 $(FPIC) $(TARGET_CFLAGS)" \
echo "export CFLAGS += $(FPIC) $(TARGET_CFLAGS) $(EXTRA_CFLAGS)"\ > $(PKG_BUILD_DIR)/res/pjproject/user.mak
" $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)"\ echo "export LDFLAGS=$(TARGET_LDFLAGS)" \
> $(PKG_BUILD_DIR)/res/pjproject/user.mak; >> $(PKG_BUILD_DIR)/res/pjproject/user.mak
echo "export LDLAGS += $(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)"\ $(call Build/Configure/Default)
" -lc $(LIBGCC_S) -lm"\ cd $(PKG_BUILD_DIR)/menuselect; \
>> $(PKG_BUILD_DIR)/res/pjproject/user.mak;
echo "export CXXFLAGS += $(FPIC) $(TARGET_CFLAGS) $(EXTRA_CFLAGS)"\
" $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)"\
>> $(PKG_BUILD_DIR)/res/pjproject/user.mak;
$(call Build/Configure/Default,,$(SITE_VARS))
(cd $(PKG_BUILD_DIR)/menuselect; \
CC="$(HOSTCC)" \ CC="$(HOSTCC)" \
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \ CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
CONFIG_SITE= \ CONFIG_SITE= \
@ -319,8 +312,7 @@ define Build/Configure
ac_cv_path_ac_pt_CONFIG_LIBXML2=$(STAGING_DIR_HOSTPKG)/bin/xml2-config \ ac_cv_path_ac_pt_CONFIG_LIBXML2=$(STAGING_DIR_HOSTPKG)/bin/xml2-config \
./configure \ ./configure \
$(HOST_CONFIGURE_ARGS) \ $(HOST_CONFIGURE_ARGS) \
$(AST_MENUSELECT_OPTS) \ $(AST_MENUSELECT_OPTS)
);
endef endef
define Build/Compile define Build/Compile
@ -334,16 +326,9 @@ define Build/Compile
--disable BUILD_NATIVE \ --disable BUILD_NATIVE \
$(if $(CONFIG_ASTERISK11_LOW_MEMORY),--enable LOW_MEMORY) \ $(if $(CONFIG_ASTERISK11_LOW_MEMORY),--enable LOW_MEMORY) \
menuselect.makeopts menuselect.makeopts
$(MAKE) -C "$(PKG_BUILD_DIR)" include/asterisk/version.h \
include/asterisk/buildopts.h defaults.h \
makeopts.embed_rules
ASTCFLAGS="$(EXTRA_CFLAGS)" \
ASTLDFLAGS="$(EXTRA_LDFLAGS)" \
$(MAKE) -C "$(PKG_BUILD_DIR)" \ $(MAKE) -C "$(PKG_BUILD_DIR)" \
ASTVARLIBDIR="/usr/lib/asterisk" \ ASTDATADIR="/usr/share/asterisk" \
ASTDATADIR="/usr/lib/asterisk" \ AST_FORTIFY_SOURCE="" \
ASTKEYDIR="/usr/lib/asterisk" \
ASTDBDIR="/usr/lib/asterisk" \
NOISY_BUILD="yes" \ NOISY_BUILD="yes" \
DEBUG="" \ DEBUG="" \
OPTIMIZE="" \ OPTIMIZE="" \

3
net/asterisk-11.x/files/asterisk.init
View file

@ -12,8 +12,7 @@ start() {
[ -d $DEST/var/run/asterisk ] || mkdir -p $DEST/var/run/asterisk [ -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/log/asterisk ] || mkdir -p $DEST/var/log/asterisk
[ -d $DEST/var/spool/asterisk ] || mkdir -p $DEST/var/spool/asterisk [ -d $DEST/var/spool/asterisk ] || mkdir -p $DEST/var/spool/asterisk
[ -d $DEST/var/lib ] || mkdir -p $DEST/var/lib [ -d $DEST/var/lib/asterisk ] || mkdir -p $DEST/var/lib/asterisk
[ -h $DEST/var/lib/asterisk ] || ln -s /usr/lib/asterisk /var/lib/asterisk
[ -d $DEST/var/lib/asterisk/keys ] || mkdir -p $DEST/var/lib/asterisk/keys [ -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 [ -d $DEST/var/log/asterisk/cdr-csv ] || mkdir -p $DEST/var/log/asterisk/cdr-csv

6
net/asterisk-13.x/Makefile
View file

@ -10,12 +10,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk13 PKG_NAME:=asterisk13
PKG_VERSION:=13.17.0 PKG_VERSION:=13.17.1
PKG_RELEASE:=5 PKG_RELEASE:=1
PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/
PKG_HASH:=c4a89386d7db58520391fcbd3202902584b4434289094ca2e4a6b8dada1e90a4 PKG_HASH:=aee15699a4100ca0360e8168802c711caf7664d21d9fb84f686873f0e7c5fb34
PKG_BUILD_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=libxml2/host PKG_BUILD_DEPENDS:=libxml2/host

2
net/asterisk-13.x/patches/054-pjsip_unresolved_symbol.patch
View file

@ -4,7 +4,7 @@ Bug: https://issues.asterisk.org/jira/browse/ASTERISK-26518
--- a/res/res_pjsip/pjsip_message_ip_updater.c --- a/res/res_pjsip/pjsip_message_ip_updater.c
+++ b/res/res_pjsip/pjsip_message_ip_updater.c +++ b/res/res_pjsip/pjsip_message_ip_updater.c
@@ -362,15 +362,15 @@ void ast_res_pjsip_cleanup_message_ip_up @@ -392,15 +392,15 @@ void ast_res_pjsip_cleanup_message_ip_up
{ {
ast_sip_unregister_service(&multihomed_module); ast_sip_unregister_service(&multihomed_module);
ast_sip_unregister_supplement(&multihomed_supplement); ast_sip_unregister_supplement(&multihomed_supplement);

3210
net/asterisk-13.x/patches/055-ASTERISK-24517.patch Normal file
View file

File diff suppressed because it is too large Load diff