gentoo resync : 06.05.2018

7 files changed, 0 insertions, 202 deletions

diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 16d7c242457c..f4f73b8805be 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -1,10 +1,4 @@
-AUX libsrtp-1.4.4-invalid-index.patch 412 BLAKE2B 15219d5d88264083d87e6a895d3a9e43993be7885d50bcf30a7c82470760fd73b9ed0148dbfd0e614ca7f3cd14bf7959ae0fa029becfe9c2f4837d1ed8a285dd SHA512 eda02d691be19de883d061031c0c7070e375da3581f4294a7c8fa30f498c4c7aaa306c291230171d0391e226b624277ae09b4337dd14aa2625a9cb6bb4884764
-AUX libsrtp-1.4.4-shared.patch 1670 BLAKE2B b1b214a5ea0476319d375f8d086f6e23a9caca97d667c6239c91340e123f793c24c9d7e1462e49eb441c22aa38792639eb4efb76637cec1e73ce49714abcea67 SHA512 c9005c00fd81cf13243897f2803d1528812bd83849aa318c5cbabfb3fd7cd3870b94cf5d6ad6eaab5b181b2e439be6cdfe9a9a38338632bbf34647a18d120a69
-AUX libsrtp-1.4.4_p20121108-shared.patch 1821 BLAKE2B e5030b14184f7a88a2b3d20e1e15979341a9c118f78ab56111a185b2571c8f42c5ae43a082661fee67285f0eb34ad31acfcd11daa2f67249a89fd7d109cc7b16 SHA512 594b2e5e6efc74a93162e299fe4247ae6dfbd1864c02435bab2bcc2788716bd5afc6513d3842ea87260182ffd2de0abcab4577b13a26dcd75c5008a849bec709
-AUX libsrtp-1.5.2-bindir.patch 879 BLAKE2B 46aef2865ee8412b45d6036dcca13c0ba18f2ae5e79d94973f6b8f09d5dfc19b964cea8032739442f7d3efce69ae5c8e755b918ae0dfae240cc726173ee4fa0c SHA512 d3eb6362dd9c79a3c670582435ba260965116fa1a57304b796498a9d4085e24044634bdcd8ba7f7b7b9f6df1b25db01ff1cad828228a823a03904b7f13d6d46f
-AUX libsrtp-1.5.2-fix-make-install.patch 582 BLAKE2B e19db604f137d72d34d18ee83d4efabb0fe3029aaf4dfc1d9aa011defd0e04d7c9b55326c102cc7106cf3bf9a24e0e64c5f3c954da0e3eaaef7614f4dfdf2797 SHA512 09bbcc378ccc01fd396fe49bc874b7f6c42f7af7173b108cde89efa90bc407086ebc6b791343ddfd609cb108364d818ac327766404acc953d81b14d9c3babb1f
 AUX libsrtp-2.1.0-pcap-automagic-r0.patch 692 BLAKE2B 2d4f182d12b97dbf1a06ef178c4e0562e1ff91a8a194076c4aef9a73dc9a7dd5e47fdd8036d334f460c3aade43350b885ab05287842f287a0738c5d0aa9d377d SHA512 ac5ffa640d61332fcdb41e99895e2934e19211809011a9a8250a1e15dcc565072f7e2a6b4b24602769bf7c70a98ec3606832ef9ab2225bfa9fded2970b07d5fa
-AUX libsrtp-CVE-2013-2139.diff 1996 BLAKE2B 126cf52f86e306c1fe005d37201b67b0f05ce820c6f02757697f4bba404f55e5c1c0ce636856a762f007dfa28e08b607e231778c49250f3db7cb471c3b8a971c SHA512 ea944ec993b8e923e2cb91a77336b5f898851f6948f6b5df45610f7528afdb7ad54706cee4acd49146b18c45f52fa5588f43e4fbc745b56df3c558d6bbf5b49b
 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
diff --git a/net-libs/libsrtp/files/libsrtp-1.4.4-invalid-index.patch b/net-libs/libsrtp/files/libsrtp-1.4.4-invalid-index.patch
deleted file mode 100644
index 90a8f019fd43..000000000000
--- a/net-libs/libsrtp/files/libsrtp-1.4.4-invalid-index.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- srtp/crypto/replay/rdb.c.orig	2012-03-20 14:52:32.890017830 +0100
-+++ srtp/crypto/replay/rdb.c	2012-03-20 14:56:31.670017835 +0100
-@@ -115,7 +115,7 @@
- 
-     /* shift the window forward by delta bits*/
-     v128_left_shift(&rdb->bitmask, delta);
--    v128_set_bit(&rdb->bitmask, rdb_bits_in_bitmask-delta);
-+    v128_set_bit(&rdb->bitmask, rdb_bits_in_bitmask-1);
-     rdb->window_start += delta;
- 
-   }    
diff --git a/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch b/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch
deleted file mode 100644
index 43b8843603c1..000000000000
--- a/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- srtp/Makefile.in
-+++ srtp/Makefile.in
-@@ -65,11 +65,11 @@
- 
- 
- # implicit rules for object files and test apps
- 
- %.o: %.c
--	$(COMPILE) -c $< -o $@
-+	$(COMPILE) -fPIC -c $< -o $@
- 
- %$(EXE): %.c
- 	$(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
- 
- 
-@@ -103,10 +103,16 @@
- 
- libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi)
- 	ar cr libsrtp.a $^
- 	$(RANLIB) libsrtp.a
- 
-+libsrtp.so: $(srtpobj) $(cryptobj) $(gdoi)
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname,libsrtp.so.1 -o libsrtp.so.1.0  $^
-+
-+libsrtp.dylib: $(srtpobj) $(cryptobj) $(gdoi)
-+	$(CC) $(LDFLAGS) -dynamiclib -install_name $(libdir)/libsrtp.1.dylib -o libsrtp.1.0.dylib  $^
-+
- # libcryptomath.a contains general-purpose routines that are used to
- # generate tables and verify cryptoalgorithm implementations - this
- # library is not meant to be included in production code
- 
- cryptomath = crypto/math/math.o crypto/math/gf2_8.o 
-@@ -195,10 +198,20 @@
- 	$(INSTALL) -d $(DESTDIR)$(includedir)/srtp
- 	$(INSTALL) -d $(DESTDIR)$(libdir)
- 	cp include/*.h $(DESTDIR)$(includedir)/srtp  
- 	cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp
- 	if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi
-+	if [ -f libsrtp.so.1.0 ]; then \
-+		cp libsrtp.so.1.0 $(DESTDIR)$(libdir)/; \
-+		ln -s libsrtp.so.1.0 $(DESTDIR)$(libdir)/libsrtp.so.1; \
-+		ln -s libsrtp.so.1.0 $(DESTDIR)$(libdir)/libsrtp.so; \
-+	fi
-+	if [ -f libsrtp.1.0.dylib ]; then \
-+		cp libsrtp.1.0.dylib $(DESTDIR)$(libdir)/; \
-+		ln -s libsrtp.1.0.dylib $(DESTDIR)$(libdir)/libsrtp.1.dylib; \
-+		ln -s libsrtp.1.0.dylib $(DESTDIR)$(libdir)/libsrtp.dylib; \
-+	fi
- 
- uninstall:
- 	rm -rf $(DESTDIR)$(includedir)/srtp
- 	rm -rf $(DESTDIR)$(libdir)/libsrtp.a
diff --git a/net-libs/libsrtp/files/libsrtp-1.4.4_p20121108-shared.patch b/net-libs/libsrtp/files/libsrtp-1.4.4_p20121108-shared.patch
deleted file mode 100644
index 4e70a0ddd34e..000000000000
--- a/net-libs/libsrtp/files/libsrtp-1.4.4_p20121108-shared.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Description: Hack build routines to compile shared library
-Author: loki_val and solar
-Origin: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch
-Last-Update: 2010-03-19
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -15,7 +15,7 @@
- 
- .PHONY: all test build_table_apps
- 
--all: test 
-+all: libsrtp.so test
- 
- runtest: build_table_apps test
- 	@echo "running libsrtp test applications..."
-@@ -67,7 +67,7 @@
- # implicit rules for object files and test apps
- 
- %.o: %.c
--	$(COMPILE) -c $< -o $@
-+	$(COMPILE) -fPIC -c $< -o $@
- 
- %$(EXE): %.c
- 	$(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
-@@ -105,6 +105,9 @@
- 	ar cr libsrtp.a $^
- 	$(RANLIB) libsrtp.a
- 
-+libsrtp.so: $(srtpobj) $(cryptobj) $(gdoi)
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname,libsrtp.so.0 -o libsrtp.so.0.0  $^
-+
- # libcryptomath.a contains general-purpose routines that are used to
- # generate tables and verify cryptoalgorithm implementations - this
- # library is not meant to be included in production code
-@@ -198,6 +201,11 @@
- 	cp $(srcdir)/crypto/include/*.h $(DESTDIR)$(includedir)/srtp
- 	if [ "$(srcdir)" != "." ]; then cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp; fi
- 	if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi
-+	if [ -f libsrtp.so.0.0 ]; then \
-+		cp libsrtp.so.0.0 $(DESTDIR)$(libdir)/; \
-+		ln -s libsrtp.so.0.0 $(DESTDIR)$(libdir)/libsrtp.so.0; \
-+		ln -s libsrtp.so.0.0 $(DESTDIR)$(libdir)/libsrtp.so; \
-+	fi
- 
- uninstall:
- 	rm -f $(DESTDIR)$(includedir)/srtp/*.h
-@@ -206,7 +214,7 @@
- 
- clean:
- 	rm -rf $(cryptobj) $(srtpobj) $(cryptomath) TAGS \
--        libcryptomath.a libsrtp.a core *.core test/core
-+        libcryptomath.a libsrtp.a libsrtp.so.0.0 core *.core test/core
- 	for a in * */* */*/*; do			\
-               if [ -f "$$a~" ] ; then rm -f $$a~; fi;	\
-         done;
diff --git a/net-libs/libsrtp/files/libsrtp-1.5.2-bindir.patch b/net-libs/libsrtp/files/libsrtp-1.5.2-bindir.patch
deleted file mode 100644
index 2c71faf48ba9..000000000000
--- a/net-libs/libsrtp/files/libsrtp-1.5.2-bindir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 1a40de2..02f090c 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -252,13 +252,13 @@ libsrtpdoc:
- install:
- 	$(INSTALL) -d $(DESTDIR)$(includedir)/srtp
- 	$(INSTALL) -d $(DESTDIR)$(libdir)
--	$(INSTALL) -d $(DESTDIR)$(bindir)
- 	cp $(srcdir)/include/*.h $(DESTDIR)$(includedir)/srtp  
- 	cp $(srcdir)/crypto/include/*.h $(DESTDIR)$(includedir)/srtp
- 	if [ "$(srcdir)" != "." ]; then cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp; fi
- 	if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi
- 	if [ -f libsrtp.dll.a ]; then cp libsrtp.dll.a $(DESTDIR)$(libdir)/; fi
- 	if [ -f libsrtp.$(SHAREDLIBSUFFIX) ]; then \
-+		$(INSTALL) -d $(DESTDIR)$(SHAREDLIB_DIR); \
- 		cp libsrtp.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/; \
- 		ln -sfn libsrtp.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/libsrtp.$(SHAREDLIBSUFFIXNOVER); \
- 	fi
diff --git a/net-libs/libsrtp/files/libsrtp-1.5.2-fix-make-install.patch b/net-libs/libsrtp/files/libsrtp-1.5.2-fix-make-install.patch
deleted file mode 100644
index f3f1f0e5c1ae..000000000000
--- a/net-libs/libsrtp/files/libsrtp-1.5.2-fix-make-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 002d25d..1a40de2 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -260,7 +260,7 @@ install:
- 	if [ -f libsrtp.dll.a ]; then cp libsrtp.dll.a $(DESTDIR)$(libdir)/; fi
- 	if [ -f libsrtp.$(SHAREDLIBSUFFIX) ]; then \
- 		cp libsrtp.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/; \
--		cp libsrtp.$(SHAREDLIBSUFFIXNOVER) $(DESTDIR)$(SHAREDLIB_DIR)/; \
-+		ln -sfn libsrtp.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/libsrtp.$(SHAREDLIBSUFFIXNOVER); \
- 	fi
- 	if [ "$(pkgconfig_DATA)" != "" ]; then \
- 		$(INSTALL) -d $(DESTDIR)$(pkgconfigdir); \
diff --git a/net-libs/libsrtp/files/libsrtp-CVE-2013-2139.diff b/net-libs/libsrtp/files/libsrtp-CVE-2013-2139.diff
deleted file mode 100644
index dcafe177638b..000000000000
--- a/net-libs/libsrtp/files/libsrtp-CVE-2013-2139.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/srtp/srtp.c b/srtp/srtp.c
-index 839c1ee..7fd19e6 100644
---- a/srtp/srtp.c
-+++ b/srtp/srtp.c
-@@ -2063,23 +2063,18 @@ static inline int base_key_length(const cipher_type_t *cipher, int key_length)
-   switch(profile) {
-   case srtp_profile_aes128_cm_sha1_80:
-     crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
--    crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
-     break;
-   case srtp_profile_aes128_cm_sha1_32:
-     crypto_policy_set_aes_cm_128_hmac_sha1_32(policy);
--    crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
-     break;
-   case srtp_profile_null_sha1_80:
-     crypto_policy_set_null_cipher_hmac_sha1_80(policy);
--    crypto_policy_set_null_cipher_hmac_sha1_80(policy);
-     break;
-   case srtp_profile_aes256_cm_sha1_80:
-     crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
--    crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
-     break;
-   case srtp_profile_aes256_cm_sha1_32:
-     crypto_policy_set_aes_cm_256_hmac_sha1_32(policy);
--    crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
-     break;
-     /* the following profiles are not (yet) supported */
-   case srtp_profile_null_sha1_32:
-@@ -2100,6 +2095,8 @@ static inline int base_key_length(const cipher_type_t *cipher, int key_length)
-     crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
-     break;
-   case srtp_profile_aes128_cm_sha1_32:
-+    /* We do not honor the 32-bit auth tag request since
-+     * this is not compliant with RFC 3711 */
-     crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
-     break;
-   case srtp_profile_null_sha1_80:
-@@ -2109,6 +2106,8 @@ static inline int base_key_length(const cipher_type_t *cipher, int key_length)
-     crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
-     break;
-   case srtp_profile_aes256_cm_sha1_32:
-+    /* We do not honor the 32-bit auth tag request since
-+     * this is not compliant with RFC 3711 */
-     crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
-     break;
-     /* the following profiles are not (yet) supported */