Browse Source

package/asterisk: fix and improve downgrade to version 1.8

Signed-off-by: Phil Sutter <phil@nwl.cc>
Phil Sutter 10 years ago
parent
commit
23fc523877
2 changed files with 7 additions and 6 deletions
  1. 3 2
      package/asterisk/Makefile
  2. 4 4
      package/asterisk/files/asterisk.init

+ 3 - 2
package/asterisk/Makefile

@@ -10,7 +10,7 @@ PKG_MD5SUM:=		c16f288f97ac39042eb8e9bee6766aff
 PKG_DESCR:=		open source pbx
 PKG_SECTION:=		net/voip
 PKG_DEPENDS:=		libncurses libpthread libopenssl libcurl libstdcxx
-PKG_BUILDDEP:=		ncurses openssl zlib curl popt gtk+
+PKG_BUILDDEP:=		ncurses openssl zlib curl popt
 PKG_URL:=		http://www.asterisk.org/
 PKG_SITES:=		http://downloads.asterisk.org/pub/telephony/asterisk/releases/
 PKG_NOPARALLEL:=	1
@@ -175,7 +175,8 @@ do-install:
 		rm -f gtalk.conf ; \
 		rm -f skinny.conf ; \
 		rm -f dundi.conf ; \
-		$(SED) '#^astdatadir = /var/#/usr/#' asterisk.conf ; \
+		$(SED) '/^astdatadir /s#/var/#/usr/#' asterisk.conf ; \
+		$(SED) '/^\[directories\]/s/(!)//' asterisk.conf ; \
 	)
 	${INSTALL_DATA} ./files/modules.conf $(IDIR_ASTERISK)/etc/asterisk/
 	$(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' \

+ 4 - 4
package/asterisk/files/asterisk.init

@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	[ -d /var/run/asterisk ] || mkdir -p /var/run/asterisk
-	[ -d /var/log/asterisk ] || mkdir -p /var/log/asterisk
-	[ -d /var/spool/asterisk ] || mkdir -p /var/spool/asterisk
-	/usr/sbin/asterisk 
+	for dir in run log spool lib; do
+		[ -d /var/$dir/asterisk ] || mkdir -p /var/$dir/asterisk
+	done
+	/usr/sbin/asterisk
 	;;
 stop)
 	[ -f /var/run/asterisk/asterisk.pid ] && \