siproxd: update to version 0.8.2

An upstream siproxd update was released after ~5 years, with bugfixes
and new features. This package supports the new plugins and their config
options, and updates required patches.

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>

diff --git a/net/siproxd/Makefile b/net/siproxd/Makefile
index a2d58a8ddcc40ae6a9168d3d3531ed5e140da8c1..66d9130a88174b4898c4b725547867fda98fe31b 100644 (file)
--- a/net/siproxd/Makefile
+++ b/net/siproxd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=siproxd
-PKG_VERSION:=0.8.1
-PKG_RELEASE:=5
+PKG_VERSION:=0.8.2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/siproxd
-PKG_MD5SUM:=1a6f9d13aeb2d650375c9a346ac6cbaf
+PKG_MD5SUM:=e3ec83f66ac880717c98512d89613f42
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
@@ -79,11 +79,16 @@ define BuildPlugin
 endef
 
 $(eval $(call BuildPackage,siproxd))
+$(eval $(call BuildPlugin,codecfilter))
 $(eval $(call BuildPlugin,defaulttarget))
 $(eval $(call BuildPlugin,demo))
 $(eval $(call BuildPlugin,fix_bogus_via))
+$(eval $(call BuildPlugin,fix_DTAG))
+$(eval $(call BuildPlugin,fix_fbox_anoncall))
 $(eval $(call BuildPlugin,logcall))
 $(eval $(call BuildPlugin,prefix))
 $(eval $(call BuildPlugin,regex))
 $(eval $(call BuildPlugin,shortdial))
+$(eval $(call BuildPlugin,stripheader))
 $(eval $(call BuildPlugin,stun))
+$(eval $(call BuildPlugin,siptrunk))

diff --git a/net/siproxd/files/siproxd.init b/net/siproxd/files/siproxd.init
index da7859c6a5d1a1ff1708f77a6d608c90c1d00292..5054f3c05f7d0da883551775c8ed42d4dbbeb023 100644 (file)
--- a/net/siproxd/files/siproxd.init
+++ b/net/siproxd/files/siproxd.init
@@ -175,6 +175,25 @@ start_instance() {
        config_list_foreach "$cfg" 'plugin_regex_pattern' deal_with_lists "plugin_regex_pattern"
        config_list_foreach "$cfg" 'plugin_regex_replace' deal_with_lists "plugin_regex_replace"
 
+       # plugin_stripheader.so
+       config_list_foreach "$cfg" 'plugin_stripheader_remove' deal_with_lists "plugin_stripheader_remove"
+
+       # plugin_codecfilter.so
+       config_list_foreach "$cfg" 'plugin_codecfilter_blacklist' deal_with_lists "plugin_codecfilter_blacklist"
+
+       # plugin_siptrunk.so
+       config_list_foreach "$cfg" 'plugin_siptrunk_name' deal_with_lists "plugin_siptrunk_name"
+       config_list_foreach "$cfg" 'plugin_siptrunk_account' deal_with_lists "plugin_siptrunk_account"
+       config_list_foreach "$cfg" 'plugin_siptrunk_numbers_regex' deal_with_lists "plugin_siptrunk_numbers_regex"
+
+       # plugin_fix_DTAG.so
+       config_get plugin_fix_DTAG_networks "$cfg" plugin_fix_DTAG_networks
+       append_conf_if_set plugin_fix_DTAG_networks
+
+       # plugin_fix_fbox_anoncall.so
+       config_get plugin_fix_fbox_anoncall_networks "$cfg" plugin_fix_fbox_anoncall_networks
+       append_conf_if_set plugin_fix_fbox_anoncall_networks
+
        SERVICE_PID_FILE="$pid_file" \
        service_start $siproxd_bin --config "$siproxd_conf_prefix$cfg.conf"
 }

diff --git a/net/siproxd/patches/010-fix-bogus-libltdl-dependency.patch b/net/siproxd/patches/010-fix-bogus-libltdl-dependency.patch
index 20f3b6b5d515d2c14e43be5eda429f1010c6444f..d457eb45e20a3b8563f3e6c00dadb820e0e8f8d1 100644 (file)
--- a/net/siproxd/patches/010-fix-bogus-libltdl-dependency.patch
+++ b/net/siproxd/patches/010-fix-bogus-libltdl-dependency.patch
@@ -1,6 +1,6 @@
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -77,8 +77,8 @@ plugin_regex_la_LDFLAGS = -module -avoid
+@@ -103,8 +103,8 @@
  #  else Cygwin goes beserk when building...)
  #
  sbin_PROGRAMS = siproxd
@@ -13,10 +13,10 @@
                  rtpproxy_relay.c accessctl.c route_processing.c \
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -326,8 +326,8 @@ plugin_prefix_la_LDFLAGS = -module -avoi
+@@ -377,8 +377,8 @@
  #
- plugin_regex_la_SOURCES = plugin_regex.c
- plugin_regex_la_LDFLAGS = -module -avoid-version -shrext '.so'
+ plugin_fix_fbox_anoncall_la_SOURCES = plugin_fix_fbox_anoncall.c
+ plugin_fix_fbox_anoncall_la_LDFLAGS = -module -avoid-version -shrext '.so'
 -siproxd_LDFLAGS = -export-dynamic
 -siproxd_LDADD = $(LIBLTDL) $(DLOPENPLUGINS)
 +siproxd_LDFLAGS = -export-dynamic -lltdl

diff --git a/net/siproxd/patches/011-include-sys-time.patch b/net/siproxd/patches/011-include-sys-time.patch
deleted file mode 100644 (file)
index 81fabda..0000000
--- a/net/siproxd/patches/011-include-sys-time.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- siproxd-0.8.1/src/dejitter.c
-+++ siproxd-0.8.1/src/dejitter.c
-@@ -24,6 +24,7 @@
- 
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <sys/time.h>
- #include <netinet/in.h>
- 
- #include <osipparser2/osip_parser.h>

diff --git a/net/siproxd/patches/100-musl-compat.patch b/net/siproxd/patches/100-musl-compat.patch
index 5e0c1dab6e3e02328ea2eb8b0254569b23b719fa..8d7bf8ee6d8c81ab91cbefc65139c601218d0238 100644 (file)
--- a/net/siproxd/patches/100-musl-compat.patch
+++ b/net/siproxd/patches/100-musl-compat.patch
@@ -1,31 +1,13 @@
 --- a/src/resolve.c
 +++ b/src/resolve.c
-@@ -30,6 +30,7 @@
+@@ -28,8 +28,10 @@
+ #include <arpa/nameser_compat.h>
+ #endif
  
++#include <stdio.h>
  #include <resolv.h>
  #include <string.h>
 +#include <sys/types.h>
  
  #include "log.h"
  
---- a/src/dejitter.c
-+++ b/src/dejitter.c
-@@ -21,6 +21,7 @@
- #include "config.h"
- 
- #include <errno.h>
-+#include <string.h>
- 
- #include <sys/types.h>
- #include <sys/socket.h>
---- a/src/plugins.c
-+++ b/src/plugins.c
-@@ -20,6 +20,8 @@
- 
- #include "config.h"
- 
-+#include <string.h>
-+
- #include <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>