From: Jiri Slachta <slachta@cesnet.cz>
Date: Sun, 21 Dec 2014 20:32:06 +0000 (+0100)
Subject: asterisk-11.x: update to 11.15.0 to fix CVE-2014-6610 and CVE-2014-9374
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d762c0ee3809a86468c82330ceb987df7033dd08;p=feed%2Ftelephony.git

asterisk-11.x: update to 11.15.0 to fix CVE-2014-6610 and CVE-2014-9374

Signed-off-by: Jiri Slachta <slachta@cesnet.cz>
---

diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile
index a6e6eb7..74ebda6 100644
--- a/net/asterisk-11.x/Makefile
+++ b/net/asterisk-11.x/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk11
-PKG_VERSION:=11.12.0
+PKG_VERSION:=11.15.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/
-PKG_MD5SUM:=4bca7a1688f0e28fe3707994421899fe
+PKG_MD5SUM:=71e8c2e207255f7ef12b81b7f0da30ea
 
 PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION)
 
@@ -113,7 +113,6 @@ define Package/asterisk11/conffiles
 /etc/asterisk/sip_notify.conf
 /etc/asterisk/udptl.conf
 /etc/asterisk/users.conf
-/etc/default/asterisk
 /etc/init.d/asterisk
 endef
 
@@ -131,8 +130,6 @@ $(call Package/asterisk11/install/sbin,$(1),safe_asterisk)
 $(call Package/asterisk11/install/sbin,$(1),astgenkey)
 $(foreach m,$(AST_CFG_FILES),$(call Package/asterisk11/install/conffile,$(1),$(m));)
 $(foreach m,$(AST_EMB_MODULES),$(call Package/asterisk11/install/module,$(1),$(m));)
-	$(INSTALL_DIR) $(1)/etc/default
-	$(INSTALL_DATA) ./files/asterisk.default $(1)/etc/default/asterisk
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/asterisk.init $(1)/etc/init.d/asterisk
 endef
diff --git a/net/asterisk-11.x/files/asterisk.default b/net/asterisk-11.x/files/asterisk.default
deleted file mode 100644
index 9d046c4..0000000
--- a/net/asterisk-11.x/files/asterisk.default
+++ /dev/null
@@ -1,4 +0,0 @@
-## startup options for /etc/init.d/asterisk
-
-ENABLE_ASTERISK="yes"
-OPTIONS=""
diff --git a/net/asterisk-11.x/files/asterisk.init b/net/asterisk-11.x/files/asterisk.init
index 78e8913..269915b 100644
--- a/net/asterisk-11.x/files/asterisk.init
+++ b/net/asterisk-11.x/files/asterisk.init
@@ -5,12 +5,10 @@ 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
diff --git a/net/asterisk-11.x/patches/001-pjproject-change-configure-args.patch b/net/asterisk-11.x/patches/001-pjproject-change-configure-args.patch
index 85dbfa3..761dd5d 100644
--- a/net/asterisk-11.x/patches/001-pjproject-change-configure-args.patch
+++ b/net/asterisk-11.x/patches/001-pjproject-change-configure-args.patch
@@ -1,5 +1,5 @@
---- asterisk-11.4.0/res/Makefile	2013-02-04 20:50:52.000000000 +0100
-+++ asterisk11-new/res/Makefile	2013-06-02 13:51:22.269684111 +0200
+--- a/res/Makefile
++++ b/res/Makefile
 @@ -75,7 +75,7 @@ dist-clean::
  	rm -f pjproject/build.mak
  
diff --git a/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch b/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch
index 96d89b0..49d2604 100644
--- a/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch
+++ b/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -16488,7 +16488,6 @@ if ac_fn_c_try_link "$LINENO"; then :
+@@ -16464,7 +16464,6 @@ if ac_fn_c_try_link "$LINENO"; then :
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }