Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	BUGS
	package/autoconf/Makefile

7 files changed, 131 insertions, 236 deletions

diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in
deleted file mode 100644
index 3cac88628..000000000
--- a/package/asterisk/Config.in
+++ /dev/null
@@ -1,97 +0,0 @@
-config ADK_PACKAGE_ASTERISK
-	bool "asterisk................... Telephony server"
-	depends on !ADK_LINUX_CRIS_FOXBOARD
-        select ADK_PACKAGE_LIBCURL
-	select ADK_PACKAGE_LIBNCURSES
-	select ADK_PACKAGE_LIBPTHREAD
-	default n
-
-menu "asterisk-modules.................. Additional modules for Asterisk"
-depends on ADK_PACKAGE_ASTERISK
-
-config ADK_PACKAGE_ASTERISK_CHAN_MGCP
-	prompt   "asterisk-chan-mgcp.............. Media Gateway Control Protocol implementation"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  Media Gateway Control Protocol implementation for Asterisk
-
-config ADK_PACKAGE_ASTERISK_CHAN_SKINNY
-	prompt   "asterisk-chan-skinny............ Skinny Client Control Protocol implementation"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  Skinny Client Control Protocol implementation for Asterisk
-
-config ADK_PACKAGE_ASTERISK_CHAN_IAX2
-	prompt   "asterisk-chan-iax2.............. Support for the Inter Asterisk Protocol"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  IAX2 allows trunking communication channels together.
-
-	  Contains:
-	  * chan_iax2.so
-
-config ADK_PACKAGE_ASTERISK_CODEC_SPEEX
-	prompt   "asterisk-codec-speex............ Speex/PCM16 Codec Translator"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	select ADK_PACKAGE_LIBSPEEX
-	help
-	  The Speex speech compression codec for Asterisk
-
-config ADK_PACKAGE_ASTERISK_CODEC_GSM
-	prompt   "asterisk-codec-gsm.............. GSM Codec"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  The GSM codec for Asterisk
-
-config ADK_PACKAGE_ASTERISK_PBX_DUNDI
-	prompt   "asterisk-pbx-dundi.............. Distributed Universal Number Discovery (DUNDi) support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  Distributed Universal Number Discovery (DUNDi) support for Asterisk
-
-config ADK_PACKAGE_ASTERISK_RES_AGI
-	prompt   "asterisk-res-agi................ Asterisk Gateway Interface module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  Asterisk Gateway Interface module
-
-config ADK_PACKAGE_ASTERISK_PGSQL
-	prompt   "asterisk-pgsql.................. PostgreSQL modules"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	select ADK_PACKAGE_LIBPQ
-	help
-	  PostgreSQL modules for Asterisk
-
-config ADK_PACKAGE_ASTERISK_SOUNDS
-	prompt   "asterisk-sounds................. Sound files"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  Sound files for Asterisk
-
-config ADK_PACKAGE_ASTERISK_VOICEMAIL
-	prompt   "asterisk-voicemail.............. Voicemail support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  Voicemail related modules for Asterisk
-
-endmenu
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index b048c823c..595bae027 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,26 +4,39 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
-PKG_VERSION:=		1.4.26.1
+PKG_VERSION:=		1.6.2.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9b46f8628f43e1d3c275460ceee26646
+PKG_MD5SUM:=		9d1f7bcf6833605ced4b2740d14bd576
 PKG_DESCR:=		Open Source PBX
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libncurses libpthread libopenssl libcurl
+PKG_MULTI:=		1
 PKG_NOPARALLEL:=	1
+PKG_DEPENDS:=		libncurses libpthread libopenssl libcurl
+PKG_BUILDDEP+=		ncurses openssl zlib curl popt
+ifneq ($(ADK_PACKAGE_ASTERISK_CODEC_SPEEX),)
+PKG_BUILDDEP+=		speex
+endif
+ifneq ($(ADK_PACKAGE_ASTERISK_PGSQL),)
+PKG_BUILDDEP+=		postgresql
+endif
 PKG_URL:=		http://www.asterisk.org
 PKG_SITES:=		http://downloads.asterisk.org/pub/telephony/asterisk/releases/
 
+PKG_DESCR_CHAN_MGCP:=	Media Gateway Control Protocol implementation
+PKG_DESCR_CHAN_SKINNY:=	Skinny Client Control Protocol implementation
+PKG_DESCR_CHAN_IAX2:=	Support for the Inter Asterisk Protocol
+PKG_DESCR_CODEC_SPEEX:=	Speex/PCM16 Codec Translator
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ASTERISK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_MGCP},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_SKINNY},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_IAX2},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CODEC_SPEEX},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -41,35 +54,34 @@ SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CODEC_GSM}+=	asterisk-codec-gsm-install
 SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_PBX_DUNDI}+=	asterisk-pbx-dundi-install
 SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_RES_AGI}+=		asterisk-res-agi-install
 
-#workaround for cris and gcc 4.4, where -Os generates ICE
-ifeq ($(ARCH),cris)
-TARGET_OPTIMIZATION:=$(subst Os,O2,$(TARGET_OPTIMIZATION))
-endif
-
 CONFIGURE_ARGS=		--with-z=${STAGING_DIR}/usr \
 			--with-ncurses=${STAGING_DIR}/usr \
 			--with-ssl=${STAGING_DIR}/usr \
-			--without-zaptel \
+			--disable-xmldoc \
 			--without-tonezone \
 			--without-asound \
 			--without-curses \
-			--without-gnutls \
+			--without-gtk \
+			--without-gtk2 \
 			--without-h323 \
 			--without-iksemel \
 			--without-imap \
-			--without-kde \
 			--without-nbs \
 			--without-netsnmp \
 			--without-newt \
-			--without-odbc \
 			--without-osptk \
 			--without-oss \
+			--without-popt \
 			--without-pri \
 			--without-pwlib \
 			--without-tds \
 			--without-termcap \
 			--without-tinfo \
-			--without-vpb
+			--without-vpb \
+			--without-misdn \
+			--without-isdnnet \
+			--without-suppserv
+
 ifneq (${ADK_PACKAGE_ASTERISK_CODEC_GSM},)
 CONFIGURE_ARGS+=	--with-gsm=internal
 else
@@ -94,35 +106,28 @@ CONFIGURE_ARGS+=	--with-postgres=${STAGING_DIR}/usr
 else
 CONFIGURE_ARGS+=	--without-postgres
 endif
-ifneq (${ADK_PACKAGE_LIBPOPT},)
-CONFIGURE_ARGS+=	--with-popt=${STAGING_DIR}/usr
-else
-CONFIGURE_ARGS+=	--without-popt
-endif
-CONFIGURE_ARGS+=	--without-misdn \
-			--without-isdnnet \
-			--without-suppserv
 
-CONFIGURE_STYLE:=	gnu
-CONFIGURE_ENV+=		STRIP=${STRIP}
-BUILD_STYLE:=		auto
+INSTALL_STYLE:=		manual
+
+TLDFLAGS+=		-lm
 MAKE_ENV=		ASTCFLAGS="${TCPPFLAGS} -DHAVE_STRTOQ" \
 			ASTLDFLAGS="${TLDFLAGS}"
 MAKE_FLAGS+=		DESTDIR="$(WRKINST)" \
 			OPTIMIZE="${TARGET_OPTIMIZATION}" \
-			CXX="${TARGET_CC}" \
 			STRIP="${TARGET_CROSS}strip" \
 			NOISY_BUILD=1
 ALL_TARGET:=		all install samples
 
 pre-configure:
-	rm ${WRKBUILD}/apps/app_followme.c
 	cd "$(WRKBUILD)/menuselect"; ./configure 
 
+pre-build:
+	$(MAKE) -C $(WRKBUILD)/menuselect
+
 post-build:
 	cd ${WRKBUILD}/sounds ; \
-	tar xzf asterisk-core-sounds-en-gsm-1.4.15.tar.gz ; \
-	rm asterisk-core-sounds-en-gsm-1.4.15.tar.gz
+	tar xzf asterisk-core-sounds-en-gsm-1.4.17.tar.gz ; \
+	rm asterisk-core-sounds-en-gsm-1.4.17.tar.gz
 	@echo
 	@echo "---> have to install ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} <---"
 	@echo
@@ -141,8 +146,9 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 		rm -rf mohmp3/*.mp3; \
 		rm -rf sounds/*; \
 		cd modules; \
-		rm -rf	*adsi* *festival* *modem* *meetme* *oss* *phone* *intercom* \
-			*mp3* *nbscat* *mysql* *postgres* *pgsql* *voicemail* *speex* \
+		rm -rf	*adsi* *festival* *modem* *meetme* *oss* \
+			*phone* *intercom* *mp3* *nbscat* *mysql* \
+			*postgres* *pgsql* *voicemail* *speex* \
 			*zapateller* *jpeg*; \
 		rm -f chan_bluetooth.so ; \
 		rm -f chan_h323.so ; \
@@ -156,80 +162,105 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 		rm -f res_agi.so ; \
 	)
 	(cd $(IDIR_ASTERISK)/etc/asterisk; \
-		rm -f 	*iax* *odbc* *mysql* *postgres* *pgsql* *voicemail* *adsi* *oss* *alsa* \
-			*festival* *modem* *meetme* *phone* *tds* *vofr* *rpt* *vpb* \
+		rm -f 	*iax* *odbc* *mysql* *postgres* *pgsql* \
+			*voicemail* *adsi* *oss* *alsa* \
+			*festival* *modem* *meetme* *phone* *tds* \
+			*vofr* *rpt* *vpb* \
 			*zapata*; \
 		rm -f bluetooth.conf ; \
 		rm -f mgcp.conf ; \
+		rm -f gtalk.conf ; \
 		rm -f skinny.conf ; \
 		rm -f dundi.conf ; \
 	)
 	${INSTALL_DATA} ./files/modules.conf $(IDIR_ASTERISK)/etc/asterisk/
-	$(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' $(WRKINST)/etc/asterisk/musiconhold.conf
+	$(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' \
+		$(WRKINST)/etc/asterisk/musiconhold.conf
 
 asterisk-pgsql-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_PGSQL)/etc/asterisk
-	${INSTALL_DATA} $(WRKBUILD)/configs/cdr_pgsql.conf.sample $(IDIR_ASTERISK_PGSQL)/etc/asterisk/cdr_pgsql.conf
+	${INSTALL_DATA} $(WRKBUILD)/configs/cdr_pgsql.conf.sample \
+		$(IDIR_ASTERISK_PGSQL)/etc/asterisk/cdr_pgsql.conf
 	${INSTALL_DIR} $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules
-	${INSTALL_BIN} $(WRKBUILD)/cdr/cdr_pgsql.so $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/cdr/cdr_pgsql.so \
+		$(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules/
 
 asterisk-sounds-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds
-	$(CP) $(WRKBUILD)/sounds/* $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/
+	$(CP) $(WRKBUILD)/sounds/* \
+		$(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/
 	rm -f $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/*.mp3
 	rm -f $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/vm-*
 
 asterisk-voicemail-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk
 	${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules
-	${INSTALL_DATA} $(WRKBUILD)/configs/voicemail.conf.sample $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk/voicemail.conf
-	${CP} $(WRKBUILD)/apps/*voicemail.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
-	${INSTALL_BIN} $(WRKBUILD)/res/res_adsi.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
+	${INSTALL_DATA} $(WRKBUILD)/configs/voicemail.conf.sample \
+		$(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk/voicemail.conf
+	${CP} $(WRKBUILD)/apps/*voicemail.so \
+		$(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/res/res_adsi.so \
+		$(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
 	${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds
-	$(CP) $(WRKBUILD)/sounds/vm-*.gsm $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds/
+	$(CP) $(WRKBUILD)/sounds/vm-*.gsm \
+		$(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds/
 
 asterisk-chan-mgcp-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_MGCP)/etc/asterisk
-	${INSTALL_DATA} $(WRKBUILD)/configs/mgcp.conf.sample $(IDIR_ASTERISK_CHAN_MGCP)/etc/asterisk/mgcp.conf
+	${INSTALL_DATA} $(WRKBUILD)/configs/mgcp.conf.sample \
+		$(IDIR_ASTERISK_CHAN_MGCP)/etc/asterisk/mgcp.conf
 	${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_MGCP)/usr/lib/asterisk/modules
-	${INSTALL_BIN} $(WRKBUILD)/channels/chan_mgcp.so $(IDIR_ASTERISK_CHAN_MGCP)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/channels/chan_mgcp.so \
+		$(IDIR_ASTERISK_CHAN_MGCP)/usr/lib/asterisk/modules/
 
 asterisk-chan-skinny-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_SKINNY)/etc/asterisk
-	${INSTALL_DATA} $(WRKBUILD)/configs/skinny.conf.sample $(IDIR_ASTERISK_CHAN_SKINNY)/etc/asterisk/skinny.conf
+	${INSTALL_DATA} $(WRKBUILD)/configs/skinny.conf.sample \
+		$(IDIR_ASTERISK_CHAN_SKINNY)/etc/asterisk/skinny.conf
 	${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_SKINNY)/usr/lib/asterisk/modules
-	${INSTALL_BIN} $(WRKBUILD)/channels/chan_skinny.so $(IDIR_ASTERISK_CHAN_SKINNY)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/channels/chan_skinny.so \
+		$(IDIR_ASTERISK_CHAN_SKINNY)/usr/lib/asterisk/modules/
 
 asterisk-chan-iax2-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk
 	${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_IAX2)/usr/lib/asterisk/modules
-	${INSTALL_DATA} $(WRKBUILD)/configs/iax.conf.sample $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iax.conf
-	${INSTALL_DATA} $(WRKBUILD)/configs/iaxprov.conf.sample $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iaxprov.conf
-	${INSTALL_BIN} $(WRKBUILD)/channels/chan_iax2.so $(IDIR_ASTERISK_CHAN_IAX2)/usr/lib/asterisk/modules/
+	${INSTALL_DATA} $(WRKBUILD)/configs/iax.conf.sample \
+		$(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iax.conf
+	${INSTALL_DATA} $(WRKBUILD)/configs/iaxprov.conf.sample \
+		$(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iaxprov.conf
+	${INSTALL_BIN} $(WRKBUILD)/channels/chan_iax2.so \
+		$(IDIR_ASTERISK_CHAN_IAX2)/usr/lib/asterisk/modules/
 
 asterisk-codec-speex-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules
-	${INSTALL_BIN} $(WRKBUILD)/codecs/codec_speex.so $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/codecs/codec_speex.so \
+		$(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules/
 
 asterisk-codec-gsm-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_CODEC_GSM)/usr/lib/asterisk/modules/
-	${INSTALL_BIN} $(WRKBUILD)/codecs/codec_gsm.so $(IDIR_ASTERISK_CODEC_GSM)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/codecs/codec_gsm.so \
+		$(IDIR_ASTERISK_CODEC_GSM)/usr/lib/asterisk/modules/
 
 asterisk-pbx-dundi-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_PBX_DUNDI)/etc/asterisk
-	${INSTALL_DATA} $(WRKBUILD)/configs/dundi.conf.sample $(IDIR_ASTERISK_PBX_DUNDI)/etc/asterisk/dundi.conf
+	${INSTALL_DATA} $(WRKBUILD)/configs/dundi.conf.sample \
+		$(IDIR_ASTERISK_PBX_DUNDI)/etc/asterisk/dundi.conf
 	${INSTALL_DIR} $(IDIR_ASTERISK_PBX_DUNDI)/usr/lib/asterisk/modules
-	${INSTALL_BIN} $(WRKBUILD)/pbx/pbx_dundi.so $(IDIR_ASTERISK_PBX_DUNDI)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/pbx/pbx_dundi.so \
+		$(IDIR_ASTERISK_PBX_DUNDI)/usr/lib/asterisk/modules/
 
 asterisk-res-agi-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_RES_AGI)/usr/lib/asterisk/agi-bin
 	${INSTALL_DIR} $(IDIR_ASTERISK_RES_AGI)/usr/lib/asterisk/modules
-	${INSTALL_BIN} $(WRKBUILD)/res/res_agi.so $(IDIR_ASTERISK_RES_AGI)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/res/res_agi.so \
+		$(IDIR_ASTERISK_RES_AGI)/usr/lib/asterisk/modules/
 
 asterisk-meetme-install:
 	${INSTALL_DIR} ${IDIR_ASTERISK_MEETME}/etc/asterisk/
 	${INSTALL_DIR} ${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules
-	${INSTALL_DATA} ${WRKBUILD}/configs/meetme.conf.sample ${IDIR_ASTERISK_MEETME}/etc/asterisk/meetme.conf
-	${INSTALL_BIN} ${WRKBUILD}/apps/app_meetme.so ${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules
+	${INSTALL_DATA} ${WRKBUILD}/configs/meetme.conf.sample \
+		${IDIR_ASTERISK_MEETME}/etc/asterisk/meetme.conf
+	${INSTALL_BIN} ${WRKBUILD}/apps/app_meetme.so \
+		${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/asterisk/files/asterisk.init b/package/asterisk/files/asterisk.init
index 01a4edd51..d11a1f1b1 100644
--- a/package/asterisk/files/asterisk.init
+++ b/package/asterisk/files/asterisk.init
@@ -10,13 +10,14 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	[ -d /var/run ] || mkdir -p /var/run
+	[ -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 
 	;;
 stop)
-	[ -f /var/run/asterisk.pid ] && kill $(cat /var/run/asterisk.pid) >/dev/null 2>&1
+	[ -f /var/run/asterisk/asterisk.pid ] && \
+		kill $(cat /var/run/asterisk/asterisk.pid) >/dev/null 2>&1
 	;;
 restart)
 	sh $0 stop
diff --git a/package/asterisk/patches/patch-Makefile b/package/asterisk/patches/patch-Makefile
new file mode 100644
index 000000000..1ba02c900
--- /dev/null
+++ b/package/asterisk/patches/patch-Makefile
@@ -0,0 +1,13 @@
+--- asterisk-1.6.2.1.orig/Makefile	2009-12-10 22:04:20.000000000 +0100
++++ asterisk-1.6.2.1/Makefile	2010-02-05 21:05:41.313084404 +0100
+@@ -366,8 +366,8 @@ makeopts: configure
+ 	@exit 1
+ 
+ menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
+-	menuselect/menuselect --check-deps $@
+-	menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
++	./menuselect/menuselect --check-deps $@
++	./menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
+ 
+ $(MOD_SUBDIRS_EMBED_LDSCRIPT):
+ 	+@echo "EMBED_LDSCRIPTS+="`$(SILENTMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
diff --git a/package/asterisk/patches/patch-apps__moduleinfo b/package/asterisk/patches/patch-apps__moduleinfo
deleted file mode 100644
index efbdcae4a..000000000
--- a/package/asterisk/patches/patch-apps__moduleinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- asterisk-1.4.24.1.orig/apps/.moduleinfo	2009-04-02 19:44:22.000000000 +0200
-+++ asterisk-1.4.24.1/apps/.moduleinfo	2009-05-12 16:07:52.000000000 +0200
-@@ -56,9 +56,6 @@
- <member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
- 	<depend>dahdi</depend>
- </member>
--<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
--        <depend>chan_local</depend>
--</member>
- <member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
- </member>
- <member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
diff --git a/package/asterisk/patches/patch-apps_app_followme_c b/package/asterisk/patches/patch-apps_app_followme_c
new file mode 100644
index 000000000..8ecfa9226
--- /dev/null
+++ b/package/asterisk/patches/patch-apps_app_followme_c
@@ -0,0 +1,26 @@
+--- asterisk-1.6.2.1.orig/apps/app_followme.c	2009-09-15 18:06:24.000000000 +0200
++++ asterisk-1.6.2.1/apps/app_followme.c	2010-02-14 10:33:51.540422962 +0100
+@@ -172,7 +172,9 @@ static int ynlongest = 0;
+ 
+ static const char *featuredigittostr;
+ static int featuredigittimeout = 5000;		/*!< Feature Digit Timeout */
+-static const char *defaultmoh = "default";    	/*!< Default Music-On-Hold Class */
++static const char *defaultmoh;		    	/*!< Default Music-On-Hold Class */
++
++
+ 
+ static char takecall[20] = "1", nextindp[20] = "2";
+ static char callfromprompt[PATH_MAX] = "followme/call-from";
+@@ -236,6 +238,7 @@ static struct call_followme *alloc_profi
+ 
+ static void init_profile(struct call_followme *f)
+ {
++	defaultmoh = "default";
+ 	f->active = 1;
+ 	ast_copy_string(f->moh, defaultmoh, sizeof(f->moh));
+ }
+@@ -1195,3 +1198,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MO
+ 		.unload = unload_module,
+ 		.reload = reload,
+ 	       );
++
diff --git a/package/asterisk/patches/patch-codecs_gsm_Makefile b/package/asterisk/patches/patch-codecs_gsm_Makefile
deleted file mode 100644
index 82653cc9b..000000000
--- a/package/asterisk/patches/patch-codecs_gsm_Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-disable uname -m checks 
---- asterisk-1.4.26.orig/codecs/gsm/Makefile	2008-11-19 22:34:47.000000000 +0100
-+++ asterisk-1.4.26/codecs/gsm/Makefile	2009-08-21 12:29:21.450418652 +0200
-@@ -37,13 +37,13 @@ WAV49	= -DWAV49
- ######### ppro's, etc, as well as the AMD K6 and K7.  The compile will
- ######### probably require gcc. 
- 
--ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
--ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
--ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
--OPTIMIZE+=-march=$(PROC)
--endif
--endif
--endif
-+#ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
-+#ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
-+#ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
-+#OPTIMIZE+=-march=$(PROC)
-+#endif
-+#endif
-+#endif
- 
- #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
- #This works for even old (2.96) versions of gcc and provides a small boost either way.
-@@ -207,13 +207,13 @@ GSM_SOURCES =	$(SRC)/add.c		\
- # add k6-specific code only if not on a non-k6 hardware or proc.
- # XXX Keep a space after each findstring argument
- # XXX should merge with GSM_OBJECTS
--ifeq ($(OSARCH),linux-gnu)
--ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
--ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
--GSM_SOURCES+= $(SRC)/k6opt.s
--endif
--endif
--endif
-+#ifeq ($(OSARCH),linux-gnu)
-+#ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
-+#ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
-+#GSM_SOURCES+= $(SRC)/k6opt.s
-+#endif
-+#endif
-+#endif
- 
- TOAST_SOURCES = $(SRC)/toast.c 		\
- 		$(SRC)/toast_lin.c	\
-@@ -259,13 +259,13 @@ GSM_OBJECTS =	$(SRC)/add.o		\
- 		$(SRC)/short_term.o	\
- 		$(SRC)/table.o
- 
--ifeq ($(OSARCH),linux-gnu)
--ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
--ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
--GSM_OBJECTS+= $(SRC)/k6opt.o
--endif
--endif
--endif
-+#ifeq ($(OSARCH),linux-gnu)
-+#ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
-+#ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
-+#GSM_OBJECTS+= $(SRC)/k6opt.o
-+#endif
-+#endif
-+#endif
- 
- TOAST_OBJECTS =	$(SRC)/toast.o 		\
- 		$(SRC)/toast_lin.o	\