Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[6814] branches/1.0/package/asterisk
|
From: <abe...@us...> - 2014-11-10 19:02:34
|
Revision: 6814
http://sourceforge.net/p/astlinux/code/6814
Author: abelbeck
Date: 2014-11-10 19:02:25 +0000 (Mon, 10 Nov 2014)
Log Message:
-----------
asterisk, version bump to 1.8.32.0 and 11.14.0
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch
branches/1.0/package/asterisk/asterisk-1.8-voicemail-multiple-recipients.patch
branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch
branches/1.0/package/asterisk/asterisk.mk
Removed Paths:
-------------
branches/1.0/package/asterisk/asterisk-1.8-srtp-crypto_kernel-include.patch
branches/1.0/package/asterisk/asterisk-11-srtp-crypto_kernel-include.patch
Modified: branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch 2014-11-10 15:37:36 UTC (rev 6813)
+++ branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch 2014-11-10 19:02:25 UTC (rev 6814)
@@ -1,6 +1,6 @@
--- asterisk-1.8.25.0/configure.ac.orig 2014-01-24 16:52:23.000000000 -0600
+++ asterisk-1.8.25.0/configure.ac 2014-01-24 16:55:14.000000000 -0600
-@@ -2283,11 +2283,13 @@
+@@ -2319,11 +2319,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Deleted: branches/1.0/package/asterisk/asterisk-1.8-srtp-crypto_kernel-include.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-srtp-crypto_kernel-include.patch 2014-11-10 15:37:36 UTC (rev 6813)
+++ branches/1.0/package/asterisk/asterisk-1.8-srtp-crypto_kernel-include.patch 2014-11-10 19:02:25 UTC (rev 6814)
@@ -1,9 +0,0 @@
---- asterisk-1.8.31.0/res/res_srtp.c.orig 2014-10-13 22:34:16.000000000 -0500
-+++ asterisk-1.8.31.0/res/res_srtp.c 2014-10-13 22:37:49.000000000 -0500
-@@ -41,5 +41,6 @@
-
- #include <srtp/srtp.h>
-+#include <srtp/crypto_kernel.h>
-
- #include "asterisk/lock.h"
- #include "asterisk/sched.h"
Modified: branches/1.0/package/asterisk/asterisk-1.8-voicemail-multiple-recipients.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-voicemail-multiple-recipients.patch 2014-11-10 15:37:36 UTC (rev 6813)
+++ branches/1.0/package/asterisk/asterisk-1.8-voicemail-multiple-recipients.patch 2014-11-10 19:02:25 UTC (rev 6814)
@@ -9,7 +9,7 @@
char *emailsubject; /*!< E-mail subject */
char *emailbody; /*!< E-mail body */
char pager[80]; /*!< E-mail address to pager (no attachment) */
-@@ -1043,6 +1043,8 @@
+@@ -1044,6 +1044,8 @@
vmu->maxdeletedmsg = maxdeletedmsg;
}
vmu->volgain = volgain;
@@ -18,7 +18,7 @@
ast_free(vmu->emailsubject);
vmu->emailsubject = NULL;
ast_free(vmu->emailbody);
-@@ -1339,7 +1341,8 @@
+@@ -1340,7 +1342,8 @@
} else if (!strcasecmp(var->name, "pager")) {
ast_copy_string(retval->pager, var->value, sizeof(retval->pager));
} else if (!strcasecmp(var->name, "email")) {
@@ -28,7 +28,7 @@
} else if (!strcasecmp(var->name, "fullname")) {
ast_copy_string(retval->fullname, var->value, sizeof(retval->fullname));
} else if (!strcasecmp(var->name, "context")) {
-@@ -1466,6 +1469,7 @@
+@@ -1467,6 +1470,7 @@
if ((vmu = (ivm ? ivm : ast_malloc(sizeof(*vmu))))) {
*vmu = *cur;
if (!ivm) {
@@ -36,7 +36,7 @@
vmu->emailbody = ast_strdup(cur->emailbody);
vmu->emailsubject = ast_strdup(cur->emailsubject);
}
-@@ -1761,6 +1765,9 @@
+@@ -1762,6 +1766,9 @@
{
if (ast_test_flag(vmu, VM_ALLOCED)) {
@@ -46,7 +46,7 @@
ast_free(vmu->emailbody);
vmu->emailbody = NULL;
-@@ -2297,7 +2304,7 @@
+@@ -2299,7 +2306,7 @@
* of this function, we will revert back to an empty string if tempcopy
* is 1.
*/
@@ -55,7 +55,7 @@
tempcopy = 1;
}
-@@ -2309,8 +2316,10 @@
+@@ -2311,8 +2318,10 @@
command hangs. */
if (!(p = vm_mkftemp(tmp))) {
ast_log(AST_LOG_WARNING, "Unable to store '%s' (can't create temporary file)\n", fn);
@@ -68,7 +68,7 @@
return -1;
}
-@@ -4563,6 +4572,9 @@
+@@ -4584,6 +4593,9 @@
struct ast_str *str1 = ast_str_create(16), *str2 = ast_str_create(16);
char *greeting_attachment;
char filename[256];
@@ -78,7 +78,7 @@
if (!str1 || !str2) {
ast_free(str1);
-@@ -4604,7 +4616,7 @@
+@@ -4625,7 +4637,7 @@
ast_str_substitute_variables(&str1, 0, ast, fromstring);
if (check_mime(ast_str_buffer(str1))) {
@@ -87,7 +87,7 @@
ast_str_encode_mime(&str2, 0, ast_str_buffer(str1), strlen("From: "), strlen(who) + 3);
while ((ptr = strchr(ast_str_buffer(str2), ' '))) {
*ptr = '\0';
-@@ -4625,20 +4637,25 @@
+@@ -4646,20 +4658,25 @@
fprintf(p, "From: Asterisk PBX <%s>" ENDL, who);
}
@@ -126,7 +126,7 @@
}
if (!ast_strlen_zero(emailsubject) || !ast_strlen_zero(vmu->emailsubject)) {
-@@ -4648,7 +4665,7 @@
+@@ -4669,7 +4686,7 @@
prep_email_sub_vars(ast, vmu, msgnum + 1, context, mailbox, fromfolder, cidnum, cidname, dur, date, category, flag);
ast_str_substitute_variables(&str1, 0, ast, e_subj);
if (check_mime(ast_str_buffer(str1))) {
@@ -135,7 +135,7 @@
char *ptr;
ast_str_encode_mime(&str2, 0, ast_str_buffer(str1), strlen("Subject: "), 0);
while ((ptr = strchr(ast_str_buffer(str2), ' '))) {
-@@ -10825,7 +10842,7 @@
+@@ -10841,7 +10858,7 @@
ast_copy_string(vmu->fullname, s, sizeof(vmu->fullname));
}
if (stringp && (s = strsep(&stringp, ","))) {
@@ -144,7 +144,7 @@
}
if (stringp && (s = strsep(&stringp, ","))) {
ast_copy_string(vmu->pager, s, sizeof(vmu->pager));
-@@ -12985,7 +13002,7 @@
+@@ -13001,7 +13018,7 @@
}
populate_defaults(vmu);
Modified: branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2014-11-10 15:37:36 UTC (rev 6813)
+++ branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2014-11-10 19:02:25 UTC (rev 6814)
@@ -1,6 +1,6 @@
--- asterisk-1.8.25.0/configure.ac.orig 2014-01-24 16:52:23.000000000 -0600
+++ asterisk-1.8.25.0/configure.ac 2014-01-24 16:55:14.000000000 -0600
-@@ -2382,11 +2382,13 @@
+@@ -2406,11 +2406,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Deleted: branches/1.0/package/asterisk/asterisk-11-srtp-crypto_kernel-include.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-srtp-crypto_kernel-include.patch 2014-11-10 15:37:36 UTC (rev 6813)
+++ branches/1.0/package/asterisk/asterisk-11-srtp-crypto_kernel-include.patch 2014-11-10 19:02:25 UTC (rev 6814)
@@ -1,9 +0,0 @@
---- asterisk-11.13.0/res/res_srtp.c.orig 2014-10-13 22:34:16.000000000 -0500
-+++ asterisk-11.13.0/res/res_srtp.c 2014-10-13 22:37:49.000000000 -0500
-@@ -41,5 +41,6 @@
-
- #include <srtp/srtp.h>
-+#include <srtp/crypto_kernel.h>
-
- #include "asterisk/lock.h"
- #include "asterisk/sched.h"
Modified: branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch 2014-11-10 15:37:36 UTC (rev 6813)
+++ branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch 2014-11-10 19:02:25 UTC (rev 6814)
@@ -9,7 +9,7 @@
char *emailsubject; /*!< E-mail subject */
char *emailbody; /*!< E-mail body */
char pager[80]; /*!< E-mail address to pager (no attachment) */
-@@ -1188,6 +1188,8 @@
+@@ -1189,6 +1189,8 @@
vmu->maxdeletedmsg = maxdeletedmsg;
}
vmu->volgain = volgain;
@@ -18,7 +18,7 @@
ast_free(vmu->emailsubject);
vmu->emailsubject = NULL;
ast_free(vmu->emailbody);
-@@ -1499,7 +1501,8 @@
+@@ -1500,7 +1502,8 @@
} else if (!strcasecmp(var->name, "pager")) {
ast_copy_string(retval->pager, var->value, sizeof(retval->pager));
} else if (!strcasecmp(var->name, "email")) {
@@ -28,7 +28,7 @@
} else if (!strcasecmp(var->name, "fullname")) {
ast_copy_string(retval->fullname, var->value, sizeof(retval->fullname));
} else if (!strcasecmp(var->name, "context")) {
-@@ -1636,6 +1639,7 @@
+@@ -1637,6 +1640,7 @@
if ((vmu = (ivm ? ivm : ast_malloc(sizeof(*vmu))))) {
*vmu = *cur;
if (!ivm) {
@@ -36,7 +36,7 @@
vmu->emailbody = ast_strdup(cur->emailbody);
vmu->emailsubject = ast_strdup(cur->emailsubject);
}
-@@ -1918,6 +1922,9 @@
+@@ -1919,6 +1923,9 @@
{
if (ast_test_flag(vmu, VM_ALLOCED)) {
@@ -46,7 +46,7 @@
ast_free(vmu->emailbody);
vmu->emailbody = NULL;
-@@ -2538,7 +2545,7 @@
+@@ -2540,7 +2547,7 @@
* of this function, we will revert back to an empty string if tempcopy
* is 1.
*/
@@ -55,7 +55,7 @@
tempcopy = 1;
}
-@@ -2550,8 +2557,10 @@
+@@ -2552,8 +2559,10 @@
command hangs. */
if (!(p = vm_mkftemp(tmp))) {
ast_log(AST_LOG_WARNING, "Unable to store '%s' (can't create temporary file)\n", fn);
@@ -68,7 +68,7 @@
return -1;
}
-@@ -4873,6 +4882,9 @@
+@@ -4894,6 +4903,9 @@
struct ast_str *str1 = ast_str_create(16), *str2 = ast_str_create(16);
char *greeting_attachment;
char filename[256];
@@ -78,7 +78,7 @@
if (!str1 || !str2) {
ast_free(str1);
-@@ -4914,7 +4926,7 @@
+@@ -4935,7 +4947,7 @@
ast_str_substitute_variables(&str1, 0, ast, fromstring);
if (check_mime(ast_str_buffer(str1))) {
@@ -87,7 +87,7 @@
ast_str_encode_mime(&str2, 0, ast_str_buffer(str1), strlen("From: "), strlen(who) + 3);
while ((ptr = strchr(ast_str_buffer(str2), ' '))) {
*ptr = '\0';
-@@ -4935,20 +4947,25 @@
+@@ -4956,20 +4968,25 @@
fprintf(p, "From: Asterisk PBX <%s>" ENDL, who);
}
@@ -126,7 +126,7 @@
}
if (!ast_strlen_zero(emailsubject) || !ast_strlen_zero(vmu->emailsubject)) {
-@@ -4958,7 +4975,7 @@
+@@ -4979,7 +4996,7 @@
prep_email_sub_vars(ast, vmu, msgnum + 1, context, mailbox, fromfolder, cidnum, cidname, dur, date, category, flag);
ast_str_substitute_variables(&str1, 0, ast, e_subj);
if (check_mime(ast_str_buffer(str1))) {
@@ -135,7 +135,7 @@
char *ptr;
ast_str_encode_mime(&str2, 0, ast_str_buffer(str1), strlen("Subject: "), 0);
while ((ptr = strchr(ast_str_buffer(str2), ' '))) {
-@@ -11713,7 +11730,7 @@
+@@ -11730,7 +11747,7 @@
ast_copy_string(vmu->fullname, s, sizeof(vmu->fullname));
}
if (stringp && (s = strsep(&stringp, ","))) {
@@ -144,7 +144,7 @@
}
if (stringp && (s = strsep(&stringp, ","))) {
ast_copy_string(vmu->pager, s, sizeof(vmu->pager));
-@@ -13982,7 +13999,7 @@
+@@ -13999,7 +14016,7 @@
}
populate_defaults(vmu);
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2014-11-10 15:37:36 UTC (rev 6813)
+++ branches/1.0/package/asterisk/asterisk.mk 2014-11-10 19:02:25 UTC (rev 6814)
@@ -4,9 +4,9 @@
#
##############################################################
ifeq ($(BR2_PACKAGE_ASTERISK_v1_8),y)
-ASTERISK_VERSION := 1.8.31.1
+ASTERISK_VERSION := 1.8.32.0
else
-ASTERISK_VERSION := 11.13.1
+ASTERISK_VERSION := 11.14.0
endif
ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
ASTERISK_SITE := http://downloads.asterisk.org/pub/telephony/asterisk/releases
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
