asterisk-11.x: update to 11.17.1

Signed-off-by: Jiri Slachta <slachta@cesnet.cz>

diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile
index 1d01ba0f4f09fe7044f65b044ff3f3fc5c7888e6..f4102ae3d6e9f0c295ea05646f13f45fdc30415b 100644 (file)
--- 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
@@ -230,9 +230,9 @@ else
        --without-iksemel
 endif
 
-EXTRA_CFLAGS+= $(TARGET_CPPFLAGS)
-EXTRA_LDFLAGS+= $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
-CONFIGURE_ARGS+= \
+EXTRA_CFLAGS += $(TARGET_CPPFLAGS)
+EXTRA_LDFLAGS += $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
+CONFIGURE_ARGS += \
        --build=$(GNU_HOST_NAME) \
        --host=$(GNU_TARGET_NAME) \
        --target=$(GNU_TARGET_NAME) \
@@ -269,24 +269,30 @@ CONFIGURE_ARGS+= \
        --with-sounds-cache="$(DL_DIR)" \
        --disable-xmldoc 
 
-define Build/Prepare
-       $(call Build/Prepare/Default)
-endef
+CONFIGURE_VARS += \
+       ac_cv_path_ac_pt_CONFIG_LIBXML2=$(STAGING_DIR)/host/bin/xml2-config
+
+AST_MENUSELECT_OPTS = \
+       --without-newt \
+       --without-ncurses \
+       --with-libxml2="$(STAGING_DIR_HOST)/usr"
 
 define Build/Configure
-       echo "export CFLAGS += $(FPIC) $(TARGET_CFLAGS) $(EXTRA_CFLAGS)"\
-               " $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)"\
-               > $(PKG_BUILD_DIR)/res/pjproject/user.mak;
-       echo "export LDLAGS += $(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)"\
-               " -lc $(LIBGCC_S) -lm"\
-               >> $(PKG_BUILD_DIR)/res/pjproject/user.mak;
-       echo "export CXXFLAGS += $(FPIC) $(TARGET_CFLAGS) $(EXTRA_CFLAGS)"\
-               " $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)"\
-               >> $(PKG_BUILD_DIR)/res/pjproject/user.mak;
        $(call Build/Configure/Default,,$(SITE_VARS))
+       (cd $(PKG_BUILD_DIR)/menuselect; \
+               ./bootstrap.sh; \
+               ./configure \
+               $(HOST_CONFIGURE_ARGS) \
+               $(AST_MENUSELECT_OPTS) \
+               LDFLAGS="$(HOST_LDFLAGS) -lxml2" \
+               CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOST)/include/libxml2" \
+       );
 endef
 
 define Build/Compile
+        $(MAKE) -C "$(PKG_BUILD_DIR)/menuselect" \
+                CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOST)/include/libxml2" \
+                LDFLAGS="$(HOST_LDFLAGS) -lxml2"
        $(MAKE) -C "$(PKG_BUILD_DIR)" \
                include/asterisk/version.h \
                include/asterisk/buildopts.h defaults.h \

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 49d2604e2a17f918d22f048bd4fcbeb57541a8db..57797141396182d9431e39cebfb75e9bc18229d7 100644 (file)
--- 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/030-srtp-fix-key-lifetime.patch b/net/asterisk-11.x/patches/030-srtp-fix-key-lifetime.patch
deleted file mode 100644 (file)
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;