From 8edb1cd5a6a03b391003a1047e0b3ca6d22acd45 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 13 Jun 2010 18:06:45 +0200 Subject: bulk package update --- package/asterisk/Makefile | 4 ++-- package/asterisk/patches/patch-Makefile | 13 ----------- package/asterisk/patches/patch-apps_app_followme_c | 26 ---------------------- 3 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 package/asterisk/patches/patch-Makefile delete mode 100644 package/asterisk/patches/patch-apps_app_followme_c (limited to 'package/asterisk') diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 425683f24..c35e686a5 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:= net PKG_MULTI:= 1 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, - ); -+ -- cgit v1.2.3