ports/115450: [UPDATE] asterisk12 to 1.2.24
viper
viper at perm.raid.ru
Mon Aug 13 04:10:02 UTC 2007
>Number: 115450
>Category: ports
>Synopsis: [UPDATE] asterisk12 to 1.2.24
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Aug 13 04:10:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: viper
>Release: STABLE6
>Organization:
>Environment:
FreeBSD xxxxx 6.2-STABLE FreeBSD 6.2-STABLE #2: Fri Jul 27 01:04:19 YEKST 2007 viper at xxxxxx:/usr/obj/usr/src/sys/viper2 i386
>Description:
http://www.asterisk.org/node/48374
"Version 1.2.24 is the final 1.2 release that contains normal bug fixes. The 1.2 branch will only be maintained with security fix releases from now until it is completely deprecated."
o Upgrade to 1.2.24.
o Enable fax-related modules. Now they are again properly compiled. Taken from the site http://soft-switch.org/downloads/snapshots/spandsp/test-apps-asterisk-1.2/
>How-To-Repeat:
>Fix:
Apply patch
Patch attached with submission follows:
diff -ruN asterisk12.orig/Makefile asterisk12/Makefile
--- asterisk12.orig/Makefile 2007-08-01 03:18:08.000000000 +0600
+++ asterisk12/Makefile 2007-08-13 09:50:43.000000000 +0600
@@ -6,7 +6,7 @@
#
PORTNAME= asterisk
-PORTVERSION= 1.2.23
+PORTVERSION= 1.2.24
PKGNAMESUFFIX= 12
CATEGORIES= net
MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \
@@ -45,7 +45,11 @@
CXX="${CXX}"
PLIST_SUB= BRISTUFF="@comment "
MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
-WITHOUT_FAX= yes # Doesn't build with spandsp-0.0.3.
+#WITHOUT_FAX= yes # Doesn't build with spandsp-0.0.3.
+WITHOUT_ZAPTEL= yes
+WITHOUT_ODBC= yes
+WITHOUT_FREETDS =yes
+WITHOUT_H323 = yes
.include <bsd.port.pre.mk>
@@ -97,6 +101,7 @@
PLIST_SUB+= WITH_FAX="@comment "
.else
MAKE_ENV+= WITH_FAX=1
+BUILD_DEPENDS+= spandsp>=0.0.3:${PORTSDIR}/comms/spandsp
LIB_DEPENDS+= spandsp.0:${PORTSDIR}/comms/spandsp
PLIST_SUB+= WITH_FAX=""
.endif
diff -ruN asterisk12.orig/distinfo asterisk12/distinfo
--- asterisk12.orig/distinfo 2007-08-01 03:18:08.000000000 +0600
+++ asterisk12/distinfo 2007-08-13 09:51:35.000000000 +0600
@@ -1,6 +1,6 @@
-MD5 (asterisk-1.2.23.tar.gz) = e1e13a496a45342dec88dcf76162e6f0
-SHA256 (asterisk-1.2.23.tar.gz) = 963f84c4d72de2df9c3d7374646f228849f90e7156a99df398fe0a50160e7561
-SIZE (asterisk-1.2.23.tar.gz) = 10660237
+MD5 (asterisk-1.2.24.tar.gz) = 63dc8b7be4cd10375c5fbda893c780bc
+SHA256 (asterisk-1.2.24.tar.gz) = 9debaf410636fa477e1e1f09fe0b16a1c2814afaf7195f34f29e4ce5b8debbbd
+SIZE (asterisk-1.2.24.tar.gz) = 10644451
MD5 (asterisk-1.2.23-codec-negotiation-20070730.diff.gz) = 8aed76c48ae24470fc578861078e38d0
SHA256 (asterisk-1.2.23-codec-negotiation-20070730.diff.gz) = 5cfec2daae25d4543abb31d1767c9ad2718ec5e27cb09494f5dc40d83f2fa9b1
SIZE (asterisk-1.2.23-codec-negotiation-20070730.diff.gz) = 32935
diff -ruN asterisk12.orig/files/patch-apps::app_rxfax.c asterisk12/files/patch-apps::app_rxfax.c
--- asterisk12.orig/files/patch-apps::app_rxfax.c 2006-07-20 06:19:08.000000000 +0600
+++ asterisk12/files/patch-apps::app_rxfax.c 2007-08-13 09:33:38.000000000 +0600
@@ -1,9 +1,6 @@
-
-$FreeBSD: ports/net/asterisk12/files/patch-apps::app_rxfax.c,v 1.5 2006/07/20 00:19:08 sobomax Exp $
-
---- apps/app_rxfax.c.orig
-+++ apps/app_rxfax.c
-@@ -0,0 +1,393 @@
+--- apps/app_rxfax.c.orig 2007-08-13 09:29:46.000000000 +0600
++++ apps/app_rxfax.c 2007-06-24 13:39:40.000000000 +0600
+@@ -0,0 +1,389 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
@@ -20,16 +17,9 @@
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
-+#if !defined(__FreeBSD__) || __FreeBSD_version < 500028
+#include <inttypes.h>
-+#else
-+#include <stdint.h>
-+#endif
+#include <pthread.h>
+#include <errno.h>
-+#if !defined(__FreeBSD__) || __FreeBSD_version >= 503000
-+#include <tgmath.h>
-+#endif
+#include <tiffio.h>
+
+#include <spandsp.h>
@@ -44,8 +34,6 @@
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
-+#include "asterisk/translate.h"
-+#include "asterisk/dsp.h"
+#include "asterisk/manager.h"
+
+static char *tdesc = "Trivial FAX Receive Application";
@@ -90,11 +78,13 @@
+}
+/*- End of function --------------------------------------------------------*/
+
++#if 0
+static void t30_flush(t30_state_t *s, int which)
+{
+ //TODO:
+}
+/*- End of function --------------------------------------------------------*/
++#endif
+
+static void phase_e_handler(t30_state_t *s, void *user_data, int result)
+{
@@ -115,7 +105,7 @@
+ ast_log(LOG_DEBUG, "Remote station id: %s\n", far_ident);
+ ast_log(LOG_DEBUG, "Local station id: %s\n", local_ident);
+ ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred);
-+ ast_log(LOG_DEBUG, "Image resolution: %i x %i\n", t.column_resolution, t.row_resolution);
++ ast_log(LOG_DEBUG, "Image resolution: %i x %i\n", t.x_resolution, t.y_resolution);
+ ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate);
+ ast_log(LOG_DEBUG, "==============================================================================\n");
+ manager_event(EVENT_FLAG_CALL,
@@ -126,13 +116,13 @@
+ far_ident,
+ local_ident,
+ t.pages_transferred,
-+ t.row_resolution,
++ t.y_resolution,
+ t.bit_rate,
+ s->rx_file);
+ pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident);
+ snprintf(buf, sizeof(buf), "%i", t.pages_transferred);
+ pbx_builtin_setvar_helper(chan, "FAXPAGES", buf);
-+ snprintf(buf, sizeof(buf), "%i", t.row_resolution);
++ snprintf(buf, sizeof(buf), "%i", t.y_resolution);
+ pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", buf);
+ snprintf(buf, sizeof(buf), "%i", t.bit_rate);
+ pbx_builtin_setvar_helper(chan, "FAXBITRATE", buf);
@@ -157,8 +147,8 @@
+ t30_get_transfer_statistics(s, &t);
+ ast_log(LOG_DEBUG, "==============================================================================\n");
+ ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred);
-+ ast_log(LOG_DEBUG, "Image size: %i x %i\n", t.columns, t.rows);
-+ ast_log(LOG_DEBUG, "Image resolution %i x %i\n", t.column_resolution, t.row_resolution);
++ ast_log(LOG_DEBUG, "Image size: %i x %i\n", t.width, t.length);
++ ast_log(LOG_DEBUG, "Image resolution %i x %i\n", t.x_resolution, t.y_resolution);
+ ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate);
+ ast_log(LOG_DEBUG, "Bad rows %i\n", t.bad_rows);
+ ast_log(LOG_DEBUG, "Longest bad row run %i\n", t.longest_bad_row_run);
@@ -181,7 +171,7 @@
+ int option;
+ int len;
+ int i;
-+ t30_state_t fax;
++ fax_state_t fax;
+ int calling_party;
+ int verbose;
+ int samples;
@@ -291,19 +281,21 @@
+ return -1;
+ }
+ }
-+ fax_init(&fax, calling_party, NULL);
++ fax_init(&fax, calling_party);
+ if (verbose)
+ fax.logging.level = SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW;
+ x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID");
+ if (x && x[0])
-+ t30_set_local_ident(&fax, x);
++ t30_set_local_ident(&fax.t30_state, x);
+ x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO");
+ if (x && x[0])
-+ t30_set_header_info(&fax, x);
-+ t30_set_rx_file(&fax, target_file, -1);
-+ //t30_set_phase_b_handler(&fax, phase_b_handler, chan);
-+ t30_set_phase_d_handler(&fax, phase_d_handler, chan);
-+ t30_set_phase_e_handler(&fax, phase_e_handler, chan);
++ t30_set_header_info(&fax.t30_state, x);
++ t30_set_rx_file(&fax.t30_state, target_file, -1);
++ //t30_set_phase_b_handler(&fax.t30_state, phase_b_handler, chan);
++ t30_set_phase_d_handler(&fax.t30_state, phase_d_handler, chan);
++ t30_set_phase_e_handler(&fax.t30_state, phase_e_handler, chan);
++ t30_set_ecm_capability(&fax.t30_state, TRUE);
++ t30_set_supported_compressions(&fax.t30_state, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION);
+ while (ast_waitfor(chan, -1) > -1)
+ {
+ inf = ast_read(chan);
@@ -354,7 +346,7 @@
+ if (res)
+ ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name);
+ }
-+ fax_release(&fax);
++ t30_terminate(&fax.t30_state);
+ }
+ else
+ {
@@ -376,6 +368,7 @@
+{
+ return ast_register_application(app, rxfax_exec, synopsis, descrip);
+}
++/*- End of function --------------------------------------------------------*/
+
+char *description(void)
+{
diff -ruN asterisk12.orig/files/patch-apps::app_txfax.c asterisk12/files/patch-apps::app_txfax.c
--- asterisk12.orig/files/patch-apps::app_txfax.c 2006-07-20 06:19:08.000000000 +0600
+++ asterisk12/files/patch-apps::app_txfax.c 2007-08-13 09:33:42.000000000 +0600
@@ -1,9 +1,6 @@
-
-$FreeBSD: ports/net/asterisk12/files/patch-apps::app_txfax.c,v 1.5 2006/07/20 00:19:08 sobomax Exp $
-
---- apps/app_txfax.c.orig
-+++ apps/app_txfax.c
-@@ -0,0 +1,320 @@
+--- apps/app_txfax.c.orig 2007-08-13 09:29:46.000000000 +0600
++++ apps/app_txfax.c 2007-06-24 13:40:05.000000000 +0600
+@@ -0,0 +1,316 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
@@ -20,16 +17,9 @@
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
-+#if !defined(__FreeBSD__) || __FreeBSD_version < 500028
+#include <inttypes.h>
-+#else
-+#include <stdint.h>
-+#endif
+#include <pthread.h>
+#include <errno.h>
-+#if !defined(__FreeBSD__) || __FreeBSD_version >= 503000
-+#include <tgmath.h>
-+#endif
+#include <tiffio.h>
+
+#include <spandsp.h>
@@ -44,7 +34,6 @@
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
-+#include "asterisk/translate.h"
+
+static char *tdesc = "Trivial FAX Transmit Application";
+
@@ -83,11 +72,13 @@
+}
+/*- End of function --------------------------------------------------------*/
+
++#if 0
+static void t30_flush(t30_state_t *s, int which)
+{
+ //TODO:
+}
+/*- End of function --------------------------------------------------------*/
++#endif
+
+static void phase_e_handler(t30_state_t *s, void *user_data, int result)
+{
@@ -119,7 +110,7 @@
+ char *v;
+ int option;
+ int len;
-+ t30_state_t fax;
++ fax_state_t fax;
+ int calling_party;
+ int verbose;
+ int samples;
@@ -216,20 +207,22 @@
+ return -1;
+ }
+ }
-+ fax_init(&fax, calling_party, NULL);
++ fax_init(&fax, calling_party);
+ if (verbose)
+ fax.logging.level = SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW;
+
+ x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID");
+ if (x && x[0])
-+ t30_set_local_ident(&fax, x);
++ t30_set_local_ident(&fax.t30_state, x);
+ x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO");
+ if (x && x[0])
-+ t30_set_header_info(&fax, x);
-+ t30_set_tx_file(&fax, source_file, -1, -1);
-+ //t30_set_phase_b_handler(&fax, phase_b_handler, chan);
-+ //t30_set_phase_d_handler(&fax, phase_d_handler, chan);
-+ t30_set_phase_e_handler(&fax, phase_e_handler, chan);
++ t30_set_header_info(&fax.t30_state, x);
++ t30_set_tx_file(&fax.t30_state, source_file, -1, -1);
++ //t30_set_phase_b_handler(&fax.t30_state, phase_b_handler, chan);
++ //t30_set_phase_d_handler(&fax.t30_state, phase_d_handler, chan);
++ t30_set_phase_e_handler(&fax.t30_state, phase_e_handler, chan);
++ t30_set_ecm_capability(&fax.t30_state, TRUE);
++ t30_set_supported_compressions(&fax.t30_state, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION);
+ while (ast_waitfor(chan, -1) > -1)
+ {
+ inf = ast_read(chan);
@@ -279,7 +272,7 @@
+ if (res)
+ ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name);
+ }
-+ fax_release(&fax);
++ t30_terminate(&fax.t30_state);
+ }
+ else
+ {
diff -ruN asterisk12.orig/files/patch-include::asterisk::plc.h asterisk12/files/patch-include::asterisk::plc.h
--- asterisk12.orig/files/patch-include::asterisk::plc.h 1970-01-01 05:00:00.000000000 +0500
+++ asterisk12/files/patch-include::asterisk::plc.h 2007-08-13 09:46:12.000000000 +0600
@@ -0,0 +1,13 @@
+--- include/asterisk/plc.h.orig 2006-06-14 20:07:53.000000000 +0600
++++ include/asterisk/plc.h 2007-08-13 09:42:38.000000000 +0600
+@@ -30,8 +30,8 @@
+ */
+
+
+-#if !defined(_PLC_H_)
+-#define _PLC_H_
++#if !defined(_SPANDSP_PLC_H_)
++#define _SPANDSP_PLC_H_
+
+ #ifdef SOLARIS
+ #include <sys/int_types.h>
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list