From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Sun, 28 Nov 2021 17:13:29 +0000 (+0100)
Subject: libsrtp: bump to 2.4.2
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7e8ee8ac26c3d2c8a0bf7013c1b643af4186fb07;p=feed%2Ftelephony.git

libsrtp: bump to 2.4.2

- switch to $(AUTORELEASE)
- update upstream URL
- add ABI_VERSION
- drop patch that is included upstream

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

diff --git a/libs/libsrtp/Makefile b/libs/libsrtp/Makefile
index 8c0cb4c..a488a64 100644
--- a/libs/libsrtp/Makefile
+++ b/libs/libsrtp/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libsrtp
-PKG_VERSION:=2.3.0
-PKG_RELEASE:=1
+PKG_VERSION:=2.4.2
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=libsrtp-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/cisco/libsrtp/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=94093a5d04c5f4743e8d81182b76938374df6d393b45322f24960d250b0110e8
+PKG_HASH:=3b1bcb14ebda572b04b9bdf07574a449c84cb924905414e4d94e62837d22b628
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
@@ -26,8 +26,9 @@ define Package/libsrtp2
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Secure RTP (SRTP) library, v$(PKG_VERSION)
-  URL:=http://sourceforge.net/projects/srtp
+  URL:=https://github.com/cisco/libsrtp
   DEPENDS:=
+  ABI_VERSION:=1
 endef
 
 define Package/libsrtp2/description
@@ -52,7 +53,7 @@ endef
 define Package/libsrtp2/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libsrtp2.so.* \
+		$(PKG_INSTALL_DIR)/usr/lib/libsrtp2.so.$(ABI_VERSION)* \
 		$(1)/usr/lib/
 endef
 
diff --git a/libs/libsrtp/patches/010-gcc10.patch b/libs/libsrtp/patches/010-gcc10.patch
deleted file mode 100644
index 70723f7..0000000
--- a/libs/libsrtp/patches/010-gcc10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/crypto/math/datatypes.c
-+++ b/crypto/math/datatypes.c
-@@ -79,7 +79,7 @@ int octet_get_weight(uint8_t octet)
- 
- /* the value MAX_PRINT_STRING_LEN is defined in datatypes.h */
- 
--char bit_string[MAX_PRINT_STRING_LEN];
-+static char bit_string[MAX_PRINT_STRING_LEN];
- 
- uint8_t srtp_nibble_to_hex_char(uint8_t nibble)
- {