Remove old 1.8 patches in files directory; a patch tarball has been used for a while now.

(Portage version: 2.1.9.49/cvs/Linux x86_64)

10 files changed, 14 insertions, 311 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 24293d5f3c75..6fc18fe9a226 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.315 2011/05/27 13:37:33 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.316 2011/06/01 20:38:13 chainsaw Exp $
+
+  01 Jun 2011; Tony Vroon <chainsaw@gentoo.org>
+  -files/1.8.0/asterisk-1.8.0-alarm-receiver-use-playtones.patch,
+  -files/1.8.0/asterisk-1.8.0-confbridge-menu-invocation.patch,
+  -files/1.8.0/asterisk-1.8.0-dahdiras-without-root.patch,
+  -files/1.8.0/asterisk-1.8.0-gsm-pic.patch,
+  -files/1.8.0/asterisk-1.8.0-iax2-peerstate.patch,
+  -files/1.8.0/asterisk-1.8.0-inband-indications.patch,
+  -files/1.8.0/asterisk-1.8.0-pbxstart-failed-spurious-bye.patch,
+  -files/1.8.0/asterisk-1.8.0-pri-missing-keyword.patch,
+  -files/1.8.0/asterisk-1.8.0-uclibc.patch:
+  Remove old 1.8 patches in files directory; a patch tarball has been used for
+  a while now.
 
   27 May 2011; Tony Vroon <chainsaw@gentoo.org> -asterisk-1.8.3.3.ebuild,
   -asterisk-1.8.4.ebuild, metadata.xml:
diff --git a/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-alarm-receiver-use-playtones.patch b/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-alarm-receiver-use-playtones.patch
deleted file mode 100644
index 34942de14fa1..000000000000
--- a/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-alarm-receiver-use-playtones.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-diff -uNr asterisk-1.8.0.ORIG//apps/app_alarmreceiver.c asterisk-1.8.0/apps/app_alarmreceiver.c
---- asterisk-1.8.0.ORIG//apps/app_alarmreceiver.c	2010-10-27 00:41:40.000000000 +0100
-+++ asterisk-1.8.0/apps/app_alarmreceiver.c	2010-10-27 00:57:00.000000000 +0100
-@@ -51,6 +51,7 @@
- #include "asterisk/callerid.h"
- #include "asterisk/astdb.h"
- #include "asterisk/utils.h"
-+#include "asterisk/indications.h"
- 
- #define ALMRCV_CONFIG "alarmreceiver.conf"
- #define ADEMCO_CONTACT_ID "ADEMCO_CONTACT_ID"
-@@ -139,86 +140,6 @@
- 	return;
- }
- 
--
--/*
--* Build a MuLaw data block for a single frequency tone
--*/
--static void make_tone_burst(unsigned char *data, float freq, float loudness, int len, int *x)
--{
--	int     i;
--	float   val;
--
--	for (i = 0; i < len; i++) {
--		val = loudness * sin((freq * 2.0 * M_PI * (*x)++)/8000.0);
--		data[i] = AST_LIN2MU((int)val);
--	}
--
--	/* wrap back around from 8000 */
--
--	if (*x >= 8000)
--		*x = 0;
--	return;
--}
--
--/*
--* Send a single tone burst for a specifed duration and frequency.
--* Returns 0 if successful
--*/
--static int send_tone_burst(struct ast_channel *chan, float freq, int duration, int tldn)
--{
--	int res = 0;
--	int i = 0;
--	int x = 0;
--	struct ast_frame *f, wf;
--	
--	struct {
--		unsigned char offset[AST_FRIENDLY_OFFSET];
--		unsigned char buf[640];
--	} tone_block;
--
--	for (;;) {
--
--		if (ast_waitfor(chan, -1) < 0) {
--			res = -1;
--			break;
--		}
--
--		f = ast_read(chan);
--		if (!f) {
--			res = -1;
--			break;
--		}
--
--		if (f->frametype == AST_FRAME_VOICE) {
--			wf.frametype = AST_FRAME_VOICE;
--			wf.subclass.codec = AST_FORMAT_ULAW;
--			wf.offset = AST_FRIENDLY_OFFSET;
--			wf.mallocd = 0;
--			wf.data.ptr = tone_block.buf;
--			wf.datalen = f->datalen;
--			wf.samples = wf.datalen;
--			
--			make_tone_burst(tone_block.buf, freq, (float) tldn, wf.datalen, &x);
--
--			i += wf.datalen / 8;
--			if (i > duration) {
--				ast_frfree(f);
--				break;
--			}
--			if (ast_write(chan, &wf)) {
--				ast_verb(4, "AlarmReceiver: Failed to write frame on %s\n", chan->name);
--				ast_log(LOG_WARNING, "AlarmReceiver Failed to write frame on %s\n",chan->name);
--				res = -1;
--				ast_frfree(f);
--				break;
--			}
--		}
--
--		ast_frfree(f);
--	}
--	return res;
--}
--
- /*
- * Receive a string of DTMF digits where the length of the digit string is known in advance. Do not give preferential
- * treatment to any digit value, and allow separate time out values to be specified for the first digit and all subsequent
-@@ -437,19 +358,29 @@
- 	database_increment("calls-received");
- 
- 	/* Wait for first event */
--	ast_verb(4, "AlarmReceiver: Waiting for first event from panel\n");
-+	ast_verb(4, "AlarmReceiver: Waiting for first event from panel...\n");
- 
- 	while (res >= 0) {
- 		if (got_some_digits == 0) {
- 			/* Send ACK tone sequence */
- 			ast_verb(4, "AlarmReceiver: Sending 1400Hz 100ms burst (ACK)\n");
--			res = send_tone_burst(chan, 1400.0, 100, tldn);
--			if (!res)
--				res = ast_safe_sleep(chan, 100);
-+			res = ast_playtones_start(chan, tldn, "1400", 0);
- 			if (!res) {
-+				ast_safe_sleep(chan, 100);
-+				ast_playtones_stop(chan);
-+			}
-+			if (!res) {
-+				ast_safe_sleep(chan, 100);
- 				ast_verb(4, "AlarmReceiver: Sending 2300Hz 100ms burst (ACK)\n");
--				res = send_tone_burst(chan, 2300.0, 100, tldn);
-+				res = ast_playtones_start(chan, tldn, "2300", 0);
-+				if (!res) {
-+					ast_safe_sleep(chan, 100);
-+					ast_playtones_stop(chan);
-+				}
-+			} else {
-+				ast_debug(1, "AlarmReceiver: Failed sending tones\n");
- 			}
-+
- 		}
- 		if ( res >= 0)
- 			res = receive_dtmf_digits(chan, event, sizeof(event) - 1, fdto, sdto);
-@@ -556,9 +487,14 @@
- 		if (res == 0)
- 			res = ast_safe_sleep(chan, 200);
- 
--		/* Send the kissoff tone */
--		if (res == 0)
--			res = send_tone_burst(chan, 1400.0, 900, tldn);
-+		/* Send the kissoff tone (1400 Hz, 900 ms) */
-+		if (res == 0) {
-+			res = ast_playtones_start(chan, tldn, "1400", 0);
-+			if (res == 0) {
-+			  	ast_safe_sleep(chan, 900);
-+				ast_playtones_stop(chan);
-+			}
-+		}
- 	}
- 
- 	return res;
diff --git a/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-confbridge-menu-invocation.patch b/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-confbridge-menu-invocation.patch
deleted file mode 100644
index 89008e4b5912..000000000000
--- a/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-confbridge-menu-invocation.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr asterisk-1.8.0.ORIG//apps/app_confbridge.c asterisk-1.8.0/apps/app_confbridge.c
---- asterisk-1.8.0.ORIG//apps/app_confbridge.c	2010-10-27 00:41:40.000000000 +0100
-+++ asterisk-1.8.0/apps/app_confbridge.c	2010-10-27 00:54:18.000000000 +0100
-@@ -734,7 +734,7 @@
- 
- 	/* If the menu option is enabled provide a user or admin menu as a custom feature hook */
- 	if (ast_test_flag(&conference_bridge_user.flags, OPTION_MENU)) {
--		ast_bridge_features_hook(&conference_bridge_user.features, "#", menu_callback, &conference_bridge_user);
-+		ast_bridge_features_hook(&conference_bridge_user.features, "*", menu_callback, &conference_bridge_user);
- 	}
- 
- 	/* If the caller should be joined already muted, make it so */
diff --git a/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-dahdiras-without-root.patch b/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-dahdiras-without-root.patch
deleted file mode 100644
index 493bc2065689..000000000000
--- a/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-dahdiras-without-root.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr asterisk-1.8.0.ORIG//apps/app_dahdiras.c asterisk-1.8.0/apps/app_dahdiras.c
---- asterisk-1.8.0.ORIG//apps/app_dahdiras.c	2010-10-27 00:41:40.000000000 +0100
-+++ asterisk-1.8.0/apps/app_dahdiras.c	2010-10-27 00:50:00.000000000 +0100
-@@ -119,8 +119,6 @@
- 		c = strsep(&stringp, ",");
- 	}
- 
--	argv[argc++] = "plugin";
--	argv[argc++] = "dahdi.so";
- 	argv[argc++] = "stdin";
- 
- 	/* Finally launch PPP */
diff --git a/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-gsm-pic.patch b/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-gsm-pic.patch
deleted file mode 100644
index a96fd47cccce..000000000000
--- a/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-gsm-pic.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -uNr asterisk-1.8.0.ORIG/codecs/gsm/Makefile asterisk-1.8.0/codecs/gsm/Makefile
---- asterisk-1.8.0.ORIG/codecs/gsm/Makefile	2010-03-09 21:39:20.000000000 +0100
-+++ asterisk-1.8.0/codecs/gsm/Makefile	2010-03-09 21:39:20.000000000 +0100
-@@ -45,30 +45,6 @@
- OPTIMIZE=-O2
- endif
- 
--ifeq (,$(findstring $(shell uname -s),Darwin SunOS))
--  ifeq (,$(strip $(findstring $(PROC) ,"x86_64 amd64 ultrasparc sparc64 arm armv5b armeb ppc powerpc ppc64 ia64 s390 bfin mipsel mips ")))
--    ifeq (,$(strip $(findstring $(shell uname -m) ,"ppc ppc64 alpha armv4l s390 ")))
--      OPTIMIZE+=-march=$(PROC)
--    endif
--  endif
--else
--  ifneq (,$(findstring $(OSARCH),Darwin))
--    ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
--      # Snow Leopard reports i386, even though it's really x86_64
--      OPTIMIZE+=-mtune=native
--    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.
--#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it.
--#So we go lowest common available by gcc and go a step down, still a step up from
--#the default as we now have a better instruction set to work with. - Belgarath
--ifeq ($(PROC),ultrasparc)
--OPTIMIZE+=-mcpu=v8 -mtune=$(PROC) -O3 
--endif
--
- PG =
- #PG = -g -pg
- ######### Profiling flags.  If you don't know what that means, leave it blank.
-@@ -223,11 +199,9 @@
- # 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
-+    ifneq ($(K6OPT),)
-+	GSM_SOURCES+= $(SRC)/k6opt.s
-+    endif
- endif
- 
- TOAST_SOURCES = $(SRC)/toast.c 		\
-@@ -275,11 +249,9 @@
- 		$(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
-+    ifneq ($(K6OPT),)
-+	GSM_OBJECTS+= $(SRC)/k6opt.o
-+    endif
- endif
- 
- TOAST_OBJECTS =	$(SRC)/toast.o 		\
diff --git a/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-iax2-peerstate.patch b/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-iax2-peerstate.patch
deleted file mode 100644
index 4ecc245d99c9..000000000000
--- a/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-iax2-peerstate.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr asterisk-1.8.0.ORIG//channels/chan_iax2.c asterisk-1.8.0/channels/chan_iax2.c
---- asterisk-1.8.0.ORIG//channels/chan_iax2.c	2010-10-27 00:41:40.000000000 +0100
-+++ asterisk-1.8.0/channels/chan_iax2.c	2010-10-27 00:47:42.000000000 +0100
-@@ -8707,7 +8707,7 @@
- 			ast_db_put("IAX/Registry", p->name, data);
- 			ast_verb(3, "Registered IAX2 '%s' (%s) at %s:%d\n", p->name,
- 					    ast_test_flag(&iaxs[callno]->state, IAX_STATE_AUTHENTICATED) ? "AUTHENTICATED" : "UNAUTHENTICATED", ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port));
--			manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: IAX2\r\nPeer: IAX2/%s\r\nPeerStatus: Registered\r\n", p->name);
-+			manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: IAX2\r\nPeer: IAX2/%s\r\nPeerStatus: Registered\r\nAddress: %s\r\nPost: %d\r\n", p->name, ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port));
- 			register_peer_exten(p, 1);
- 			ast_devstate_changed(AST_DEVICE_UNKNOWN, "IAX2/%s", p->name); /* Activate notification */
- 		} else if (!ast_test_flag64(p, IAX_TEMPONLY)) {
diff --git a/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-inband-indications.patch b/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-inband-indications.patch
deleted file mode 100644
index b249bf9cf818..000000000000
--- a/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-inband-indications.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNr asterisk-1.8.0.ORIG/main/channel.c asterisk-1.8.0/main/channel.c
---- asterisk-1.8.0-orig/main/channel.c	2010-10-22 10:04:33.439148782 +0200
-+++ asterisk-1.8.0/main/channel.c	2010-10-22 10:05:51.124146954 +0200
-@@ -2955,6 +2955,8 @@
- 			chan->generator->release(chan, chan->generatordata);
- 		chan->generatordata = NULL;
- 	}
-+
-+	ast_prod(chan);
- 	if (gen->alloc && !(chan->generatordata = gen->alloc(chan, params))) {
- 		res = -1;
- 	}
-@@ -2964,8 +2966,6 @@
- 	}
- 	ast_channel_unlock(chan);
- 
--	ast_prod(chan);
--
- 	return res;
- }
- 
diff --git a/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-pbxstart-failed-spurious-bye.patch b/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-pbxstart-failed-spurious-bye.patch
deleted file mode 100644
index 361c1ebb9d48..000000000000
--- a/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-pbxstart-failed-spurious-bye.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr asterisk-1.8.0.ORIG//channels/chan_sip.c asterisk-1.8.0/channels/chan_sip.c
---- asterisk-1.8.0.ORIG//channels/chan_sip.c	2010-10-27 00:41:40.000000000 +0100
-+++ asterisk-1.8.0/channels/chan_sip.c	2010-10-27 00:52:14.000000000 +0100
-@@ -21567,6 +21567,8 @@
- 
- 				if (result) {
- 
-+					sip_alreadygone(p);
-+
- 					/* Unlock locks so ast_hangup can do its magic */
- 					ast_channel_unlock(c);
- 					sip_pvt_unlock(p);
diff --git a/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-pri-missing-keyword.patch b/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-pri-missing-keyword.patch
deleted file mode 100644
index 5db2bcaa2729..000000000000
--- a/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-pri-missing-keyword.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr asterisk-1.8.0.ORIG//include/asterisk/autoconfig.h.in asterisk-1.8.0/include/asterisk/autoconfig.h.in
---- asterisk-1.8.0.ORIG//include/asterisk/autoconfig.h.in	2010-10-27 00:41:40.000000000 +0100
-+++ asterisk-1.8.0/include/asterisk/autoconfig.h.in	2010-10-27 00:43:34.000000000 +0100
-@@ -573,6 +573,8 @@
- /* Define to 1 if you have the ISDN PRI hangup fix library. */
- #undef HAVE_PRI_HANGUP_FIX
- 
-+#undef HAVE_PRI_PROG_W_CAUSE
-+
- /* Define to 1 if you have the ISDN PRI set_inbanddisconnect library. */
- #undef HAVE_PRI_INBANDDISCONNECT
- 
diff --git a/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-uclibc.patch b/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-uclibc.patch
deleted file mode 100644
index 87d9a98ef058..000000000000
--- a/net-misc/asterisk/files/1.8.0/asterisk-1.8.0-uclibc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNr asterisk-1.8.0.ORIG/Makefile asterisk-1.8.0/Makefile
---- asterisk-1.8.0-orig/Makefile.old	2008-03-22 11:51:39.000000000 +0100
-+++ asterisk-1.8.0/Makefile	2008-03-22 11:51:49.000000000 +0100
-@@ -259,6 +259,10 @@
-   ASTCFLAGS+=-pthread
- endif
- 
-+ifeq ($(OSARCH),linux-uclibc)
-+  AST_LIBS+=-lpthread -ldl
-+endif
-+
- ifeq ($(OSARCH),SunOS)
-   ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2
- endif