diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index 8c21ce2..1cfaaa8 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk PKG_VERSION:=18.1.1 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases diff --git a/net/asterisk/patches/001-disable-semaphores-on-uclibc-otherwise-allow.patch b/net/asterisk/patches/001-disable-semaphores-on-uclibc-otherwise-allow.patch index ad8bc59..e925416 100644 --- a/net/asterisk/patches/001-disable-semaphores-on-uclibc-otherwise-allow.patch +++ b/net/asterisk/patches/001-disable-semaphores-on-uclibc-otherwise-allow.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -1035,15 +1035,18 @@ AC_LINK_IFELSE( +@@ -1037,15 +1037,18 @@ AC_LINK_IFELSE( # Some platforms define sem_init(), but only support sem_open(). joyous. AC_MSG_CHECKING(for working unnamed semaphores) diff --git a/net/asterisk/patches/002-configure-fix-detection-of-re-entrant-resolver-funct.patch b/net/asterisk/patches/002-configure-fix-detection-of-re-entrant-resolver-funct.patch index 74ae605..fabf423 100644 --- a/net/asterisk/patches/002-configure-fix-detection-of-re-entrant-resolver-funct.patch +++ b/net/asterisk/patches/002-configure-fix-detection-of-re-entrant-resolver-funct.patch @@ -18,7 +18,7 @@ Signed-off-by: Bernd Kuhls --- a/configure.ac +++ b/configure.ac -@@ -1429,7 +1429,11 @@ AC_LINK_IFELSE( +@@ -1431,7 +1431,11 @@ AC_LINK_IFELSE( #include #endif #include ], diff --git a/net/asterisk/patches/130-eventfd.patch b/net/asterisk/patches/130-eventfd.patch index 75a0e70..ca57021 100644 --- a/net/asterisk/patches/130-eventfd.patch +++ b/net/asterisk/patches/130-eventfd.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -1208,7 +1208,7 @@ if test "${ac_cv_have_variable_fdset}x" +@@ -1210,7 +1210,7 @@ if test "${ac_cv_have_variable_fdset}x" fi AC_MSG_CHECKING([if we have usable eventfd support]) diff --git a/net/asterisk/patches/140-use-default-lua.patch b/net/asterisk/patches/140-use-default-lua.patch index 1dcbd05..52d0249 100644 --- a/net/asterisk/patches/140-use-default-lua.patch +++ b/net/asterisk/patches/140-use-default-lua.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -2560,7 +2560,11 @@ if test -z "$__opus_include" -o x"$__opu +@@ -2564,7 +2564,11 @@ if test -z "$__opus_include" -o x"$__opu fi AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include]) diff --git a/net/asterisk/patches/150-musl-12x.patch b/net/asterisk/patches/150-musl-12x.patch new file mode 100644 index 0000000..08441be --- /dev/null +++ b/net/asterisk/patches/150-musl-12x.patch @@ -0,0 +1,35 @@ +--- a/include/asterisk/compat.h ++++ b/include/asterisk/compat.h +@@ -130,14 +130,16 @@ void timersub(struct timeval *tvend, str + + #include + +-#ifdef SOLARIS ++#ifndef __BEGIN_DECLS + #define __BEGIN_DECLS + #define __END_DECLS ++#endif + + #ifndef __P + #define __P(p) p + #endif + ++#ifdef SOLARIS + #include + #include + #include +--- a/utils/db1-ast/include/db.h ++++ b/utils/db1-ast/include/db.h +@@ -68,8 +68,11 @@ typedef unsigned long long u_int64_t; + #endif /* __FreeBSD__ */ + #endif + +-#ifdef SOLARIS ++#ifndef __P + #define __P(p) p ++#endif ++ ++#ifndef __BEGIN_DECLS + #define __BEGIN_DECLS + #define __END_DECLS + #endif