I missed one of the two required upstream SVN commits to port app_fax.c to SpanDSP 0.0.6; this would have broken your build if it affected you.

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

3 files changed, 170 insertions, 9 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 73511d52a7da..02e067db039e 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.190 2009/03/19 13:08:38 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.191 2009/03/20 14:00:58 chainsaw Exp $
+
+  20 Mar 2009; <chainsaw@gentoo.org>
+  files/1.6.0/asterisk-1.6.0.6-spandsp-api-change.patch:
+  I missed one of the two required upstream SVN commits to port app_fax.c to
+  SpanDSP 0.0.6; this would have broken your build if it affected you.
 
   19 Mar 2009; Brent Baude <ranger@gentoo.org> asterisk-1.2.31.1.ebuild:
   Marking asterisk-1.2.31.1 ppc for bug 250748
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index c742e7d5eb47..4f1ac79a0f8a 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.0.0/asterisk-1.0.5-uclibc-dns.diff 304 RMD160 6d58a0fdad04f5105c1b8f8bb3e2058b4f97f12f SHA1 5f7819a1e5f5b8f035146d5506bab83f4ecb6ae0 SHA256 e4de36e528b7d1a7941689d530d93f1ffd41a2f863a856e612e3637f78ea4890
 AUX 1.2.0/asterisk-1.2.1-uclibc-getloadavg.diff 317 RMD160 f598d94a52cec83fefdafdce0694049c657e09e0 SHA1 fc0f4d990e386d39d43bac073f353421063186c9 SHA256 61daa70727418dbaf232fc5d1eaddd20a8505b943b8fb724a1b63170edfe88cc
 AUX 1.2.0/asterisk-1.2.21.1-h323-dumb-makefile.diff 1098 RMD160 c39cee5a6f420e6e63e30ac5e83aa9b78c1b12c8 SHA1 93087ecdcde11bd983d25acaac3723450abbc111 SHA256 86d0c8cd754754916c45d77d9c745d1688b3b7b54181ecb1d42a1934bdea7deb
@@ -16,7 +19,7 @@ AUX 1.6.0/asterisk-1.6.0.6-imap-kerberos.patch 747 RMD160 eacde011d0037b22148199
 AUX 1.6.0/asterisk-1.6.0.6-parallelmake.patch 4952 RMD160 d57a16f8c9c783acf83c1ce2e436e73d4dd23166 SHA1 60f09e30f837ddaa9bafde69863fb707b33474d8 SHA256 1d80039098c5f9746ac35ca31f3bf7697cc7e5505428e1457fbe922fd6a1a75f
 AUX 1.6.0/asterisk-1.6.0.6-sip-use-specified-port.patch 391 RMD160 191be72373a53ac32932d09bb78486d8634d0a9c SHA1 b483a88251f464464e9f54382cfda759b6c6c760 SHA256 cb1d7a923ce6d719e44cc75c9ba91f6975f872da731fc701bd000c628d604f65
 AUX 1.6.0/asterisk-1.6.0.6-socket-details.patch 2636 RMD160 73414fda459b0dba8e01bc22e03887db8edc8d70 SHA1 ab9c6bed2782da9d8b3a29f56483749b990ecdb4 SHA256 30f70998221b452a1a2d05b17641d9d3632de451b37019fa68783509015232cd
-AUX 1.6.0/asterisk-1.6.0.6-spandsp-api-change.patch 1630 RMD160 3c297783f35251bb94f74d37e8471ad53056504d SHA1 def21b3058e65123964a14139eeb14e6be82b6b3 SHA256 0191f62b9995878749cd54dd91b3404d16a9ced1a5444991ea21e6f78c459c77
+AUX 1.6.0/asterisk-1.6.0.6-spandsp-api-change.patch 6026 RMD160 77106003f17d737045f64656eb07b7d1afd47b75 SHA1 f429e5a8aee5fc0eeb84bb560392fd326ddbf0f4 SHA256 461379cecbedab34ecfdefabb973d48f23b3d93b51b47ed69ec506ed32ee0f80
 AUX 1.6.0/asterisk-1.6.0.6-toolcheck-libs-not-ldflags.patch 726 RMD160 c1886f3462e175ef66ebcfaba626fc110a228301 SHA1 3f9443575c459bd2808472e7cb053c34cdc32f26 SHA256 ddced0af87ea654e5576ea1b95994ccd4ea8d535f7e55db1a1f0c5c495029923
 AUX 1.6.0/asterisk.confd 2204 RMD160 31bceebfa535e97cb2634e313678cc42186d4750 SHA1 748c623cea238cd9b322672d5ebcfe214a4f0463 SHA256 daec84c58e0ef6cbd71a6fc62cb83129b1bcffdfdd619ebbd62a642f0cd1eee7
 AUX 1.6.0/asterisk.rc6 5891 RMD160 55a2cd4c5d2e069c4cabb5e8864870467608197c SHA1 d8d2e39ed2aa658a008103dc9655255a78e5796c SHA256 d8dbe6d0d0cc8a17c641a02e248c77107d298684fe3bdbfd87324bbe26e35979
@@ -30,5 +33,12 @@ DIST bristuff-0.3.0-PRE-1y-w.tar.gz 300178 RMD160 9edbfa43547f29da345deea9b7787d
 EBUILD asterisk-1.2.27.ebuild 11496 RMD160 216ef8ceedecfef8d5ae873cd2a1630ce2e97dda SHA1 795491a8718b681d899f76c6b636ebff13f48c10 SHA256 031deb2d04fe0047c4cf1dcffd4cf9f672e1eb651235f4784a143d6166101129
 EBUILD asterisk-1.2.31.1.ebuild 11809 RMD160 e07642f266dd340afd216be517ab53c05d21d18e SHA1 079aecf9aa5ed0488810684f6ecb6fac14f25a9d SHA256 b0fdfc45867fe79763cd98913d246eb18f85f5ba772d2a9240fe06f415913acc
 EBUILD asterisk-1.6.0.6.ebuild 13097 RMD160 82e354456d9aea40e4b8eec6e00bba2a35d3020b SHA1 329ad7461a0853e363bdf4be270a4fe18cabb942 SHA256 5ddbb41695f622b4ceb346575513003ea5fe28f0ab5548685b037e372c3ac2ad
-MISC ChangeLog 39271 RMD160 49a912f1474f7de867280915b1cf80b1d5fa8434 SHA1 930515317c274b6b50308eac9811aed622029424 SHA256 34860a6e3410f415a9049ce7b084a96e50c88eebc721287102d4f732d29bf082
+MISC ChangeLog 39516 RMD160 32b70976ddb42921202542f9ad2b09e7eead548b SHA1 46f892d48766d9f8c2c836d0772ff8f19df02ba0 SHA256 63b76f30c7d49edd42c0397f260ec313fe96ada5f19151d9d94abce30a02d655
 MISC metadata.xml 1248 RMD160 3dc4417124d1cbc49566798212a75464aa0eaa78 SHA1 bef2f778e9f63e295eeec8127d5e0bd5353efd61 SHA256 25bab15816cd5b3e69899b26a059c8f5abb098692dc16fd78280bf225cc245a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAknDoSIACgkQp5vW4rUFj5rg5gCeOmbw+lBQ0ffUSs/JYcADeIP+
+QiIAn3V93drcTCPfZ2N/4KeGyIgYCh/r
+=Z4cq
+-----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/files/1.6.0/asterisk-1.6.0.6-spandsp-api-change.patch b/net-misc/asterisk/files/1.6.0/asterisk-1.6.0.6-spandsp-api-change.patch
index 8f05aab56a9b..9fcdf811d4b4 100644
--- a/net-misc/asterisk/files/1.6.0/asterisk-1.6.0.6-spandsp-api-change.patch
+++ b/net-misc/asterisk/files/1.6.0/asterisk-1.6.0.6-spandsp-api-change.patch
@@ -1,6 +1,15 @@
---- branches/1.6.0/apps/app_fax.c	2009/02/20 21:41:54	177762
-+++ branches/1.6.0/apps/app_fax.c	2009/02/20 21:56:39	177763
-@@ -161,6 +161,7 @@
+diff -uNr asterisk-1.6.0.6.ORIG/apps/app_fax.c asterisk-1.6.0.6/apps/app_fax.c
+--- asterisk-1.6.0.6.ORIG/apps/app_fax.c	2009-03-20 13:47:53.000000000 +0000
++++ asterisk-1.6.0.6/apps/app_fax.c	2009-03-20 13:48:56.000000000 +0000
+@@ -32,6 +32,7 @@
+ #ifdef HAVE_SPANDSP_EXPOSE_H
+ #include <spandsp/expose.h>
+ #endif
++#include <spandsp/version.h>
+ 
+ #include "asterisk/lock.h"
+ #include "asterisk/file.h"
+@@ -160,6 +161,7 @@
  	char buf[20];
  	fax_session *s = (fax_session *) user_data;
  	t30_stats_t stat;
@@ -8,7 +17,7 @@
  
  	ast_debug(1, "Fax phase E handler. result=%d\n", result);
  
-@@ -186,7 +187,12 @@
+@@ -185,7 +187,12 @@
  	pbx_builtin_setvar_helper(s->chan, "FAXSTATUS", "SUCCESS"); 
  	pbx_builtin_setvar_helper(s->chan, "FAXERROR", NULL); 
  	pbx_builtin_setvar_helper(s->chan, "REMOTESTATIONID", far_ident);
@@ -22,7 +31,7 @@
  	pbx_builtin_setvar_helper(s->chan, "FAXPAGES", buf);
  	snprintf(buf, sizeof(buf), "%d", stat.y_resolution);
  	pbx_builtin_setvar_helper(s->chan, "FAXRESOLUTION", buf);
-@@ -195,7 +201,7 @@
+@@ -194,7 +201,7 @@
  	
  	ast_debug(1, "Fax transmitted successfully.\n");
  	ast_debug(1, "  Remote station ID: %s\n", far_ident);
@@ -31,7 +40,7 @@
  	ast_debug(1, "  Image resolution:  %d x %d\n", stat.x_resolution, stat.y_resolution);
  	ast_debug(1, "  Transfer Rate:     %d\n", stat.bit_rate);
  	
-@@ -215,7 +221,7 @@
+@@ -214,7 +221,7 @@
  		      S_OR(s->chan->cid.cid_num, ""),
  		      far_ident,
  		      local_ident,
@@ -40,3 +49,140 @@
  		      stat.y_resolution,
  		      stat.bit_rate,
  		      s->file_name);
+@@ -313,6 +320,7 @@
+ 	int original_read_fmt = AST_FORMAT_SLINEAR;
+ 	int original_write_fmt = AST_FORMAT_SLINEAR;
+ 	fax_state_t fax;
++	t30_state_t *t30state;
+ 	struct ast_dsp *dsp = NULL;
+ 	int detect_tone = 0;
+ 	struct ast_frame *inf = NULL;
+@@ -321,6 +329,14 @@
+ 	struct timeval now, start, state_change;
+ 	enum ast_control_t38 t38control;
+ 
++#if SPANDSP_RELEASE_DATE >= 20081012
++        /* for spandsp shaphots 0.0.6 and higher */
++        t30state = &fax.t30;
++#else
++        /* for spandsp release 0.0.5 */
++        t30state = &fax.t30_state;
++#endif
++
+ 	original_read_fmt = s->chan->readformat;
+ 	if (original_read_fmt != AST_FORMAT_SLINEAR) {
+ 		res = ast_set_read_format(s->chan, AST_FORMAT_SLINEAR);
+@@ -344,16 +360,16 @@
+ 
+ 	/* Setup logging */
+ 	set_logging(&fax.logging);
+-	set_logging(&fax.t30_state.logging);
++	set_logging(&t30state->logging);
+ 
+ 	/* Configure terminal */
+-	set_local_info(&fax.t30_state, s);
+-	set_file(&fax.t30_state, s);
+-	set_ecm(&fax.t30_state, TRUE);
++	set_local_info(t30state, s);
++	set_file(t30state, s);
++	set_ecm(t30state, TRUE);
+ 
+ 	fax_set_transmit_on_idle(&fax, TRUE);
+ 
+-	t30_set_phase_e_handler(&fax.t30_state, phase_e_handler, s);
++	t30_set_phase_e_handler(t30state, phase_e_handler, s);
+ 
+ 	if (s->t38state == T38_STATE_UNAVAILABLE) {
+ 		ast_debug(1, "T38 is unavailable on %s\n", s->chan->name);
+@@ -418,9 +434,9 @@
+ 			}
+ 
+ 			/* Watchdog */
+-			if (last_state != fax.t30_state.state) {
++			if (last_state != t30state->state) {
+ 				state_change = ast_tvnow();
+-				last_state = fax.t30_state.state;
++				last_state = t30state->state;
+ 			}
+ 		} else if (inf->frametype == AST_FRAME_CONTROL && inf->subclass == AST_CONTROL_T38 &&
+ 				inf->datalen == sizeof(enum ast_control_t38)) {
+@@ -459,10 +475,10 @@
+ 	   by t30_terminate, display diagnostics and set status variables although no transmittion
+ 	   has taken place yet. */
+ 	if (res > 0) {
+-		t30_set_phase_e_handler(&fax.t30_state, NULL, NULL);
++		t30_set_phase_e_handler(t30state, NULL, NULL);
+ 	}
+ 
+-	t30_terminate(&fax.t30_state);
++	t30_terminate(t30state);
+ 	fax_release(&fax);
+ 
+ done:
+@@ -489,6 +505,19 @@
+ 	struct timeval now, start, state_change, last_frame;
+ 	enum ast_control_t38 t38control;
+ 
++	t30_state_t *t30state;
++	t38_core_state_t *t38state;
++
++#if SPANDSP_RELEASE_DATE >= 20081012
++	/* for spandsp shaphots 0.0.6 and higher */
++	t30state = &t38.t30;
++	t38state = &t38.t38_fe.t38;
++#else
++	/* for spandsp releases 0.0.5 */
++	t30state = &t38.t30_state;
++	t38state = &t38.t38;
++#endif
++
+ 	/* Initialize terminal */
+ 	memset(&t38, 0, sizeof(t38));
+ 	if (t38_terminal_init(&t38, s->caller_mode, t38_tx_packet_handler, s->chan) == NULL) {
+@@ -498,15 +527,15 @@
+ 
+ 	/* Setup logging */
+ 	set_logging(&t38.logging);
+-	set_logging(&t38.t30_state.logging);
+-	set_logging(&t38.t38.logging);
++	set_logging(&t30state->logging);
++	set_logging(&t38state->logging);
+ 
+ 	/* Configure terminal */
+-	set_local_info(&t38.t30_state, s);
+-	set_file(&t38.t30_state, s);
+-	set_ecm(&t38.t30_state, TRUE);
++	set_local_info(t30state, s);
++	set_file(t30state, s);
++	set_ecm(t30state, TRUE);
+ 
+-	t30_set_phase_e_handler(&t38.t30_state, phase_e_handler, s);
++	t30_set_phase_e_handler(t30state, phase_e_handler, s);
+ 
+ 	now = start = state_change = ast_tvnow();
+ 
+@@ -532,12 +561,12 @@
+ 		ast_debug(10, "frame %d/%d, len=%d\n", inf->frametype, inf->subclass, inf->datalen);
+ 
+ 		if (inf->frametype == AST_FRAME_MODEM && inf->subclass == AST_MODEM_T38) {
+-			t38_core_rx_ifp_packet(&t38.t38, inf->data, inf->datalen, inf->seqno);
++			t38_core_rx_ifp_packet(t38state, inf->data, inf->datalen, inf->seqno);
+ 
+ 			/* Watchdog */
+-			if (last_state != t38.t30_state.state) {
++			if (last_state != t30state->state) {
+ 				state_change = ast_tvnow();
+-				last_state = t38.t30_state.state;
++				last_state = t30state->state;
+ 			}
+ 		} else if (inf->frametype == AST_FRAME_CONTROL && inf->subclass == AST_CONTROL_T38 &&
+ 				inf->datalen == sizeof(enum ast_control_t38)) {
+@@ -567,7 +596,7 @@
+ 	if (inf)
+ 		ast_frfree(inf);
+ 
+-	t30_terminate(&t38.t30_state);
++	t30_terminate(t30state);
+ 	t38_terminal_release(&t38);
+ 
+ 	return res;