Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

asterisk-13.x: revert to version 13.2.0 with AST-2015-003 fix

Browse source 
Signed-off-by: Jiri Slachta <slachta@cesnet.cz>
This commit is contained in:
Jiri Slachta 2015-05-13 14:05:36 +02:00
parent 608a59a693
commit bdae15e056
4 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/asterisk-13.x/Makefile
View file

@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk13 PKG_NAME:=asterisk13
PKG_VERSION:=13.3.2 PKG_VERSION:=13.2.0
PKG_RELEASE:=2 PKG_RELEASE:=4
PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/
PKG_MD5SUM:=afc8a5b7fc239c7aa5692b563d7e6ed2 PKG_MD5SUM:=36033a5faa2f0f9ac3bc34b799e823a2
PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION) PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=libxml2/host PKG_BUILD_DEPENDS:=libxml2/host

2
net/asterisk-13.x/patches/002-undef-res-ninit.patch
View file

@ -1,6 +1,6 @@
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1202,7 +1202,6 @@ AC_LINK_IFELSE( @@ -1177,7 +1177,6 @@ AC_LINK_IFELSE(
#include <resolv.h>], #include <resolv.h>],
[int foo = res_ninit(NULL);])], [int foo = res_ninit(NULL);])],
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)

2
net/asterisk-13.x/patches/004-ifdef-missing-execinfo.patch
View file

@ -111,7 +111,7 @@
#include <time.h> /* we want to override localtime_r */ #include <time.h> /* we want to override localtime_r */
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
@@ -540,13 +542,17 @@ extern void *_ast_mem_backtrace_buffer[_ @@ -514,13 +516,17 @@ extern void *_ast_mem_backtrace_buffer[_
* Ok, this sucks. But if we're already out of mem, we don't * Ok, this sucks. But if we're already out of mem, we don't
* want the logger to create infinite recursion (and a crash). * want the logger to create infinite recursion (and a crash).
*/ */

20
net/asterisk-13.x/patches/100-AST-2015-003-13.diff Normal file
View file

@ -0,0 +1,20 @@
--- a/main/tcptls.c
+++ b/main/tcptls.c
@@ -640,9 +640,15 @@
break;
}
str = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(name, pos));
- ASN1_STRING_to_UTF8(&str2, str);
+ ret = ASN1_STRING_to_UTF8(&str2, str);
+ if (ret < 0) {
+ continue;
+ }
+
if (str2) {
- if (!strcasecmp(tcptls_session->parent->hostname, (char *) str2)) {
+ if (strlen((char *) str2) != ret) {
+ ast_log(LOG_WARNING, "Invalid certificate common name length (contains NULL bytes?)\n");
+ } else if (!strcasecmp(tcptls_session->parent->hostname, (char *) str2)) {
found = 1;
}
ast_debug(3, "SSL Common Name compare s1='%s' s2='%s'\n", tcptls_session->parent->hostname, str2);