[gentoo-commits] repo/gentoo:master commit in: net-libs/libsrtp/files/

[Aaron Bauman]

commit:     f1c10ce60a121746d17c1da1e8fbea377db40085
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Apr 28 07:39:46 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat May  5 01:20:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1c10ce6

net-libs/libsrtp: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/8187

 .../files/libsrtp-1.4.4-invalid-index.patch        | 11 -----
 net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch  | 52 --------------------
 .../files/libsrtp-1.4.4_p20121108-shared.patch     | 55 ----------------------
 net-libs/libsrtp/files/libsrtp-1.5.2-bindir.patch  | 19 --------
 .../files/libsrtp-1.5.2-fix-make-install.patch     | 13 -----
 net-libs/libsrtp/files/libsrtp-CVE-2013-2139.diff  | 46 ------------------
 6 files changed, 196 deletions(-)

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 90a8f019fd4..00000000000
--- 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 43b8843603c..00000000000
--- 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 4e70a0ddd34..00000000000
--- 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 2c71faf48ba..00000000000
--- 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 f3f1f0e5c1a..00000000000
--- 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 dcafe177638..00000000000
--- 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 */