summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-08-28 19:55:50 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2022-08-29 21:09:10 +0200
commit3520d209daaba0e0e19fec194079dd91bcc6161a (patch)
treefd5fdf671815fe8ac83cc4e155a1980ed944d5d8
parentsci-electronics/xoscope: add 2.3, bump to EAPI-8, add missing deps (diff)
downloadgentoo-3520d209.tar.gz
gentoo-3520d209.tar.bz2
gentoo-3520d209.zip
net-libs/libsrtp: drop 2.2.0, EAPI-6--
Closes: https://bugs.gentoo.org/762151 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--net-libs/libsrtp/Manifest1
-rw-r--r--net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch26
-rw-r--r--net-libs/libsrtp/files/libsrtp-2.2.0-pcap-automagic-r0.patch20
-rw-r--r--net-libs/libsrtp/libsrtp-2.2.0.ebuild76
4 files changed, 0 insertions, 123 deletions
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 4cdfe368ac83..e077b2f0b4af 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -1,3 +1,2 @@
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
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/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
-}