net/asterisk-13.x: bump to 13.17.0

[feed/telephony.git] / net / asterisk-13.x / patches / 052-musl-libcap.patch

diff --git a/net/asterisk-13.x/patches/052-musl-libcap.patch b/net/asterisk-13.x/patches/052-musl-libcap.patch
index 2b824de7c749d066015d3d7e32cc8e7ea6fdec06..90150d9aa6a080d985ec403a976ff280cdf21949 100644 (file)
--- a/net/asterisk-13.x/patches/052-musl-libcap.patch
+++ b/net/asterisk-13.x/patches/052-musl-libcap.patch
@@ -1,8 +1,7 @@
-diff -rupN asterisk-13.8.0/configure.ac ast13/configure.ac
---- asterisk-13.8.0/configure.ac       2016-04-04 14:41:26.398129246 +0200
-+++ ast13/configure.ac 2016-04-04 14:40:48.421815607 +0200
+--- a/configure.ac
++++ b/configure.ac
 @@ -181,6 +181,9 @@ case "${host_os}" in
-      linux-gnueabi* |  linux-gnuspe)
+      linux-gnu*)
       OSARCH=linux-gnu
       ;;
 +     linux-musl*)
@@ -11,7 +10,7 @@ diff -rupN asterisk-13.8.0/configure.ac ast13/configure.ac
       kfreebsd*-gnu)
       OSARCH=kfreebsd-gnu
       ;;
-@@ -1373,9 +1376,11 @@ if test "${PBX_BFD}" = "0"; then
+@@ -1403,9 +1406,11 @@ if test "${PBX_BFD}" = "0"; then
    AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_check_format], [bfd.h], [-ldl -liberty -lz])
  fi
  
@@ -25,15 +24,14 @@ diff -rupN asterisk-13.8.0/configure.ac ast13/configure.ac
  
  AST_C_DEFINE_CHECK([DAHDI], [DAHDI_RESET_COUNTERS], [dahdi/user.h], [230])
  AST_C_DEFINE_CHECK([DAHDI], [DAHDI_DEFAULT_MTU_MRU], [dahdi/user.h], [220])
-diff -rupN asterisk-13.8.0/main/Makefile ast13/main/Makefile
---- asterisk-13.8.0/main/Makefile      2016-03-29 21:39:33.000000000 +0200
-+++ ast13/main/Makefile        2016-04-04 14:40:48.421815607 +0200
-@@ -45,7 +45,7 @@ AST_LIBS+=$(UUID_LIB)
- AST_LIBS+=$(CRYPT_LIB)
- AST_LIBS+=$(AST_CLANG_BLOCKS_LIBS)
+--- a/main/Makefile
++++ b/main/Makefile
+@@ -47,7 +47,7 @@ AST_LIBS+=$(AST_CLANG_BLOCKS_LIBS)
+ AST_LIBS+=$(RT_LIB)
+ AST_LIBS+=$(SYSTEMD_LIB)
  
 -ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc kfreebsd-gnu),)
 +ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-musl kfreebsd-gnu),)
-   ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
    AST_LIBS+=-ldl
-   endif
+   ifneq (x$(CAP_LIB),x)
+     AST_LIBS+=$(CAP_LIB)