diff options
Diffstat (limited to 'net-libs/libsrtp')
-rw-r--r-- | net-libs/libsrtp/Manifest | 5 | ||||
-rw-r--r-- | net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch | 26 | ||||
-rw-r--r-- | net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild | 2 | ||||
-rw-r--r-- | net-libs/libsrtp/libsrtp-2.2.0.ebuild | 9 |
4 files changed, 36 insertions, 6 deletions
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest index 5f668f33f17e..99e4b6243b89 100644 --- a/net-libs/libsrtp/Manifest +++ b/net-libs/libsrtp/Manifest @@ -2,10 +2,11 @@ AUX libsrtp-1.6.0-openssl-1.1.patch 11603 BLAKE2B 1d5addff655f04bef9cebc79690a97 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-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 -EBUILD libsrtp-1.6.0-r1.ebuild 2398 BLAKE2B 2173fb4622651c28f714c19e7eaf6848f9f6ca95264c3d4327d81e4a0d938c5683a8e5b2be09a67a96b665da326c2bd22a0f3c76a65162118c3281037c5f02c7 SHA512 4d863311f0b0fe068b261f58b1c72d8bfcc789d52a5e6c1f55b9be07a7cc9d13db4090e5a11b9fe1cc896d4e56e5f82463cc09be706bb02c8464157f23536584 -EBUILD libsrtp-2.2.0.ebuild 1863 BLAKE2B bd1dcd6369ba64b441a168a0364a6c1dd117fe8eb651515c87ec9f42c20eb189bb5ae4d11e288ab6e2be32c9da8ec1c832481fbfdce69c4d3d6b659ef3cfca16 SHA512 1fe796d21c84cedb16cf09397b57215164615386599f43f00d2aed08f1977c394e4799d7fc5ecfe48739cdd0bbac9ef2ce9939269ce95a298dec45e61e7dbafe +EBUILD libsrtp-1.6.0-r1.ebuild 2399 BLAKE2B 207a6a0bc6e71c738ad27eedf4fdbb55b59d3aa7716a78651deb2bc9d87db8477e44012a459dbe0c9466188d172260c161f337f6723b04a0214817ca2c2d9e65 SHA512 323bb9318ba07ebf4f426ea91680981f95ccdf749ed5d73fb753deed79d87495c2c48d0bf3876e87ebc3ad93ece12ad82f2b1a34f876f9bfee41aa41830697d6 +EBUILD libsrtp-2.2.0.ebuild 1898 BLAKE2B 45632f9983d710f4faa9a4b71385f8cdf500acab47e3f4d5bbb266df4818934bed9be6d666fa7b38dc8a49c47de6f0c950ac38ba7065d60522e141a7dc56349c SHA512 554864d7db3374042f23eed8ca99a93a930dc50d3c133efe8d57958af97a6946301b7aa5bce234db3a4dc934ae37ffca1210f1f9d06d1ff4618a65d39704ef48 MISC metadata.xml 785 BLAKE2B 4dca0339742c5c52eede087bc89e86b8f1da07dd895e1c3361f11456d2408361ead847997ea9d344e369949cf0d29ff88a22fa65917b7c74143b642f8d28d716 SHA512 3c23a7d6242dc7d42e34681850ad861bb67a5c44c5113ef5a82201127900e66bfbe03d065f60410d5652ed2abada24b1ac373a6c061392b48afb97080caa718d 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 new file mode 100644 index 000000000000..771ae0f51448 --- /dev/null +++ b/net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch @@ -0,0 +1,26 @@ +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/libsrtp-1.6.0-r1.ebuild b/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild index efedd66ddf54..93b4e0249db5 100644 --- a/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild +++ b/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0/1" -KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos" IUSE="aesicm console debug doc libressl openssl static-libs syslog test" RESTRICT="!test? ( test )" diff --git a/net-libs/libsrtp/libsrtp-2.2.0.ebuild b/net-libs/libsrtp/libsrtp-2.2.0.ebuild index a66f1cdb1db5..1ee4065fcb39 100644 --- a/net-libs/libsrtp/libsrtp-2.2.0.ebuild +++ b/net-libs/libsrtp/libsrtp-2.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ 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 ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos" IUSE="aesicm console debug doc libressl openssl static-libs syslog test" RESTRICT="!test? ( test )" @@ -25,7 +25,10 @@ DEPEND="${RDEPEND}" DOCS=( CHANGES ) -PATCHES=( "${FILESDIR}/${P}-pcap-automagic-r0.patch" ) +PATCHES=( + "${FILESDIR}/${P}-pcap-automagic-r0.patch" + "${FILESDIR}/${P}-gcc-10.patch" +) src_prepare() { default |