Merge pull request #603 from neheb/f

freeswitch: fix compilation with musl 1.2.0
This commit is contained in:
micmac1 2021-01-01 23:03:01 +01:00 committed by GitHub
commit 87085e580c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 21 deletions

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=freeswitch PKG_NAME:=freeswitch
PKG_VERSION:=1.10.5 PKG_VERSION:=1.10.5
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net> PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
PKG_SOURCE:=freeswitch-$(PKG_VERSION).-release.tar.xz PKG_SOURCE:=freeswitch-$(PKG_VERSION).-release.tar.xz

View file

@ -22,8 +22,6 @@ Date: Wed Nov 13 20:29:50 2019 +0100
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net> Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
diff --git a/scripts/gentls_cert.in b/scripts/gentls_cert.in
index 43aa8ac605..dd56c9f6dc 100644
--- a/scripts/gentls_cert.in --- a/scripts/gentls_cert.in
+++ b/scripts/gentls_cert.in +++ b/scripts/gentls_cert.in
@@ -89,7 +89,7 @@ setup_ca() { @@ -89,7 +89,7 @@ setup_ca() {

View file

@ -11,23 +11,12 @@
$(RADCLIENT_LA): $(RADCLIENT_BUILDDIR)/Makefile $(RADCLIENT_LA): $(RADCLIENT_BUILDDIR)/Makefile
--- /dev/null --- /dev/null
+++ b/src/mod/event_handlers/mod_radius_cdr/freeradius-client-1.1.6-configure-in.diff +++ b/src/mod/event_handlers/mod_radius_cdr/freeradius-client-1.1.6-configure-in.diff
@@ -0,0 +1,32 @@ @@ -0,0 +1,21 @@
+diff --git a/configure.in b/configure.in
+index 4f194bd..647e9b9 100644
+--- a/configure.in +--- a/configure.in
++++ b/configure.in ++++ b/configure.in
+@@ -209,7 +209,7 @@ AC_CHECK_FUNCS(stricmp random rand snprintf vsnprintf) +@@ -234,13 +234,11 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([
+ if test "$ac_cv_func_uname" = 'yes' + enable_getrandom=getentropy],
+ then + [AC_MSG_RESULT(no)])
+ AC_MSG_CHECKING([for field domainname in struct utsname])
+- AC_TRY_RUN([
++ AC_COMPILE_IFELSE([
+ #include <sys/utsname.h>
+
+ main(int argc, char **argv)
+@@ -224,13 +224,11 @@ then
+ )
+ fi
+ +
+-AC_MSG_CHECKING([for /dev/urandom]) +-AC_MSG_CHECKING([for /dev/urandom])
+-if test -c /dev/urandom +-if test -c /dev/urandom
@ -43,4 +32,4 @@
++ AC_DEFINE(HAVE_DEV_URANDOM) ++ AC_DEFINE(HAVE_DEV_URANDOM)
+ fi + fi
+ +
+ dnl Determine PATH setting + AC_ARG_WITH([nettle], [AS_HELP_STRING([--with-nettle],

View file

@ -4,8 +4,6 @@ Date: Tue Sep 1 12:13:28 2020 -0400
[mod_rayo] Enable -fno-common compilation [mod_rayo] Enable -fno-common compilation
diff --git a/src/mod/event_handlers/mod_rayo/iks_helpers.h b/src/mod/event_handlers/mod_rayo/iks_helpers.h
index e221abe390..b98dbf5be6 100644
--- a/src/mod/event_handlers/mod_rayo/iks_helpers.h --- a/src/mod/event_handlers/mod_rayo/iks_helpers.h
+++ b/src/mod/event_handlers/mod_rayo/iks_helpers.h +++ b/src/mod/event_handlers/mod_rayo/iks_helpers.h
@@ -51,8 +51,7 @@ struct xmpp_error { @@ -51,8 +51,7 @@ struct xmpp_error {