asterisk-1.8.x: update to 1.8.29, fix configure args

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

diff --git a/net/asterisk-1.8.x/Makefile b/net/asterisk-1.8.x/Makefile
index 1ee786c815265872dde61018bd5fafa867a0bf01..eccd94cc2805fdd80c2f8e8f23fc8db20c307d1b 100644 (file)
--- a/net/asterisk-1.8.x/Makefile
+++ b/net/asterisk-1.8.x/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk18
-PKG_VERSION:=1.8.28.2
+PKG_VERSION:=1.8.29.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/
-PKG_MD5SUM:=c16f288f97ac39042eb8e9bee6766aff
+PKG_MD5SUM:=23778d7ebefdecd4c742d5de39f5e2c1
 
 PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION)
 
@@ -303,7 +303,7 @@ endif
 
 ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-mysql),)
   CONFIGURE_ARGS+= \
-       --with-mysqlclient="$(STAGING_DIR)/usr/bin"
+       --with-mysqlclient
 else
   CONFIGURE_ARGS+= \
        --without-mysqlclient

diff --git a/net/asterisk-1.8.x/patches/500-nres.patch b/net/asterisk-1.8.x/patches/500-nres.patch
index 6abff8645bf8f1474c64876d87a2ce58a1d33150..935dd2b7eb870382ceeaf0001b590ef90f8d4ee3 100644 (file)
--- a/net/asterisk-1.8.x/patches/500-nres.patch
+++ b/net/asterisk-1.8.x/patches/500-nres.patch
@@ -1,11 +1,12 @@
---- a/configure
-+++ b/configure
-@@ -16911,7 +16911,7 @@ if ac_fn_c_try_link "$LINENO"; then :
+diff -rupN asterisk-1.8.29.0/configure asterisk-1.29.0-new/configure
+--- asterisk-1.8.29.0/configure        2014-06-21 01:12:25.000000000 +0200
++++ asterisk-1.29.0-new/configure      2014-07-17 20:29:27.122165674 +0200
+@@ -16925,8 +16925,6 @@ if ac_fn_c_try_link "$LINENO"; then :
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
 -$as_echo "#define HAVE_RES_NINIT 1" >>confdefs.h
-+$as_echo "//#define HAVE_RES_NINIT 1" >>confdefs.h
- 
+-
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing res_9_ndestroy" >&5
  $as_echo_n "checking for library containing res_9_ndestroy... " >&6; }
+ if ${ac_cv_search_res_9_ndestroy+:} false; then :