gentoo auto-resync : 29:08:2022 - 22:47:16

6 files changed, 117 insertions, 126 deletions

diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 026f19798773..73b052e61f33 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -2,16 +2,15 @@ AUX libsrtp-1.6.0-openssl-1.1.patch 11366 BLAKE2B ab8d7dfc2c5de1a3b49eea5ed76c9b
 AUX libsrtp-1.6.0-openssl-aem_gcm-key.patch 2704 BLAKE2B 686530bce1ba56f96fa6df4606e7133aa38df0f68e3636c7c599da54371383bc64dcb63baf7404b9744ec3bcf3f3548a4877edee1ab4be699f40ad37f10468af SHA512 f0b6156494c2c8f0c3dd78142203bc15ec52f3176e01dbed74cad5302b49dc3e146cd75a4fdaff30a83ea3b8498c1e147f0c820533f362af0a2b8599087ff837
 AUX libsrtp-1.6.0-openssl-aem_icm-key.patch 3870 BLAKE2B 47dd3f9def13b48cc19657bcaf8a8c4ed77e2a4f738f72119f64825865c8820adb8ea2675695d8ce1b021dc61cdd6f478ec76fc97d9c9942178e63c1d578dc80 SHA512 561ce042f2216cdee8926f3931407116294aeed170297bf325fde02cda86a43d71aab538f2b54b2b7727a02629903c9aaf36cfe84dc6a2e4cda9388047519842
 AUX libsrtp-1.6.0-openssl-hmac.patch 7673 BLAKE2B 92d4aa2699b324b81540f2e2fb360e1a4864b2626062c96265dade3581ad3af7119e0f6ebd8b1bdcd3591bcde29bffa2b516ed9ee0bdd4c578a5274805c1a7cd SHA512 c187d0249243e26d6cdae4a24b593651fb006b473d0a72b6c4c9b6ad2025893a37e33b163adbee728aa702223397b98fbc38ac2856b737dd03fd067b4dc4baf0
-AUX libsrtp-2.2.0-gcc-10.patch 724 BLAKE2B 559079dd02413b25fa03b90bdbf709d2b16ccc5b0f0db97fb2558ab21773648d3e0fbded74b8bee2fe6d94c68da746f156b9d7b3b3b682d809715929f4e597a5 SHA512 3a1c51620af703e9dd061101e29288458452f9d0f2758dd29e9494689357d3adf408cdc7e2f60fe606680970364c0d55cc2bb4e7618b86b76384f6ab208352ed
-AUX libsrtp-2.2.0-pcap-automagic-r0.patch 729 BLAKE2B 8933586830cab4c911ff5271cdddb6a959dc59d0fcaa340faf5d04ad9b6803d676d626ce6cecdee1e097defc3c69df7e1216f012276e81c22fb043e6b0e633c4 SHA512 b3c80f5d05748eeb5d93f1c5fe2cc73b3380529a8de44315291fe2a9fbf32df861dec511038f551df65c2cb2592ce337d497c06c8855ce8dd1def9a67bae40ad
 AUX libsrtp-2.3.0-gcc-10.patch 752 BLAKE2B 6d401cbbc0c57487183390293b54c572dc3d263b94c6edd66be5986d46746390160f8d3c95346b311bf00439eb826d7734568be462ac8c7eafcc5f3a8556b24b SHA512 4bce9f8b95fce4b89f8e9a2c10cead73e363dc966ec0574516b56cb3124edf49a8d00806f5d5de6cc8610140c21183350b4dec7b1225bcaa6e5592250293cd40
 AUX libsrtp-2.3.0-nss.patch 431 BLAKE2B f56fcf59fd43618b76fca02873b57a9bd073cc67cafe9797b58702379f01e825ba4f3391f62cab9e4a1173b66c55bdea82bfb5e108bd8f68af1b0a29fe6fdafb SHA512 0e54f320a8fc4c27ad5ac40bad07c45a3f75b01ba375aa07a1c35804ba73c1f3cd4b830b6626bff128e59d6f69433bc80028eac55cc4038db25874fde882c53d
 AUX libsrtp-2.3.0-rtp-header.patch 904 BLAKE2B f2756956a913e6be8c49d0d178f2351cb3ac634523979f47add96814d9514c7b2c4343f9302d4f24f0e75cd543aee9c587552b3cb415ceca32403d51c8550036 SHA512 e2e9dea744f6cc41a4351a443e2712b9471ffb1df0f69c41e99e562d896db3c4b29bd684352334b31a03de61a18154ac9d7fb94ab40192a5058cfa2574b81711
+AUX libsrtp-2.4.2-doc.patch 1819 BLAKE2B bc4c53bc623f839e8069b24d8bee6a5e6e52f37783ee66afc9f2f72f325c7fcbb0f9fbdff4d460953050c196a3e2d3531b009c463ba9fca50c18027146f15661 SHA512 4bbb557ad7aa93842a8003084297277a67853fc6c408fb00ce52828a05abc3c2fe726ffebedbad939a15fab6838c08f364de772e4ab9b6037b03f4d2805a5802
 AUX libsrtp-pcap-automagic-r0.patch 615 BLAKE2B 5e4edeafd8f9e921c211b67064c72aecd10a708d16c8e89ea6be01ff69126ca546528532b05bc23aae80f07bac6dd2dacfc0ce6b977f6f0efae44ab017ab03d9 SHA512 ee55bdf6f9c77ebacd7469db92f42ed09728fe91a81496ff425c07ad8610e9998fec2a8992b4fafd7c684bb06989837b0244172ed96483984d1c2e6ff6c0dc0c
 DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f04c6dd084ef473c439d720733d0fd8b38bdfe92e30e05a8a94c41df965d04bca52601b2644352428b49b1ed9093 SHA512 5ac712d0d343c3b63ed248503cc7d33c637895a274c4434c91f513be117836f27cd5daba83088b4647bbd9c82d841e216e6346af8d485cb9ddcd35dee21d4887
-DIST libsrtp-2.2.0.tar.gz 308469 BLAKE2B 4ef318bdf5c69b69b5869f478d5f0b9ee82d7d8a52440d10e931722c75b2f3a62b59f7542bb932cc93a21b7af24e6b253d70b4722833c5e1e5afce052e3b00e2 SHA512 3a5214b02199ae8dff45a2ed225ed9b1dcb75a9c6b07669e23bf86f97ad26e3e22b4930acdf3c56b21b605211a89a53a17c61602195b391a5b29a09823ba868c
 DIST libsrtp-2.3.0.tar.gz 633819 BLAKE2B 9ea40e9689fabc29b7a2c637bd4e4a2c44eec79205a6e5c5e5abf1069dfec7ba28d868ba620462205d61fdb28d0ca3b8532c1f59db704edd508e01afb551d255 SHA512 34b1a01cb9a75aed175be09aadd2827224203b9801becc3fbc5214667cce79c3b87b0f59e4315583863ab5a2cc4fc81d56ab604a5e4c984518b8a8a2a7b77461
+DIST libsrtp-2.4.2.tar.gz 631393 BLAKE2B a062fb7a92294c66f1876c66bf05d9b11412a170c5f7221089680770ab85a62eabb68f781e487981b28602b1f4f7dbba07ebd44ed0248deaf6b9b56061227534 SHA512 6e4805e6d34b2050a6f68f629b0b42356b1d27f2cbaa6cc6166e56957609c3d9aa6b723dcc674e5c74180d122d27badd2f9496639ccb1e0c210b9e1f7949d0e2
 EBUILD libsrtp-1.6.0-r1.ebuild 2337 BLAKE2B 52f337ea0bf805f22faa49c822d13fd93101ea021d5a69dafe48fa94cecb99d897c57674d5948558b9a4f7c052f0eb64f1a46899f91ee9223d86ff35ecc80ad4 SHA512 24b38fea4642f344faaa1f9722909b51f8c9c373fa2c231956309eefea81b938c19e55e7aaa1f4971a26f14130c2bce5d6631551d2bd7c976f17641e707b544b
-EBUILD libsrtp-2.2.0.ebuild 1808 BLAKE2B 1fb3991cfc010b0610d2e4c5bb4d68374ee8110197e07a50575dbca4ec921daac6181aa91dcdd5022114add234e1b0ad323dd777284a8d609711aa75f29da237 SHA512 7311aea94bdd39e0a5c19e384f88babed4f20dbf46635bebe6c9807c258460f7da88989e7c2b341308c9677e4b955807241cc789d59b07eaff2e01cd754d1daf
 EBUILD libsrtp-2.3.0-r1.ebuild 1964 BLAKE2B 190d974f229d348ce03631032c70858e898c28804a7a752e52d755d265c9ae8f443d64a86f54cc01e7be56dc1934462b9f7c64169cc07cb7728f09c5bf217daa SHA512 fa3d3a4d34a7c542df04aaa0a87de790044ca8e735ef6096c035fcca29faae12136b7dffcfca995e0b11ff6f51919987b921a5c88765618a6228e08bcad7991a
+EBUILD libsrtp-2.4.2.ebuild 1664 BLAKE2B 9638ee1efd37da4b88bb357d3210c2bfaa8e532a4d93a41e31bb80a8392b10452c4ee8269f98f234fdb69bba51a2e229abddc853465a732cfe9ebbe806c4d921 SHA512 c5dd360404f015a1c3a87e00ba359b2241207d146716db4d906076dd76c19ad531a5499dd47dca51e60648f46a010675fa1ee2695e1ef5070d358e3ae7497508
 MISC metadata.xml 732 BLAKE2B 77564b70a4af50dea6dad18ad1763a5d61fbd8753fef74039b50d9131eb080758e3de2e06736a1665a66bbc716941549ac82efe44f0d58e321778144faf29166 SHA512 f021171abc6eae3bc732e3beac09a5ef126d4c8f31912192db9281cf523d2e2632f740757420b3fb477b88957ace138e03ee752ab44df63b0b16787f1a29e883
diff --git a/net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch b/net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch
deleted file mode 100644
index 771ae0f51448..000000000000
--- a/net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/crypto/math/datatypes.c b/crypto/math/datatypes.c
-index c0dfece..ec2fe6d 100644
---- 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/test/util.c b/test/util.c
-index eb203f4..04e149c 100644
---- a/test/util.c
-+++ b/test/util.c
-@@ -47,7 +47,7 @@
- #include <string.h>
- #include <stdint.h>
- 
--char bit_string[MAX_PRINT_STRING_LEN];
-+static char bit_string[MAX_PRINT_STRING_LEN];
- 
- static inline int hex_char_to_nibble(uint8_t c)
- {
diff --git a/net-libs/libsrtp/files/libsrtp-2.2.0-pcap-automagic-r0.patch b/net-libs/libsrtp/files/libsrtp-2.2.0-pcap-automagic-r0.patch
deleted file mode 100644
index 1075825945cb..000000000000
--- a/net-libs/libsrtp/files/libsrtp-2.2.0-pcap-automagic-r0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -uNr libsrtp-2.2.0.ORIG/configure.ac libsrtp-2.2.0/configure.ac
---- libsrtp-2.2.0.ORIG/configure.ac	2018-06-18 13:28:52.385014993 +0100
-+++ libsrtp-2.2.0/configure.ac	2018-06-18 13:31:09.217020686 +0100
-@@ -273,6 +273,8 @@
- 
- dnl Checking for PCAP
- 
-+AC_ARG_ENABLE([pcap], AS_HELP_STRING([--disable-pcap], [Build without `pcap' library (-lpcap)]))
-+AS_IF([test "x$enable_pcap" != "xno"], [
- PCAP_LIB=""
- AC_CHECK_LIB([pcap], [pcap_create],
-   [PCAP_LIB="-lpcap"
-@@ -284,6 +286,7 @@
-    AC_DEFINE([HAVE_PCAP], [1], [Define to 1 if you have the `winpcap' library (-lwpcap)])
-    AC_SUBST([HAVE_PCAP], [1])])
- AC_SUBST([PCAP_LIB])
-+])
-    
- AC_MSG_CHECKING([whether to redirect logging to stdout])
- AC_ARG_ENABLE([log-stdout],
diff --git a/net-libs/libsrtp/files/libsrtp-2.4.2-doc.patch b/net-libs/libsrtp/files/libsrtp-2.4.2-doc.patch
new file mode 100644
index 000000000000..571c3f3c5d44
--- /dev/null
+++ b/net-libs/libsrtp/files/libsrtp-2.4.2-doc.patch
@@ -0,0 +1,42 @@
+--- a/doc/Doxyfile.in
++++ b/doc/Doxyfile.in
+@@ -771,13 +771,13 @@ WARN_LOGFILE           =
+ # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+ # Note: If this tag is empty the current directory is searched.
+ 
+-INPUT                  = ../README.md \
+-                         ../include/srtp.h \
+-                         ../crypto/include/auth.h \
+-                         ../crypto/include/cipher.h \
+-                         ../crypto/include/crypto_types.h \
+-                         ../crypto/include/err.h \
+-                         crypto_kernel.txt
++INPUT                  = @TOP_SRCDIR@/README.md \
++                         @TOP_SRCDIR@/include/srtp.h \
++                         @TOP_SRCDIR@/crypto/include/auth.h \
++                         @TOP_SRCDIR@/crypto/include/cipher.h \
++                         @TOP_SRCDIR@/crypto/include/crypto_types.h \
++                         @TOP_SRCDIR@/crypto/include/err.h \
++                         @TOP_SRCDIR@/doc/crypto_kernel.txt
+ 
+ # This tag can be used to specify the character encoding of the source files
+ # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+@@ -1104,7 +1104,7 @@ HTML_FOOTER            =
+ # obsolete.
+ # This tag requires that the tag GENERATE_HTML is set to YES.
+ 
+-HTML_STYLESHEET        = docs.css
++HTML_STYLESHEET        = @TOP_SRCDIR@/doc/docs.css
+ 
+ # The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+ # cascading style sheets that are included after the standard style sheets
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -8,6 +8,7 @@ endif
+ 
+ doc_config = configuration_data()
+ doc_config.set('LIBSRTPVERSIONNUMBER', meson.project_version())
++doc_config.set('TOP_SRCDIR', meson.source_root())
+ 
+ doxyfile = configure_file(input: 'Doxyfile.in',
+   output: 'Doxyfile',
diff --git a/net-libs/libsrtp/libsrtp-2.2.0.ebuild b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
deleted file mode 100644
index f25da2660cd5..000000000000
--- a/net-libs/libsrtp/libsrtp-2.2.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
-HOMEPAGE="https://github.com/cisco/libsrtp"
-SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos"
-IUSE="aesicm console debug doc openssl static-libs syslog test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	openssl? (
-		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES )
-
-PATCHES=(
-	"${FILESDIR}/${P}-pcap-automagic-r0.patch"
-	"${FILESDIR}/${P}-gcc-10.patch"
-)
-
-src_prepare() {
-	default
-
-	# test/rtpw.c is using /usr/share/dict/words assuming it exists
-	# using test/rtpw.c guaratees the file exists in any case
-	sed -i -e "s:/usr/share/dict/words:rtpw.c:" test/rtpw.c || die
-
-	eautoreconf
-
-	# sadly, tests are too broken to even consider using work-arounds
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# stdout: default error output for messages in debug
-	# pcap: seems to be test-only
-	# openssl-kdf: OpenSSL 1.1.0+
-	econf \
-		--enable-log-stdout \
-		--disable-pcap \
-		--disable-openssl-kdf \
-		$(use_enable debug debug-logging) \
-		$(use_enable openssl)
-}
-
-multilib_src_compile() {
-	use static-libs && emake ${PN}2.a
-	emake shared_library
-	use test && emake test
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}" emake -j1 runtest
-
-	# Makefile.in has '$(testapp): libsrtp2.a'
-	if use !static-libs; then
-		rm libsrtp2.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	# libsrtp.pdf can be generated with doxygen, but it seems to be broken.
-	use doc && DOCS+=( doc/*.txt )
-	einstalldocs
-}
diff --git a/net-libs/libsrtp/libsrtp-2.4.2.ebuild b/net-libs/libsrtp/libsrtp-2.4.2.ebuild
new file mode 100644
index 000000000000..593b1ed935be
--- /dev/null
+++ b/net-libs/libsrtp/libsrtp-2.4.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+HOMEPAGE="https://github.com/cisco/libsrtp"
+SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv -sparc ~x86 ~ppc-macos ~x64-macos"
+IUSE="debug doc nss openssl static-libs test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="?? ( nss openssl )"
+
+RDEPEND="
+	openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	nss? ( >=dev-libs/nss-3.52[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/libsrtp-2.4.2-doc.patch )
+
+multilib_src_configure() {
+	local crypto_lib="none"
+	use openssl && crypto_lib="openssl"
+	use nss && crypto_lib="nss"
+
+	# stdout: default error output for messages in debug
+	# openssl-kdf: OpenSSL 1.1.0+
+	local emesonargs=(
+		-Dcrypto-library=${crypto_lib}
+		-Dcrypto-library-kdf=disabled
+		-Dfuzzer=disabled
+		-Dlog-stdout=true
+		-Dpcap-tests=disabled
+		-Ddefault_library=$(usex static-libs both shared)
+
+		$(meson_feature test tests)
+		$(meson_native_use_feature doc)
+		$(meson_use debug debug-logging)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+	if multilib_is_native_abi && use doc; then
+		meson_src_compile doc
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use doc; then
+		dodoc -r html
+	fi
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	local DOCS=( CHANGES )
+	einstalldocs
+}