From c09634ff9f21bc8a1558579ef2997202a01566b0 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 17 May 2015 10:03:31 +0200 Subject: [PATCH] net/asterisk-11.x: Bump again to 11.17.1 (cross compile fix included) Signed-off-by: Sebastian Kemper --- net/asterisk-11.x/Makefile | 6 ++--- ...0-asterisk-configure-undef-res-ninit.patch | 2 +- ...2-asterisk-11.17.1-fix-cross-compile.patch | 11 ++++++++++ .../patches/030-srtp-fix-key-lifetime.patch | 12 ---------- .../patches/100-AST-2015-003-11.6.patch | 22 ------------------- 5 files changed, 15 insertions(+), 38 deletions(-) create mode 100644 net/asterisk-11.x/patches/022-asterisk-11.17.1-fix-cross-compile.patch delete mode 100644 net/asterisk-11.x/patches/030-srtp-fix-key-lifetime.patch delete mode 100644 net/asterisk-11.x/patches/100-AST-2015-003-11.6.patch diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile index e7579da..45466f0 100644 --- a/net/asterisk-11.x/Makefile +++ b/net/asterisk-11.x/Makefile @@ -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 diff --git a/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch b/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch index 49d2604..5779714 100644 --- a/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch +++ b/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch @@ -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; } diff --git a/net/asterisk-11.x/patches/022-asterisk-11.17.1-fix-cross-compile.patch b/net/asterisk-11.x/patches/022-asterisk-11.17.1-fix-cross-compile.patch new file mode 100644 index 0000000..eff0081 --- /dev/null +++ b/net/asterisk-11.x/patches/022-asterisk-11.17.1-fix-cross-compile.patch @@ -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" + diff --git a/net/asterisk-11.x/patches/030-srtp-fix-key-lifetime.patch b/net/asterisk-11.x/patches/030-srtp-fix-key-lifetime.patch deleted file mode 100644 index fbebb1e..0000000 --- a/net/asterisk-11.x/patches/030-srtp-fix-key-lifetime.patch +++ /dev/null @@ -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; diff --git a/net/asterisk-11.x/patches/100-AST-2015-003-11.6.patch b/net/asterisk-11.x/patches/100-AST-2015-003-11.6.patch deleted file mode 100644 index e0f4772..0000000 --- a/net/asterisk-11.x/patches/100-AST-2015-003-11.6.patch +++ /dev/null @@ -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); -- 2.30.2