From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Sat, 3 Oct 2020 16:58:03 +0000 (+0200)
Subject: libsrtp2: move folder, bump to 2.3.0
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a85ce8450a3167c12918d5ebfb626ad3efeb5aea;p=feed%2Ftelephony.git

libsrtp2: move folder, bump to 2.3.0

Bump to upstream release 2.3.0. Move folder and change PKG_NAME so that
we don't have to deal with how github names the tar.gz archive.

Also, don't install the libsrtp2.so symlink anymore on target, as it is
not required and only used in staging.

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

diff --git a/libs/libsrtp/Makefile b/libs/libsrtp/Makefile
new file mode 100644
index 0000000..8c0cb4c
--- /dev/null
+++ b/libs/libsrtp/Makefile
@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2017 OpenWrt.org
+# Copyright (C) 2017 Jiri Slachta <jiri@slachta.eu>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libsrtp
+PKG_VERSION:=2.3.0
+PKG_RELEASE:=1
+
+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_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libsrtp2
+  SUBMENU:=Telephony
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Secure RTP (SRTP) library, v$(PKG_VERSION)
+  URL:=http://sourceforge.net/projects/srtp
+  DEPENDS:=
+endef
+
+define Package/libsrtp2/description
+Open-source implementation of the Secure Real-time Transport
+Protocol (SRTP) originally authored by Cisco Systems, Inc.
+It is available under a BSD-style license.
+endef
+
+define Build/Install
+	$(call Build/Install/Default,all shared_library install)
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/srtp2 $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsrtp2.{a,so*} $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libsrtp2.pc $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libsrtp2/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libsrtp2.so.* \
+		$(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libsrtp2))
diff --git a/libs/libsrtp/patches/010-gcc10.patch b/libs/libsrtp/patches/010-gcc10.patch
new file mode 100644
index 0000000..70723f7
--- /dev/null
+++ b/libs/libsrtp/patches/010-gcc10.patch
@@ -0,0 +1,11 @@
+--- 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)
+ {
diff --git a/libs/libsrtp2/Makefile b/libs/libsrtp2/Makefile
deleted file mode 100644
index 345fc29..0000000
--- a/libs/libsrtp2/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Copyright (C) 2017 OpenWrt.org
-# Copyright (C) 2017 Jiri Slachta <jiri@slachta.eu>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libsrtp2
-PKG_VERSION:=2.2.0
-PKG_RELEASE:=2
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/cisco/libsrtp.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=94ac00d5ac6409e3f6409e4a5edfcdbdaa7fdabe
-PKG_MIRROR_HASH:=0429edcddfe9d36ee47eb221384c528bbe31ee9255e216f9755641c7b6083457
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libsrtp2
-  SUBMENU:=Telephony
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Secure RTP (SRTP) library, v$(PKG_VERSION)
-  URL:=http://sourceforge.net/projects/srtp
-  DEPENDS:=
-endef
-
-define Package/libsrtp2/description
-Open-source implementation of the Secure Real-time Transport
-Protocol (SRTP) originally authored by Cisco Systems, Inc.
-It is available under a BSD-style license.
-endef
-
-define Build/Install
-	$(call Build/Install/Default,all shared_library install)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/srtp2 $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsrtp2.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libsrtp2.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libsrtp2/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libsrtp2.so* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libsrtp2))
diff --git a/libs/libsrtp2/patches/010-gcc10.patch b/libs/libsrtp2/patches/010-gcc10.patch
deleted file mode 100644
index 70723f7..0000000
--- a/libs/libsrtp2/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)
- {