diff options
Diffstat (limited to 'package/asterisk/patches')
-rw-r--r-- | package/asterisk/patches/patch-apps__moduleinfo | 13 | ||||
-rw-r--r-- | package/asterisk/patches/patch-channels_chan_iax2_c | 20 | ||||
-rw-r--r-- | package/asterisk/patches/patch-channels_chan_oss_c | 37 | ||||
-rw-r--r-- | package/asterisk/patches/patch-codecs_gsm_Makefile | 66 | ||||
-rw-r--r-- | package/asterisk/patches/patch-main_astobj2_c | 11 | ||||
-rw-r--r-- | package/asterisk/patches/patch-main_translate_c | 11 | ||||
-rw-r--r-- | package/asterisk/patches/patch-menuselect-tree | 12 | ||||
-rw-r--r-- | package/asterisk/patches/patch-res_res_features_c | 11 |
8 files changed, 0 insertions, 181 deletions
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-channels_chan_iax2_c b/package/asterisk/patches/patch-channels_chan_iax2_c deleted file mode 100644 index f39c2bf5b..000000000 --- a/package/asterisk/patches/patch-channels_chan_iax2_c +++ /dev/null @@ -1,20 +0,0 @@ ---- asterisk-1.4.27.1.orig/channels/chan_iax2.c 2009-11-10 18:15:57.000000000 +0100 -+++ asterisk-1.4.27.1/channels/chan_iax2.c 2009-12-03 20:57:05.000000000 +0100 -@@ -7076,7 +7076,7 @@ static int try_transfer(struct chan_iax2 - - memset(&ied, 0, sizeof(ied)); - if (ies->apparent_addr) -- bcopy(ies->apparent_addr, &new, sizeof(new)); -+ memcpy(&new, ies->apparent_addr, sizeof(new)); - if (ies->callno) - newcall = ies->callno; - if (!newcall || !new.sin_addr.s_addr || !new.sin_port) { -@@ -7235,7 +7235,7 @@ static int iax2_ack_registry(struct iax_ - - memset(&us, 0, sizeof(us)); - if (ies->apparent_addr) -- bcopy(ies->apparent_addr, &us, sizeof(us)); -+ memcpy(&us, ies->apparent_addr, sizeof(us)); - if (ies->username) - ast_copy_string(peer, ies->username, sizeof(peer)); - if (ies->refresh) diff --git a/package/asterisk/patches/patch-channels_chan_oss_c b/package/asterisk/patches/patch-channels_chan_oss_c deleted file mode 100644 index 33e9aaad7..000000000 --- a/package/asterisk/patches/patch-channels_chan_oss_c +++ /dev/null @@ -1,37 +0,0 @@ ---- asterisk-1.4.27.1.orig/channels/chan_oss.c 2009-08-10 21:15:57.000000000 +0200 -+++ asterisk-1.4.27.1/channels/chan_oss.c 2009-12-03 20:58:13.000000000 +0100 -@@ -562,7 +562,7 @@ static void send_sound(struct chan_oss_p - l = FRAME_SIZE - ofs; - if (l > s->datalen - start) /* don't overflow the source */ - l = s->datalen - start; -- bcopy(s->data + start, myframe + ofs, l * 2); -+ memcpy(myframe + ofs, s->data + start, l * 2); - if (0) - ast_log(LOG_WARNING, "send_sound sound %d/%d of %d into %d\n", l_sampsent, l, s->samplen, ofs); - l_sampsent += l; -@@ -573,14 +573,14 @@ static void send_sound(struct chan_oss_p - if (l > 0) { - if (l > FRAME_SIZE - ofs) - l = FRAME_SIZE - ofs; -- bcopy(silence, myframe + ofs, l * 2); -+ memcpy(myframe + ofs, silence, l * 2); - l_sampsent += l; - } else { /* silence is over, restart sound if loop */ - if (s->repeat == 0) { /* last block */ - o->cursound = -1; - o->nosound = 0; /* allow audio data */ - if (ofs < FRAME_SIZE) /* pad with silence */ -- bcopy(silence, myframe + ofs, (FRAME_SIZE - ofs) * 2); -+ memcpy(myframe + ofs, silence, (FRAME_SIZE - ofs) * 2); - } - l_sampsent = 0; - } -@@ -905,7 +905,7 @@ static struct ast_frame *oss_read(struct - - /* XXX can be simplified returning &ast_null_frame */ - /* prepare a NULL frame in case we don't have enough data to return */ -- bzero(f, sizeof(struct ast_frame)); -+ memset(f, 0, sizeof(struct ast_frame)); - f->frametype = AST_FRAME_NULL; - f->src = oss_tech.type; - 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 \ diff --git a/package/asterisk/patches/patch-main_astobj2_c b/package/asterisk/patches/patch-main_astobj2_c deleted file mode 100644 index d8aaf114b..000000000 --- a/package/asterisk/patches/patch-main_astobj2_c +++ /dev/null @@ -1,11 +0,0 @@ ---- asterisk-1.4.27.1.orig/main/astobj2.c 2009-10-06 03:16:36.000000000 +0200 -+++ asterisk-1.4.27.1/main/astobj2.c 2009-12-03 20:54:12.000000000 +0100 -@@ -236,7 +236,7 @@ int ao2_ref(void *user_data, const int d - /* for safety, zero-out the astobj2 header and also the - * first word of the user-data, which we make sure is always - * allocated. */ -- bzero(obj, sizeof(struct astobj2 *) + sizeof(void *) ); -+ memset(obj, 0, sizeof(struct astobj2 *) + sizeof(void *) ); - free(obj); - } - diff --git a/package/asterisk/patches/patch-main_translate_c b/package/asterisk/patches/patch-main_translate_c deleted file mode 100644 index 36d7c3058..000000000 --- a/package/asterisk/patches/patch-main_translate_c +++ /dev/null @@ -1,11 +0,0 @@ ---- asterisk-1.4.27.1.orig/main/translate.c 2009-10-21 18:44:49.000000000 +0200 -+++ asterisk-1.4.27.1/main/translate.c 2009-12-03 20:53:36.000000000 +0100 -@@ -442,7 +442,7 @@ static void rebuild_matrix(int samples) - if (option_debug) - ast_log(LOG_DEBUG, "Resetting translation matrix\n"); - -- bzero(tr_matrix, sizeof(tr_matrix)); -+ memset(tr_matrix, 0, sizeof(tr_matrix)); - - /* first, compute all direct costs */ - AST_LIST_TRAVERSE(&translators, t, list) { diff --git a/package/asterisk/patches/patch-menuselect-tree b/package/asterisk/patches/patch-menuselect-tree deleted file mode 100644 index 6bac1894d..000000000 --- a/package/asterisk/patches/patch-menuselect-tree +++ /dev/null @@ -1,12 +0,0 @@ ---- asterisk-1.4.27.1.orig/menuselect-tree 2009-11-30 19:30:41.000000000 +0100 -+++ asterisk-1.4.27.1/menuselect-tree 2009-12-03 20:55:04.000000000 +0100 -@@ -59,9 +59,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-res_res_features_c b/package/asterisk/patches/patch-res_res_features_c deleted file mode 100644 index a237fbf97..000000000 --- a/package/asterisk/patches/patch-res_res_features_c +++ /dev/null @@ -1,11 +0,0 @@ ---- asterisk-1.4.27.1.orig/res/res_features.c 2009-10-20 19:46:37.000000000 +0200 -+++ asterisk-1.4.27.1/res/res_features.c 2009-12-03 20:53:57.000000000 +0100 -@@ -279,7 +279,7 @@ static void *ast_bridge_call_thread(void - ast_bridge_call(tobj->peer, tobj->chan, &tobj->bconfig); - ast_hangup(tobj->chan); - ast_hangup(tobj->peer); -- bzero(tobj, sizeof(*tobj)); /*! \todo XXX for safety */ -+ memset(tobj, 0, sizeof(*tobj)); /*! \todo XXX for safety */ - free(tobj); - return NULL; - } |