diff options
Diffstat (limited to 'package/asterisk')
| -rw-r--r-- | package/asterisk/Makefile | 14 | ||||
| -rw-r--r-- | package/asterisk/patches/patch-Makefile | 13 | ||||
| -rw-r--r-- | package/asterisk/patches/patch-apps_app_followme_c | 26 |
3 files changed, 9 insertions, 44 deletions
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 7ae77256f..6cc6cfa52 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= asterisk -PKG_VERSION:= 1.6.2.5 +PKG_VERSION:= 1.6.2.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9d1f7bcf6833605ced4b2740d14bd576 +PKG_MD5SUM:= 861f57ba43bfe05dc645e0679a260e41 PKG_DESCR:= Open Source PBX PKG_SECTION:= phone PKG_MULTI:= 1 @@ -121,7 +121,7 @@ MAKE_FLAGS+= DESTDIR="$(WRKINST)" \ ALL_TARGET:= all install samples pre-configure: - cd "$(WRKBUILD)/menuselect"; ./configure + cd "$(WRKBUILD)/menuselect"; ./configure pre-build: $(MAKE) -C $(WRKBUILD)/menuselect @@ -174,6 +174,7 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} rm -f gtalk.conf ; \ rm -f skinny.conf ; \ rm -f dundi.conf ; \ + $(SED) '#^astdatadir = /var/#/usr/#' asterisk.conf ; \ ) ${INSTALL_DATA} ./files/modules.conf $(IDIR_ASTERISK)/etc/asterisk/ $(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' \ @@ -191,8 +192,11 @@ asterisk-sounds-install: ${INSTALL_DIR} $(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-* + (cd $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds; \ + rm -f *.mp3 vm-*; \ + rm -f CHANGES* CREDITS* LICENSE* *.txt ; \ + rm -f *.tar.gz Makefile ; \ + ) asterisk-voicemail-install: ${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk diff --git a/package/asterisk/patches/patch-Makefile b/package/asterisk/patches/patch-Makefile deleted file mode 100644 index 1ba02c900..000000000 --- a/package/asterisk/patches/patch-Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- 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_app_followme_c b/package/asterisk/patches/patch-apps_app_followme_c deleted file mode 100644 index 8ecfa9226..000000000 --- a/package/asterisk/patches/patch-apps_app_followme_c +++ /dev/null @@ -1,26 +0,0 @@ ---- 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, - ); -+ |