freeswitch-stable: bump to 1.10.6

- patches refreshed
- upstreamed patches removed
- hotplug script fix (ntpq output could print a plus that the script
  didn't expect)

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

11 files changed, 21 insertions, 97 deletions

diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile
index 71cbe69..e00e5ca 100644
--- a/net/freeswitch-stable/Makefile
+++ b/net/freeswitch-stable/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PRG_NAME:=freeswitch
 PKG_NAME:=$(PRG_NAME)-stable
-PKG_VERSION:=1.10.5
+PKG_VERSION:=1.10.6
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
 
 PKG_SOURCE:=$(PRG_NAME)-$(PKG_VERSION).-release.tar.xz
 PKG_SOURCE_URL:=https://files.$(PRG_NAME).org/releases/$(PRG_NAME)
-PKG_HASH:=3e26600767a82946eca94af2c8f14712783aa83db5fb1cc57585f544aecce327
+PKG_HASH:=9a08d4e184e6d715e1c12c43a0f901597151752ef236f0a37e40996272b5c38d
 
 PKG_CPE_ID:=cpe:/a:freeswitch:freeswitch
 
diff --git a/net/freeswitch-stable/files/freeswitch.hotplug b/net/freeswitch-stable/files/freeswitch.hotplug
index 68fc3b0..5b515be 100644
--- a/net/freeswitch-stable/files/freeswitch.hotplug
+++ b/net/freeswitch-stable/files/freeswitch.hotplug
@@ -103,7 +103,7 @@ config_get_bool ntpd hotplug ntpd 0
       $LOG_NOTICE ntpd stratum $result
       if [ $result -lt 16 ] 2> /dev/null; then
         result=$(ntpq -c 'timeout 300' -c 'rv 0 offset' 2> /dev/null \
-                 | awk -F '=' '{print $2}' | grep -o -E '^-?[0-9]+')
+                 | awk -F '=' '{print $2}' | grep -o -E '^[-+]?[0-9]+')
         if [ -z $result ]; then
           $LOG_ERR failed to extract offset from ntpd
           notReady="unable to extract offset"
diff --git a/net/freeswitch-stable/patches/003-modmake-fix.patch b/net/freeswitch-stable/patches/003-modmake-fix.patch
index d0cf333..9c2fe17 100644
--- a/net/freeswitch-stable/patches/003-modmake-fix.patch
+++ b/net/freeswitch-stable/patches/003-modmake-fix.patch
@@ -1,11 +1,20 @@
 --- a/build/modmake.rulesam
 +++ b/build/modmake.rulesam
-@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign subdir-object
+@@ -1,8 +1,8 @@
+ AUTOMAKE_OPTIONS = foreign subdir-objects
  AM_CFLAGS   = $(SWITCH_AM_CFLAGS) $(SWITCH_ANSI_CFLAGS)
- AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS)
+-AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS)
++AM_CPPFLAGS = $(SWITCH_AM_CPPFLAGS)
  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@
+@@ -18,4 +18,4 @@ extraclean-modules: extraclean
+ print_tests:
+ 	@set +e; \
+ 	test -z "$(TESTS)" || for i in $(TESTS); do echo $(subdir)/$$i; done;
+-	
+\ No newline at end of file
++	
diff --git a/net/freeswitch-stable/patches/030-fix-configure-ac.patch b/net/freeswitch-stable/patches/030-fix-configure-ac.patch
index cea47f0..4176d10 100644
--- a/net/freeswitch-stable/patches/030-fix-configure-ac.patch
+++ b/net/freeswitch-stable/patches/030-fix-configure-ac.patch
@@ -40,7 +40,7 @@
  AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
  
  case $host in
-@@ -1623,13 +1599,7 @@ AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl
+@@ -1643,13 +1619,7 @@ AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl
  # -a "x$ac_cv_have_EXTERN_h" != "xno"
  
  if test "x$ac_cv_have_perl" != "xno"; then
@@ -55,7 +55,7 @@
  
     save_CFLAGS="$CFLAGS"
     CFLAGS="$PERL_CFLAGS"
-@@ -1724,24 +1694,12 @@ then
+@@ -1744,24 +1714,12 @@ then
  		if test "$python_has_distutils" != "no" ; then
  			AC_MSG_CHECKING([location of site-packages])
  
diff --git a/net/freeswitch-stable/patches/040-gentls_cert_update_message_digest.patch b/net/freeswitch-stable/patches/040-gentls_cert_update_message_digest.patch
deleted file mode 100644
index ff5226d..0000000
--- a/net/freeswitch-stable/patches/040-gentls_cert_update_message_digest.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit 70d1cbafe4ab0176cd9fc01f740e34cd1bae326b
-Author: Sebastian Kemper <sebastian_ml@gmx.net>
-Date:   Wed Nov 13 20:29:50 2019 +0100
-
-    [gentls_cert] Update message digest
-    
-    Debian Buster updated /etc/ssl/openssl.cnf to default to
-    
-    MinProtocol = TLSv1.2
-    CipherString = DEFAULT@SECLEVEL=2
-    
-    gentls_cert currently uses SHA1 as message digest. According to OpenSSL
-    documentation this only offers 80 bit of security. 80 bits is enough for
-    security level 1, but not 2.
-    
-    The OpenSSL default MD nowadays is SHA256. This commit updates
-    gentls_cert to use it.
-    
-    Issue was reported on the FS mailing list. The certificates created by
-    gentls_cert caused "md too weak" errors and clients were unable to
-    connect.
-    
-    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
-+++ b/scripts/gentls_cert.in
-@@ -89,7 +89,7 @@ setup_ca() {
- 
- 	openssl req -out "${CONFDIR}/CA/cacert.pem" \
- 		-new -x509 -keyout "${CONFDIR}/CA/cakey.pem" \
--		-config "${TMPFILE}.cfg" -nodes -days ${DAYS} -sha1 >/dev/null || exit 1
-+		-config "${TMPFILE}.cfg" -nodes -days ${DAYS} -sha256 >/dev/null || exit 1
- 	cat "${CONFDIR}/CA/cacert.pem" > "${CONFDIR}/cafile.pem"
- 	cp $TMPFILE.cfg /tmp/ssl.cfg
- 	rm "${TMPFILE}.cfg"
-@@ -131,11 +131,11 @@ generate_cert() {
- 
- 	openssl req -new -out "${TMPFILE}.req" \
- 		-newkey rsa:${KEY_SIZE} -keyout "${TMPFILE}.key" \
--		-config "${TMPFILE}.cfg" -nodes -sha1 >/dev/null || exit 1
-+		-config "${TMPFILE}.cfg" -nodes -sha256 >/dev/null || exit 1
- 
- 	openssl x509 -req -CAkey "${CONFDIR}/CA/cakey.pem" -CA "${CONFDIR}/CA/cacert.pem" -CAcreateserial \
- 		-in "${TMPFILE}.req" -out "${TMPFILE}.crt" -extfile "${TMPFILE}.cfg" \
--		-extensions "${EXTENSIONS}" -days ${DAYS} -sha1 >/dev/null || exit 1
-+		-extensions "${EXTENSIONS}" -days ${DAYS} -sha256 >/dev/null || exit 1
- 
- 	cat "${TMPFILE}.crt" "${TMPFILE}.key" > "${CONFDIR}/${OUTFILE}"
- 
diff --git a/net/freeswitch-stable/patches/110-apr-add-cache-for-strerror_r.patch b/net/freeswitch-stable/patches/110-apr-add-cache-for-strerror_r.patch
index a753697..2b86010 100644
--- a/net/freeswitch-stable/patches/110-apr-add-cache-for-strerror_r.patch
+++ b/net/freeswitch-stable/patches/110-apr-add-cache-for-strerror_r.patch
@@ -12,7 +12,7 @@
  #include <errno.h>
  #include <string.h>
  #include <stdio.h>
-@@ -531,14 +532,10 @@ int main(void)
+@@ -534,14 +535,10 @@ int main(void)
  }], [
      ac_cv_strerror_r_rc_int=yes ], [
      ac_cv_strerror_r_rc_int=no ], [
@@ -42,7 +42,7 @@
  #include <errno.h>
  #include <string.h>
  #include <stdio.h>
-@@ -531,14 +532,10 @@ int main(void)
+@@ -534,14 +535,10 @@ int main(void)
  }], [
      ac_cv_strerror_r_rc_int=yes ], [
      ac_cv_strerror_r_rc_int=no ], [
diff --git a/net/freeswitch-stable/patches/120-fix-copts.patch b/net/freeswitch-stable/patches/120-fix-copts.patch
index 3d9b082..673765c 100644
--- a/net/freeswitch-stable/patches/120-fix-copts.patch
+++ b/net/freeswitch-stable/patches/120-fix-copts.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2041,7 +2041,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS)
+@@ -2063,7 +2063,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS)
  AC_SUBST(OUR_DISABLED_UNINSTALL_MODS)
  AC_SUBST(AM_MAKEFLAGS)
  
diff --git a/net/freeswitch-stable/patches/140-libvpx-cross.patch b/net/freeswitch-stable/patches/140-libvpx-cross.patch
index 9cf1c3f..86513f2 100644
--- a/net/freeswitch-stable/patches/140-libvpx-cross.patch
+++ b/net/freeswitch-stable/patches/140-libvpx-cross.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -585,8 +585,15 @@ libs/libedit/src/.libs/libedit.a:
+@@ -583,8 +583,15 @@ libs/libedit/src/.libs/libedit.a:
  libs/libzrtp/libzrtp.a:
  	cd libs/libzrtp && $(MAKE)
  
diff --git a/net/freeswitch-stable/patches/340-mod-spandsp-fix-typo.patch b/net/freeswitch-stable/patches/340-mod-spandsp-fix-typo.patch
deleted file mode 100644
index bc4f852..0000000
--- a/net/freeswitch-stable/patches/340-mod-spandsp-fix-typo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/mod/applications/mod_spandsp/Makefile.am
-+++ b/src/mod/applications/mod_spandsp/Makefile.am
-@@ -4,6 +4,6 @@ MODNAME=mod_spandsp
- mod_LTLIBRARIES = mod_spandsp.la
- mod_spandsp_la_SOURCES  = mod_spandsp.c udptl.c mod_spandsp_fax.c mod_spandsp_dsp.c mod_spandsp_codecs.c mod_spandsp_modem.c
- mod_spandsp_la_CFLAGS   = $(AM_CFLAGS) 
--mod_spandsp_la_CPPFLAGS = $(SPANDSL_CFLAGS) -I.
-+mod_spandsp_la_CPPFLAGS = $(SPANDSP_CFLAGS) -I.
- mod_spandsp_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LIBS) -ljpeg -lz -ltiff
- mod_spandsp_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/net/freeswitch-stable/patches/350-gsmopen-spandsp-fixup.patch b/net/freeswitch-stable/patches/350-gsmopen-spandsp-fixup.patch
deleted file mode 100644
index dccd8bf..0000000
--- a/net/freeswitch-stable/patches/350-gsmopen-spandsp-fixup.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/mod/endpoints/mod_gsmopen/Makefile.am
-+++ b/src/mod/endpoints/mod_gsmopen/Makefile.am
-@@ -1,19 +1,9 @@
- include $(top_srcdir)/build/modmake.rulesam
- MODNAME=mod_gsmopen
- 
--SPANDSP_DIR=$(switch_srcdir)/libs/spandsp
--SPANDSP_BUILDDIR=$(switch_builddir)/libs/spandsp
--SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la
--
- mod_LTLIBRARIES = mod_gsmopen.la
- mod_gsmopen_la_SOURCES  = mod_gsmopen.cpp gsmopen_protocol.cpp 
- mod_gsmopen_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS)
--mod_gsmopen_la_CPPFLAGS = -I$(SPANDSP_DIR)/src -I$(SPANDSP_BUILDDIR)/src -I.
--mod_gsmopen_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LA)
-+mod_gsmopen_la_CPPFLAGS = $(SPANDSP_CFLAGS) -I.
-+mod_gsmopen_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LIBS)
- mod_gsmopen_la_LDFLAGS  = -avoid-version -module -no-undefined -lctb-0.16 -lgsmme
--
--BUILT_SOURCES = $(SPANDSP_LA)
--
--$(SPANDSP_LA): $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
--	cd $(SPANDSP_BUILDDIR) && $(MAKE) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)"
--	$(TOUCH_TARGET)
diff --git a/net/freeswitch-stable/patches/390-spandsp3-pkg-config.patch b/net/freeswitch-stable/patches/390-spandsp3-pkg-config.patch
index 7fe82c6..2ce2ed4 100644
--- a/net/freeswitch-stable/patches/390-spandsp3-pkg-config.patch
+++ b/net/freeswitch-stable/patches/390-spandsp3-pkg-config.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -703,7 +703,7 @@ PKG_CHECK_MODULES([MARIADB], [libmariadb
+@@ -709,7 +709,7 @@ PKG_CHECK_MODULES([MARIADB], [libmariadb
    ])
  ])