openwrt-mirror/telephony
1
0
Fork 0
mirror of https://github.com/openwrt/telephony.git synced 2025-12-21 19:14:34 +04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Jiri Slachta <slachta@cesnet.cz>
This commit is contained in:
Jiri Slachta
2014-12-21 21:32:06 +01:00
parent 8e191fc7c0
commit d762c0ee38
5 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/asterisk-11.x/Makefile
View File

@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk11 PKG_NAME:=asterisk11
PKG_VERSION:=11.12.0 PKG_VERSION:=11.15.0
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:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/
PKG_MD5SUM:=4bca7a1688f0e28fe3707994421899fe PKG_MD5SUM:=71e8c2e207255f7ef12b81b7f0da30ea
PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION) PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION)
@@ -113,7 +113,6 @@ define Package/asterisk11/conffiles
/etc/asterisk/sip_notify.conf /etc/asterisk/sip_notify.conf
/etc/asterisk/udptl.conf /etc/asterisk/udptl.conf
/etc/asterisk/users.conf /etc/asterisk/users.conf
/etc/default/asterisk
/etc/init.d/asterisk /etc/init.d/asterisk
endef endef
@@ -131,8 +130,6 @@ $(call Package/asterisk11/install/sbin,$(1),safe_asterisk)
$(call Package/asterisk11/install/sbin,$(1),astgenkey) $(call Package/asterisk11/install/sbin,$(1),astgenkey)
$(foreach m,$(AST_CFG_FILES),$(call Package/asterisk11/install/conffile,$(1),$(m));) $(foreach m,$(AST_CFG_FILES),$(call Package/asterisk11/install/conffile,$(1),$(m));)
$(foreach m,$(AST_EMB_MODULES),$(call Package/asterisk11/install/module,$(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_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/asterisk.init $(1)/etc/init.d/asterisk $(INSTALL_BIN) ./files/asterisk.init $(1)/etc/init.d/asterisk
endef endef

4
net/asterisk-11.x/files/asterisk.default
View File

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

2
net/asterisk-11.x/files/asterisk.init
View File

@@ -5,12 +5,10 @@ START=99
APP=asterisk APP=asterisk
OPTIONS= OPTIONS=
DEST= DEST=
DEFAULT=$DEST/etc/default/$APP
BIN_FILE=$DEST/usr/sbin/$APP BIN_FILE=$DEST/usr/sbin/$APP
PID_FILE=$DEST/var/run/$APP/$APP.pid PID_FILE=$DEST/var/run/$APP/$APP.pid
start() { start() {
[ -f $DEFAULT ] && . $DEFAULT
[ -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

4
net/asterisk-11.x/patches/001-pjproject-change-configure-args.patch
View File

@@ -1,5 +1,5 @@
--- asterisk-11.4.0/res/Makefile 2013-02-04 20:50:52.000000000 +0100 --- a/res/Makefile
+++ asterisk11-new/res/Makefile 2013-06-02 13:51:22.269684111 +0200 +++ b/res/Makefile
@@ -75,7 +75,7 @@ dist-clean:: @@ -75,7 +75,7 @@ dist-clean::
rm -f pjproject/build.mak rm -f pjproject/build.mak

2
net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch
View File

@@ -1,6 +1,6 @@
--- a/configure --- a/configure
+++ b/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 "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }