Menu
▾
▴
astlinux-commits
|
From: <abe...@us...> - 2015-01-12 18:40:37
|
Revision: 6926
http://sourceforge.net/p/astlinux/code/6926
Author: abelbeck
Date: 2015-01-12 18:40:29 +0000 (Mon, 12 Jan 2015)
Log Message:
-----------
asterisk, add support for /mnt/kd/custom-agi just like /mnt/kd/custom-sounds but for agi-bin/custom-agi. The /mnt/kd/custom-agi contents will be (later) backed-up and restored via a Basic configuration backup
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk.init
branches/1.0/package/asterisk/asterisk.mk
Modified: branches/1.0/package/asterisk/asterisk.init
===================================================================
--- branches/1.0/package/asterisk/asterisk.init 2015-01-12 17:28:07 UTC (rev 6925)
+++ branches/1.0/package/asterisk/asterisk.init 2015-01-12 18:40:29 UTC (rev 6926)
@@ -29,6 +29,8 @@
mkdir -p /var/tmp/asterisk/sounds
+ mkdir -p /var/tmp/asterisk/agi-bin
+
if [ ! -d /var/log/asterisk ]; then
mkdir /var/log/asterisk
fi
@@ -71,6 +73,8 @@
make_symlink_or_dir "/mnt/kd/custom-sounds" "/var/tmp/asterisk/sounds/custom-sounds"
+ make_symlink_or_dir "/mnt/kd/custom-agi" "/var/tmp/asterisk/agi-bin/custom-agi"
+
if [ -f /mnt/kd/astdb -o -f /mnt/kd/astdb.sqlite3 ]; then
ln -sf /mnt/kd/astdb /var/db/astdb
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2015-01-12 17:28:07 UTC (rev 6925)
+++ branches/1.0/package/asterisk/asterisk.mk 2015-01-12 18:40:29 UTC (rev 6926)
@@ -331,6 +331,7 @@
rm -rf $(TARGET_DIR)/etc/asterisk
ln -sf /tmp/etc/asterisk $(TARGET_DIR)/etc/asterisk
ln -sf /var/tmp/asterisk/sounds/custom-sounds $(TARGET_DIR)/stat/var/lib/asterisk/sounds/custom-sounds
+ ln -sf /var/tmp/asterisk/agi-bin/custom-agi $(TARGET_DIR)/stat/var/lib/asterisk/agi-bin/custom-agi
if [ -d $(TARGET_DIR)/usr/share/snmp/mibs ]; then \
$(INSTALL) -D -m 0644 package/asterisk/mibs/ASTERISK-MIB.txt $(TARGET_DIR)/usr/share/snmp/mibs/ ; \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <abe...@us...> - 2015-04-04 16:22:54
|
Revision: 7024
http://sourceforge.net/p/astlinux/code/7024
Author: abelbeck
Date: 2015-04-04 16:22:45 +0000 (Sat, 04 Apr 2015)
Log Message:
-----------
asterisk, version bump to 11.17.0 and 13.3.0
Modified Paths:
--------------
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-13-configure-menuselect-cross-fix.patch
branches/1.0/package/asterisk/asterisk.mk
Modified: branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2015-03-31 00:11:16 UTC (rev 7023)
+++ branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2015-04-04 16:22:45 UTC (rev 7024)
@@ -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
-@@ -2406,11 +2406,13 @@
+@@ -2431,11 +2431,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Modified: branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch 2015-03-31 00:11:16 UTC (rev 7023)
+++ branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch 2015-04-04 16:22:45 UTC (rev 7024)
@@ -46,7 +46,7 @@
ast_free(vmu->emailbody);
vmu->emailbody = NULL;
-@@ -2545,7 +2552,7 @@
+@@ -2571,7 +2578,7 @@
* of this function, we will revert back to an empty string if tempcopy
* is 1.
*/
@@ -55,7 +55,7 @@
tempcopy = 1;
}
-@@ -2557,8 +2564,10 @@
+@@ -2583,8 +2590,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;
}
-@@ -4903,6 +4912,9 @@
+@@ -4929,6 +4938,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);
-@@ -4944,7 +4956,7 @@
+@@ -4970,7 +4982,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';
-@@ -4965,20 +4977,25 @@
+@@ -4991,20 +5003,25 @@
fprintf(p, "From: Asterisk PBX <%s>" ENDL, who);
}
@@ -126,7 +126,7 @@
}
if (!ast_strlen_zero(emailsubject) || !ast_strlen_zero(vmu->emailsubject)) {
-@@ -4988,7 +5005,7 @@
+@@ -5014,7 +5031,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), ' '))) {
-@@ -11740,7 +11757,7 @@
+@@ -11766,7 +11783,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));
-@@ -14009,7 +14026,7 @@
+@@ -14035,7 +14052,7 @@
}
populate_defaults(vmu);
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-03-31 00:11:16 UTC (rev 7023)
+++ branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2015-04-04 16:22:45 UTC (rev 7024)
@@ -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
-@@ -2519,11 +2519,13 @@
+@@ -2544,11 +2544,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-03-31 00:11:16 UTC (rev 7023)
+++ branches/1.0/package/asterisk/asterisk.mk 2015-04-04 16:22:45 UTC (rev 7024)
@@ -7,9 +7,9 @@
ASTERISK_VERSION := 1.8.32.2
else
ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
-ASTERISK_VERSION := 11.16.0
+ASTERISK_VERSION := 11.17.0
else
-ASTERISK_VERSION := 13.2.0
+ASTERISK_VERSION := 13.3.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.
|
|
From: <abe...@us...> - 2015-04-23 15:42:57
|
Revision: 7044
http://sourceforge.net/p/astlinux/code/7044
Author: abelbeck
Date: 2015-04-23 15:42:55 +0000 (Thu, 23 Apr 2015)
Log Message:
-----------
asterisk, chan_sip, add patch(es) to increase the verbosity level needed for 'Extension Changed' logs, from 2 to 4
Added Paths:
-----------
branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
Added: branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch 2015-04-23 15:42:55 UTC (rev 7044)
@@ -0,0 +1,11 @@
+--- asterisk-1.8.32.3/channels/chan_sip.c.orig 2015-04-23 10:15:19.000000000 -0500
++++ asterisk-1.8.32.3/channels/chan_sip.c 2015-04-23 10:15:40.000000000 -0500
+@@ -15121,7 +15121,7 @@
+ ast_set_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE);
+ }
+ }
+- ast_verb(2, "Extension Changed %s[%s] new state %s for Notify User %s %s\n", exten, context, ast_extension_state2str(state), p->username,
++ ast_verb(4, "Extension Changed %s[%s] new state %s for Notify User %s %s\n", exten, context, ast_extension_state2str(state), p->username,
+ ast_test_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE) ? "(queued)" : "");
+
+ sip_pvt_unlock(p);
Added: branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2015-04-23 15:42:55 UTC (rev 7044)
@@ -0,0 +1,11 @@
+--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
++++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
+@@ -16733,7 +16733,7 @@
+ }
+
+ if (!force) {
+- ast_verb(2, "Extension Changed %s[%s] new state %s for Notify User %s %s\n", exten, context, ast_extension_state2str(data->state), p->username,
++ ast_verb(4, "Extension Changed %s[%s] new state %s for Notify User %s %s\n", exten, context, ast_extension_state2str(data->state), p->username,
+ ast_test_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE) ? "(queued)" : "");
+ }
+
Added: branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2015-04-23 15:42:55 UTC (rev 7044)
@@ -0,0 +1,11 @@
+--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
++++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
+@@ -16871,7 +16871,7 @@
+ }
+
+ if (!force) {
+- ast_verb(2, "Extension Changed %s[%s] new state %s for Notify User %s %s\n", exten, context, ast_extension_state2str(data->state), p->username,
++ ast_verb(4, "Extension Changed %s[%s] new state %s for Notify User %s %s\n", exten, context, ast_extension_state2str(data->state), p->username,
+ ast_test_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE) ? "(queued)" : "");
+ }
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-04-23 16:23:05
|
Revision: 7045
http://sourceforge.net/p/astlinux/code/7045
Author: abelbeck
Date: 2015-04-23 16:22:56 +0000 (Thu, 23 Apr 2015)
Log Message:
-----------
asterisk, followup to r7044, set verbosity to 5 per Ian's suggestion
Revision Links:
--------------
http://sourceforge.net/p/astlinux/code/7044
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
Modified: branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch 2015-04-23 15:42:55 UTC (rev 7044)
+++ branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch 2015-04-23 16:22:56 UTC (rev 7045)
@@ -5,7 +5,7 @@
}
}
- ast_verb(2, "Extension Changed %s[%s] new state %s for Notify User %s %s\n", exten, context, ast_extension_state2str(state), p->username,
-+ ast_verb(4, "Extension Changed %s[%s] new state %s for Notify User %s %s\n", exten, context, ast_extension_state2str(state), p->username,
++ ast_verb(5, "Extension Changed %s[%s] new state %s for Notify User %s %s\n", exten, context, ast_extension_state2str(state), p->username,
ast_test_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE) ? "(queued)" : "");
sip_pvt_unlock(p);
Modified: branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2015-04-23 15:42:55 UTC (rev 7044)
+++ branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2015-04-23 16:22:56 UTC (rev 7045)
@@ -5,7 +5,7 @@
if (!force) {
- ast_verb(2, "Extension Changed %s[%s] new state %s for Notify User %s %s\n", exten, context, ast_extension_state2str(data->state), p->username,
-+ ast_verb(4, "Extension Changed %s[%s] new state %s for Notify User %s %s\n", exten, context, ast_extension_state2str(data->state), p->username,
++ ast_verb(5, "Extension Changed %s[%s] new state %s for Notify User %s %s\n", exten, context, ast_extension_state2str(data->state), p->username,
ast_test_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE) ? "(queued)" : "");
}
Modified: branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2015-04-23 15:42:55 UTC (rev 7044)
+++ branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2015-04-23 16:22:56 UTC (rev 7045)
@@ -5,7 +5,7 @@
if (!force) {
- ast_verb(2, "Extension Changed %s[%s] new state %s for Notify User %s %s\n", exten, context, ast_extension_state2str(data->state), p->username,
-+ ast_verb(4, "Extension Changed %s[%s] new state %s for Notify User %s %s\n", exten, context, ast_extension_state2str(data->state), p->username,
++ ast_verb(5, "Extension Changed %s[%s] new state %s for Notify User %s %s\n", exten, context, ast_extension_state2str(data->state), p->username,
ast_test_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE) ? "(queued)" : "");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-08-08 14:04:40
|
Revision: 7188
http://sourceforge.net/p/astlinux/code/7188
Author: abelbeck
Date: 2015-08-08 14:04:38 +0000 (Sat, 08 Aug 2015)
Log Message:
-----------
asterisk, version bump to 11.19.0 and 13.5.0
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk.mk
Modified: branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2015-08-07 14:48:41 UTC (rev 7187)
+++ branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2015-08-08 14:04:38 UTC (rev 7188)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -16734,7 +16734,7 @@
+@@ -16743,7 +16743,7 @@
}
if (!force) {
Modified: branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2015-08-07 14:48:41 UTC (rev 7187)
+++ branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2015-08-08 14:04:38 UTC (rev 7188)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -16871,7 +16871,7 @@
+@@ -16894,7 +16894,7 @@
}
if (!force) {
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2015-08-07 14:48:41 UTC (rev 7187)
+++ branches/1.0/package/asterisk/asterisk.mk 2015-08-08 14:04:38 UTC (rev 7188)
@@ -7,9 +7,9 @@
ASTERISK_VERSION := 1.8.32.3
else
ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
-ASTERISK_VERSION := 11.18.0
+ASTERISK_VERSION := 11.19.0
else
-ASTERISK_VERSION := 13.4.0
+ASTERISK_VERSION := 13.5.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.
|
|
From: <abe...@us...> - 2015-10-10 17:22:24
|
Revision: 7267
http://sourceforge.net/p/astlinux/code/7267
Author: abelbeck
Date: 2015-10-10 17:22:22 +0000 (Sat, 10 Oct 2015)
Log Message:
-----------
asterisk, version bump to 11.20.0 and 13.6.0
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk.mk
Modified: branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2015-10-10 16:37:14 UTC (rev 7266)
+++ branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2015-10-10 17:22:22 UTC (rev 7267)
@@ -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
-@@ -2398,11 +2398,13 @@
+@@ -2404,11 +2404,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Modified: branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2015-10-10 16:37:14 UTC (rev 7266)
+++ branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2015-10-10 17:22:22 UTC (rev 7267)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -16743,7 +16743,7 @@
+@@ -16767,7 +16767,7 @@
}
if (!force) {
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-10-10 16:37:14 UTC (rev 7266)
+++ branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2015-10-10 17:22:22 UTC (rev 7267)
@@ -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
-@@ -2511,11 +2511,13 @@
+@@ -2517,11 +2517,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Modified: branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2015-10-10 16:37:14 UTC (rev 7266)
+++ branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2015-10-10 17:22:22 UTC (rev 7267)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -16894,7 +16894,7 @@
+@@ -16911,7 +16911,7 @@
}
if (!force) {
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2015-10-10 16:37:14 UTC (rev 7266)
+++ branches/1.0/package/asterisk/asterisk.mk 2015-10-10 17:22:22 UTC (rev 7267)
@@ -7,9 +7,9 @@
ASTERISK_VERSION := 1.8.32.3
else
ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
-ASTERISK_VERSION := 11.19.0
+ASTERISK_VERSION := 11.20.0
else
-ASTERISK_VERSION := 13.5.0
+ASTERISK_VERSION := 13.6.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.
|
|
From: <abe...@us...> - 2015-10-18 22:56:59
|
Revision: 7275
http://sourceforge.net/p/astlinux/code/7275
Author: abelbeck
Date: 2015-10-18 22:56:56 +0000 (Sun, 18 Oct 2015)
Log Message:
-----------
asterisk, revert r7267, set versions to 11.19.0 and 13.5.0
Revision Links:
--------------
http://sourceforge.net/p/astlinux/code/7267
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk.mk
Modified: branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2015-10-16 15:38:59 UTC (rev 7274)
+++ branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2015-10-18 22:56:56 UTC (rev 7275)
@@ -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
-@@ -2404,11 +2404,13 @@
+@@ -2398,11 +2398,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Modified: branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2015-10-16 15:38:59 UTC (rev 7274)
+++ branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2015-10-18 22:56:56 UTC (rev 7275)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -16767,7 +16767,7 @@
+@@ -16743,7 +16743,7 @@
}
if (!force) {
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-10-16 15:38:59 UTC (rev 7274)
+++ branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2015-10-18 22:56:56 UTC (rev 7275)
@@ -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
-@@ -2517,11 +2517,13 @@
+@@ -2511,11 +2511,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Modified: branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2015-10-16 15:38:59 UTC (rev 7274)
+++ branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2015-10-18 22:56:56 UTC (rev 7275)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -16911,7 +16911,7 @@
+@@ -16894,7 +16894,7 @@
}
if (!force) {
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2015-10-16 15:38:59 UTC (rev 7274)
+++ branches/1.0/package/asterisk/asterisk.mk 2015-10-18 22:56:56 UTC (rev 7275)
@@ -7,9 +7,9 @@
ASTERISK_VERSION := 1.8.32.3
else
ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
-ASTERISK_VERSION := 11.20.0
+ASTERISK_VERSION := 11.19.0
else
-ASTERISK_VERSION := 13.6.0
+ASTERISK_VERSION := 13.5.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.
|
|
From: <abe...@us...> - 2015-10-20 17:50:26
|
Revision: 7282
http://sourceforge.net/p/astlinux/code/7282
Author: abelbeck
Date: 2015-10-20 17:50:23 +0000 (Tue, 20 Oct 2015)
Log Message:
-----------
asterisk, version bump to 11.20.0 and 13.6.0, apply fixes later
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk.mk
Modified: branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2015-10-20 17:11:56 UTC (rev 7281)
+++ branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2015-10-20 17:50:23 UTC (rev 7282)
@@ -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
-@@ -2398,11 +2398,13 @@
+@@ -2404,11 +2404,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Modified: branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2015-10-20 17:11:56 UTC (rev 7281)
+++ branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2015-10-20 17:50:23 UTC (rev 7282)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -16743,7 +16743,7 @@
+@@ -16767,7 +16767,7 @@
}
if (!force) {
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-10-20 17:11:56 UTC (rev 7281)
+++ branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2015-10-20 17:50:23 UTC (rev 7282)
@@ -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
-@@ -2511,11 +2511,13 @@
+@@ -2517,11 +2517,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Modified: branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2015-10-20 17:11:56 UTC (rev 7281)
+++ branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2015-10-20 17:50:23 UTC (rev 7282)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -16894,7 +16894,7 @@
+@@ -16911,7 +16911,7 @@
}
if (!force) {
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2015-10-20 17:11:56 UTC (rev 7281)
+++ branches/1.0/package/asterisk/asterisk.mk 2015-10-20 17:50:23 UTC (rev 7282)
@@ -7,9 +7,9 @@
ASTERISK_VERSION := 1.8.32.3
else
ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
-ASTERISK_VERSION := 11.19.0
+ASTERISK_VERSION := 11.20.0
else
-ASTERISK_VERSION := 13.5.0
+ASTERISK_VERSION := 13.6.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.
|
|
From: <abe...@us...> - 2015-10-20 18:12:28
|
Revision: 7283
http://sourceforge.net/p/astlinux/code/7283
Author: abelbeck
Date: 2015-10-20 18:12:26 +0000 (Tue, 20 Oct 2015)
Log Message:
-----------
asterisk, add issue ASTERISK-25476 patches
Added Paths:
-----------
branches/1.0/package/asterisk/asterisk-11-issue-ASTERISK-25476.patch
branches/1.0/package/asterisk/asterisk-13-issue-ASTERISK-25476.patch
Added: branches/1.0/package/asterisk/asterisk-11-issue-ASTERISK-25476.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-issue-ASTERISK-25476.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11-issue-ASTERISK-25476.patch 2015-10-20 18:12:26 UTC (rev 7283)
@@ -0,0 +1,20 @@
+--- asterisk-11.20.0/res/res_rtp_asterisk.c.orig 2015-10-20 12:52:37.000000000 -0500
++++ asterisk-11.20.0/res/res_rtp_asterisk.c 2015-10-20 12:53:38.000000000 -0500
+@@ -4635,7 +4635,7 @@
+ return;
+ } else {
+ if (rtp->rtcp) {
+- if (rtp->rtcp->schedid > 0) {
++ if (rtp->rtcp->schedid > -1) {
+ if (!ast_sched_del(rtp->sched, rtp->rtcp->schedid)) {
+ /* Successfully cancelled scheduler entry. */
+ ao2_ref(instance, -1);
+@@ -4863,7 +4863,7 @@
+ }
+ #endif
+
+- if (rtp->rtcp && rtp->rtcp->schedid > 0) {
++ if (rtp->rtcp && rtp->rtcp->schedid > -1) {
+ if (!ast_sched_del(rtp->sched, rtp->rtcp->schedid)) {
+ /* successfully cancelled scheduler entry. */
+ ao2_ref(instance, -1);
Added: branches/1.0/package/asterisk/asterisk-13-issue-ASTERISK-25476.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-issue-ASTERISK-25476.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-13-issue-ASTERISK-25476.patch 2015-10-20 18:12:26 UTC (rev 7283)
@@ -0,0 +1,20 @@
+--- asterisk-11.20.0/res/res_rtp_asterisk.c.orig 2015-10-20 12:52:37.000000000 -0500
++++ asterisk-11.20.0/res/res_rtp_asterisk.c 2015-10-20 12:53:38.000000000 -0500
+@@ -4780,7 +4780,7 @@
+ return;
+ } else {
+ if (rtp->rtcp) {
+- if (rtp->rtcp->schedid > 0) {
++ if (rtp->rtcp->schedid > -1) {
+ if (!ast_sched_del(rtp->sched, rtp->rtcp->schedid)) {
+ /* Successfully cancelled scheduler entry. */
+ ao2_ref(instance, -1);
+@@ -4997,7 +4997,7 @@
+ }
+ #endif
+
+- if (rtp->rtcp && rtp->rtcp->schedid > 0) {
++ if (rtp->rtcp && rtp->rtcp->schedid > -1) {
+ if (!ast_sched_del(rtp->sched, rtp->rtcp->schedid)) {
+ /* successfully cancelled scheduler entry. */
+ ao2_ref(instance, -1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-07 15:02:36
|
Revision: 7320
http://sourceforge.net/p/astlinux/code/7320
Author: abelbeck
Date: 2015-11-07 15:02:33 +0000 (Sat, 07 Nov 2015)
Log Message:
-----------
asterisk, revert back to 11.19.0 and 13.5.0, later versions have stability issues as doucmented in ASTERISK-25476
Ref: https://issues.asterisk.org/jira/browse/ASTERISK-25476
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk.mk
Removed Paths:
-------------
branches/1.0/package/asterisk/asterisk-11-issue-ASTERISK-25476.patch
branches/1.0/package/asterisk/asterisk-13-issue-ASTERISK-25476.patch
Modified: branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2015-11-06 17:50:29 UTC (rev 7319)
+++ branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2015-11-07 15:02:33 UTC (rev 7320)
@@ -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
-@@ -2404,11 +2404,13 @@
+@@ -2398,11 +2398,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Modified: branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2015-11-06 17:50:29 UTC (rev 7319)
+++ branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2015-11-07 15:02:33 UTC (rev 7320)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -16767,7 +16767,7 @@
+@@ -16743,7 +16743,7 @@
}
if (!force) {
Deleted: branches/1.0/package/asterisk/asterisk-11-issue-ASTERISK-25476.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-issue-ASTERISK-25476.patch 2015-11-06 17:50:29 UTC (rev 7319)
+++ branches/1.0/package/asterisk/asterisk-11-issue-ASTERISK-25476.patch 2015-11-07 15:02:33 UTC (rev 7320)
@@ -1,20 +0,0 @@
---- asterisk-11.20.0/res/res_rtp_asterisk.c.orig 2015-10-20 12:52:37.000000000 -0500
-+++ asterisk-11.20.0/res/res_rtp_asterisk.c 2015-10-20 12:53:38.000000000 -0500
-@@ -4635,7 +4635,7 @@
- return;
- } else {
- if (rtp->rtcp) {
-- if (rtp->rtcp->schedid > 0) {
-+ if (rtp->rtcp->schedid > -1) {
- if (!ast_sched_del(rtp->sched, rtp->rtcp->schedid)) {
- /* Successfully cancelled scheduler entry. */
- ao2_ref(instance, -1);
-@@ -4863,7 +4863,7 @@
- }
- #endif
-
-- if (rtp->rtcp && rtp->rtcp->schedid > 0) {
-+ if (rtp->rtcp && rtp->rtcp->schedid > -1) {
- if (!ast_sched_del(rtp->sched, rtp->rtcp->schedid)) {
- /* successfully cancelled scheduler entry. */
- ao2_ref(instance, -1);
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-11-06 17:50:29 UTC (rev 7319)
+++ branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2015-11-07 15:02:33 UTC (rev 7320)
@@ -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
-@@ -2517,11 +2517,13 @@
+@@ -2511,11 +2511,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Modified: branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2015-11-06 17:50:29 UTC (rev 7319)
+++ branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2015-11-07 15:02:33 UTC (rev 7320)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -16911,7 +16911,7 @@
+@@ -16894,7 +16894,7 @@
}
if (!force) {
Deleted: branches/1.0/package/asterisk/asterisk-13-issue-ASTERISK-25476.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-issue-ASTERISK-25476.patch 2015-11-06 17:50:29 UTC (rev 7319)
+++ branches/1.0/package/asterisk/asterisk-13-issue-ASTERISK-25476.patch 2015-11-07 15:02:33 UTC (rev 7320)
@@ -1,20 +0,0 @@
---- asterisk-11.20.0/res/res_rtp_asterisk.c.orig 2015-10-20 12:52:37.000000000 -0500
-+++ asterisk-11.20.0/res/res_rtp_asterisk.c 2015-10-20 12:53:38.000000000 -0500
-@@ -4780,7 +4780,7 @@
- return;
- } else {
- if (rtp->rtcp) {
-- if (rtp->rtcp->schedid > 0) {
-+ if (rtp->rtcp->schedid > -1) {
- if (!ast_sched_del(rtp->sched, rtp->rtcp->schedid)) {
- /* Successfully cancelled scheduler entry. */
- ao2_ref(instance, -1);
-@@ -4997,7 +4997,7 @@
- }
- #endif
-
-- if (rtp->rtcp && rtp->rtcp->schedid > 0) {
-+ if (rtp->rtcp && rtp->rtcp->schedid > -1) {
- if (!ast_sched_del(rtp->sched, rtp->rtcp->schedid)) {
- /* successfully cancelled scheduler entry. */
- ao2_ref(instance, -1);
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2015-11-06 17:50:29 UTC (rev 7319)
+++ branches/1.0/package/asterisk/asterisk.mk 2015-11-07 15:02:33 UTC (rev 7320)
@@ -7,9 +7,9 @@
ASTERISK_VERSION := 1.8.32.3
else
ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
-ASTERISK_VERSION := 11.20.0
+ASTERISK_VERSION := 11.19.0
else
-ASTERISK_VERSION := 13.6.0
+ASTERISK_VERSION := 13.5.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.
|
|
From: <abe...@us...> - 2016-02-10 23:25:26
|
Revision: 7515
http://sourceforge.net/p/astlinux/code/7515
Author: abelbeck
Date: 2016-02-10 23:25:23 +0000 (Wed, 10 Feb 2016)
Log Message:
-----------
asterisk, version 1.8 security patches
Ref: http://downloads.asterisk.org/pub/security/AST-2016-001.pdf
Ref: http://downloads.asterisk.org/pub/security/AST-2016-002.pdf
Ref: http://downloads.asterisk.org/pub/security/AST-2016-003.pdf
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch
Added Paths:
-----------
branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.28.patch
branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.28.patch
branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.28.patch
Added: branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.28.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.28.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.28.patch 2016-02-10 23:25:23 UTC (rev 7515)
@@ -0,0 +1,140 @@
+diff --git a/configs/http.conf.sample b/configs/http.conf.sample
+index 1a7f4fd..9a06fcf 100644
+--- a/configs/http.conf.sample
++++ b/configs/http.conf.sample
+@@ -67,10 +67,31 @@ bindaddr=127.0.0.1
+ ; If no path is given for tlscertfile or tlsprivatekey, default is to look in current
+ ; directory. If no tlsprivatekey is given, default is to search tlscertfile for private key.
+ ;
++;
+ ; To produce a certificate you can e.g. use openssl. This places both the cert and
+ ; private in same .pem file.
+ ; openssl req -new -x509 -days 365 -nodes -out /tmp/foo.pem -keyout /tmp/foo.pem
+ ;
++; tlscipher= ; The list of allowed ciphers
++; ; if none are specified the following cipher
++; ; list will be used instead:
++; ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:
++; ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:
++; kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:
++; ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:
++; ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:
++; DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:
++; AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:
++; AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:
++; !EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
++;
++; tlsdisablev1=yes ; Disable TLSv1 support - if not set this defaults to "yes"
++; tlsdisablev11=yes ; Disable TLSv1.1 support - if not set this defaults to "no"
++; tlsdisablev12=yes ; Disable TLSv1.2 support - if not set this defaults to "no"
++;
++; tlsservercipherorder=yes ; Use the server preference order instead of the client order
++; ; Defaults to "yes"
++;
+ ; The post_mappings section maps URLs to real paths on the filesystem. If a
+ ; POST is done from within an authenticated manager session to one of the
+ ; configured POST mappings, then any files in the POST will be placed in the
+diff --git a/include/asterisk/tcptls.h b/include/asterisk/tcptls.h
+index f3f5e1f..eb7166f 100644
+--- a/include/asterisk/tcptls.h
++++ b/include/asterisk/tcptls.h
+@@ -79,7 +79,15 @@ enum ast_ssl_flags {
+ /*! Use SSLv3 for outgoing client connections */
+ AST_SSL_SSLV3_CLIENT = (1 << 4),
+ /*! Use TLSv1 for outgoing client connections */
+- AST_SSL_TLSV1_CLIENT = (1 << 5)
++ AST_SSL_TLSV1_CLIENT = (1 << 5),
++ /*! Use server cipher order instead of the client order */
++ AST_SSL_SERVER_CIPHER_ORDER = (1 << 6),
++ /*! Disable TLSv1 support */
++ AST_SSL_DISABLE_TLSV1 = (1 << 7),
++ /*! Disable TLSv1.1 support */
++ AST_SSL_DISABLE_TLSV11 = (1 << 8),
++ /*! Disable TLSv1.2 support */
++ AST_SSL_DISABLE_TLSV12 = (1 << 9),
+ };
+
+ struct ast_tls_config {
+diff --git a/main/http.c b/main/http.c
+index 9bebbe7..4bfa985 100644
+--- a/main/http.c
++++ b/main/http.c
+@@ -1118,10 +1118,13 @@ static int __ast_http_load(int reload)
+ }
+ http_tls_cfg.pvtfile = ast_strdup("");
+
++ /* Apply modern intermediate settings according to the Mozilla OpSec team as of July 30th, 2015 but disable TLSv1 */
++ ast_set_flag(&http_tls_cfg.flags, AST_SSL_DISABLE_TLSV1 | AST_SSL_SERVER_CIPHER_ORDER);
++
+ if (http_tls_cfg.cipher) {
+ ast_free(http_tls_cfg.cipher);
+ }
+- http_tls_cfg.cipher = ast_strdup("");
++ http_tls_cfg.cipher = ast_strdup("ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA");
+
+ AST_RWLIST_WRLOCK(&uri_redirects);
+ while ((redirect = AST_RWLIST_REMOVE_HEAD(&uri_redirects, entry))) {
+@@ -1146,8 +1149,6 @@ static int __ast_http_load(int reload)
+ && strcasecmp(v->name, "tlsdontverifyserver")
+ && strcasecmp(v->name, "tlsclientmethod")
+ && strcasecmp(v->name, "sslclientmethod")
+- && strcasecmp(v->name, "tlscipher")
+- && strcasecmp(v->name, "sslcipher")
+ && !ast_tls_read_conf(&http_tls_cfg, &https_desc, v->name, v->value)) {
+ continue;
+ }
+diff --git a/main/tcptls.c b/main/tcptls.c
+index 6f918ce..0f27e45 100644
+--- a/main/tcptls.c
++++ b/main/tcptls.c
+@@ -749,6 +749,7 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
+ return 0;
+ #else
+ int disable_ssl = 0;
++ long ssl_opts = 0;
+
+ if (!cfg->enabled)
+ return 0;
+@@ -793,11 +794,24 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
+ * them. SSLv23_*_method supports TLSv1+.
+ */
+ if (disable_ssl) {
+- long ssl_opts;
++ ssl_opts |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
++ }
++
++ if (ast_test_flag(&cfg->flags, AST_SSL_SERVER_CIPHER_ORDER)) {
++ ssl_opts |= SSL_OP_CIPHER_SERVER_PREFERENCE;
++ }
+
+- ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
+- SSL_CTX_set_options(cfg->ssl_ctx, ssl_opts);
++ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV1)) {
++ ssl_opts |= SSL_OP_NO_TLSv1;
+ }
++ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV11)) {
++ ssl_opts |= SSL_OP_NO_TLSv1_1;
++ }
++ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV12)) {
++ ssl_opts |= SSL_OP_NO_TLSv1_2;
++ }
++
++ SSL_CTX_set_options(cfg->ssl_ctx, ssl_opts);
+
+ SSL_CTX_set_verify(cfg->ssl_ctx,
+ ast_test_flag(&cfg->flags, AST_SSL_VERIFY_CLIENT) ? SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT : SSL_VERIFY_NONE,
+@@ -1109,6 +1123,14 @@ int ast_tls_read_conf(struct ast_tls_config *tls_cfg, struct ast_tcptls_session_
+ ast_clear_flag(&tls_cfg->flags, AST_SSL_TLSV1_CLIENT);
+ ast_clear_flag(&tls_cfg->flags, AST_SSL_SSLV3_CLIENT);
+ }
++ } else if (!strcasecmp(varname, "tlsservercipherorder")) {
++ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_SERVER_CIPHER_ORDER);
++ } else if (!strcasecmp(varname, "tlsdisablev1")) {
++ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV1);
++ } else if (!strcasecmp(varname, "tlsdisablev11")) {
++ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV11);
++ } else if (!strcasecmp(varname, "tlsdisablev12")) {
++ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV12);
+ } else {
+ return -1;
+ }
Added: branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.28.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.28.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.28.patch 2016-02-10 23:25:23 UTC (rev 7515)
@@ -0,0 +1,18 @@
+diff --git a/channels/chan_sip.c b/channels/chan_sip.c
+index 16e3e53..86c52e9 100644
+--- a/channels/chan_sip.c
++++ b/channels/chan_sip.c
+@@ -3771,6 +3771,13 @@ static int retrans_pkt(const void *data)
+ }
+
+ /* For non-invites, a maximum of 4 secs */
++ if (INT_MAX / pkt->timer_a < pkt->timer_t1) {
++ /*
++ * Uh Oh, we will have an integer overflow.
++ * Recalculate previous timeout time instead.
++ */
++ pkt->timer_a = pkt->timer_a / 2;
++ }
+ siptimer_a = pkt->timer_t1 * pkt->timer_a; /* Double each time */
+ if (pkt->method != SIP_INVITE && siptimer_a > 4000) {
+ siptimer_a = 4000;
Added: branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.28.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.28.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.28.patch 2016-02-10 23:25:23 UTC (rev 7515)
@@ -0,0 +1,28 @@
+diff --git a/main/udptl.c b/main/udptl.c
+index 8885d7a..136dcb6 100644
+--- a/main/udptl.c
++++ b/main/udptl.c
+@@ -231,16 +231,15 @@ static int decode_open_type(uint8_t *buf, unsigned int limit, unsigned int *len,
+ if (decode_length(buf, limit, len, &octet_cnt) != 0)
+ return -1;
+
+- if (octet_cnt > 0) {
+- /* Make sure the buffer contains at least the number of bits requested */
+- if ((*len + octet_cnt) > limit)
+- return -1;
+-
+- *p_num_octets = octet_cnt;
+- *p_object = &buf[*len];
+- *len += octet_cnt;
++ /* Make sure the buffer contains at least the number of bits requested */
++ if ((*len + octet_cnt) > limit) {
++ return -1;
+ }
+
++ *p_num_octets = octet_cnt;
++ *p_object = &buf[*len];
++ *len += octet_cnt;
++
+ return 0;
+ }
+ /*- End of function --------------------------------------------------------*/
Modified: branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch 2016-02-10 17:31:49 UTC (rev 7514)
+++ branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch 2016-02-10 23:25:23 UTC (rev 7515)
@@ -1,6 +1,6 @@
--- asterisk-1.8.32.3/channels/chan_sip.c.orig 2015-04-23 10:15:19.000000000 -0500
+++ asterisk-1.8.32.3/channels/chan_sip.c 2015-04-23 10:15:40.000000000 -0500
-@@ -15121,7 +15121,7 @@
+@@ -15128,7 +15128,7 @@
ast_set_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-12 15:21:50
|
Revision: 7524
http://sourceforge.net/p/astlinux/code/7524
Author: abelbeck
Date: 2016-02-12 15:21:48 +0000 (Fri, 12 Feb 2016)
Log Message:
-----------
asterisk, version bump to 11.21.2 and 13.7.2
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk.mk
Modified: branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2016-02-11 22:17:41 UTC (rev 7523)
+++ branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2016-02-12 15:21:48 UTC (rev 7524)
@@ -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
-@@ -2398,11 +2398,13 @@
+@@ -2410,11 +2410,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Modified: branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2016-02-11 22:17:41 UTC (rev 7523)
+++ branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2016-02-12 15:21:48 UTC (rev 7524)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -16743,7 +16743,7 @@
+@@ -16790,7 +16790,7 @@
}
if (!force) {
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 2016-02-11 22:17:41 UTC (rev 7523)
+++ branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2016-02-12 15:21:48 UTC (rev 7524)
@@ -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
-@@ -2511,11 +2511,13 @@
+@@ -2523,11 +2523,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Modified: branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2016-02-11 22:17:41 UTC (rev 7523)
+++ branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2016-02-12 15:21:48 UTC (rev 7524)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -16894,7 +16894,7 @@
+@@ -16943,7 +16943,7 @@
}
if (!force) {
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2016-02-11 22:17:41 UTC (rev 7523)
+++ branches/1.0/package/asterisk/asterisk.mk 2016-02-12 15:21:48 UTC (rev 7524)
@@ -7,9 +7,9 @@
ASTERISK_VERSION := 1.8.32.3
else
ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
-ASTERISK_VERSION := 11.19.0
+ASTERISK_VERSION := 11.21.2
else
-ASTERISK_VERSION := 13.5.0
+ASTERISK_VERSION := 13.7.2
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.
|
|
From: <abe...@us...> - 2016-02-15 15:54:29
|
Revision: 7532
http://sourceforge.net/p/astlinux/code/7532
Author: abelbeck
Date: 2016-02-15 15:54:26 +0000 (Mon, 15 Feb 2016)
Log Message:
-----------
asterisk, no functional change, use the 1.8 patches against the latest release rather than the 1.8.28 release, though not mentioned in the PDF, use these patches:
http://downloads.asterisk.org/pub/security/AST-2016-001-1.8.diff
http://downloads.asterisk.org/pub/security/AST-2016-002-1.8.diff
http://downloads.asterisk.org/pub/security/AST-2016-003-1.8.diff
Added Paths:
-----------
branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.patch
branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.patch
branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.patch
Removed Paths:
-------------
branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.28.patch
branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.28.patch
branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.28.patch
Deleted: branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.28.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.28.patch 2016-02-13 22:58:22 UTC (rev 7531)
+++ branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.28.patch 2016-02-15 15:54:26 UTC (rev 7532)
@@ -1,140 +0,0 @@
-diff --git a/configs/http.conf.sample b/configs/http.conf.sample
-index 1a7f4fd..9a06fcf 100644
---- a/configs/http.conf.sample
-+++ b/configs/http.conf.sample
-@@ -67,10 +67,31 @@ bindaddr=127.0.0.1
- ; If no path is given for tlscertfile or tlsprivatekey, default is to look in current
- ; directory. If no tlsprivatekey is given, default is to search tlscertfile for private key.
- ;
-+;
- ; To produce a certificate you can e.g. use openssl. This places both the cert and
- ; private in same .pem file.
- ; openssl req -new -x509 -days 365 -nodes -out /tmp/foo.pem -keyout /tmp/foo.pem
- ;
-+; tlscipher= ; The list of allowed ciphers
-+; ; if none are specified the following cipher
-+; ; list will be used instead:
-+; ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:
-+; ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:
-+; kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:
-+; ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:
-+; ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:
-+; DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:
-+; AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:
-+; AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:
-+; !EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
-+;
-+; tlsdisablev1=yes ; Disable TLSv1 support - if not set this defaults to "yes"
-+; tlsdisablev11=yes ; Disable TLSv1.1 support - if not set this defaults to "no"
-+; tlsdisablev12=yes ; Disable TLSv1.2 support - if not set this defaults to "no"
-+;
-+; tlsservercipherorder=yes ; Use the server preference order instead of the client order
-+; ; Defaults to "yes"
-+;
- ; The post_mappings section maps URLs to real paths on the filesystem. If a
- ; POST is done from within an authenticated manager session to one of the
- ; configured POST mappings, then any files in the POST will be placed in the
-diff --git a/include/asterisk/tcptls.h b/include/asterisk/tcptls.h
-index f3f5e1f..eb7166f 100644
---- a/include/asterisk/tcptls.h
-+++ b/include/asterisk/tcptls.h
-@@ -79,7 +79,15 @@ enum ast_ssl_flags {
- /*! Use SSLv3 for outgoing client connections */
- AST_SSL_SSLV3_CLIENT = (1 << 4),
- /*! Use TLSv1 for outgoing client connections */
-- AST_SSL_TLSV1_CLIENT = (1 << 5)
-+ AST_SSL_TLSV1_CLIENT = (1 << 5),
-+ /*! Use server cipher order instead of the client order */
-+ AST_SSL_SERVER_CIPHER_ORDER = (1 << 6),
-+ /*! Disable TLSv1 support */
-+ AST_SSL_DISABLE_TLSV1 = (1 << 7),
-+ /*! Disable TLSv1.1 support */
-+ AST_SSL_DISABLE_TLSV11 = (1 << 8),
-+ /*! Disable TLSv1.2 support */
-+ AST_SSL_DISABLE_TLSV12 = (1 << 9),
- };
-
- struct ast_tls_config {
-diff --git a/main/http.c b/main/http.c
-index 9bebbe7..4bfa985 100644
---- a/main/http.c
-+++ b/main/http.c
-@@ -1118,10 +1118,13 @@ static int __ast_http_load(int reload)
- }
- http_tls_cfg.pvtfile = ast_strdup("");
-
-+ /* Apply modern intermediate settings according to the Mozilla OpSec team as of July 30th, 2015 but disable TLSv1 */
-+ ast_set_flag(&http_tls_cfg.flags, AST_SSL_DISABLE_TLSV1 | AST_SSL_SERVER_CIPHER_ORDER);
-+
- if (http_tls_cfg.cipher) {
- ast_free(http_tls_cfg.cipher);
- }
-- http_tls_cfg.cipher = ast_strdup("");
-+ http_tls_cfg.cipher = ast_strdup("ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA");
-
- AST_RWLIST_WRLOCK(&uri_redirects);
- while ((redirect = AST_RWLIST_REMOVE_HEAD(&uri_redirects, entry))) {
-@@ -1146,8 +1149,6 @@ static int __ast_http_load(int reload)
- && strcasecmp(v->name, "tlsdontverifyserver")
- && strcasecmp(v->name, "tlsclientmethod")
- && strcasecmp(v->name, "sslclientmethod")
-- && strcasecmp(v->name, "tlscipher")
-- && strcasecmp(v->name, "sslcipher")
- && !ast_tls_read_conf(&http_tls_cfg, &https_desc, v->name, v->value)) {
- continue;
- }
-diff --git a/main/tcptls.c b/main/tcptls.c
-index 6f918ce..0f27e45 100644
---- a/main/tcptls.c
-+++ b/main/tcptls.c
-@@ -749,6 +749,7 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
- return 0;
- #else
- int disable_ssl = 0;
-+ long ssl_opts = 0;
-
- if (!cfg->enabled)
- return 0;
-@@ -793,11 +794,24 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
- * them. SSLv23_*_method supports TLSv1+.
- */
- if (disable_ssl) {
-- long ssl_opts;
-+ ssl_opts |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
-+ }
-+
-+ if (ast_test_flag(&cfg->flags, AST_SSL_SERVER_CIPHER_ORDER)) {
-+ ssl_opts |= SSL_OP_CIPHER_SERVER_PREFERENCE;
-+ }
-
-- ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
-- SSL_CTX_set_options(cfg->ssl_ctx, ssl_opts);
-+ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV1)) {
-+ ssl_opts |= SSL_OP_NO_TLSv1;
- }
-+ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV11)) {
-+ ssl_opts |= SSL_OP_NO_TLSv1_1;
-+ }
-+ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV12)) {
-+ ssl_opts |= SSL_OP_NO_TLSv1_2;
-+ }
-+
-+ SSL_CTX_set_options(cfg->ssl_ctx, ssl_opts);
-
- SSL_CTX_set_verify(cfg->ssl_ctx,
- ast_test_flag(&cfg->flags, AST_SSL_VERIFY_CLIENT) ? SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT : SSL_VERIFY_NONE,
-@@ -1109,6 +1123,14 @@ int ast_tls_read_conf(struct ast_tls_config *tls_cfg, struct ast_tcptls_session_
- ast_clear_flag(&tls_cfg->flags, AST_SSL_TLSV1_CLIENT);
- ast_clear_flag(&tls_cfg->flags, AST_SSL_SSLV3_CLIENT);
- }
-+ } else if (!strcasecmp(varname, "tlsservercipherorder")) {
-+ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_SERVER_CIPHER_ORDER);
-+ } else if (!strcasecmp(varname, "tlsdisablev1")) {
-+ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV1);
-+ } else if (!strcasecmp(varname, "tlsdisablev11")) {
-+ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV11);
-+ } else if (!strcasecmp(varname, "tlsdisablev12")) {
-+ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV12);
- } else {
- return -1;
- }
Added: branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.patch 2016-02-15 15:54:26 UTC (rev 7532)
@@ -0,0 +1,140 @@
+diff --git a/configs/http.conf.sample b/configs/http.conf.sample
+index 1a7f4fd..9a06fcf 100644
+--- a/configs/http.conf.sample
++++ b/configs/http.conf.sample
+@@ -67,10 +67,31 @@ bindaddr=127.0.0.1
+ ; If no path is given for tlscertfile or tlsprivatekey, default is to look in current
+ ; directory. If no tlsprivatekey is given, default is to search tlscertfile for private key.
+ ;
++;
+ ; To produce a certificate you can e.g. use openssl. This places both the cert and
+ ; private in same .pem file.
+ ; openssl req -new -x509 -days 365 -nodes -out /tmp/foo.pem -keyout /tmp/foo.pem
+ ;
++; tlscipher= ; The list of allowed ciphers
++; ; if none are specified the following cipher
++; ; list will be used instead:
++; ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:
++; ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:
++; kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:
++; ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:
++; ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:
++; DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:
++; AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:
++; AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:
++; !EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
++;
++; tlsdisablev1=yes ; Disable TLSv1 support - if not set this defaults to "yes"
++; tlsdisablev11=yes ; Disable TLSv1.1 support - if not set this defaults to "no"
++; tlsdisablev12=yes ; Disable TLSv1.2 support - if not set this defaults to "no"
++;
++; tlsservercipherorder=yes ; Use the server preference order instead of the client order
++; ; Defaults to "yes"
++;
+ ; The post_mappings section maps URLs to real paths on the filesystem. If a
+ ; POST is done from within an authenticated manager session to one of the
+ ; configured POST mappings, then any files in the POST will be placed in the
+diff --git a/include/asterisk/tcptls.h b/include/asterisk/tcptls.h
+index f3f5e1f..eb7166f 100644
+--- a/include/asterisk/tcptls.h
++++ b/include/asterisk/tcptls.h
+@@ -79,7 +79,15 @@ enum ast_ssl_flags {
+ /*! Use SSLv3 for outgoing client connections */
+ AST_SSL_SSLV3_CLIENT = (1 << 4),
+ /*! Use TLSv1 for outgoing client connections */
+- AST_SSL_TLSV1_CLIENT = (1 << 5)
++ AST_SSL_TLSV1_CLIENT = (1 << 5),
++ /*! Use server cipher order instead of the client order */
++ AST_SSL_SERVER_CIPHER_ORDER = (1 << 6),
++ /*! Disable TLSv1 support */
++ AST_SSL_DISABLE_TLSV1 = (1 << 7),
++ /*! Disable TLSv1.1 support */
++ AST_SSL_DISABLE_TLSV11 = (1 << 8),
++ /*! Disable TLSv1.2 support */
++ AST_SSL_DISABLE_TLSV12 = (1 << 9),
+ };
+
+ struct ast_tls_config {
+diff --git a/main/http.c b/main/http.c
+index 9bebbe7..4bfa985 100644
+--- a/main/http.c
++++ b/main/http.c
+@@ -1118,10 +1118,13 @@ static int __ast_http_load(int reload)
+ }
+ http_tls_cfg.pvtfile = ast_strdup("");
+
++ /* Apply modern intermediate settings according to the Mozilla OpSec team as of July 30th, 2015 but disable TLSv1 */
++ ast_set_flag(&http_tls_cfg.flags, AST_SSL_DISABLE_TLSV1 | AST_SSL_SERVER_CIPHER_ORDER);
++
+ if (http_tls_cfg.cipher) {
+ ast_free(http_tls_cfg.cipher);
+ }
+- http_tls_cfg.cipher = ast_strdup("");
++ http_tls_cfg.cipher = ast_strdup("ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA");
+
+ AST_RWLIST_WRLOCK(&uri_redirects);
+ while ((redirect = AST_RWLIST_REMOVE_HEAD(&uri_redirects, entry))) {
+@@ -1146,8 +1149,6 @@ static int __ast_http_load(int reload)
+ && strcasecmp(v->name, "tlsdontverifyserver")
+ && strcasecmp(v->name, "tlsclientmethod")
+ && strcasecmp(v->name, "sslclientmethod")
+- && strcasecmp(v->name, "tlscipher")
+- && strcasecmp(v->name, "sslcipher")
+ && !ast_tls_read_conf(&http_tls_cfg, &https_desc, v->name, v->value)) {
+ continue;
+ }
+diff --git a/main/tcptls.c b/main/tcptls.c
+index a5a2af6..f73c2aa 100644
+--- a/main/tcptls.c
++++ b/main/tcptls.c
+@@ -749,6 +749,7 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
+ return 0;
+ #else
+ int disable_ssl = 0;
++ long ssl_opts = 0;
+
+ if (!cfg->enabled)
+ return 0;
+@@ -793,11 +794,24 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
+ * them. SSLv23_*_method supports TLSv1+.
+ */
+ if (disable_ssl) {
+- long ssl_opts;
++ ssl_opts |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
++ }
++
++ if (ast_test_flag(&cfg->flags, AST_SSL_SERVER_CIPHER_ORDER)) {
++ ssl_opts |= SSL_OP_CIPHER_SERVER_PREFERENCE;
++ }
+
+- ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
+- SSL_CTX_set_options(cfg->ssl_ctx, ssl_opts);
++ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV1)) {
++ ssl_opts |= SSL_OP_NO_TLSv1;
+ }
++ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV11)) {
++ ssl_opts |= SSL_OP_NO_TLSv1_1;
++ }
++ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV12)) {
++ ssl_opts |= SSL_OP_NO_TLSv1_2;
++ }
++
++ SSL_CTX_set_options(cfg->ssl_ctx, ssl_opts);
+
+ SSL_CTX_set_verify(cfg->ssl_ctx,
+ ast_test_flag(&cfg->flags, AST_SSL_VERIFY_CLIENT) ? SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT : SSL_VERIFY_NONE,
+@@ -1109,6 +1123,14 @@ int ast_tls_read_conf(struct ast_tls_config *tls_cfg, struct ast_tcptls_session_
+ ast_clear_flag(&tls_cfg->flags, AST_SSL_TLSV1_CLIENT);
+ ast_clear_flag(&tls_cfg->flags, AST_SSL_SSLV3_CLIENT);
+ }
++ } else if (!strcasecmp(varname, "tlsservercipherorder")) {
++ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_SERVER_CIPHER_ORDER);
++ } else if (!strcasecmp(varname, "tlsdisablev1")) {
++ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV1);
++ } else if (!strcasecmp(varname, "tlsdisablev11")) {
++ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV11);
++ } else if (!strcasecmp(varname, "tlsdisablev12")) {
++ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV12);
+ } else {
+ return -1;
+ }
Deleted: branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.28.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.28.patch 2016-02-13 22:58:22 UTC (rev 7531)
+++ branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.28.patch 2016-02-15 15:54:26 UTC (rev 7532)
@@ -1,18 +0,0 @@
-diff --git a/channels/chan_sip.c b/channels/chan_sip.c
-index 16e3e53..86c52e9 100644
---- a/channels/chan_sip.c
-+++ b/channels/chan_sip.c
-@@ -3771,6 +3771,13 @@ static int retrans_pkt(const void *data)
- }
-
- /* For non-invites, a maximum of 4 secs */
-+ if (INT_MAX / pkt->timer_a < pkt->timer_t1) {
-+ /*
-+ * Uh Oh, we will have an integer overflow.
-+ * Recalculate previous timeout time instead.
-+ */
-+ pkt->timer_a = pkt->timer_a / 2;
-+ }
- siptimer_a = pkt->timer_t1 * pkt->timer_a; /* Double each time */
- if (pkt->method != SIP_INVITE && siptimer_a > 4000) {
- siptimer_a = 4000;
Added: branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.patch 2016-02-15 15:54:26 UTC (rev 7532)
@@ -0,0 +1,18 @@
+diff --git a/channels/chan_sip.c b/channels/chan_sip.c
+index 5de304a..277eec7 100644
+--- a/channels/chan_sip.c
++++ b/channels/chan_sip.c
+@@ -3771,6 +3771,13 @@ static int retrans_pkt(const void *data)
+ }
+
+ /* For non-invites, a maximum of 4 secs */
++ if (INT_MAX / pkt->timer_a < pkt->timer_t1) {
++ /*
++ * Uh Oh, we will have an integer overflow.
++ * Recalculate previous timeout time instead.
++ */
++ pkt->timer_a = pkt->timer_a / 2;
++ }
+ siptimer_a = pkt->timer_t1 * pkt->timer_a; /* Double each time */
+ if (pkt->method != SIP_INVITE && siptimer_a > 4000) {
+ siptimer_a = 4000;
Deleted: branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.28.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.28.patch 2016-02-13 22:58:22 UTC (rev 7531)
+++ branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.28.patch 2016-02-15 15:54:26 UTC (rev 7532)
@@ -1,28 +0,0 @@
-diff --git a/main/udptl.c b/main/udptl.c
-index 8885d7a..136dcb6 100644
---- a/main/udptl.c
-+++ b/main/udptl.c
-@@ -231,16 +231,15 @@ static int decode_open_type(uint8_t *buf, unsigned int limit, unsigned int *len,
- if (decode_length(buf, limit, len, &octet_cnt) != 0)
- return -1;
-
-- if (octet_cnt > 0) {
-- /* Make sure the buffer contains at least the number of bits requested */
-- if ((*len + octet_cnt) > limit)
-- return -1;
--
-- *p_num_octets = octet_cnt;
-- *p_object = &buf[*len];
-- *len += octet_cnt;
-+ /* Make sure the buffer contains at least the number of bits requested */
-+ if ((*len + octet_cnt) > limit) {
-+ return -1;
- }
-
-+ *p_num_octets = octet_cnt;
-+ *p_object = &buf[*len];
-+ *len += octet_cnt;
-+
- return 0;
- }
- /*- End of function --------------------------------------------------------*/
Added: branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.patch 2016-02-15 15:54:26 UTC (rev 7532)
@@ -0,0 +1,28 @@
+diff --git a/main/udptl.c b/main/udptl.c
+index a8244e8..6960487 100644
+--- a/main/udptl.c
++++ b/main/udptl.c
+@@ -231,16 +231,15 @@ static int decode_open_type(uint8_t *buf, unsigned int limit, unsigned int *len,
+ if (decode_length(buf, limit, len, &octet_cnt) != 0)
+ return -1;
+
+- if (octet_cnt > 0) {
+- /* Make sure the buffer contains at least the number of bits requested */
+- if ((*len + octet_cnt) > limit)
+- return -1;
+-
+- *p_num_octets = octet_cnt;
+- *p_object = &buf[*len];
+- *len += octet_cnt;
++ /* Make sure the buffer contains at least the number of bits requested */
++ if ((*len + octet_cnt) > limit) {
++ return -1;
+ }
+
++ *p_num_octets = octet_cnt;
++ *p_object = &buf[*len];
++ *len += octet_cnt;
++
+ return 0;
+ }
+ /*- End of function --------------------------------------------------------*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-04-20 15:58:28
|
Revision: 7650
http://sourceforge.net/p/astlinux/code/7650
Author: abelbeck
Date: 2016-04-20 15:58:26 +0000 (Wed, 20 Apr 2016)
Log Message:
-----------
asterisk, version bump to 13.8.2 and add app_queue-segfault-fix patch for 11.x and 13.x
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk.mk
Added Paths:
-----------
branches/1.0/package/asterisk/asterisk-11-app_queue-segfault-fix.patch
branches/1.0/package/asterisk/asterisk-13-app_queue-segfault-fix.patch
Added: branches/1.0/package/asterisk/asterisk-11-app_queue-segfault-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-app_queue-segfault-fix.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11-app_queue-segfault-fix.patch 2016-04-20 15:58:26 UTC (rev 7650)
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=apps%2Fapp_queue.c;h=fa432cb76f5e41ad1168b73d3cd415daf3c851c3;hp=4a8029080d4b88a34a84f8d2b20491ba1dcbf6f0;hb=32b4320d620ffff5c55f111fc22f22fdb07f8c60;hpb=981ed6091e513bc81d4863d409762638495c2ed1
+
+diff --git a/apps/app_queue.c b/apps/app_queue.c
+index 4a80290..fa432cb 100644
+--- a/apps/app_queue.c
++++ b/apps/app_queue.c
+@@ -3641,7 +3641,7 @@ static int can_ring_entry(struct queue_ent *qe, struct callattempt *call)
+ return 0;
+ }
+
+- if (call->member->in_call && call->lastqueue->wrapuptime) {
++ if (call->member->in_call && call->lastqueue && call->lastqueue->wrapuptime) {
+ ast_debug(1, "%s is in call, so not available (wrapuptime %d)\n",
+ call->interface, call->lastqueue->wrapuptime);
+ return 0;
Added: branches/1.0/package/asterisk/asterisk-13-app_queue-segfault-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-app_queue-segfault-fix.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-13-app_queue-segfault-fix.patch 2016-04-20 15:58:26 UTC (rev 7650)
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=apps%2Fapp_queue.c;h=34fdfe7a3ea3296c27dfa814b368ef46d8b7dd4f;hp=939a0e2ad99e415037334bd7e0b377e377ef85e8;hb=3b9d8b60b211377f2023ebfbfdd157cfb668de6e;hpb=56c8182913b4df446e39ac76283dc7be355210f4
+
+diff --git a/apps/app_queue.c b/apps/app_queue.c
+index 939a0e2..34fdfe7 100644
+--- a/apps/app_queue.c
++++ b/apps/app_queue.c
+@@ -4164,7 +4164,7 @@ static int can_ring_entry(struct queue_ent *qe, struct callattempt *call)
+ return 0;
+ }
+
+- if (call->member->in_call && call->lastqueue->wrapuptime) {
++ if (call->member->in_call && call->lastqueue && call->lastqueue->wrapuptime) {
+ ast_debug(1, "%s is in call, so not available (wrapuptime %d)\n",
+ call->interface, call->lastqueue->wrapuptime);
+ return 0;
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2016-04-19 13:12:10 UTC (rev 7649)
+++ branches/1.0/package/asterisk/asterisk.mk 2016-04-20 15:58:26 UTC (rev 7650)
@@ -9,7 +9,7 @@
ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
ASTERISK_VERSION := 11.22.0
else
-ASTERISK_VERSION := 13.8.1
+ASTERISK_VERSION := 13.8.2
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.
|
|
From: <abe...@us...> - 2016-09-10 17:03:38
|
Revision: 7829
http://sourceforge.net/p/astlinux/code/7829
Author: abelbeck
Date: 2016-09-10 17:03:35 +0000 (Sat, 10 Sep 2016)
Log Message:
-----------
asterisk, version bump to 11.23.1 and 13.11.2, security fixes
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk.mk
Modified: branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2016-09-10 16:31:27 UTC (rev 7828)
+++ branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2016-09-10 17:03:35 UTC (rev 7829)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -16799,7 +16799,7 @@
+@@ -16816,7 +16816,7 @@
}
if (!force) {
Modified: branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2016-09-10 16:31:27 UTC (rev 7828)
+++ branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2016-09-10 17:03:35 UTC (rev 7829)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -17319,7 +17319,7 @@
+@@ -17336,7 +17336,7 @@
}
if (!force) {
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2016-09-10 16:31:27 UTC (rev 7828)
+++ branches/1.0/package/asterisk/asterisk.mk 2016-09-10 17:03:35 UTC (rev 7829)
@@ -7,9 +7,9 @@
ASTERISK_VERSION := 1.8.32.3
else
ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
-ASTERISK_VERSION := 11.23.0
+ASTERISK_VERSION := 11.23.1
else
-ASTERISK_VERSION := 13.11.0
+ASTERISK_VERSION := 13.11.2
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.
|
|
From: <abe...@us...> - 2016-11-11 14:48:23
|
Revision: 7943
http://sourceforge.net/p/astlinux/code/7943
Author: abelbeck
Date: 2016-11-11 14:48:21 +0000 (Fri, 11 Nov 2016)
Log Message:
-----------
asterisk, version bump to 13.12.2
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk.mk
Removed Paths:
-------------
branches/1.0/package/asterisk/asterisk-13-upstream-chan_sip-revert-lastrtprx-fix.patch
Modified: branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2016-11-11 14:02:14 UTC (rev 7942)
+++ branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2016-11-11 14:48:21 UTC (rev 7943)
@@ -1,6 +1,6 @@
--- asterisk-13/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-13/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -17358,7 +17358,7 @@
+@@ -17356,7 +17356,7 @@
}
if (!force) {
Deleted: branches/1.0/package/asterisk/asterisk-13-upstream-chan_sip-revert-lastrtprx-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-upstream-chan_sip-revert-lastrtprx-fix.patch 2016-11-11 14:02:14 UTC (rev 7942)
+++ branches/1.0/package/asterisk/asterisk-13-upstream-chan_sip-revert-lastrtprx-fix.patch 2016-11-11 14:48:21 UTC (rev 7943)
@@ -1,17 +0,0 @@
-X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=channels%2Fchan_sip.c;h=b661f0de227ff5023155faf7181892b28699a519;hp=b6b4cc86e50c7eb36d26abb0620f0f5c3fbb09e0;hb=cb30963d222cb1e12af9bbf8dfed58001c9fcaf4;hpb=57a9797e0ac51eae3b8f3254627646b9698a60d2
-
-diff --git a/channels/chan_sip.c b/channels/chan_sip.c
-index b6b4cc8..b661f0d 100644
---- a/channels/chan_sip.c
-+++ b/channels/chan_sip.c
-@@ -8628,9 +8628,7 @@ static struct ast_frame *sip_read(struct ast_channel *ast)
-
- sip_pvt_lock(p);
- fr = sip_rtp_read(ast, p, &faxdetected);
-- if (fr && fr->frametype != AST_FRAME_NULL) {
-- p->lastrtprx = time(NULL);
-- }
-+ p->lastrtprx = time(NULL);
-
- /* If we detect a CNG tone and fax detection is enabled then send us off to the fax extension */
- if (faxdetected && ast_test_flag(&p->flags[1], SIP_PAGE2_FAX_DETECT_CNG)) {
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2016-11-11 14:02:14 UTC (rev 7942)
+++ branches/1.0/package/asterisk/asterisk.mk 2016-11-11 14:48:21 UTC (rev 7943)
@@ -7,7 +7,7 @@
ASTERISK_VERSION := 11.24.1
else
ifeq ($(BR2_PACKAGE_ASTERISK_v13),y)
-ASTERISK_VERSION := 13.12.1
+ASTERISK_VERSION := 13.12.2
else
ASTERISK_VERSION := 15.0.0
endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-12-05 18:35:38
|
Revision: 8017
http://sourceforge.net/p/astlinux/code/8017
Author: abelbeck
Date: 2016-12-05 18:35:36 +0000 (Mon, 05 Dec 2016)
Log Message:
-----------
asterisk, backport 13.13.0 patch to allow the newer utf-8 enabled libedit to work in the CLI. This allows asterisk to share the newer version of libedit and makes the asterisk binary 100 KB smaller
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk.mk
Added Paths:
-----------
branches/1.0/package/asterisk/asterisk-11-cli-libedit-utf8.patch
branches/1.0/package/asterisk/asterisk-13-cli-libedit-utf8.patch
Added: branches/1.0/package/asterisk/asterisk-11-cli-libedit-utf8.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-cli-libedit-utf8.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11-cli-libedit-utf8.patch 2016-12-05 18:35:36 UTC (rev 8017)
@@ -0,0 +1,63 @@
+X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=main%2Fasterisk.c;h=fa919936b4767580ff852f2ba1fcbe7781949968;hp=1c7a0e1885501e5e2446c72266e492ffd40a08ef;hb=5e0c22404316ecdf8e1510553474274eddf55e20;hpb=ec17e96784b8a75f74d84621165c73d986d56f95
+
+diff --git a/main/asterisk.c b/main/asterisk.c
+index 1c7a0e1..fa91993 100644
+--- a/main/asterisk.c
++++ b/main/asterisk.c
+@@ -2568,7 +2568,13 @@ static void send_rasterisk_connect_commands(void)
+ }
+ }
+
++#define HAVE_LIBEDIT_IS_UNICODE 1
++
++#ifdef HAVE_LIBEDIT_IS_UNICODE
++static int ast_el_read_char(EditLine *editline, wchar_t *cp)
++#else
+ static int ast_el_read_char(EditLine *editline, char *cp)
++#endif
+ {
+ int num_read = 0;
+ int lastpos = 0;
+@@ -2598,10 +2604,16 @@ static int ast_el_read_char(EditLine *editline, char *cp)
+ }
+
+ if (!ast_opt_exec && fds[1].revents) {
+- num_read = read(STDIN_FILENO, cp, 1);
++ char c = '\0';
++ num_read = read(STDIN_FILENO, &c, 1);
+ if (num_read < 1) {
+ break;
+ } else {
++#ifdef HAVE_LIBEDIT_IS_UNICODE
++ *cp = btowc(c);
++#else
++ *cp = c;
++#endif
+ return (num_read);
+ }
+ }
+@@ -2645,7 +2657,11 @@ static int ast_el_read_char(EditLine *editline, char *cp)
+ console_print(buf, 0);
+
+ if ((res < EL_BUF_SIZE - 1) && ((buf[res-1] == '\n') || (res >= 2 && buf[res-2] == '\n'))) {
++#ifdef HAVE_LIBEDIT_IS_UNICODE
++ *cp = btowc(CC_REFRESH);
++#else
+ *cp = CC_REFRESH;
++#endif
+ return(1);
+ } else {
+ lastpos = 1;
+@@ -2653,7 +2669,12 @@ static int ast_el_read_char(EditLine *editline, char *cp)
+ }
+ }
+
++#ifdef HAVE_LIBEDIT_IS_UNICODE
++ *cp = btowc('\0');
++#else
+ *cp = '\0';
++#endif
++
+ return (0);
+ }
+
Added: branches/1.0/package/asterisk/asterisk-13-cli-libedit-utf8.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-cli-libedit-utf8.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-13-cli-libedit-utf8.patch 2016-12-05 18:35:36 UTC (rev 8017)
@@ -0,0 +1,63 @@
+X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=main%2Fasterisk.c;h=fa919936b4767580ff852f2ba1fcbe7781949968;hp=1c7a0e1885501e5e2446c72266e492ffd40a08ef;hb=5e0c22404316ecdf8e1510553474274eddf55e20;hpb=ec17e96784b8a75f74d84621165c73d986d56f95
+
+diff --git a/main/asterisk.c b/main/asterisk.c
+index 1c7a0e1..fa91993 100644
+--- a/main/asterisk.c
++++ b/main/asterisk.c
+@@ -2818,7 +2818,13 @@ static void send_rasterisk_connect_commands(void)
+ }
+ }
+
++#define HAVE_LIBEDIT_IS_UNICODE 1
++
++#ifdef HAVE_LIBEDIT_IS_UNICODE
++static int ast_el_read_char(EditLine *editline, wchar_t *cp)
++#else
+ static int ast_el_read_char(EditLine *editline, char *cp)
++#endif
+ {
+ int num_read = 0;
+ int lastpos = 0;
+@@ -2848,10 +2854,16 @@ static int ast_el_read_char(EditLine *editline, char *cp)
+ }
+
+ if (!ast_opt_exec && fds[1].revents) {
+- num_read = read(STDIN_FILENO, cp, 1);
++ char c = '\0';
++ num_read = read(STDIN_FILENO, &c, 1);
+ if (num_read < 1) {
+ break;
+ } else {
++#ifdef HAVE_LIBEDIT_IS_UNICODE
++ *cp = btowc(c);
++#else
++ *cp = c;
++#endif
+ return (num_read);
+ }
+ }
+@@ -2895,7 +2907,11 @@ static int ast_el_read_char(EditLine *editline, char *cp)
+ console_print(buf, 0);
+
+ if ((res < EL_BUF_SIZE - 1) && ((buf[res-1] == '\n') || (res >= 2 && buf[res-2] == '\n'))) {
++#ifdef HAVE_LIBEDIT_IS_UNICODE
++ *cp = btowc(CC_REFRESH);
++#else
+ *cp = CC_REFRESH;
++#endif
+ return(1);
+ } else {
+ lastpos = 1;
+@@ -2903,7 +2919,12 @@ static int ast_el_read_char(EditLine *editline, char *cp)
+ }
+ }
+
++#ifdef HAVE_LIBEDIT_IS_UNICODE
++ *cp = btowc('\0');
++#else
+ *cp = '\0';
++#endif
++
+ return (0);
+ }
+
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2016-12-05 16:10:15 UTC (rev 8016)
+++ branches/1.0/package/asterisk/asterisk.mk 2016-12-05 18:35:36 UTC (rev 8017)
@@ -52,9 +52,14 @@
ASTERISK_CONFIGURE_ARGS+= \
--without-cap
-# Asterisk does not work using system libedit with wide-char/UTF-8 support
+ifeq ($(strip $(BR2_PACKAGE_LIBEDIT)),y)
+ASTERISK_EXTRAS+=libedit
ASTERISK_CONFIGURE_ARGS+= \
+ --with-libedit="$(STAGING_DIR)/usr"
+else
+ASTERISK_CONFIGURE_ARGS+= \
--without-libedit
+endif
ifeq ($(strip $(BR2_PACKAGE_LIBXML2)),y)
ASTERISK_EXTRAS+=libxml2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-12-09 13:32:19
|
Revision: 8025
http://sourceforge.net/p/astlinux/code/8025
Author: abelbeck
Date: 2016-12-09 13:32:17 +0000 (Fri, 09 Dec 2016)
Log Message:
-----------
asterisk, version bump to 11.25.1 and 13.x security patches
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk.mk
Added Paths:
-----------
branches/1.0/package/asterisk/asterisk-13-upstream-AST-2016-008-13-security.patch
branches/1.0/package/asterisk/asterisk-13-upstream-AST-2016-009-13-security.patch
branches/1.0/package/asterisk/asterisk-13-upstream-cli-libedit-utf8.patch
Removed Paths:
-------------
branches/1.0/package/asterisk/asterisk-13-cli-libedit-utf8.patch
Modified: branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2016-12-08 16:54:13 UTC (rev 8024)
+++ branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2016-12-09 13:32:17 UTC (rev 8025)
@@ -1,6 +1,6 @@
--- asterisk-11/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -16817,7 +16817,7 @@
+@@ -16815,7 +16815,7 @@
}
if (!force) {
Deleted: branches/1.0/package/asterisk/asterisk-13-cli-libedit-utf8.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-cli-libedit-utf8.patch 2016-12-08 16:54:13 UTC (rev 8024)
+++ branches/1.0/package/asterisk/asterisk-13-cli-libedit-utf8.patch 2016-12-09 13:32:17 UTC (rev 8025)
@@ -1,63 +0,0 @@
-X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=main%2Fasterisk.c;h=fa919936b4767580ff852f2ba1fcbe7781949968;hp=1c7a0e1885501e5e2446c72266e492ffd40a08ef;hb=5e0c22404316ecdf8e1510553474274eddf55e20;hpb=ec17e96784b8a75f74d84621165c73d986d56f95
-
-diff --git a/main/asterisk.c b/main/asterisk.c
-index 1c7a0e1..fa91993 100644
---- a/main/asterisk.c
-+++ b/main/asterisk.c
-@@ -2818,7 +2818,13 @@ static void send_rasterisk_connect_commands(void)
- }
- }
-
-+#define HAVE_LIBEDIT_IS_UNICODE 1
-+
-+#ifdef HAVE_LIBEDIT_IS_UNICODE
-+static int ast_el_read_char(EditLine *editline, wchar_t *cp)
-+#else
- static int ast_el_read_char(EditLine *editline, char *cp)
-+#endif
- {
- int num_read = 0;
- int lastpos = 0;
-@@ -2848,10 +2854,16 @@ static int ast_el_read_char(EditLine *editline, char *cp)
- }
-
- if (!ast_opt_exec && fds[1].revents) {
-- num_read = read(STDIN_FILENO, cp, 1);
-+ char c = '\0';
-+ num_read = read(STDIN_FILENO, &c, 1);
- if (num_read < 1) {
- break;
- } else {
-+#ifdef HAVE_LIBEDIT_IS_UNICODE
-+ *cp = btowc(c);
-+#else
-+ *cp = c;
-+#endif
- return (num_read);
- }
- }
-@@ -2895,7 +2907,11 @@ static int ast_el_read_char(EditLine *editline, char *cp)
- console_print(buf, 0);
-
- if ((res < EL_BUF_SIZE - 1) && ((buf[res-1] == '\n') || (res >= 2 && buf[res-2] == '\n'))) {
-+#ifdef HAVE_LIBEDIT_IS_UNICODE
-+ *cp = btowc(CC_REFRESH);
-+#else
- *cp = CC_REFRESH;
-+#endif
- return(1);
- } else {
- lastpos = 1;
-@@ -2903,7 +2919,12 @@ static int ast_el_read_char(EditLine *editline, char *cp)
- }
- }
-
-+#ifdef HAVE_LIBEDIT_IS_UNICODE
-+ *cp = btowc('\0');
-+#else
- *cp = '\0';
-+#endif
-+
- return (0);
- }
-
Added: branches/1.0/package/asterisk/asterisk-13-upstream-AST-2016-008-13-security.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-upstream-AST-2016-008-13-security.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-13-upstream-AST-2016-008-13-security.patch 2016-12-09 13:32:17 UTC (rev 8025)
@@ -0,0 +1,72 @@
+commit 888142e89160169220bff1bae742f6ef558a7b11
+Author: Joshua Colp <jc...@di...>
+Date: Tue Nov 15 00:18:21 2016 +0000
+
+ res_format_attr_opus: Fix crash when fmtp contains spaces.
+
+ When an opus offer or answer was received that contained an
+ fmtp line with spaces between the attributes the module would
+ fail to properly parse it and crash due to recursion.
+
+ This change makes the module handle the space properly and
+ also removes the recursion requirement.
+
+ ASTERISK-26579
+
+ Change-Id: I01f53e5d9fa9f1925a7365f8d25071b5b3ac2dc3
+
+diff --git a/res/res_format_attr_opus.c b/res/res_format_attr_opus.c
+index 49382f6..857b943 100644
+--- a/res/res_format_attr_opus.c
++++ b/res/res_format_attr_opus.c
+@@ -102,27 +102,35 @@ static int opus_clone(const struct ast_format *src, struct ast_format *dst)
+
+ static void sdp_fmtp_get(const char *attributes, const char *name, int *attr)
+ {
+- const char *kvp = "";
++ const char *kvp = attributes;
+ int val;
+
+- if (attributes && !(kvp = strstr(attributes, name))) {
++ if (ast_strlen_zero(attributes)) {
+ return;
+ }
+
+- /*
+- * If the named attribute is not at the start of the given attributes, and
+- * the preceding character is not a space or semicolon then it's not the
+- * attribute we are looking for. It's an attribute with the name embedded
+- * within it (e.g. ptime in maxptime, stereo in sprop-stereo).
++ /* This logic goes through each attribute in the fmtp line looking for the
++ * requested named attribute.
+ */
+- if (kvp != attributes && *(kvp - 1) != ' ' && *(kvp - 1) != ';') {
+- /* Keep searching as it might still be in the attributes string */
+- sdp_fmtp_get(strchr(kvp, ';'), name, attr);
+- /*
+- * Otherwise it's a match, so retrieve the value and set the attribute.
+- */
+- } else if (sscanf(kvp, "%*[^=]=%30d", &val) == 1) {
+- *attr = val;
++ while (*kvp) {
++ /* Skip any preceeding blanks as some implementations separate attributes using spaces too */
++ kvp = ast_skip_blanks(kvp);
++
++ /* If we are at at the requested attribute get its value and return */
++ if (!strncmp(kvp, name, strlen(name)) && kvp[strlen(name)] == '=') {
++ if (sscanf(kvp, "%*[^=]=%30d", &val) == 1) {
++ *attr = val;
++ break;
++ }
++ }
++
++ /* Move on to the next attribute if possible */
++ kvp = strchr(kvp, ';');
++ if (!kvp) {
++ break;
++ }
++
++ kvp++;
+ }
+ }
+
Added: branches/1.0/package/asterisk/asterisk-13-upstream-AST-2016-009-13-security.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-upstream-AST-2016-009-13-security.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-13-upstream-AST-2016-009-13-security.patch 2016-12-09 13:32:17 UTC (rev 8025)
@@ -0,0 +1,27 @@
+diff --git a/channels/chan_sip.c b/channels/chan_sip.c
+index 50183c2..c53d9ba 100644
+--- a/channels/chan_sip.c
++++ b/channels/chan_sip.c
+@@ -8446,8 +8446,6 @@ static const char *__get_header(const struct sip_request *req, const char *name,
+ * one afterwards. If you shouldn't do it, what absolute idiot decided it was
+ * a good idea to say you can do it, and if you can do it, why in the hell would.
+ * you say you shouldn't.
+- * Anyways, pedanticsipchecking controls whether we allow spaces before ':',
+- * and we always allow spaces after that for compatibility.
+ */
+ const char *sname = find_alias(name, NULL);
+ int x, len = strlen(name), slen = (sname ? 1 : 0);
+@@ -8460,10 +8458,10 @@ static const char *__get_header(const struct sip_request *req, const char *name,
+ if (match || smatch) {
+ /* skip name */
+ const char *r = header + (match ? len : slen );
+- if (sip_cfg.pedanticsipchecking) {
+- r = ast_skip_blanks(r);
++ /* HCOLON has optional SP/HTAB; skip past those */
++ while (*r == ' ' || *r == '\t') {
++ ++r;
+ }
+-
+ if (*r == ':') {
+ *start = x+1;
+ return ast_skip_blanks(r+1);
Copied: branches/1.0/package/asterisk/asterisk-13-upstream-cli-libedit-utf8.patch (from rev 8024, branches/1.0/package/asterisk/asterisk-13-cli-libedit-utf8.patch)
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-upstream-cli-libedit-utf8.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-13-upstream-cli-libedit-utf8.patch 2016-12-09 13:32:17 UTC (rev 8025)
@@ -0,0 +1,63 @@
+X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=main%2Fasterisk.c;h=fa919936b4767580ff852f2ba1fcbe7781949968;hp=1c7a0e1885501e5e2446c72266e492ffd40a08ef;hb=5e0c22404316ecdf8e1510553474274eddf55e20;hpb=ec17e96784b8a75f74d84621165c73d986d56f95
+
+diff --git a/main/asterisk.c b/main/asterisk.c
+index 1c7a0e1..fa91993 100644
+--- a/main/asterisk.c
++++ b/main/asterisk.c
+@@ -2818,7 +2818,13 @@ static void send_rasterisk_connect_commands(void)
+ }
+ }
+
++#define HAVE_LIBEDIT_IS_UNICODE 1
++
++#ifdef HAVE_LIBEDIT_IS_UNICODE
++static int ast_el_read_char(EditLine *editline, wchar_t *cp)
++#else
+ static int ast_el_read_char(EditLine *editline, char *cp)
++#endif
+ {
+ int num_read = 0;
+ int lastpos = 0;
+@@ -2848,10 +2854,16 @@ static int ast_el_read_char(EditLine *editline, char *cp)
+ }
+
+ if (!ast_opt_exec && fds[1].revents) {
+- num_read = read(STDIN_FILENO, cp, 1);
++ char c = '\0';
++ num_read = read(STDIN_FILENO, &c, 1);
+ if (num_read < 1) {
+ break;
+ } else {
++#ifdef HAVE_LIBEDIT_IS_UNICODE
++ *cp = btowc(c);
++#else
++ *cp = c;
++#endif
+ return (num_read);
+ }
+ }
+@@ -2895,7 +2907,11 @@ static int ast_el_read_char(EditLine *editline, char *cp)
+ console_print(buf, 0);
+
+ if ((res < EL_BUF_SIZE - 1) && ((buf[res-1] == '\n') || (res >= 2 && buf[res-2] == '\n'))) {
++#ifdef HAVE_LIBEDIT_IS_UNICODE
++ *cp = btowc(CC_REFRESH);
++#else
+ *cp = CC_REFRESH;
++#endif
+ return(1);
+ } else {
+ lastpos = 1;
+@@ -2903,7 +2919,12 @@ static int ast_el_read_char(EditLine *editline, char *cp)
+ }
+ }
+
++#ifdef HAVE_LIBEDIT_IS_UNICODE
++ *cp = btowc('\0');
++#else
+ *cp = '\0';
++#endif
++
+ return (0);
+ }
+
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2016-12-08 16:54:13 UTC (rev 8024)
+++ branches/1.0/package/asterisk/asterisk.mk 2016-12-09 13:32:17 UTC (rev 8025)
@@ -4,7 +4,7 @@
#
##############################################################
ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
-ASTERISK_VERSION := 11.25.0
+ASTERISK_VERSION := 11.25.1
else
ifeq ($(BR2_PACKAGE_ASTERISK_v13),y)
ASTERISK_VERSION := 13.12.2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-01-28 15:31:51
|
Revision: 8128
http://sourceforge.net/p/astlinux/code/8128
Author: abelbeck
Date: 2017-01-28 15:31:49 +0000 (Sat, 28 Jan 2017)
Log Message:
-----------
asterisk, version bump to 13.13.1
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk.mk
Removed Paths:
-------------
branches/1.0/package/asterisk/asterisk-13-upstream-AST-2016-008-13-security.patch
branches/1.0/package/asterisk/asterisk-13-upstream-AST-2016-009-13-security.patch
branches/1.0/package/asterisk/asterisk-13-upstream-cli-libedit-utf8.patch
Modified: branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2017-01-28 14:58:19 UTC (rev 8127)
+++ branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2017-01-28 15:31:49 UTC (rev 8128)
@@ -1,6 +1,6 @@
--- asterisk-13/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-13/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -17356,7 +17356,7 @@
+@@ -17354,7 +17354,7 @@
}
if (!force) {
Deleted: branches/1.0/package/asterisk/asterisk-13-upstream-AST-2016-008-13-security.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-upstream-AST-2016-008-13-security.patch 2017-01-28 14:58:19 UTC (rev 8127)
+++ branches/1.0/package/asterisk/asterisk-13-upstream-AST-2016-008-13-security.patch 2017-01-28 15:31:49 UTC (rev 8128)
@@ -1,72 +0,0 @@
-commit 888142e89160169220bff1bae742f6ef558a7b11
-Author: Joshua Colp <jc...@di...>
-Date: Tue Nov 15 00:18:21 2016 +0000
-
- res_format_attr_opus: Fix crash when fmtp contains spaces.
-
- When an opus offer or answer was received that contained an
- fmtp line with spaces between the attributes the module would
- fail to properly parse it and crash due to recursion.
-
- This change makes the module handle the space properly and
- also removes the recursion requirement.
-
- ASTERISK-26579
-
- Change-Id: I01f53e5d9fa9f1925a7365f8d25071b5b3ac2dc3
-
-diff --git a/res/res_format_attr_opus.c b/res/res_format_attr_opus.c
-index 49382f6..857b943 100644
---- a/res/res_format_attr_opus.c
-+++ b/res/res_format_attr_opus.c
-@@ -102,27 +102,35 @@ static int opus_clone(const struct ast_format *src, struct ast_format *dst)
-
- static void sdp_fmtp_get(const char *attributes, const char *name, int *attr)
- {
-- const char *kvp = "";
-+ const char *kvp = attributes;
- int val;
-
-- if (attributes && !(kvp = strstr(attributes, name))) {
-+ if (ast_strlen_zero(attributes)) {
- return;
- }
-
-- /*
-- * If the named attribute is not at the start of the given attributes, and
-- * the preceding character is not a space or semicolon then it's not the
-- * attribute we are looking for. It's an attribute with the name embedded
-- * within it (e.g. ptime in maxptime, stereo in sprop-stereo).
-+ /* This logic goes through each attribute in the fmtp line looking for the
-+ * requested named attribute.
- */
-- if (kvp != attributes && *(kvp - 1) != ' ' && *(kvp - 1) != ';') {
-- /* Keep searching as it might still be in the attributes string */
-- sdp_fmtp_get(strchr(kvp, ';'), name, attr);
-- /*
-- * Otherwise it's a match, so retrieve the value and set the attribute.
-- */
-- } else if (sscanf(kvp, "%*[^=]=%30d", &val) == 1) {
-- *attr = val;
-+ while (*kvp) {
-+ /* Skip any preceeding blanks as some implementations separate attributes using spaces too */
-+ kvp = ast_skip_blanks(kvp);
-+
-+ /* If we are at at the requested attribute get its value and return */
-+ if (!strncmp(kvp, name, strlen(name)) && kvp[strlen(name)] == '=') {
-+ if (sscanf(kvp, "%*[^=]=%30d", &val) == 1) {
-+ *attr = val;
-+ break;
-+ }
-+ }
-+
-+ /* Move on to the next attribute if possible */
-+ kvp = strchr(kvp, ';');
-+ if (!kvp) {
-+ break;
-+ }
-+
-+ kvp++;
- }
- }
-
Deleted: branches/1.0/package/asterisk/asterisk-13-upstream-AST-2016-009-13-security.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-upstream-AST-2016-009-13-security.patch 2017-01-28 14:58:19 UTC (rev 8127)
+++ branches/1.0/package/asterisk/asterisk-13-upstream-AST-2016-009-13-security.patch 2017-01-28 15:31:49 UTC (rev 8128)
@@ -1,27 +0,0 @@
-diff --git a/channels/chan_sip.c b/channels/chan_sip.c
-index 50183c2..c53d9ba 100644
---- a/channels/chan_sip.c
-+++ b/channels/chan_sip.c
-@@ -8446,8 +8446,6 @@ static const char *__get_header(const struct sip_request *req, const char *name,
- * one afterwards. If you shouldn't do it, what absolute idiot decided it was
- * a good idea to say you can do it, and if you can do it, why in the hell would.
- * you say you shouldn't.
-- * Anyways, pedanticsipchecking controls whether we allow spaces before ':',
-- * and we always allow spaces after that for compatibility.
- */
- const char *sname = find_alias(name, NULL);
- int x, len = strlen(name), slen = (sname ? 1 : 0);
-@@ -8460,10 +8458,10 @@ static const char *__get_header(const struct sip_request *req, const char *name,
- if (match || smatch) {
- /* skip name */
- const char *r = header + (match ? len : slen );
-- if (sip_cfg.pedanticsipchecking) {
-- r = ast_skip_blanks(r);
-+ /* HCOLON has optional SP/HTAB; skip past those */
-+ while (*r == ' ' || *r == '\t') {
-+ ++r;
- }
--
- if (*r == ':') {
- *start = x+1;
- return ast_skip_blanks(r+1);
Deleted: branches/1.0/package/asterisk/asterisk-13-upstream-cli-libedit-utf8.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-upstream-cli-libedit-utf8.patch 2017-01-28 14:58:19 UTC (rev 8127)
+++ branches/1.0/package/asterisk/asterisk-13-upstream-cli-libedit-utf8.patch 2017-01-28 15:31:49 UTC (rev 8128)
@@ -1,63 +0,0 @@
-X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=main%2Fasterisk.c;h=fa919936b4767580ff852f2ba1fcbe7781949968;hp=1c7a0e1885501e5e2446c72266e492ffd40a08ef;hb=5e0c22404316ecdf8e1510553474274eddf55e20;hpb=ec17e96784b8a75f74d84621165c73d986d56f95
-
-diff --git a/main/asterisk.c b/main/asterisk.c
-index 1c7a0e1..fa91993 100644
---- a/main/asterisk.c
-+++ b/main/asterisk.c
-@@ -2818,7 +2818,13 @@ static void send_rasterisk_connect_commands(void)
- }
- }
-
-+#define HAVE_LIBEDIT_IS_UNICODE 1
-+
-+#ifdef HAVE_LIBEDIT_IS_UNICODE
-+static int ast_el_read_char(EditLine *editline, wchar_t *cp)
-+#else
- static int ast_el_read_char(EditLine *editline, char *cp)
-+#endif
- {
- int num_read = 0;
- int lastpos = 0;
-@@ -2848,10 +2854,16 @@ static int ast_el_read_char(EditLine *editline, char *cp)
- }
-
- if (!ast_opt_exec && fds[1].revents) {
-- num_read = read(STDIN_FILENO, cp, 1);
-+ char c = '\0';
-+ num_read = read(STDIN_FILENO, &c, 1);
- if (num_read < 1) {
- break;
- } else {
-+#ifdef HAVE_LIBEDIT_IS_UNICODE
-+ *cp = btowc(c);
-+#else
-+ *cp = c;
-+#endif
- return (num_read);
- }
- }
-@@ -2895,7 +2907,11 @@ static int ast_el_read_char(EditLine *editline, char *cp)
- console_print(buf, 0);
-
- if ((res < EL_BUF_SIZE - 1) && ((buf[res-1] == '\n') || (res >= 2 && buf[res-2] == '\n'))) {
-+#ifdef HAVE_LIBEDIT_IS_UNICODE
-+ *cp = btowc(CC_REFRESH);
-+#else
- *cp = CC_REFRESH;
-+#endif
- return(1);
- } else {
- lastpos = 1;
-@@ -2903,7 +2919,12 @@ static int ast_el_read_char(EditLine *editline, char *cp)
- }
- }
-
-+#ifdef HAVE_LIBEDIT_IS_UNICODE
-+ *cp = btowc('\0');
-+#else
- *cp = '\0';
-+#endif
-+
- return (0);
- }
-
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2017-01-28 14:58:19 UTC (rev 8127)
+++ branches/1.0/package/asterisk/asterisk.mk 2017-01-28 15:31:49 UTC (rev 8128)
@@ -7,7 +7,7 @@
ASTERISK_VERSION := 11.25.1
else
ifeq ($(BR2_PACKAGE_ASTERISK_v13),y)
-ASTERISK_VERSION := 13.12.2
+ASTERISK_VERSION := 13.13.1
else
ASTERISK_VERSION := 15.0.0
endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-03-31 16:30:33
|
Revision: 8252
http://sourceforge.net/p/astlinux/code/8252
Author: abelbeck
Date: 2017-03-31 16:30:31 +0000 (Fri, 31 Mar 2017)
Log Message:
-----------
asterisk, backport Asterisk 14 'followme: allow disabling callee prompt' feature. Requested by Michael Keuter.
Ref: http://git.asterisk.org/gitweb/?p=asterisk/asterisk.git;a=commit;h=1d60bfcdf1ad7a265177fa35a9d2a55468bbe78f
Added Paths:
-----------
branches/1.0/package/asterisk/asterisk-11-followme-callee-prompt-control.patch
branches/1.0/package/asterisk/asterisk-13-followme-callee-prompt-control.patch
Added: branches/1.0/package/asterisk/asterisk-11-followme-callee-prompt-control.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-followme-callee-prompt-control.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11-followme-callee-prompt-control.patch 2017-03-31 16:30:31 UTC (rev 8252)
@@ -0,0 +1,205 @@
+diff --git a/apps/app_followme.c b/apps/app_followme.c
+index 1069020..7d13bb4 100644
+--- a/apps/app_followme.c
++++ b/apps/app_followme.c
+@@ -160,6 +160,8 @@ struct call_followme {
+ char context[AST_MAX_CONTEXT]; /*!< Context to dial from */
+ unsigned int active; /*!< Profile is active (1), or disabled (0). */
+ int realtime; /*!< Cached from realtime */
++ /*! Allow callees to accept/reject the forwarded call */
++ unsigned int enable_callee_prompt:1;
+ char takecall[MAX_YN_STRING]; /*!< Digit mapping to take a call */
+ char nextindp[MAX_YN_STRING]; /*!< Digit mapping to decline a call */
+ char callfromprompt[PATH_MAX]; /*!< Sound prompt name and path */
+@@ -190,6 +192,8 @@ struct fm_args {
+ unsigned int pending_out_connected_update:1;
+ /*! TRUE if caller has a pending hold request for the winning call. */
+ unsigned int pending_hold:1;
++ /*! TRUE if callees will be prompted to answer */
++ unsigned int enable_callee_prompt:1;
+ /*! Music On Hold Class suggested by caller hold for winning call. */
+ char suggested_moh[MAX_MUSICCLASS];
+ char context[AST_MAX_CONTEXT];
+@@ -260,6 +264,7 @@ static const char *defaultmoh = "default"; /*!< Default Music-On-Hold Class
+
+ static char takecall[MAX_YN_STRING] = "1";
+ static char nextindp[MAX_YN_STRING] = "2";
++static int enable_callee_prompt = 1;
+ static char callfromprompt[PATH_MAX] = "followme/call-from";
+ static char norecordingprompt[PATH_MAX] = "followme/no-recording";
+ static char optionsprompt[PATH_MAX] = "followme/options";
+@@ -312,6 +317,7 @@
+ static void init_profile(struct call_followme *f, int activate)
+ {
+ f->context[0] = '\0';
++ f->enable_callee_prompt = enable_callee_prompt;
+ ast_copy_string(f->moh, defaultmoh, sizeof(f->moh));
+ ast_copy_string(f->takecall, takecall, sizeof(f->takecall));
+ ast_copy_string(f->nextindp, nextindp, sizeof(f->nextindp));
+@@ -336,6 +342,8 @@ static void profile_set_param(struct call_followme *f, const char *param, const
+ ast_copy_string(f->moh, val, sizeof(f->moh));
+ else if (!strcasecmp(param, "context"))
+ ast_copy_string(f->context, val, sizeof(f->context));
++ else if (!strcasecmp(param, "enable_callee_prompt"))
++ f->enable_callee_prompt = ast_true(val);
+ else if (!strcasecmp(param, "takecall"))
+ ast_copy_string(f->takecall, val, sizeof(f->takecall));
+ else if (!strcasecmp(param, "declinecall"))
+@@ -391,6 +399,7 @@ static int reload_followme(int reload)
+ char *numberstr;
+ int timeout;
+ int numorder;
++ const char* enable_callee_prompt_str;
+ const char *takecallstr;
+ const char *declinecallstr;
+ const char *tmpstr;
+@@ -423,6 +432,12 @@ static int reload_followme(int reload)
+ featuredigittimeout = 5000;
+ }
+
++ if ((enable_callee_prompt_str = ast_variable_retrieve(cfg, "general",
++ "enable_callee_prompt")) &&
++ !ast_strlen_zero(enable_callee_prompt_str)) {
++ enable_callee_prompt = ast_true(enable_callee_prompt_str);
++ }
++
+ if ((takecallstr = ast_variable_retrieve(cfg, "general", "takecall")) && !ast_strlen_zero(takecallstr)) {
+ ast_copy_string(takecall, takecallstr, sizeof(takecall));
+ }
+@@ -656,26 +671,30 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us
+ if (tmpuser->digts && (tmpuser->digts > featuredigittimeout)) {
+ ast_verb(3, "<%s> We've been waiting for digits longer than we should have.\n",
+ ast_channel_name(tmpuser->ochan));
+- if (!ast_strlen_zero(tpargs->namerecloc)) {
+- tmpuser->state = 1;
+- tmpuser->digts = 0;
+- if (!ast_streamfile(tmpuser->ochan, callfromname, ast_channel_language(tmpuser->ochan))) {
+- ast_sched_runq(ast_channel_sched(tmpuser->ochan));
++ if (tpargs->enable_callee_prompt) {
++ if (!ast_strlen_zero(tpargs->namerecloc)) {
++ tmpuser->state = 1;
++ tmpuser->digts = 0;
++ if (!ast_streamfile(tmpuser->ochan, callfromname, ast_channel_language(tmpuser->ochan))) {
++ ast_sched_runq(ast_channel_sched(tmpuser->ochan));
++ } else {
++ ast_log(LOG_WARNING, "Unable to playback %s.\n", callfromname);
++ clear_caller(tmpuser);
++ continue;
++ }
+ } else {
+- ast_log(LOG_WARNING, "Unable to playback %s.\n", callfromname);
+- clear_caller(tmpuser);
+- continue;
++ tmpuser->state = 2;
++ tmpuser->digts = 0;
++ if (!ast_streamfile(tmpuser->ochan, tpargs->norecordingprompt, ast_channel_language(tmpuser->ochan)))
++ ast_sched_runq(ast_channel_sched(tmpuser->ochan));
++ else {
++ ast_log(LOG_WARNING, "Unable to playback %s.\n", tpargs->norecordingprompt);
++ clear_caller(tmpuser);
++ continue;
++ }
+ }
+ } else {
+- tmpuser->state = 2;
+- tmpuser->digts = 0;
+- if (!ast_streamfile(tmpuser->ochan, tpargs->norecordingprompt, ast_channel_language(tmpuser->ochan)))
+- ast_sched_runq(ast_channel_sched(tmpuser->ochan));
+- else {
+- ast_log(LOG_WARNING, "Unable to playback %s.\n", tpargs->norecordingprompt);
+- clear_caller(tmpuser);
+- continue;
+- }
++ tmpuser->state = 3;
+ }
+ }
+ if (ast_channel_stream(tmpuser->ochan)) {
+@@ -789,23 +808,28 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us
+ /* If call has been answered, then the eventual hangup is likely to be normal hangup */
+ ast_channel_hangupcause_set(winner, AST_CAUSE_NORMAL_CLEARING);
+ ast_channel_hangupcause_set(caller, AST_CAUSE_NORMAL_CLEARING);
+- ast_verb(3, "Starting playback of %s\n", callfromname);
+- if (!ast_strlen_zero(tpargs->namerecloc)) {
+- if (!ast_streamfile(winner, callfromname, ast_channel_language(winner))) {
+- ast_sched_runq(ast_channel_sched(winner));
+- tmpuser->state = 1;
++ if (tpargs->enable_callee_prompt) {
++ ast_verb(3, "Starting playback of %s\n", callfromname);
++ if (!ast_strlen_zero(tpargs->namerecloc)) {
++ if (!ast_streamfile(winner, callfromname, ast_channel_language(winner))) {
++ ast_sched_runq(ast_channel_sched(winner));
++ tmpuser->state = 1;
++ } else {
++ ast_log(LOG_WARNING, "Unable to playback %s.\n", callfromname);
++ clear_caller(tmpuser);
++ }
+ } else {
+- ast_log(LOG_WARNING, "Unable to playback %s.\n", callfromname);
+- clear_caller(tmpuser);
++ tmpuser->state = 2;
++ if (!ast_streamfile(tmpuser->ochan, tpargs->norecordingprompt, ast_channel_language(tmpuser->ochan)))
++ ast_sched_runq(ast_channel_sched(tmpuser->ochan));
++ else {
++ ast_log(LOG_WARNING, "Unable to playback %s.\n", tpargs->norecordingprompt);
++ clear_caller(tmpuser);
++ }
+ }
+ } else {
++ ast_verb(3, "Skip playback of caller name / norecording\n");
+ tmpuser->state = 2;
+- if (!ast_streamfile(tmpuser->ochan, tpargs->norecordingprompt, ast_channel_language(tmpuser->ochan)))
+- ast_sched_runq(ast_channel_sched(tmpuser->ochan));
+- else {
+- ast_log(LOG_WARNING, "Unable to playback %s.\n", tpargs->norecordingprompt);
+- clear_caller(tmpuser);
+- }
+ }
+ break;
+ case AST_CONTROL_BUSY:
+@@ -927,6 +951,11 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us
+ break;
+ }
+ }
++ if (!tpargs->enable_callee_prompt && tmpuser) {
++ ast_debug(1, "Taking call with no prompt\n");
++ ast_frfree(f);
++ return tmpuser->ochan;
++ }
+ if (tmpuser && tmpuser->state == 3 && f->frametype == AST_FRAME_DTMF) {
+ int cmp_len;
+
+@@ -1365,6 +1394,7 @@ static int app_exec(struct ast_channel *chan, const char *data)
+
+ /* Lock the profile lock and copy out everything we need to run with before unlocking it again */
+ ast_mutex_lock(&f->lock);
++ targs->enable_callee_prompt = f->enable_callee_prompt;
+ targs->mohclass = ast_strdupa(f->moh);
+ ast_copy_string(targs->context, f->context, sizeof(targs->context));
+ ast_copy_string(targs->takecall, f->takecall, sizeof(targs->takecall));
+
+diff --git a/configs/samples/followme.conf.sample b/configs/samples/followme.conf.sample
+index a233948..7e1d40f 100644
+--- a/configs/followme.conf.sample
++++ b/configs/followme.conf.sample
+@@ -5,6 +5,11 @@ featuredigittimeout=>5000
+ ; The number of ms to wait for a digit input for the callee on whether to take the call or
+ ; not before we consider them "done" entering digits.
+ ;
++enable_callee_prompt=>true
++; Enable prompting a callee to either accept or reject the forwarded call.
++; If disabled, the optional prompting for caller name (option 'a') is
++; likewise disabled. Enabled by default.
++;
+ takecall=>1
+ ; The global default keypress for the callee to take taking the current call. This can be
+ ; a single digit or multiple digits. Default is "1".
+@@ -54,6 +59,9 @@ number=>01233456,25
+ ; step to make a choice on whether to take the call or not. That being the case,
+ ; you may want to make the timeout on the last step longer to give enough time to
+ ; make the choice to accept or not.
++enable_callee_prompt=>true
++; Enable prompting the callee to accept the forwarded call. The default
++; is the global value.
+ takecall=>1
+ ; The keypress for the callee to take taking the current call. This can be
+ ; a single digit or multiple digits. Default is the global default.
Added: branches/1.0/package/asterisk/asterisk-13-followme-callee-prompt-control.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-followme-callee-prompt-control.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-13-followme-callee-prompt-control.patch 2017-03-31 16:30:31 UTC (rev 8252)
@@ -0,0 +1,205 @@
+diff --git a/apps/app_followme.c b/apps/app_followme.c
+index 1069020..7d13bb4 100644
+--- a/apps/app_followme.c
++++ b/apps/app_followme.c
+@@ -168,6 +168,8 @@ struct call_followme {
+ char context[AST_MAX_CONTEXT]; /*!< Context to dial from */
+ unsigned int active; /*!< Profile is active (1), or disabled (0). */
+ int realtime; /*!< Cached from realtime */
++ /*! Allow callees to accept/reject the forwarded call */
++ unsigned int enable_callee_prompt:1;
+ char takecall[MAX_YN_STRING]; /*!< Digit mapping to take a call */
+ char nextindp[MAX_YN_STRING]; /*!< Digit mapping to decline a call */
+ char callfromprompt[PATH_MAX]; /*!< Sound prompt name and path */
+@@ -198,6 +200,8 @@ struct fm_args {
+ unsigned int pending_out_connected_update:1;
+ /*! TRUE if caller has a pending hold request for the winning call. */
+ unsigned int pending_hold:1;
++ /*! TRUE if callees will be prompted to answer */
++ unsigned int enable_callee_prompt:1;
+ /*! Music On Hold Class suggested by caller hold for winning call. */
+ char suggested_moh[MAX_MUSICCLASS];
+ char context[AST_MAX_CONTEXT];
+@@ -268,6 +272,7 @@ static const char *defaultmoh = "default"; /*!< Default Music-On-Hold Class
+
+ static char takecall[MAX_YN_STRING] = "1";
+ static char nextindp[MAX_YN_STRING] = "2";
++static int enable_callee_prompt = 1;
+ static char callfromprompt[PATH_MAX] = "followme/call-from";
+ static char norecordingprompt[PATH_MAX] = "followme/no-recording";
+ static char optionsprompt[PATH_MAX] = "followme/options";
+@@ -320,6 +325,7 @@
+ static void init_profile(struct call_followme *f, int activate)
+ {
+ f->context[0] = '\0';
++ f->enable_callee_prompt = enable_callee_prompt;
+ ast_copy_string(f->moh, defaultmoh, sizeof(f->moh));
+ ast_copy_string(f->takecall, takecall, sizeof(f->takecall));
+ ast_copy_string(f->nextindp, nextindp, sizeof(f->nextindp));
+@@ -344,6 +350,8 @@ static void profile_set_param(struct call_followme *f, const char *param, const
+ ast_copy_string(f->moh, val, sizeof(f->moh));
+ else if (!strcasecmp(param, "context"))
+ ast_copy_string(f->context, val, sizeof(f->context));
++ else if (!strcasecmp(param, "enable_callee_prompt"))
++ f->enable_callee_prompt = ast_true(val);
+ else if (!strcasecmp(param, "takecall"))
+ ast_copy_string(f->takecall, val, sizeof(f->takecall));
+ else if (!strcasecmp(param, "declinecall"))
+@@ -399,6 +407,7 @@ static int reload_followme(int reload)
+ char *numberstr;
+ int timeout;
+ int numorder;
++ const char* enable_callee_prompt_str;
+ const char *takecallstr;
+ const char *declinecallstr;
+ const char *tmpstr;
+@@ -431,6 +440,12 @@ static int reload_followme(int reload)
+ featuredigittimeout = 5000;
+ }
+
++ if ((enable_callee_prompt_str = ast_variable_retrieve(cfg, "general",
++ "enable_callee_prompt")) &&
++ !ast_strlen_zero(enable_callee_prompt_str)) {
++ enable_callee_prompt = ast_true(enable_callee_prompt_str);
++ }
++
+ if ((takecallstr = ast_variable_retrieve(cfg, "general", "takecall")) && !ast_strlen_zero(takecallstr)) {
+ ast_copy_string(takecall, takecallstr, sizeof(takecall));
+ }
+@@ -652,26 +667,30 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us
+ if (tmpuser->digts && (tmpuser->digts > featuredigittimeout)) {
+ ast_verb(3, "<%s> We've been waiting for digits longer than we should have.\n",
+ ast_channel_name(tmpuser->ochan));
+- if (!ast_strlen_zero(tpargs->namerecloc)) {
+- tmpuser->state = 1;
+- tmpuser->digts = 0;
+- if (!ast_streamfile(tmpuser->ochan, callfromname, ast_channel_language(tmpuser->ochan))) {
+- ast_sched_runq(ast_channel_sched(tmpuser->ochan));
++ if (tpargs->enable_callee_prompt) {
++ if (!ast_strlen_zero(tpargs->namerecloc)) {
++ tmpuser->state = 1;
++ tmpuser->digts = 0;
++ if (!ast_streamfile(tmpuser->ochan, callfromname, ast_channel_language(tmpuser->ochan))) {
++ ast_sched_runq(ast_channel_sched(tmpuser->ochan));
++ } else {
++ ast_log(LOG_WARNING, "Unable to playback %s.\n", callfromname);
++ clear_caller(tmpuser);
++ continue;
++ }
+ } else {
+- ast_log(LOG_WARNING, "Unable to playback %s.\n", callfromname);
+- clear_caller(tmpuser);
+- continue;
++ tmpuser->state = 2;
++ tmpuser->digts = 0;
++ if (!ast_streamfile(tmpuser->ochan, tpargs->norecordingprompt, ast_channel_language(tmpuser->ochan)))
++ ast_sched_runq(ast_channel_sched(tmpuser->ochan));
++ else {
++ ast_log(LOG_WARNING, "Unable to playback %s.\n", tpargs->norecordingprompt);
++ clear_caller(tmpuser);
++ continue;
++ }
+ }
+ } else {
+- tmpuser->state = 2;
+- tmpuser->digts = 0;
+- if (!ast_streamfile(tmpuser->ochan, tpargs->norecordingprompt, ast_channel_language(tmpuser->ochan)))
+- ast_sched_runq(ast_channel_sched(tmpuser->ochan));
+- else {
+- ast_log(LOG_WARNING, "Unable to playback %s.\n", tpargs->norecordingprompt);
+- clear_caller(tmpuser);
+- continue;
+- }
++ tmpuser->state = 3;
+ }
+ }
+ if (ast_channel_stream(tmpuser->ochan)) {
+@@ -788,23 +807,28 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us
+ /* If call has been answered, then the eventual hangup is likely to be normal hangup */
+ ast_channel_hangupcause_set(winner, AST_CAUSE_NORMAL_CLEARING);
+ ast_channel_hangupcause_set(caller, AST_CAUSE_NORMAL_CLEARING);
+- ast_verb(3, "Starting playback of %s\n", callfromname);
+- if (!ast_strlen_zero(tpargs->namerecloc)) {
+- if (!ast_streamfile(winner, callfromname, ast_channel_language(winner))) {
+- ast_sched_runq(ast_channel_sched(winner));
+- tmpuser->state = 1;
++ if (tpargs->enable_callee_prompt) {
++ ast_verb(3, "Starting playback of %s\n", callfromname);
++ if (!ast_strlen_zero(tpargs->namerecloc)) {
++ if (!ast_streamfile(winner, callfromname, ast_channel_language(winner))) {
++ ast_sched_runq(ast_channel_sched(winner));
++ tmpuser->state = 1;
++ } else {
++ ast_log(LOG_WARNING, "Unable to playback %s.\n", callfromname);
++ clear_caller(tmpuser);
++ }
+ } else {
+- ast_log(LOG_WARNING, "Unable to playback %s.\n", callfromname);
+- clear_caller(tmpuser);
++ tmpuser->state = 2;
++ if (!ast_streamfile(tmpuser->ochan, tpargs->norecordingprompt, ast_channel_language(tmpuser->ochan)))
++ ast_sched_runq(ast_channel_sched(tmpuser->ochan));
++ else {
++ ast_log(LOG_WARNING, "Unable to playback %s.\n", tpargs->norecordingprompt);
++ clear_caller(tmpuser);
++ }
+ }
+ } else {
++ ast_verb(3, "Skip playback of caller name / norecording\n");
+ tmpuser->state = 2;
+- if (!ast_streamfile(tmpuser->ochan, tpargs->norecordingprompt, ast_channel_language(tmpuser->ochan)))
+- ast_sched_runq(ast_channel_sched(tmpuser->ochan));
+- else {
+- ast_log(LOG_WARNING, "Unable to playback %s.\n", tpargs->norecordingprompt);
+- clear_caller(tmpuser);
+- }
+ }
+ break;
+ case AST_CONTROL_BUSY:
+@@ -928,6 +952,11 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us
+ break;
+ }
+ }
++ if (!tpargs->enable_callee_prompt && tmpuser) {
++ ast_debug(1, "Taking call with no prompt\n");
++ ast_frfree(f);
++ return tmpuser->ochan;
++ }
+ if (tmpuser && tmpuser->state == 3 && f->frametype == AST_FRAME_DTMF) {
+ int cmp_len;
+
+@@ -1367,6 +1396,7 @@ static int app_exec(struct ast_channel *chan, const char *data)
+
+ /* Lock the profile lock and copy out everything we need to run with before unlocking it again */
+ ast_mutex_lock(&f->lock);
++ targs->enable_callee_prompt = f->enable_callee_prompt;
+ targs->mohclass = ast_strdupa(f->moh);
+ ast_copy_string(targs->context, f->context, sizeof(targs->context));
+ ast_copy_string(targs->takecall, f->takecall, sizeof(targs->takecall));
+
+diff --git a/configs/samples/followme.conf.sample b/configs/samples/followme.conf.sample
+index a233948..7e1d40f 100644
+--- a/configs/samples/followme.conf.sample
++++ b/configs/samples/followme.conf.sample
+@@ -5,6 +5,11 @@ featuredigittimeout=>5000
+ ; The number of ms to wait for a digit input for the callee on whether to take the call or
+ ; not before we consider them "done" entering digits.
+ ;
++enable_callee_prompt=>true
++; Enable prompting a callee to either accept or reject the forwarded call.
++; If disabled, the optional prompting for caller name (option 'a') is
++; likewise disabled. Enabled by default.
++;
+ takecall=>1
+ ; The global default keypress for the callee to take taking the current call. This can be
+ ; a single digit or multiple digits. Default is "1".
+@@ -54,6 +59,9 @@ number=>01233456,25
+ ; step to make a choice on whether to take the call or not. That being the case,
+ ; you may want to make the timeout on the last step longer to give enough time to
+ ; make the choice to accept or not.
++enable_callee_prompt=>true
++; Enable prompting the callee to accept the forwarded call. The default
++; is the global value.
+ takecall=>1
+ ; The keypress for the callee to take taking the current call. This can be
+ ; a single digit or multiple digits. Default is the global default.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X