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

net/asterisk-11.x: Bump again to 11.17.1 (cross compile fix included)

Browse source 
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2015-05-17 10:03:31 +02:00 committed by Daniel Golle
parent 7b56edaa63
commit 2d319d0063
5 changed files with 15 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk11
PKG_VERSION:=11.16.0
PKG_RELEASE:=4
PKG_VERSION:=11.17.1
PKG_RELEASE:=1
PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/
PKG_MD5SUM:=de06d4ac0d1ba531c4c18805a9d5a18d
PKG_MD5SUM:=2c6cd0f499152d0d5ff32f36e274fc2e
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING LICENSE

2
net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch
View file

@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
@@ -16464,7 +16464,6 @@ if ac_fn_c_try_link "$LINENO"; then :
@@ -16533,7 +16533,6 @@ if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }

11
net/asterisk-11.x/patches/022-asterisk-11.17.1-fix-cross-compile.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/Makefile
+++ b/Makefile
@@ -901,7 +901,7 @@ nmenuselect: menuselect/nmenuselect menu
-@menuselect/nmenuselect menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
# options for make in menuselect/
-MAKE_MENUSELECT=CC="$(CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" \
+MAKE_MENUSELECT=CC="$(BUILD_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" \
CFLAGS="$(BUILD_CFLAGS)" LDFLAGS="$(BUILD_LDFLAGS)" \
$(MAKE) -C menuselect CONFIGURE_SILENT="--silent"

12
net/asterisk-11.x/patches/030-srtp-fix-key-lifetime.patch
View file

@ -1,12 +0,0 @@
--- a/channels/sip/sdp_crypto.c
+++ b/channels/sip/sdp_crypto.c
@@ -252,8 +252,7 @@
lifetime = strsep(&info, "|");
if (lifetime) {
+ ast_log(LOG_NOTICE, "Crypto life time unsupported: %s. Ignoring.\n", attr);
- ast_log(LOG_NOTICE, "Crypto life time unsupported: %s\n", attr);
- continue;
}
found = 1;

22
net/asterisk-11.x/patches/100-AST-2015-003-11.6.patch
View file

@ -1,22 +0,0 @@
Index: main/tcptls.c
===================================================================
--- a/main/tcptls.c (revision 433338)
+++ b/main/tcptls.c (working copy)
@@ -639,9 +639,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);