From: Sebastian Kemper Date: Sun, 31 Oct 2021 07:52:48 +0000 (+0100) Subject: freeswitch: fix 230-mod_radius_cdr.patch X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F698%2Fhead;p=feed%2Ftelephony.git freeswitch: fix 230-mod_radius_cdr.patch This is a patch in a patch. It may happen that the patch was already applied previously, so this amends the patch line to continue if the patch doesn't apply. It also sets the direction to forward-only. Also removes two trailing whitespace warnings. Signed-off-by: Sebastian Kemper --- diff --git a/net/freeswitch/patches/230-mod_radius_cdr.patch b/net/freeswitch/patches/230-mod_radius_cdr.patch index 406c0df..b6645d4 100644 --- a/net/freeswitch/patches/230-mod_radius_cdr.patch +++ b/net/freeswitch/patches/230-mod_radius_cdr.patch @@ -5,7 +5,7 @@ $(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="${CFLAGS} -Wno-cpp" $(RADCLIENT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(RADCLIENT_DIR) ++ cd $(RADCLIENT_BUILDDIR) && patch -N -p1 < ../../src/mod/event_handlers/mod_radius_cdr/freeradius-client-1.1.6-configure-in.diff || echo "Assuming patch was applied previously" && autoreconf -v -f -i -s && $(DEFAULT_VARS) CFLAGS="${CFLAGS} -Wno-cpp" $(RADCLIENT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(RADCLIENT_DIR) $(TOUCH_TARGET) $(RADCLIENT_LA): $(RADCLIENT_BUILDDIR)/Makefile @@ -17,7 +17,7 @@ +@@ -234,13 +234,11 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([ + enable_getrandom=getentropy], + [AC_MSG_RESULT(no)]) -+ ++ +-AC_MSG_CHECKING([for /dev/urandom]) +-if test -c /dev/urandom +-then @@ -31,5 +31,5 @@ ++if test $ac_cv_dev_urandom = yes; then ++ AC_DEFINE(HAVE_DEV_URANDOM) + fi -+ ++ + AC_ARG_WITH([nettle], [AS_HELP_STRING([--with-nettle],