From: Sebastian Kemper Date: Sat, 31 Aug 2019 17:23:48 +0000 (+0200) Subject: freeswitch-stable: rename some patches X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=33ee0bd1dd4504fadad33957336a0c884a8c3973;p=feed%2Ftelephony.git freeswitch-stable: rename some patches Some patches don't carry the extension .patch. This fixes that. Signed-off-by: Sebastian Kemper --- diff --git a/net/freeswitch-stable/patches/003-modmake-fix.diff b/net/freeswitch-stable/patches/003-modmake-fix.diff deleted file mode 100644 index d0cf333..0000000 --- a/net/freeswitch-stable/patches/003-modmake-fix.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/build/modmake.rulesam -+++ b/build/modmake.rulesam -@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign subdir-object - AM_CFLAGS = $(SWITCH_AM_CFLAGS) $(SWITCH_ANSI_CFLAGS) - AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS) - AM_LDFLAGS = $(SWITCH_AM_LDFLAGS) --DEFAULT_VARS = CFLAGS="$(CFLAGS)" CPPFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)" -+DEFAULT_VARS = CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)" - DEFAULT_ARGS = --build=$(build) --host=$(host) --target=$(target) --prefix="$(prefix)" --exec_prefix="$(exec_prefix)" --libdir="$(libdir)" --disable-shared --with-pic - - moddir=@modulesdir@ diff --git a/net/freeswitch-stable/patches/003-modmake-fix.patch b/net/freeswitch-stable/patches/003-modmake-fix.patch new file mode 100644 index 0000000..d0cf333 --- /dev/null +++ b/net/freeswitch-stable/patches/003-modmake-fix.patch @@ -0,0 +1,11 @@ +--- a/build/modmake.rulesam ++++ b/build/modmake.rulesam +@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign subdir-object + AM_CFLAGS = $(SWITCH_AM_CFLAGS) $(SWITCH_ANSI_CFLAGS) + AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS) + AM_LDFLAGS = $(SWITCH_AM_LDFLAGS) +-DEFAULT_VARS = CFLAGS="$(CFLAGS)" CPPFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)" ++DEFAULT_VARS = CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)" + DEFAULT_ARGS = --build=$(build) --host=$(host) --target=$(target) --prefix="$(prefix)" --exec_prefix="$(exec_prefix)" --libdir="$(libdir)" --disable-shared --with-pic + + moddir=@modulesdir@ diff --git a/net/freeswitch-stable/patches/120-fix-copts.diff b/net/freeswitch-stable/patches/120-fix-copts.diff deleted file mode 100644 index 6381f90..0000000 --- a/net/freeswitch-stable/patches/120-fix-copts.diff +++ /dev/null @@ -1,138 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -2038,7 +2038,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS) - AC_SUBST(OUR_DISABLED_UNINSTALL_MODS) - AC_SUBST(AM_MAKEFLAGS) - --ac_configure_args="$ac_configure_args --with-modinstdir=${modulesdir} CONFIGURE_CFLAGS='$CFLAGS $CPPFLAGS' CONFIGURE_CXXFLAGS='$CXXFLAGS $CPPFLAGS' CONFIGURE_LDFLAGS='$LDFLAGS' " -+APR_ADDTO(CONFIGURE_CFLAGS, [$CFLAGS]) -+APR_ADDTO(CONFIGURE_CPPFLAGS, [$CPPFLAGS]) -+APR_ADDTO(CONFIGURE_CXXFLAGS, [$CXXFLAGS]) -+APR_ADDTO(CONFIGURE_LDFLAGS, [$LDFLAGS]) -+ -+ac_configure_args="$ac_configure_args --with-modinstdir=${modulesdir} CONFIGURE_CFLAGS='$CONFIGURE_CFLAGS' CONFIGURE_CPPFLAGS='$CONFIGURE_CPPFLAGS' CONFIGURE_CXXFLAGS='$CONFIGURE_CXXFLAGS' CONFIGURE_LDFLAGS='$CONFIGURE_LDFLAGS' " - - # --prefix='$prefix' --exec_prefix='$exec_prefix' --libdir='$libdir' --libexecdir='$libexecdir' --bindir='$bindir' --sbindir='$sbindir' \ - # --localstatedir='$localstatedir' --datadir='$datadir'" ---- a/libs/apr-util/configure.ac -+++ b/libs/apr-util/configure.ac -@@ -20,9 +20,10 @@ dnl Generate ./config.nice for reproduci - dnl - APR_CONFIG_NICE(config.nice) - --CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" --CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" --LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" -+APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS]) -+APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS]) -+APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS]) -+APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS]) - - dnl # Some initial steps for configuration. We setup the default directory - dnl # and which files are to be configured. ---- a/libs/apr/configure.ac -+++ b/libs/apr/configure.ac -@@ -20,9 +20,10 @@ sinclude(build/apr_hints.m4) - sinclude(build/libtool.m4) - sinclude(build/ltsugar.m4) - --CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" --CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" --LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" -+APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS]) -+APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS]) -+APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS]) -+APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS]) - - dnl Hard-coded inclusion at the tail end of apr_private.h: - AH_BOTTOM([ ---- a/libs/iksemel/configure.ac -+++ b/libs/iksemel/configure.ac -@@ -6,9 +6,12 @@ AC_CONFIG_SRCDIR([configure.ac]) - AM_INIT_AUTOMAKE - AC_CONFIG_HEADERS(include/config.h) - --CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" --CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" --LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" -+m4_include(../apr/build/apr_common.m4) -+ -+APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS]) -+APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS]) -+APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS]) -+APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS]) - - AC_CANONICAL_HOST - ---- a/libs/libdingaling/configure.ac -+++ b/libs/libdingaling/configure.ac -@@ -8,9 +8,12 @@ AM_INIT_AUTOMAKE - AC_CONFIG_SRCDIR([src]) - AC_CONFIG_HEADERS([src/config.h]) - --CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" --CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" --LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" -+m4_include(../apr/build/apr_common.m4) -+ -+APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS]) -+APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS]) -+APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS]) -+APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS]) - - #Set default language - AC_LANG_C ---- a/libs/sofia-sip/configure.ac -+++ b/libs/sofia-sip/configure.ac -@@ -13,9 +13,12 @@ dnl --------------------------- - dnl update both the version for AC_INIT and the LIBSOFIA_SIP_UA_MAJOR_MINOR - AC_INIT([sofia-sip], [1.12.10devel]) - --CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" --CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" --LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" -+m4_include(../apr/build/apr_common.m4) -+ -+APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS]) -+APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS]) -+APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS]) -+APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS]) - - AC_CONFIG_SRCDIR([libsofia-sip-ua/sip/sofia-sip/sip.h]) - AC_CONFIG_MACRO_DIR([m4]) ---- a/libs/spandsp/configure.ac -+++ b/libs/spandsp/configure.ac -@@ -21,9 +21,12 @@ - AC_PREREQ([2.59]) - AC_INIT([spandsp], [1.99.0]) - --CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" --CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" --LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" -+m4_include(../apr/build/apr_common.m4) -+ -+APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS]) -+APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS]) -+APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS]) -+APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS]) - - SPANDSP_LT_CURRENT=3 - SPANDSP_LT_REVISION=0 ---- a/libs/srtp/configure.ac -+++ b/libs/srtp/configure.ac -@@ -3,9 +3,12 @@ AC_INIT(srtp, 1.4.2, mcgrew@cisco.com) - AC_CONFIG_AUX_DIR(build) - AM_INIT_AUTOMAKE - --CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" --CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" --LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" -+m4_include(../apr/build/apr_common.m4) -+ -+APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS]) -+APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS]) -+APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS]) -+APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS]) - - #Set default language - AC_LANG_C diff --git a/net/freeswitch-stable/patches/120-fix-copts.patch b/net/freeswitch-stable/patches/120-fix-copts.patch new file mode 100644 index 0000000..6381f90 --- /dev/null +++ b/net/freeswitch-stable/patches/120-fix-copts.patch @@ -0,0 +1,138 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -2038,7 +2038,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS) + AC_SUBST(OUR_DISABLED_UNINSTALL_MODS) + AC_SUBST(AM_MAKEFLAGS) + +-ac_configure_args="$ac_configure_args --with-modinstdir=${modulesdir} CONFIGURE_CFLAGS='$CFLAGS $CPPFLAGS' CONFIGURE_CXXFLAGS='$CXXFLAGS $CPPFLAGS' CONFIGURE_LDFLAGS='$LDFLAGS' " ++APR_ADDTO(CONFIGURE_CFLAGS, [$CFLAGS]) ++APR_ADDTO(CONFIGURE_CPPFLAGS, [$CPPFLAGS]) ++APR_ADDTO(CONFIGURE_CXXFLAGS, [$CXXFLAGS]) ++APR_ADDTO(CONFIGURE_LDFLAGS, [$LDFLAGS]) ++ ++ac_configure_args="$ac_configure_args --with-modinstdir=${modulesdir} CONFIGURE_CFLAGS='$CONFIGURE_CFLAGS' CONFIGURE_CPPFLAGS='$CONFIGURE_CPPFLAGS' CONFIGURE_CXXFLAGS='$CONFIGURE_CXXFLAGS' CONFIGURE_LDFLAGS='$CONFIGURE_LDFLAGS' " + + # --prefix='$prefix' --exec_prefix='$exec_prefix' --libdir='$libdir' --libexecdir='$libexecdir' --bindir='$bindir' --sbindir='$sbindir' \ + # --localstatedir='$localstatedir' --datadir='$datadir'" +--- a/libs/apr-util/configure.ac ++++ b/libs/apr-util/configure.ac +@@ -20,9 +20,10 @@ dnl Generate ./config.nice for reproduci + dnl + APR_CONFIG_NICE(config.nice) + +-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" +-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" +-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" ++APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS]) ++APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS]) ++APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS]) ++APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS]) + + dnl # Some initial steps for configuration. We setup the default directory + dnl # and which files are to be configured. +--- a/libs/apr/configure.ac ++++ b/libs/apr/configure.ac +@@ -20,9 +20,10 @@ sinclude(build/apr_hints.m4) + sinclude(build/libtool.m4) + sinclude(build/ltsugar.m4) + +-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" +-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" +-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" ++APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS]) ++APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS]) ++APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS]) ++APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS]) + + dnl Hard-coded inclusion at the tail end of apr_private.h: + AH_BOTTOM([ +--- a/libs/iksemel/configure.ac ++++ b/libs/iksemel/configure.ac +@@ -6,9 +6,12 @@ AC_CONFIG_SRCDIR([configure.ac]) + AM_INIT_AUTOMAKE + AC_CONFIG_HEADERS(include/config.h) + +-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" +-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" +-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" ++m4_include(../apr/build/apr_common.m4) ++ ++APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS]) ++APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS]) ++APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS]) ++APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS]) + + AC_CANONICAL_HOST + +--- a/libs/libdingaling/configure.ac ++++ b/libs/libdingaling/configure.ac +@@ -8,9 +8,12 @@ AM_INIT_AUTOMAKE + AC_CONFIG_SRCDIR([src]) + AC_CONFIG_HEADERS([src/config.h]) + +-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" +-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" +-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" ++m4_include(../apr/build/apr_common.m4) ++ ++APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS]) ++APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS]) ++APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS]) ++APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS]) + + #Set default language + AC_LANG_C +--- a/libs/sofia-sip/configure.ac ++++ b/libs/sofia-sip/configure.ac +@@ -13,9 +13,12 @@ dnl --------------------------- + dnl update both the version for AC_INIT and the LIBSOFIA_SIP_UA_MAJOR_MINOR + AC_INIT([sofia-sip], [1.12.10devel]) + +-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" +-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" +-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" ++m4_include(../apr/build/apr_common.m4) ++ ++APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS]) ++APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS]) ++APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS]) ++APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS]) + + AC_CONFIG_SRCDIR([libsofia-sip-ua/sip/sofia-sip/sip.h]) + AC_CONFIG_MACRO_DIR([m4]) +--- a/libs/spandsp/configure.ac ++++ b/libs/spandsp/configure.ac +@@ -21,9 +21,12 @@ + AC_PREREQ([2.59]) + AC_INIT([spandsp], [1.99.0]) + +-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" +-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" +-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" ++m4_include(../apr/build/apr_common.m4) ++ ++APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS]) ++APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS]) ++APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS]) ++APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS]) + + SPANDSP_LT_CURRENT=3 + SPANDSP_LT_REVISION=0 +--- a/libs/srtp/configure.ac ++++ b/libs/srtp/configure.ac +@@ -3,9 +3,12 @@ AC_INIT(srtp, 1.4.2, mcgrew@cisco.com) + AC_CONFIG_AUX_DIR(build) + AM_INIT_AUTOMAKE + +-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" +-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" +-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" ++m4_include(../apr/build/apr_common.m4) ++ ++APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS]) ++APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS]) ++APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS]) ++APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS]) + + #Set default language + AC_LANG_C diff --git a/net/freeswitch-stable/patches/130-fix-iksemel-copts.diff b/net/freeswitch-stable/patches/130-fix-iksemel-copts.diff deleted file mode 100644 index 005b7a4..0000000 --- a/net/freeswitch-stable/patches/130-fix-iksemel-copts.diff +++ /dev/null @@ -1,9 +0,0 @@ ---- a/libs/iksemel/src/Makefile.am -+++ b/libs/iksemel/src/Makefile.am -@@ -25,5 +25,5 @@ libiksemel_la_SOURCES = \ - base64.c - - libiksemel_la_LDFLAGS = -version-info 4:0:1 -no-undefined --libiksemel_la_CFLAGS = $(CFLAGS) $(LIBGNUTLS_CFLAGS) -+libiksemel_la_CFLAGS = $(LIBGNUTLS_CFLAGS) - libiksemel_la_LIBADD = $(LIBGNUTLS_LIBS) diff --git a/net/freeswitch-stable/patches/130-fix-iksemel-copts.patch b/net/freeswitch-stable/patches/130-fix-iksemel-copts.patch new file mode 100644 index 0000000..005b7a4 --- /dev/null +++ b/net/freeswitch-stable/patches/130-fix-iksemel-copts.patch @@ -0,0 +1,9 @@ +--- a/libs/iksemel/src/Makefile.am ++++ b/libs/iksemel/src/Makefile.am +@@ -25,5 +25,5 @@ libiksemel_la_SOURCES = \ + base64.c + + libiksemel_la_LDFLAGS = -version-info 4:0:1 -no-undefined +-libiksemel_la_CFLAGS = $(CFLAGS) $(LIBGNUTLS_CFLAGS) ++libiksemel_la_CFLAGS = $(LIBGNUTLS_CFLAGS) + libiksemel_la_LIBADD = $(LIBGNUTLS_LIBS) diff --git a/net/freeswitch-stable/patches/230-mod_radius_cdr.diff b/net/freeswitch-stable/patches/230-mod_radius_cdr.diff deleted file mode 100644 index 2fa58ee..0000000 --- a/net/freeswitch-stable/patches/230-mod_radius_cdr.diff +++ /dev/null @@ -1,46 +0,0 @@ ---- a/src/mod/event_handlers/mod_radius_cdr/Makefile.am -+++ b/src/mod/event_handlers/mod_radius_cdr/Makefile.am -@@ -20,7 +20,7 @@ $(RADCLIENT_DIR): - - $(RADCLIENT_BUILDDIR)/Makefile: $(RADCLIENT_DIR) - mkdir -p $(RADCLIENT_BUILDDIR) -- cd $(RADCLIENT_BUILDDIR) && $(DEFAULT_VARS) $(RADCLIENT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(RADCLIENT_DIR) -+ cd $(RADCLIENT_BUILDDIR) && patch -p1 < ../../src/mod/event_handlers/mod_radius_cdr/freeradius-client-1.1.6-configure-in.diff && autoreconf -v -f -i -s && $(DEFAULT_VARS) CFLAGS+="-Wno-cpp" $(RADCLIENT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(RADCLIENT_DIR) - $(TOUCH_TARGET) - - $(RADCLIENT_LA): $(RADCLIENT_BUILDDIR)/Makefile ---- /dev/null -+++ b/src/mod/event_handlers/mod_radius_cdr/freeradius-client-1.1.6-configure-in.diff -@@ -0,0 +1,32 @@ -+diff --git a/configure.in b/configure.in -+index 4f194bd..647e9b9 100644 -+--- a/configure.in -++++ b/configure.in -+@@ -209,7 +209,7 @@ AC_CHECK_FUNCS(stricmp random rand snprintf vsnprintf) -+ if test "$ac_cv_func_uname" = 'yes' -+ then -+ AC_MSG_CHECKING([for field domainname in struct utsname]) -+- AC_TRY_RUN([ -++ AC_COMPILE_IFELSE([ -+ #include -+ -+ main(int argc, char **argv) -+@@ -224,13 +224,11 @@ then -+ ) -+ fi -+ -+-AC_MSG_CHECKING([for /dev/urandom]) -+-if test -c /dev/urandom -+-then -+- AC_MSG_RESULT(yes) -+- AC_DEFINE(HAVE_DEV_URANDOM) -+-else -+- AC_MSG_RESULT(no) -++AC_CACHE_CHECK([/dev/urandom], [ac_cv_dev_urandom], -++ [ac_cv_dev_urandom=no -++ if test -c /dev/urandom; then ac_cv_dev_urandom=yes; fi]) -++if test $ac_cv_dev_urandom = yes; then -++ AC_DEFINE(HAVE_DEV_URANDOM) -+ fi -+ -+ dnl Determine PATH setting diff --git a/net/freeswitch-stable/patches/230-mod_radius_cdr.patch b/net/freeswitch-stable/patches/230-mod_radius_cdr.patch new file mode 100644 index 0000000..2fa58ee --- /dev/null +++ b/net/freeswitch-stable/patches/230-mod_radius_cdr.patch @@ -0,0 +1,46 @@ +--- a/src/mod/event_handlers/mod_radius_cdr/Makefile.am ++++ b/src/mod/event_handlers/mod_radius_cdr/Makefile.am +@@ -20,7 +20,7 @@ $(RADCLIENT_DIR): + + $(RADCLIENT_BUILDDIR)/Makefile: $(RADCLIENT_DIR) + mkdir -p $(RADCLIENT_BUILDDIR) +- cd $(RADCLIENT_BUILDDIR) && $(DEFAULT_VARS) $(RADCLIENT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(RADCLIENT_DIR) ++ cd $(RADCLIENT_BUILDDIR) && patch -p1 < ../../src/mod/event_handlers/mod_radius_cdr/freeradius-client-1.1.6-configure-in.diff && autoreconf -v -f -i -s && $(DEFAULT_VARS) CFLAGS+="-Wno-cpp" $(RADCLIENT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(RADCLIENT_DIR) + $(TOUCH_TARGET) + + $(RADCLIENT_LA): $(RADCLIENT_BUILDDIR)/Makefile +--- /dev/null ++++ b/src/mod/event_handlers/mod_radius_cdr/freeradius-client-1.1.6-configure-in.diff +@@ -0,0 +1,32 @@ ++diff --git a/configure.in b/configure.in ++index 4f194bd..647e9b9 100644 ++--- a/configure.in +++++ b/configure.in ++@@ -209,7 +209,7 @@ AC_CHECK_FUNCS(stricmp random rand snprintf vsnprintf) ++ if test "$ac_cv_func_uname" = 'yes' ++ then ++ AC_MSG_CHECKING([for field domainname in struct utsname]) ++- AC_TRY_RUN([ +++ AC_COMPILE_IFELSE([ ++ #include ++ ++ main(int argc, char **argv) ++@@ -224,13 +224,11 @@ then ++ ) ++ fi ++ ++-AC_MSG_CHECKING([for /dev/urandom]) ++-if test -c /dev/urandom ++-then ++- AC_MSG_RESULT(yes) ++- AC_DEFINE(HAVE_DEV_URANDOM) ++-else ++- AC_MSG_RESULT(no) +++AC_CACHE_CHECK([/dev/urandom], [ac_cv_dev_urandom], +++ [ac_cv_dev_urandom=no +++ if test -c /dev/urandom; then ac_cv_dev_urandom=yes; fi]) +++if test $ac_cv_dev_urandom = yes; then +++ AC_DEFINE(HAVE_DEV_URANDOM) ++ fi ++ ++ dnl Determine PATH setting diff --git a/net/freeswitch-stable/patches/260-mod_event_zmq-fix-build-with-fortify-headers.diff b/net/freeswitch-stable/patches/260-mod_event_zmq-fix-build-with-fortify-headers.diff deleted file mode 100644 index a2df8e7..0000000 --- a/net/freeswitch-stable/patches/260-mod_event_zmq-fix-build-with-fortify-headers.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/mod/event_handlers/mod_event_zmq/Makefile.am -+++ b/src/mod/event_handlers/mod_event_zmq/Makefile.am -@@ -22,6 +22,7 @@ $(ZMQ_DIR): - $(GETLIB) $(ZMQ_BASEURL) $(ZMQ).tar.gz || $(GETLIB) $(ZMQ_BASEURL_ALT) $(ZMQ).tar.gz - sed -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' $(ZMQ_DIR)/configure.in > $(ZMQ_DIR)/configure.in.tmp && \ - mv $(ZMQ_DIR)/configure.in.tmp $(ZMQ_DIR)/configure.in -+ sed -i '/^libzmq_pedantic="yes"/s/yes/no/' $(ZMQ_DIR)/configure.in - cd $(ZMQ_DIR) && ./autogen.sh - - $(ZMQ_BUILDDIR)/Makefile: $(ZMQ_DIR) diff --git a/net/freeswitch-stable/patches/260-mod_event_zmq-fix-build-with-fortify-headers.patch b/net/freeswitch-stable/patches/260-mod_event_zmq-fix-build-with-fortify-headers.patch new file mode 100644 index 0000000..a2df8e7 --- /dev/null +++ b/net/freeswitch-stable/patches/260-mod_event_zmq-fix-build-with-fortify-headers.patch @@ -0,0 +1,10 @@ +--- a/src/mod/event_handlers/mod_event_zmq/Makefile.am ++++ b/src/mod/event_handlers/mod_event_zmq/Makefile.am +@@ -22,6 +22,7 @@ $(ZMQ_DIR): + $(GETLIB) $(ZMQ_BASEURL) $(ZMQ).tar.gz || $(GETLIB) $(ZMQ_BASEURL_ALT) $(ZMQ).tar.gz + sed -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' $(ZMQ_DIR)/configure.in > $(ZMQ_DIR)/configure.in.tmp && \ + mv $(ZMQ_DIR)/configure.in.tmp $(ZMQ_DIR)/configure.in ++ sed -i '/^libzmq_pedantic="yes"/s/yes/no/' $(ZMQ_DIR)/configure.in + cd $(ZMQ_DIR) && ./autogen.sh + + $(ZMQ_BUILDDIR)/Makefile: $(ZMQ_DIR)