asterisk-13.x: bump to 13.18.5

The currently used version 13.8.0 has the following open CVEs:

CVE-2016-7551
CVE-2016-9938
CVE-2017-14099
CVE-2017-14100
CVE-2017-14603
CVE-2017-16671
CVE-2017-16672
CVE-2017-17090
CVE-2017-17664
CVE-2017-17850
CVE-2017-7617
CVE-2017-9358
CVE-2017-17850

Upstream provided patches for these but used 13.13.0 or later versions
as baseline. Multiple of these patches fail to apply to 13.8.0. So
upgrade to the current version instead.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2018-01-10 22:18:46 +01:00
parent 91756021ca
commit 1b98907582
3 changed files with 5 additions and 19 deletions

View file

@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk13 PKG_NAME:=asterisk13
PKG_VERSION:=13.8.0 PKG_VERSION:=13.18.5
PKG_RELEASE:=1 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:=https://downloads.asterisk.org/pub/telephony/asterisk/releases/
PKG_MD5SUM:=ad48eb4a01df72c8e30d3aec524b1a02 PKG_MD5SUM:=4ad2a5ab1dd12cba5f37fca52961aa2a
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
@ -94,7 +94,7 @@ define Package/asterisk13
$(call Package/asterisk13/Default) $(call Package/asterisk13/Default)
TITLE:=Complete open source PBX, v$(PKG_VERSION) TITLE:=Complete open source PBX, v$(PKG_VERSION)
MENU:=1 MENU:=1
DEPENDS:=+jansson +libncurses +libopenssl +libpopt +libsqlite3 +libstdcpp +libuuid +libxml2 +libxslt +zlib DEPENDS:=+jansson +libncurses +libopenssl +libpopt +librt +libsqlite3 +libstdcpp +libuuid +libxml2 +libxslt +zlib
endef endef
define Package/asterisk13/description define Package/asterisk13/description
@ -218,7 +218,6 @@ CONFIGURE_ARGS+= \
--without-tds \ --without-tds \
--without-termcap \ --without-termcap \
--without-tinfo \ --without-tinfo \
--with-uuid="$(STAGING_DIR)/usr" \
--without-vorbis \ --without-vorbis \
--without-vpb \ --without-vpb \
--with-z="$(STAGING_DIR)/usr" \ --with-z="$(STAGING_DIR)/usr" \

View file

@ -31,7 +31,7 @@
@@ -114,9 +120,11 @@ struct ast_lock_track { @@ -114,9 +120,11 @@ struct ast_lock_track {
int reentrancy; int reentrancy;
const char *func[AST_MAX_REENTRANCY]; const char *func[AST_MAX_REENTRANCY];
pthread_t thread[AST_MAX_REENTRANCY]; pthread_t thread_id[AST_MAX_REENTRANCY];
+#ifndef __UCLIBC__ +#ifndef __UCLIBC__
#ifdef HAVE_BKTR #ifdef HAVE_BKTR
struct ast_bt backtrace[AST_MAX_REENTRANCY]; struct ast_bt backtrace[AST_MAX_REENTRANCY];

View file

@ -1,13 +0,0 @@
--- a/main/config_options.c
+++ b/main/config_options.c
@@ -198,8 +198,8 @@ static int link_option_to_types(struct a
#ifdef AST_DEVMODE
opt->doc_unavailable = 1;
#endif
-#endif
}
+#endif
}
/* The container(s) should hold the only ref to opt */
ao2_ref(opt, -1);