Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[6971] branches/1.0/package/asterisk
|
From: <abe...@us...> - 2015-02-11 01:24:33
|
Revision: 6971
http://sourceforge.net/p/astlinux/code/6971
Author: abelbeck
Date: 2015-02-11 01:24:30 +0000 (Wed, 11 Feb 2015)
Log Message:
-----------
asterisk, version bump to 11.16.0 and 13.2.0
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch
branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
branches/1.0/package/asterisk/asterisk.mk
Removed Paths:
-------------
branches/1.0/package/asterisk/asterisk-13-anonymous-semaphores.patch
Modified: branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch 2015-02-09 16:56:05 UTC (rev 6970)
+++ branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch 2015-02-11 01:24:30 UTC (rev 6971)
@@ -1,6 +1,6 @@
---- asterisk-11.11.0/apps/app_voicemail.c.orig 2014-05-09 17:28:40.000000000 -0500
-+++ asterisk-11.11.0/apps/app_voicemail.c 2014-08-09 11:29:01.000000000 -0500
-@@ -748,7 +748,7 @@
+--- asterisk-11.16.0/apps/app_voicemail.c.orig 2015-01-23 08:51:03.000000000 -0600
++++ asterisk-11.16.0/apps/app_voicemail.c 2015-02-10 09:58:04.000000000 -0600
+@@ -751,7 +751,7 @@
char mailbox[AST_MAX_EXTENSION]; /*!< Mailbox id, unique within vm context */
char password[80]; /*!< Secret pin code, numbers only */
char fullname[80]; /*!< Full name, for directory app */
@@ -9,7 +9,7 @@
char *emailsubject; /*!< E-mail subject */
char *emailbody; /*!< E-mail body */
char pager[80]; /*!< E-mail address to pager (no attachment) */
-@@ -1189,6 +1189,8 @@
+@@ -1194,6 +1194,8 @@
vmu->maxdeletedmsg = maxdeletedmsg;
}
vmu->volgain = volgain;
@@ -18,7 +18,7 @@
ast_free(vmu->emailsubject);
vmu->emailsubject = NULL;
ast_free(vmu->emailbody);
-@@ -1500,7 +1502,8 @@
+@@ -1505,7 +1507,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")) {
-@@ -1637,6 +1640,7 @@
+@@ -1642,6 +1645,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);
}
-@@ -1919,6 +1923,9 @@
+@@ -1924,6 +1928,9 @@
{
if (ast_test_flag(vmu, VM_ALLOCED)) {
@@ -46,7 +46,7 @@
ast_free(vmu->emailbody);
vmu->emailbody = NULL;
-@@ -2540,7 +2547,7 @@
+@@ -2545,7 +2552,7 @@
* of this function, we will revert back to an empty string if tempcopy
* is 1.
*/
@@ -55,7 +55,7 @@
tempcopy = 1;
}
-@@ -2552,8 +2559,10 @@
+@@ -2557,8 +2564,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;
}
-@@ -4894,6 +4903,9 @@
+@@ -4903,6 +4912,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);
-@@ -4935,7 +4947,7 @@
+@@ -4944,7 +4956,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';
-@@ -4956,20 +4968,25 @@
+@@ -4965,20 +4977,25 @@
fprintf(p, "From: Asterisk PBX <%s>" ENDL, who);
}
@@ -126,7 +126,7 @@
}
if (!ast_strlen_zero(emailsubject) || !ast_strlen_zero(vmu->emailsubject)) {
-@@ -4979,7 +4996,7 @@
+@@ -4988,7 +5005,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), ' '))) {
-@@ -11730,7 +11747,7 @@
+@@ -11740,7 +11757,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));
-@@ -13999,7 +14016,7 @@
+@@ -14009,7 +14026,7 @@
}
populate_defaults(vmu);
Deleted: branches/1.0/package/asterisk/asterisk-13-anonymous-semaphores.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-anonymous-semaphores.patch 2015-02-09 16:56:05 UTC (rev 6970)
+++ branches/1.0/package/asterisk/asterisk-13-anonymous-semaphores.patch 2015-02-11 01:24:30 UTC (rev 6971)
@@ -1,14 +0,0 @@
---- asterisk-13.1.0/configure.ac.orig 2015-01-05 15:32:02.000000000 -0600
-+++ asterisk-13.1.0/configure.ac 2015-01-05 15:41:42.000000000 -0600
-@@ -883,7 +883,10 @@
- [sem_t sem; return sem_init(&sem, 0, 0);])],
- AC_MSG_RESULT(yes)
- AC_DEFINE([HAS_WORKING_SEMAPHORE], 1, [Define to 1 if anonymous semaphores work.]),
-- AC_MSG_RESULT(no)
-+ AC_MSG_RESULT(no),
-+ AC_MSG_RESULT(cross-compile)
-+ AC_MSG_NOTICE([WARNING: result yes guessed because of cross compilation])
-+ AC_DEFINE([HAS_WORKING_SEMAPHORE], 1, [Define to 1 if anonymous semaphores work.])
- )
-
- LIBS="$save_LIBS"
Modified: branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2015-02-09 16:56:05 UTC (rev 6970)
+++ branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2015-02-11 01:24:30 UTC (rev 6971)
@@ -1,6 +1,6 @@
--- asterisk-13.1.0/configure.ac.orig 2014-01-24 16:52:23.000000000 -0600
+++ asterisk-13.1.0/configure.ac 2014-01-24 16:55:14.000000000 -0600
-@@ -2497,11 +2497,13 @@
+@@ -2519,11 +2519,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2015-02-09 16:56:05 UTC (rev 6970)
+++ branches/1.0/package/asterisk/asterisk.mk 2015-02-11 01:24:30 UTC (rev 6971)
@@ -7,9 +7,9 @@
ASTERISK_VERSION := 1.8.32.2
else
ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
-ASTERISK_VERSION := 11.15.1
+ASTERISK_VERSION := 11.16.0
else
-ASTERISK_VERSION := 13.1.1
+ASTERISK_VERSION := 13.2.0
endif
endif
ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
