Merge pull request #473 from micmac1/kam5.2.5

kamailio-5.x: bump to 5.2.5

diff --git a/libs/re/Makefile b/libs/re/Makefile
index e308804edf8c7e745549640f7ad2415e94bfcec7..385d3ebe34e3eb484cc21eb4bc83e8b528e10a9c 100644 (file)
--- a/libs/re/Makefile
+++ b/libs/re/Makefile
@@ -9,17 +9,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=re
-PKG_VERSION:=0.6.0
+PKG_VERSION:=0.6.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.creytiv.com/pub
-PKG_HASH:=0e97bcb5cc8f84d6920aa78de24c7d4bf271c5ddefbb650848e0db50afe98131
+PKG_HASH:=cd5bfc79640411803b200c7531e4ba8a230da3806746d3bd2de970da2060fe43
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=docs/COPYING
 PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/libs/rem/Makefile b/libs/rem/Makefile
index 771781efdfe121cd40b46d3849fe046a294f800b..bdec7af32e0888e99a7583006c87779bcf5e9cf7 100644 (file)
--- a/libs/rem/Makefile
+++ b/libs/rem/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rem
 PKG_VERSION:=0.6.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.creytiv.com/pub
@@ -20,6 +20,7 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=docs/COPYING
 PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/net/baresip/Makefile b/net/baresip/Makefile
index b5ad2ad794174883108b2cf445c031a58636eec1..cf19dce79ff9d3f0bb5e1ef529e839867ce34a36 100644 (file)
--- a/net/baresip/Makefile
+++ b/net/baresip/Makefile
@@ -9,17 +9,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=baresip
-PKG_VERSION:=0.6.2
-PKG_RELEASE:=2
+PKG_VERSION:=0.6.4
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.creytiv.com/pub
-PKG_HASH:=e1fae11ea9e6dc861bb2c43d6bef641778945aad86581d58bc4b0ea64b8d28e2
+PKG_HASH:=61710bd1bec406ae1faf167c5743bad8eef9ced5152a3943b94d7e1cf9597581
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=docs/COPYING
 PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 baresip-mods:= \

diff --git a/net/baresip/patches/002-fix-rem-include.patch b/net/baresip/patches/002-fix-rem-include.patch
index d2b85c1e33cb6f5b2a27340775d2839951c883d0..e4ecda0aaa785386f8294451811c8b57ae3c14d3 100644 (file)
--- a/net/baresip/patches/002-fix-rem-include.patch
+++ b/net/baresip/patches/002-fix-rem-include.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -48,11 +48,11 @@ endif
+@@ -45,11 +45,11 @@ endif
  
  CFLAGS    += -I. -Iinclude -I$(LIBRE_INC) -I$(SYSROOT)/include
  CFLAGS    += -I$(LIBREM_PATH)/include

diff --git a/net/restund/Makefile b/net/restund/Makefile
index 64cf4203da0c269954c007cc2c7b5b30faf603ed..7a0ab63b2444f8c0c4f67b6b91f97b413b789fc1 100644 (file)
--- a/net/restund/Makefile
+++ b/net/restund/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=restund
 PKG_VERSION:=0.4.12
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.creytiv.com/pub
@@ -20,6 +20,7 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=docs/COPYING
 PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 restund-mods:=mysql

diff --git a/net/rtpproxy/Makefile b/net/rtpproxy/Makefile
index aef54ac660359adbc34184f0aebb2aae15516222..ff3b96d2bbfd9512162be6f8fc9b84e27eaa3f1d 100644 (file)
--- a/net/rtpproxy/Makefile
+++ b/net/rtpproxy/Makefile
@@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/sippy/rtpproxy.git
 PKG_SOURCE_DATE=2019-10-02
 PKG_SOURCE_VERSION:=aa1f179e09097f467bc4726e3300014c1e35246f
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MIRROR_HASH:=7acc5f5bf2d4be23e9a2fad0c4e7576f172191c9f1b37104aee4d05dbdcac8fd
 
 PKG_BUILD_PARALLEL:=1

diff --git a/net/rtpproxy/patches/103-fix-rtp-crypto-setup.patch b/net/rtpproxy/patches/103-fix-rtp-crypto-setup.patch
new file mode 100644 (file)
index 0000000..5437151
--- /dev/null
+++ b/net/rtpproxy/patches/103-fix-rtp-crypto-setup.patch
@@ -0,0 +1,78 @@
+commit aa43d358634ab9bf66250babab743a846e2bd689
+Author: Sebastian Kemper <sebastian_ml@gmx.net>
+Date:   Thu Oct 3 19:58:08 2019 +0200
+
+    Fix RTP crypto setup
+    
+    RTPProxy's configure script checks for both libsrtp and libsrtp2. When
+    both are available the configure script ends up setting
+    
+    LIBS_SRTP="-lsrtp2"
+    
+    and defining both ENABLE_SRTP and ENABLE_SRTP2. But the below
+    preprocessor macro in extractaudio/eaud_crypto.c can only deal with one
+    or the other, not both:
+    
+      #if ENABLE_SRTP
+      #       include <srtp/srtp.h>
+      #       define srtp_crypto_policy_set_rtp_default crypto_policy_set_rtp_default
+      #       define srtp_crypto_policy_set_rtcp_default crypto_policy_set_rtcp_default
+      #       define srtp_sec_serv_t sec_serv_t
+      #       define srtp_err_status_ok err_status_ok
+      #elif ENABLE_SRTP2
+      #       include <srtp2/srtp.h>
+      #else
+      #       error "One of srtp or srtp2 must be configured."
+      #endif
+    
+    So it chooses a setup which would be valid for libsrtp and not libsrtp2.
+    But afterward the build system tries to link against libsrtp2 (because
+    of LIBS_SRTP="-lsrtp2") and the compile fails:
+    
+    /home/sk/tmp/openwrt/staging_dir/toolchain-mips_24kc_gcc-7.4.0_musl/lib/gcc/mips-openwrt-linux-musl/7.4.0/../../../../mips-openwrt-linux-musl/bin/ld: extractaudio-eaud_crypto.o: in function `eaud_crypto_getopt_parse':
+    eaud_crypto.c:(.text+0xc8): undefined reference to `crypto_policy_set_rtp_default'
+    /home/sk/tmp/openwrt/staging_dir/toolchain-mips_24kc_gcc-7.4.0_musl/lib/gcc/mips-openwrt-linux-musl/7.4.0/../../../../mips-openwrt-linux-musl/bin/ld: eaud_crypto.c:(.text+0xd0): undefined reference to `crypto_policy_set_rtcp_default'
+    collect2: error: ld returned 1 exit status
+    make[4]: *** [Makefile:567: extractaudio] Error 1
+    
+    Fix this by checking for libsrtp only if libsrtp2 is not found.
+    
+    Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
+
+diff --git a/configure.ac b/configure.ac
+index 6e680c63..fe3216b6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -140,22 +140,22 @@ then
+    AC_DEFINE([ENABLE_SNDFILE], 1, [Define if you have libsndfile library installed]))
+ fi
+ 
+-# libsrtp
+-AC_CHECK_HEADER(srtp/srtp.h, found_libsrtp=yes)
+-if test "$found_libsrtp" = yes
+-then
+-  AC_CHECK_LIB(srtp, srtp_init,
+-   LIBS_SRTP="-lsrtp"
+-   AC_DEFINE([ENABLE_SRTP], 1, [Define if you have libsrtp library installed]))
+-fi
+-
+-# libsrtp2
++# libsrtp2 (preferred)
+ AC_CHECK_HEADER(srtp2/srtp.h, found_libsrtp2=yes)
+ if test "$found_libsrtp2" = yes
+ then
+   AC_CHECK_LIB(srtp2, srtp_init,
+    LIBS_SRTP="-lsrtp2"
+    AC_DEFINE([ENABLE_SRTP2], 1, [Define if you have libsrtp2 library installed]))
++else
++  # libsrtp
++  AC_CHECK_HEADER(srtp/srtp.h, found_libsrtp=yes)
++  if test "$found_libsrtp" = yes
++  then
++    AC_CHECK_LIB(srtp, srtp_init,
++     LIBS_SRTP="-lsrtp"
++     AC_DEFINE([ENABLE_SRTP], 1, [Define if you have libsrtp library installed]))
++  fi
+ fi
+ 
+ # libelperiodic