gentoo resync : 23.06.2018

4 files changed, 99 insertions, 3 deletions

diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index f4f73b8805be..e30533703f5f 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -1,10 +1,13 @@
 AUX libsrtp-2.1.0-pcap-automagic-r0.patch 692 BLAKE2B 2d4f182d12b97dbf1a06ef178c4e0562e1ff91a8a194076c4aef9a73dc9a7dd5e47fdd8036d334f460c3aade43350b885ab05287842f287a0738c5d0aa9d377d SHA512 ac5ffa640d61332fcdb41e99895e2934e19211809011a9a8250a1e15dcc565072f7e2a6b4b24602769bf7c70a98ec3606832ef9ab2225bfa9fded2970b07d5fa
+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.0.0.tar.gz 265564 BLAKE2B ebae4a88fd5c77f3ed656569ee4300e4213d5be5c788efc84d8439a14a7773cfa60dc2b7c35a044ad1b5633af581f1526d1c3caa10e3ec800a2d66d5f837ce96 SHA512 61bba9aba9bb3e888c2bbc150411d0b3d583ed71ca455c5a3d4d6d06ecd383fdd61f86ad1979fb9c04da1b824e3fb9bb63f0d97e50b4a469d56907fb9dbc42d6
 DIST libsrtp-2.1.0.tar.gz 306090 BLAKE2B c5055a66bf12997cd1b0d996a930d413d144280ccf40a1bed4b1ef10caa097f9c4fa40910a66a41bd8e33732b810d8ca5f7cb8acd9cb506cc42ab7e5b5adaf6e SHA512 60f4eb6fd37517eb96df80ab8a9c6fd79dfc89d969bdb04673cd98364f7108fbc703a64b1898056f9220a55315574b6f3f796b6814086360f6fd143e3b20fb3f
+DIST libsrtp-2.2.0.tar.gz 308469 BLAKE2B 4ef318bdf5c69b69b5869f478d5f0b9ee82d7d8a52440d10e931722c75b2f3a62b59f7542bb932cc93a21b7af24e6b253d70b4722833c5e1e5afce052e3b00e2 SHA512 3a5214b02199ae8dff45a2ed225ed9b1dcb75a9c6b07669e23bf86f97ad26e3e22b4930acdf3c56b21b605211a89a53a17c61602195b391a5b29a09823ba868c
 EBUILD libsrtp-1.6.0.ebuild 2215 BLAKE2B 0c7fc9e569f320487aa26c95c9d5b70335fa770bcc7471a1727e0872f8af655b3af9034831fa5d8800afb0492bf2b6bcc61f1aa9b3b1d6b39f065dee7b2787c0 SHA512 14f95b201db1eba997d54059ac6c54d0af5d5047bab001510bfa1fe6ed7ed3b3b29428a1221fb6c0e44fd0fc96b8a481416a912e4c0c79fab3f6b56afab29712
 EBUILD libsrtp-2.0.0-r1.ebuild 1911 BLAKE2B 02c26044260d022738fb2ef726181f05b1ce5144d03e5a7efbdf371908ea2985aa373188f319034b8eff65f0e9d0fc290d8bfdeab564f5e75e502bd9bb922cb3 SHA512 8ee91195f444de10b1fcce602943d099ecf7ef4b2e4cae9d92c41fb71842db6395ec572bd298669069138f4525ae4008480c36000525d02f16ce8fe7ff5e757f
 EBUILD libsrtp-2.0.0.ebuild 1711 BLAKE2B 9b3d9549d9b491a8049770229bb364671f8c89e63281b84d57050d0092072eeed9bb402073c012b44d16c0b9a45c3351b6b0910ef9d7d60ce26af383c73e76c8 SHA512 68343d3a4f86f72f6881e885a89110360e7e342ae65fac94706c0e08fcd6af7a0d00bf3cdff91f11cb77482e86ddbe7b041df7c4a9a59b54caa79e2346fa9c62
-EBUILD libsrtp-2.1.0.ebuild 1887 BLAKE2B c448715aa5133964869a2dc6a05c59b3d45da56796975dc7b339add72d72aa90ef3b8acf8bfe049bd7bc2b8dca55b91af3445fd3aef6caf7051de24af74f3c73 SHA512 887d4478b069be03722d42ec370095a20e7087d1894b377237480ca1cc834af479fe7235915f4afb657b32242970e37086e7a908a8bb4b8088bac65bce245036
+EBUILD libsrtp-2.1.0.ebuild 1888 BLAKE2B 745b206204bd6b9ec77ea27a94a024154f0b495f57656e4c432de9a928fc043fc67408184a70af66a256cc17ae49c50d430a987350134193c2d3870447fcfb91 SHA512 b6999a6b65f2d0536504273644e99de39d9a8787021e0d16a2a205afaee2ca9e3487a41202bddb1e67c298e585e8fa84cf26699aa769cf259d31e5a6e8c18513
+EBUILD libsrtp-2.2.0.ebuild 1851 BLAKE2B dbe6659a09a18039d93b1f4018336ef8f32c8c3beffa2d52e81fcad14589742ee245a950210a912c8298a8660507bf032cecb02bfb0a8a573602d1c51169ad3e SHA512 1b2b919949ee53b5c35549a49e62b8b8ff09a0e498c6ed996d727edb2399e42066c7638aacae52c25aacb1ea0ef819a53649d01cfffb5483902bbd652d84ab25
 MISC metadata.xml 785 BLAKE2B 4dca0339742c5c52eede087bc89e86b8f1da07dd895e1c3361f11456d2408361ead847997ea9d344e369949cf0d29ff88a22fa65917b7c74143b642f8d28d716 SHA512 3c23a7d6242dc7d42e34681850ad861bb67a5c44c5113ef5a82201127900e66bfbe03d065f60410d5652ed2abada24b1ac373a6c061392b48afb97080caa718d
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
new file mode 100644
index 000000000000..1075825945cb
--- /dev/null
+++ b/net-libs/libsrtp/files/libsrtp-2.2.0-pcap-automagic-r0.patch
@@ -0,0 +1,20 @@
+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.1.0.ebuild b/net-libs/libsrtp/libsrtp-2.1.0.ebuild
index 791ef4e55633..0ae62cb07f74 100644
--- a/net-libs/libsrtp/libsrtp-2.1.0.ebuild
+++ b/net-libs/libsrtp/libsrtp-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,7 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	use static-libs && emake ${PN}.a
+	use static-libs && emake ${PN}2.a
 	emake shared_library
 	use test && emake test
 }
diff --git a/net-libs/libsrtp/libsrtp-2.2.0.ebuild b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
new file mode 100644
index 000000000000..05aa4830df6b
--- /dev/null
+++ b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
+
+RDEPEND="
+	openssl? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES )
+
+PATCHES=( "${FILESDIR}/${P}-pcap-automagic-r0.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
+}