update asterisk16 to 1.6.2.6 and apply fix from #6255; thanks swalker

SVN-Revision: 20618

diff --git a/net/asterisk-1.6.x/Makefile b/net/asterisk-1.6.x/Makefile
index bdaad069141410556e4e718d29bb96cf406289a9..971c1dc4591133e33b5d0fcc6467526e2f955cd4 100644 (file)
--- a/net/asterisk-1.6.x/Makefile
+++ b/net/asterisk-1.6.x/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk
-PKG_VERSION:=1.6.2.1
+PKG_VERSION:=1.6.2.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.digium.com/pub/asterisk/releases/
-PKG_MD5SUM:=8fbc60f9d80e686c749ae95292e225d8
+PKG_MD5SUM:=f068ef2433eebdc7f6dd635986f36d77
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -250,6 +250,7 @@ define Package/asterisk16/conffiles
 /etc/asterisk/sip.conf
 /etc/asterisk/sip_notify.conf
 /etc/asterisk/features.conf
+/etc/asterisk/indications.conf
 /etc/asterisk/logger.conf
 /etc/asterisk/manager.conf
 /etc/asterisk/rtp.conf
@@ -260,7 +261,7 @@ endef
 define Package/asterisk16/install
        $(INSTALL_DIR) $(1)/etc/asterisk
        for f in asterisk extensions features \
-               logger manager modules \
+               indications logger manager modules \
                sip sip_notify rtp; do \
                $(CP) $(PKG_INSTALL_DIR)/etc/asterisk/$$$$f.conf $(1)/etc/asterisk/ ; \
        done

diff --git a/net/asterisk-1.6.x/files/asterisk.init b/net/asterisk-1.6.x/files/asterisk.init
index 77f4a2e9815c083bf24da0dbeda03f106021ca1b..53bf4afafce29720943508669e601a0fb93051c1 100644 (file)
--- a/net/asterisk-1.6.x/files/asterisk.init
+++ b/net/asterisk-1.6.x/files/asterisk.init
@@ -8,7 +8,7 @@ OPTIONS=""
 
 start() {
        [ -f $DEFAULT ] && . $DEFAULT
-       [ -d $DEST/var/run ] || mkdir -p $DEST/var/run
+       [ -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 /var/spool/asterisk ] || mkdir -p /var/spool/asterisk
@@ -17,5 +17,5 @@ start() {
 }
 
 stop() {
-       [ -f $DEST/var/run/asterisk.pid ] && kill $(cat $DEST/var/run/asterisk.pid) >/dev/null 2>&1
+       [ -f $DEST/var/run/asterisk/asterisk.pid ] && kill $(cat $DEST/var/run/asterisk/asterisk.pid) >/dev/null 2>&1
 }