1 |
commit: 3520d209daaba0e0e19fec194079dd91bcc6161a |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 28 17:55:50 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 29 19:09:10 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3520d209 |
7 |
|
8 |
net-libs/libsrtp: drop 2.2.0, EAPI-6-- |
9 |
|
10 |
Closes: https://bugs.gentoo.org/762151 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
net-libs/libsrtp/Manifest | 1 - |
14 |
net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch | 26 -------- |
15 |
.../files/libsrtp-2.2.0-pcap-automagic-r0.patch | 20 ------ |
16 |
net-libs/libsrtp/libsrtp-2.2.0.ebuild | 76 ---------------------- |
17 |
4 files changed, 123 deletions(-) |
18 |
|
19 |
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest |
20 |
index 4cdfe368ac83..e077b2f0b4af 100644 |
21 |
--- a/net-libs/libsrtp/Manifest |
22 |
+++ b/net-libs/libsrtp/Manifest |
23 |
@@ -1,3 +1,2 @@ |
24 |
DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f04c6dd084ef473c439d720733d0fd8b38bdfe92e30e05a8a94c41df965d04bca52601b2644352428b49b1ed9093 SHA512 5ac712d0d343c3b63ed248503cc7d33c637895a274c4434c91f513be117836f27cd5daba83088b4647bbd9c82d841e216e6346af8d485cb9ddcd35dee21d4887 |
25 |
-DIST libsrtp-2.2.0.tar.gz 308469 BLAKE2B 4ef318bdf5c69b69b5869f478d5f0b9ee82d7d8a52440d10e931722c75b2f3a62b59f7542bb932cc93a21b7af24e6b253d70b4722833c5e1e5afce052e3b00e2 SHA512 3a5214b02199ae8dff45a2ed225ed9b1dcb75a9c6b07669e23bf86f97ad26e3e22b4930acdf3c56b21b605211a89a53a17c61602195b391a5b29a09823ba868c |
26 |
DIST libsrtp-2.3.0.tar.gz 633819 BLAKE2B 9ea40e9689fabc29b7a2c637bd4e4a2c44eec79205a6e5c5e5abf1069dfec7ba28d868ba620462205d61fdb28d0ca3b8532c1f59db704edd508e01afb551d255 SHA512 34b1a01cb9a75aed175be09aadd2827224203b9801becc3fbc5214667cce79c3b87b0f59e4315583863ab5a2cc4fc81d56ab604a5e4c984518b8a8a2a7b77461 |
27 |
|
28 |
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 |
29 |
deleted file mode 100644 |
30 |
index 771ae0f51448..000000000000 |
31 |
--- a/net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch |
32 |
+++ /dev/null |
33 |
@@ -1,26 +0,0 @@ |
34 |
-diff --git a/crypto/math/datatypes.c b/crypto/math/datatypes.c |
35 |
-index c0dfece..ec2fe6d 100644 |
36 |
---- a/crypto/math/datatypes.c |
37 |
-+++ b/crypto/math/datatypes.c |
38 |
-@@ -79,7 +79,7 @@ int octet_get_weight(uint8_t octet) |
39 |
- |
40 |
- /* the value MAX_PRINT_STRING_LEN is defined in datatypes.h */ |
41 |
- |
42 |
--char bit_string[MAX_PRINT_STRING_LEN]; |
43 |
-+static char bit_string[MAX_PRINT_STRING_LEN]; |
44 |
- |
45 |
- uint8_t srtp_nibble_to_hex_char(uint8_t nibble) |
46 |
- { |
47 |
-diff --git a/test/util.c b/test/util.c |
48 |
-index eb203f4..04e149c 100644 |
49 |
---- a/test/util.c |
50 |
-+++ b/test/util.c |
51 |
-@@ -47,7 +47,7 @@ |
52 |
- #include <string.h> |
53 |
- #include <stdint.h> |
54 |
- |
55 |
--char bit_string[MAX_PRINT_STRING_LEN]; |
56 |
-+static char bit_string[MAX_PRINT_STRING_LEN]; |
57 |
- |
58 |
- static inline int hex_char_to_nibble(uint8_t c) |
59 |
- { |
60 |
|
61 |
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 |
62 |
deleted file mode 100644 |
63 |
index 1075825945cb..000000000000 |
64 |
--- a/net-libs/libsrtp/files/libsrtp-2.2.0-pcap-automagic-r0.patch |
65 |
+++ /dev/null |
66 |
@@ -1,20 +0,0 @@ |
67 |
-diff -uNr libsrtp-2.2.0.ORIG/configure.ac libsrtp-2.2.0/configure.ac |
68 |
---- libsrtp-2.2.0.ORIG/configure.ac 2018-06-18 13:28:52.385014993 +0100 |
69 |
-+++ libsrtp-2.2.0/configure.ac 2018-06-18 13:31:09.217020686 +0100 |
70 |
-@@ -273,6 +273,8 @@ |
71 |
- |
72 |
- dnl Checking for PCAP |
73 |
- |
74 |
-+AC_ARG_ENABLE([pcap], AS_HELP_STRING([--disable-pcap], [Build without `pcap' library (-lpcap)])) |
75 |
-+AS_IF([test "x$enable_pcap" != "xno"], [ |
76 |
- PCAP_LIB="" |
77 |
- AC_CHECK_LIB([pcap], [pcap_create], |
78 |
- [PCAP_LIB="-lpcap" |
79 |
-@@ -284,6 +286,7 @@ |
80 |
- AC_DEFINE([HAVE_PCAP], [1], [Define to 1 if you have the `winpcap' library (-lwpcap)]) |
81 |
- AC_SUBST([HAVE_PCAP], [1])]) |
82 |
- AC_SUBST([PCAP_LIB]) |
83 |
-+]) |
84 |
- |
85 |
- AC_MSG_CHECKING([whether to redirect logging to stdout]) |
86 |
- AC_ARG_ENABLE([log-stdout], |
87 |
|
88 |
diff --git a/net-libs/libsrtp/libsrtp-2.2.0.ebuild b/net-libs/libsrtp/libsrtp-2.2.0.ebuild |
89 |
deleted file mode 100644 |
90 |
index f25da2660cd5..000000000000 |
91 |
--- a/net-libs/libsrtp/libsrtp-2.2.0.ebuild |
92 |
+++ /dev/null |
93 |
@@ -1,76 +0,0 @@ |
94 |
-# Copyright 1999-2021 Gentoo Authors |
95 |
-# Distributed under the terms of the GNU General Public License v2 |
96 |
- |
97 |
-EAPI=6 |
98 |
- |
99 |
-inherit autotools multilib-minimal |
100 |
- |
101 |
-DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)" |
102 |
-HOMEPAGE="https://github.com/cisco/libsrtp" |
103 |
-SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
104 |
- |
105 |
-LICENSE="BSD" |
106 |
-SLOT="2/1" |
107 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos" |
108 |
-IUSE="aesicm console debug doc openssl static-libs syslog test" |
109 |
-RESTRICT="!test? ( test )" |
110 |
- |
111 |
-RDEPEND=" |
112 |
- openssl? ( |
113 |
- dev-libs/openssl:0=[${MULTILIB_USEDEP}] |
114 |
- ) |
115 |
-" |
116 |
-DEPEND="${RDEPEND}" |
117 |
- |
118 |
-DOCS=( CHANGES ) |
119 |
- |
120 |
-PATCHES=( |
121 |
- "${FILESDIR}/${P}-pcap-automagic-r0.patch" |
122 |
- "${FILESDIR}/${P}-gcc-10.patch" |
123 |
-) |
124 |
- |
125 |
-src_prepare() { |
126 |
- default |
127 |
- |
128 |
- # test/rtpw.c is using /usr/share/dict/words assuming it exists |
129 |
- # using test/rtpw.c guaratees the file exists in any case |
130 |
- sed -i -e "s:/usr/share/dict/words:rtpw.c:" test/rtpw.c || die |
131 |
- |
132 |
- eautoreconf |
133 |
- |
134 |
- # sadly, tests are too broken to even consider using work-arounds |
135 |
- multilib_copy_sources |
136 |
-} |
137 |
- |
138 |
-multilib_src_configure() { |
139 |
- # stdout: default error output for messages in debug |
140 |
- # pcap: seems to be test-only |
141 |
- # openssl-kdf: OpenSSL 1.1.0+ |
142 |
- econf \ |
143 |
- --enable-log-stdout \ |
144 |
- --disable-pcap \ |
145 |
- --disable-openssl-kdf \ |
146 |
- $(use_enable debug debug-logging) \ |
147 |
- $(use_enable openssl) |
148 |
-} |
149 |
- |
150 |
-multilib_src_compile() { |
151 |
- use static-libs && emake ${PN}2.a |
152 |
- emake shared_library |
153 |
- use test && emake test |
154 |
-} |
155 |
- |
156 |
-multilib_src_test() { |
157 |
- LD_LIBRARY_PATH="${BUILD_DIR}" emake -j1 runtest |
158 |
- |
159 |
- # Makefile.in has '$(testapp): libsrtp2.a' |
160 |
- if use !static-libs; then |
161 |
- rm libsrtp2.a || die |
162 |
- fi |
163 |
-} |
164 |
- |
165 |
-multilib_src_install_all() { |
166 |
- # libsrtp.pdf can be generated with doxygen, but it seems to be broken. |
167 |
- use doc && DOCS+=( doc/*.txt ) |
168 |
- einstalldocs |
169 |
-} |