diff options
| -rw-r--r-- | package/asterisk/Makefile | 8 | ||||
| -rw-r--r-- | package/asterisk/patches/patch-Makefile | 11 | ||||
| -rw-r--r-- | package/asterisk/patches/patch-Makefile_moddir_rules | 11 | ||||
| -rw-r--r-- | package/asterisk/patches/patch-main_Makefile | 19 | ||||
| -rw-r--r-- | package/asterisk/patches/patch-main_buildinfo_c | 13 |
5 files changed, 4 insertions, 58 deletions
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 169374eb0..b0d366c1e 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.10 +PKG_VERSION:= 1.8.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= 50412a90942ae7306fb8dcc31a05c2ce +PKG_MD5SUM:= 79964868c124a921e71fd568fbc9290f PKG_DESCR:= Open Source PBX PKG_SECTION:= phone PKG_DEPENDS:= libncurses libpthread libopenssl libcurl @@ -116,8 +116,8 @@ pre-build: post-build: cd ${WRKBUILD}/sounds ; \ - tar xzf asterisk-core-sounds-en-gsm-1.4.19.tar.gz ; \ - rm asterisk-core-sounds-en-gsm-1.4.19.tar.gz + tar xzf asterisk-core-sounds-en-gsm-1.4.20.tar.gz ; \ + rm asterisk-core-sounds-en-gsm-1.4.20.tar.gz do-install: $(CP) $(WRKINST)/* $(IDIR_ASTERISK) diff --git a/package/asterisk/patches/patch-Makefile b/package/asterisk/patches/patch-Makefile deleted file mode 100644 index 676239410..000000000 --- a/package/asterisk/patches/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- asterisk-1.6.2.10.orig/Makefile 2010-06-10 22:35:06.000000000 +0200 -+++ asterisk-1.6.2.10/Makefile 2010-07-26 19:10:40.000000000 +0200 -@@ -289,7 +289,7 @@ endif - - _ASTCFLAGS+=$(OPTIONS) - --MOD_SUBDIRS:=channels pbx apps codecs formats cdr bridges funcs tests main res $(LOCAL_MOD_SUBDIRS) -+MOD_SUBDIRS:=channels pbx apps codecs formats cdr bridges funcs main res $(LOCAL_MOD_SUBDIRS) - OTHER_SUBDIRS:=utils agi - SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS) - SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install) diff --git a/package/asterisk/patches/patch-Makefile_moddir_rules b/package/asterisk/patches/patch-Makefile_moddir_rules deleted file mode 100644 index ad6ef82b7..000000000 --- a/package/asterisk/patches/patch-Makefile_moddir_rules +++ /dev/null @@ -1,11 +0,0 @@ ---- asterisk-1.6.2.10.orig/Makefile.moddir_rules 2009-07-21 15:56:35.000000000 +0200 -+++ asterisk-1.6.2.10/Makefile.moddir_rules 2010-07-26 18:53:03.000000000 +0200 -@@ -117,7 +117,7 @@ clean:: - - install:: all - @echo "Installing modules from `basename $(CURDIR)`..." -- @for x in $(LOADABLE_MODS:%=%.so); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(LOADABLE_MODS:%=%.so); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done - - uninstall:: - diff --git a/package/asterisk/patches/patch-main_Makefile b/package/asterisk/patches/patch-main_Makefile deleted file mode 100644 index 1803f5ea3..000000000 --- a/package/asterisk/patches/patch-main_Makefile +++ /dev/null @@ -1,19 +0,0 @@ ---- asterisk-1.6.2.10.orig/main/Makefile 2010-06-25 20:58:37.000000000 +0200 -+++ asterisk-1.6.2.10/main/Makefile 2010-07-26 19:28:05.000000000 +0200 -@@ -178,14 +178,14 @@ GMIMELDFLAGS+=$(GMIME_LIB) - endif - - $(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -- @$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS) -+ $(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS) - $(ECHO_PREFIX) echo " [LD] $^ -> $@" - ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) - $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) - else - $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) - endif -- $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@ -+ #$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@ - - clean:: - rm -f asterisk diff --git a/package/asterisk/patches/patch-main_buildinfo_c b/package/asterisk/patches/patch-main_buildinfo_c deleted file mode 100644 index dce0fb546..000000000 --- a/package/asterisk/patches/patch-main_buildinfo_c +++ /dev/null @@ -1,13 +0,0 @@ ---- asterisk-1.6.2.10.orig/main/buildinfo.c 2008-10-30 17:49:02.000000000 +0100 -+++ asterisk-1.6.2.10/main/buildinfo.c 2010-07-26 19:22:57.000000000 +0200 -@@ -23,8 +23,8 @@ - * \author Kevin P. Fleming <kpfleming@digium.com> - */ - --#include "asterisk/buildinfo.h" --#include "asterisk/build.h" -+#include "../include/asterisk/buildinfo.h" -+#include "../include/asterisk/build.h" - - const char *ast_build_hostname = BUILD_HOSTNAME; - const char *ast_build_kernel = BUILD_KERNEL; |