rpms/asterisk/devel 0016-pagecount.patch, NONE, 1.1 asterisk.spec, 1.53, 1.54

[Jeffrey C. Ollie]

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1400

Modified Files:
	asterisk.spec 
Added Files:
	0016-pagecount.patch 
Log Message:
* Tue Sep  1 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.26.rc1
- Add a patch from Quentin Armitage and rebuld.


0016-pagecount.patch:
 app_fax.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE 0016-pagecount.patch ---
--- a/apps/app_fax.c	2008-12-15 15:50:12.000000000 +0000
+++ b/apps/app_fax.c	2009-09-02 00:05:15.000000000 +0100
@@ -161,6 +161,7 @@
 	char buf[20];
 	fax_session *s = (fax_session *) user_data;
 	t30_stats_t stat;
+	int pages_transferred;
 
 	ast_debug(1, "Fax phase E handler. result=%d\n", result);
 
@@ -186,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);
-	snprintf(buf, sizeof(buf), "%d", stat.pages_transferred);
+#if SPANDSP_RELEASE_DATE >= 20090220
+	pages_transferred = (s->direction) ? stat.pages_tx : stat.pages_rx;
+#else
+	pages_transferred = stat.pages_transferred;
+#endif
+	snprintf(buf, sizeof(buf), "%d", pages_transferred);
 	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 @@
 	
 	ast_debug(1, "Fax transmitted successfully.\n");
 	ast_debug(1, "  Remote station ID: %s\n", far_ident);
-	ast_debug(1, "  Pages transferred: %d\n", stat.pages_transferred);
+	ast_debug(1, "  Pages transferred: %d\n", pages_transferred);
 	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 @@
 		      S_OR(s->chan->cid.cid_num, ""),
 		      far_ident,
 		      local_ident,
-		      stat.pages_transferred,
+		      pages_transferred,
 		      stat.y_resolution,
 		      stat.bit_rate,
 		      s->file_name);


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- asterisk.spec	21 Aug 2009 12:31:44 -0000	1.53
+++ asterisk.spec	2 Sep 2009 02:53:49 -0000	1.54
@@ -3,7 +3,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.1
-Release: 0.25.%{?_rc:rc%{_rc}}%{?dist}
+Release: 0.26.%{?_rc:rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -55,6 +55,7 @@ Patch12: 0012-Add-LDAP-schema-that-is-co
 Patch13: 0013-Bridging-work-as-of-svn-rev-174216.patch
 Patch14: 0014-Adding-in-CLI-apps.patch
 Patch15: 0015-Update-autoconf.patch
+Patch16: 0016-pagecount.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -456,6 +457,7 @@ local filesystem.
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -1099,6 +1101,9 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Tue Sep  1 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.26.rc1
+- Add a patch from Quentin Armitage and rebuld.
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.1-0.25.rc1
 - rebuilt with new openssl