From: Daniel Golle <daniel@makrotopia.org>
Date: Fri, 19 Jun 2015 02:42:39 +0000 (+0200)
Subject: asterisk-11.x: update to 11.18.0
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=8885c6784ccfb9381d7acb950255f9f7a84f1db2;p=feed%2Ftelephony.git

asterisk-11.x: update to 11.18.0

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile
index a9de21b..6e2cf57 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.17.1
+PKG_VERSION:=11.18.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/
-PKG_MD5SUM:=2c6cd0f499152d0d5ff32f36e274fc2e
+PKG_MD5SUM:=3ddb42b54db200faccd68906df210a40
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING LICENSE
@@ -289,13 +289,13 @@ define Build/Configure
 endef
 
 define Build/Compile
-	$(MAKE) -C "$(PKG_BUILD_DIR)" \
+	( retry=""; while [ ! "$$$$retry" ] && ! $(MAKE) -C "$(PKG_BUILD_DIR)" \
 		include/asterisk/version.h \
 		include/asterisk/buildopts.h defaults.h \
-		makeopts.embed_rules
+		makeopts.embed_rules; do retry=1; done )
 	ASTCFLAGS="$(EXTRA_CFLAGS) -DLOW_MEMORY"
 	ASTLDFLAGS="$(EXTRA_LDFLAGS)"
-	$(MAKE) -C "$(PKG_BUILD_DIR)" \
+	( retry=""; while [ ! "$$$$retry" ] && ! $(MAKE) -C "$(PKG_BUILD_DIR)" \
 		ASTVARLIBDIR="/usr/lib/asterisk" \
 		ASTDATADIR="/usr/lib/asterisk" \
 		ASTKEYDIR="/usr/lib/asterisk" \
@@ -304,7 +304,7 @@ define Build/Compile
 		DEBUG="" \
 		OPTIMIZE="" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install samples
+		all install samples; do retry=1; done )
 endef
 
 define Build/InstallDev
diff --git a/net/asterisk-11.x/patches/001-pjproject-change-configure-args.patch b/net/asterisk-11.x/patches/001-pjproject-change-configure-args.patch
index 761dd5d..335a6bd 100644
--- a/net/asterisk-11.x/patches/001-pjproject-change-configure-args.patch
+++ b/net/asterisk-11.x/patches/001-pjproject-change-configure-args.patch
@@ -1,6 +1,6 @@
 --- a/res/Makefile
 +++ b/res/Makefile
-@@ -75,7 +75,7 @@ dist-clean::
+@@ -78,7 +78,7 @@ distclean::
  	rm -f pjproject/build.mak
  
  pjproject/build.mak: pjproject/aconfigure
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 5779714..937ab0f 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
-@@ -16533,7 +16533,6 @@ if ac_fn_c_try_link "$LINENO"; then :
+@@ -16606,7 +16606,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
deleted file mode 100644
index eff0081..0000000
--- a/net/asterisk-11.x/patches/022-asterisk-11.17.1-fix-cross-compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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"
-