gentoo resync : 27.03.2021

10 files changed, 2 insertions, 209 deletions

diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest
index 103f9286316a..c3b37fa93113 100644
--- a/net-analyzer/ssldump/Manifest
+++ b/net-analyzer/ssldump/Manifest
@@ -1,14 +1,5 @@
-AUX ssldump-0.9-DLT_LINUX_SLL.patch 256 BLAKE2B c870e361dd093fd178f363937e95d5354800fcf454ef4ab267a7f71cf9011be85c23eac8a60c5916beaa0df8fb84203a6aef5508a87bcd97fe7fd7119aea9c02 SHA512 4365db431100d7d6520b5563c2f97c0954bc0c66867a5e86b49d66d1cf39fac05bfe87b585e279f51de8358fd8def3ffc3a6d448280a11344522cea21d702130
-AUX ssldump-0.9-configure-dylib.patch 743 BLAKE2B 95f72227b3ae3ee52903f824c15b000f246f65fa3b968164780b0e4791363d23e7432699c9f5f5fc234c5300d7aca88d431542cdf775adf34e410c8ae2cf0d99 SHA512 7dcaa84416e7c776a0dffaefce7944ef23f9bd4084885ccec1f4b5d885851abdd2dd6829ca69cbaeae3e109175ca19a79cb0e19ba6e370138e9989d892e55aa5
-AUX ssldump-0.9-declaration.patch 361 BLAKE2B 4633b8d257df9aa5aa6008ec681c2f978b244b33541e0f710899bd294b20baaea4b8d376b1cd848d4651e742d780bc6ffeaffcdc88cdc467fee2b78c0ba7bc8a SHA512 318a28c2a92cd2b2983e056d2116b8b755248f5e3578a062fa687c35ebe20b8f9d152dea29bb273b016991ad50a197356607c9fd2a75e30879fcace4cbe15d7f
-AUX ssldump-0.9-includes.patch 700 BLAKE2B 6ed8f3baef1ca01538cb8449a4b45d4adc7a40fa10858db6b6f480c340bd2d3ad650dfb069bb48dd852fbfd873f592b7bc329ac7e7b82391d03ef297c77e107f SHA512 ebd0fd742d93f35926b68a45039ef895153e7c3ca6e8d1afc412392cedcdaadfc03bd364b9c55ef1c88812a6d10de5be7a0455cf3a7f3b010b44bfcf096b5625
-AUX ssldump-0.9-libpcap-header.patch 178 BLAKE2B c879ae913ee4e5e36ca2fdb559bf6930249c88782e86e9d51bba43d35a0aad1d653e606a6b5746872e0f160bbbffcb18fc265e28319aedd01da2467e57993053 SHA512 ef50bcb81712ffb41414bf68ca91c7d7d4158d205e9527718d54373c04a4a4fbe1cdc93f4546d993d20a1bece6954b058a2ee4816e2ff3f167867c366cba8863
-AUX ssldump-0.9-openssl-0.9.8.compile-fix.patch 449 BLAKE2B 35a7860d59c63d9749e1a7ca56c87453868726aeaca1562bce8f662ebac8cd9f348e08aab9057707343cc4525f71aa39689a47adc8eada09837d70214e3ef31d SHA512 37b6ab0f9ae44751570c8eb1eaf4cb1f04a3b812dc18611c6dbca003ac84dd260582351749011e7a56eac2858f817376fc92cdd5a0aae2a2c11ce98e96b3aeb9
-AUX ssldump-0.9-prefix-fix.patch 554 BLAKE2B 797544d1bd63e476379f2c6a9df8e6377cb839a179e3eaee47b00d35c967249e050a5a235efcf4c8606f5c7ec3e354b6a869c372bb0ddd215f1b21ecedaf2383 SHA512 55a11a1ec6e76039b474dabb2a9b5e647c66231d0ab12620dc5513335da3057bcedb36df1a5e19480be7f4a7004aaecc4d21abd8420149a79fb48abc981d1ff8
-DIST ssldump-0.9b3.tar.gz 137435 BLAKE2B e42eeac4daa99a62537ac7ee5152428664fed40256ec10f7c61621f9bbd06476d280af1a6c517eaff253058e3720a282e88604b2f1de0c7ad1b5328597879449 SHA512 ea81558a243950ab43354c9f33c0a4feae0ae859bc2bd6e6b58838a01f4a1e7a6447f2a9ab1fa40bbe8dbd6c3630c489c17fc9c066cacfddfb64269b0cd5090a
 DIST ssldump-1.1.tar.gz 187436 BLAKE2B 3cafd7263762a7a326fb30722a918bcfaae5b43eedca37a0b5c341efc510e935671dc7ebf71eb807fcacbfce5f77896f310b634028713deb5516390fcfc21f65 SHA512 00ff449d3818a27fbcb46316733428f6a623488e758a67fcb7ee4390835e3279e7242aa0134ddc158740cb8323f5fd9869bd50efb35189dce977d4768d9636c2
 DIST ssldump-1.3.tar.gz 122819 BLAKE2B 8a96746939eb8d9ba33340ff112b1bc5b436a7eb5756fda494065c8f8fd7d6ec9c1c28d8f7f880d25856f24749fd8a8a98d4104753bb68772b2583dafef099b8 SHA512 6da4db890a30673278b17eb00201b6c2535ba476b769bed6ed4e31c06744f32e299d0f0dd6420aa7255e2c982a378cd721d7bf51dd0aeb23211ab678d1e5f26e
-EBUILD ssldump-0.9_beta3.ebuild 1431 BLAKE2B 4451fa21e460c7554d7cfaa05f1ad7b0cff8af134a619e8262a7f1cb8159218974f5e3034da807818228ce7b93554b616a607a56f924becb12bfe14c60a1e5d4 SHA512 ce3c6eb328a86b04693bdb308ff3debd9486ed3304e0cff38f48d7a076ce4b8ef5394e066887ac69d658fbd29cfa54881a57f5a2b72aed9fe68f19cd80de9480
-EBUILD ssldump-1.1.ebuild 938 BLAKE2B 06f060fa831fad3f474a9ec17143b75f0a775b6e54436213f232f867e18063b876f92037256be91f4f65a10dc79dd0754426ec314691d6112a3825badccd24fd SHA512 d07b96f75e830924757e1b7f3473dc05d907aa1a92fe228495ad10225ae5533d5a31d90da45769e30144ce430830b4c961a3eeab2150adaeceaa88fc88ce9b92
+EBUILD ssldump-1.1.ebuild 937 BLAKE2B cb9e7f84168680586b01f3d7392e92782476684a50f507be370ba5da0cc93fba4410dbb85d172cc2985560c8f4516c893b88a9aae0596ffd78590b481e78a7b7 SHA512 7e2d32d38e73c1768778d54f9357b5da7000ee7e794e74ea05304fef283ccf945643a336ed380cf3098d968649e6ee2f2599bb173a18cb0a7dc7f1af82813314
 EBUILD ssldump-1.3-r1.ebuild 671 BLAKE2B a671056fbf79208e795c53ccc693ddc97530cb27af6439739cc80f69c85436e8f7ffd3bf539426f5c252241f600cc8b90413150692403bfaa12afef4b7047761 SHA512 adbb68839511cc2f66dc46fbe4077c46db8a2386f08fdb69edf2f66a83d0494c246c41e5618d218815086d6872ac45f9c8c87e3246ab64cb6226bd8f367aaf22
 MISC metadata.xml 359 BLAKE2B 6cfa34e7b48e628a649c1e0775e8fde048226ba01436a3c275844089fbbe14f0588be44a2fc9ee6a4e89cc16ad1e479a53c926a4c3ba9edabe910bfb7d19bccd SHA512 e3eadb3bc57cdd5909cd93907f9d12a6541d303070a860bed60b10f5e018b6571d89f5100be0ff3800b2da5c58c40e3095cdfa43105273c389714c182ff33fe1
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch b/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch
deleted file mode 100644
index 9a58c6369929..000000000000
--- a/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/base/pcap-snoop.c
-+++ b/base/pcap-snoop.c
-@@ -157,6 +157,10 @@
-           return;
-         
-         break;
-+      case DLT_LINUX_SLL:
-+        data+=16;
-+        len-=16;
-+        break;
-     }
-     network_process_packet(n,&hdr->ts,data,len);
-   }
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch b/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch
deleted file mode 100644
index 941350e8c789..000000000000
--- a/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -102,14 +102,13 @@
- AC_MSG_CHECKING(for PCAP library)
- ac_found_pcap_lib_dir="no"
- for dir in $ac_pcap_lib_dir; do
--	if test -f $dir/libpcap.a; then
-+	if test -f $dir/libpcap.so -o -f $dir/libpcap.dylib; then
- 	dnl Ok, we think we've found them, but check that they
--	dnl actually ontain the right functions
-+	dnl actually contain the right functions
- 		save_LIBS=$LIBS
--		save_LDFLAGS=$LDFLAGS
- 		LIBS="-lpcap $LIBS"
- 		if test "$dir" != "/usr/lib"; then
--			LDFLAGS="-L$dir $LDFLAGS"
-+			LIBS="-L$dir $LIBS"
- 		fi
- 		AC_TRY_LINK_FUNC(pcap_open_live,ac_linked_libpcap="true",
- 			ac_linked_libpcap="false");
-@@ -118,7 +117,6 @@
- 			break
- 		fi
- 		LIBS=$save_LIBS
--		LDFLAGS=$save_LDFLAGS
- 	fi
- done
- 
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-declaration.patch b/net-analyzer/ssldump/files/ssldump-0.9-declaration.patch
deleted file mode 100644
index 836b52c84ab2..000000000000
--- a/net-analyzer/ssldump/files/ssldump-0.9-declaration.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ssl/ssl_rec.h
-+++ b/ssl/ssl_rec.h
-@@ -54,6 +54,8 @@
-   SSL_CipherSuite *cs,UCHAR *mk,UCHAR *sk,UCHAR *iv));
- int ssl_decode_rec_data PROTO_LIST((ssl_obj *ssl,ssl_rec_decoder *d,
-   int ct,int version,UCHAR *in,int inl,UCHAR *out,int *outl));
-+int ssl3_check_mac(ssl_rec_decoder *d, int ct, int ver, UCHAR *data,
-+  UINT4 datalen, UCHAR *mac);
- 
- #endif
- 
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-includes.patch b/net-analyzer/ssldump/files/ssldump-0.9-includes.patch
deleted file mode 100644
index 8ca06dcef449..000000000000
--- a/net-analyzer/ssldump/files/ssldump-0.9-includes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/common/lib/r_assoc.c
-+++ b/common/lib/r_assoc.c
-@@ -57,6 +57,7 @@
- static char *RCSSTRING="$Id$";
- 
- #include <r_common.h>
-+#include <string.h> /* memcpy() memcmp() */
- #include "r_assoc.h"
- 
- typedef struct r_assoc_el_ {
---- a/common/lib/r_bitfield.c
-+++ b/common/lib/r_bitfield.c
-@@ -11,6 +11,7 @@
- static char *RCSSTRING="$Id$";
- 
- #include <r_common.h>
-+#include <string.h> /* memcpy() memset() */
- #include "r_bitfield.h"
- 
- int r_bitfield_create(setp,size)
---- a/common/lib/r_data.c
-+++ b/common/lib/r_data.c
-@@ -47,6 +47,7 @@
- static char *RCSSTRING="$Id$";
- 
- #include <r_common.h>
-+#include <string.h> /* memcmp() memcpy() memset() */
- #include <r_data.h>
- 
- int r_data_create(dp,d,l)
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch b/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch
deleted file mode 100644
index a9a724658ccf..000000000000
--- a/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/base/pcap-snoop.c
-+++ b/base/pcap-snoop.c
-@@ -49,7 +49,6 @@
- 
- #include <pcap.h>
- #include <unistd.h>
--#include <net/bpf.h>
- #ifndef _WIN32
- #include <sys/param.h>
- #endif
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch b/net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch
deleted file mode 100644
index 2ce16d54f168..000000000000
--- a/net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/ssl/ssldecode.c
-+++ b/ssl/ssldecode.c
-@@ -51,6 +51,7 @@
- #include <openssl/ssl.h>
- #include <openssl/hmac.h>
- #include <openssl/evp.h>
-+#include <openssl/md5.h>
- #include <openssl/x509v3.h>
- #endif
- #include "ssldecode.h"
-@@ -131,6 +132,7 @@
-     ssl_decode_ctx *d=0;
-     int r,_status;
-     
-+    SSL_library_init();
-     SSLeay_add_all_algorithms();
-     if(!(d=(ssl_decode_ctx *)malloc(sizeof(ssl_decode_ctx))))
-       ABORT(R_NO_MEMORY);
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch b/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch
deleted file mode 100644
index 74d7ddcd6f68..000000000000
--- a/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-eliminates unused variable ROOT, which disturbs ld from Prefix. Bug #414335
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -46,13 +46,12 @@ BINDIR=@sbindir@
- MANDIR=@mandir@
- RM=rm -f
- 
--ROOT=./
--ANALYZE_SRCDIR=$(ROOT)base/
-+ANALYZE_SRCDIR=base/
- COMMONDIR=common/
- COMMON_LIB_SRCDIR=$(COMMONDIR)lib/
--ANALYZE_NULL_SRCDIR=$(ROOT)null/
--ANALYZE_SSL_SRCDIR=$(ROOT)ssl/
--ANALYZE_RECORD_SRCDIR=$(ROOT)@RECORD_MOD@/
-+ANALYZE_NULL_SRCDIR=null/
-+ANALYZE_SSL_SRCDIR=ssl/
-+ANALYZE_RECORD_SRCDIR=@RECORD_MOD@/
- include rules.mk
- 
- include $(COMMON_LIB_SRCDIR)/targets.mk
diff --git a/net-analyzer/ssldump/ssldump-0.9_beta3.ebuild b/net-analyzer/ssldump/ssldump-0.9_beta3.ebuild
deleted file mode 100644
index 0f7107da7d0b..000000000000
--- a/net-analyzer/ssldump/ssldump-0.9_beta3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF=1
-inherit autotools eutils toolchain-funcs
-
-MY_PV=${PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="An SSLv3/TLS network protocol analyzer"
-HOMEPAGE="http://ssldump.sourceforge.net/"
-SRC_URI="
-	http://downloads.sourceforge.net/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz
-"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ssl"
-
-RDEPEND="
-	net-libs/libpcap
-	ssl? ( >=dev-libs/openssl-1:0= )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9-libpcap-header.patch
-	"${FILESDIR}"/${PN}-0.9-configure-dylib.patch
-	"${FILESDIR}"/${PN}-0.9-openssl-0.9.8.compile-fix.patch
-	"${FILESDIR}"/${PN}-0.9-DLT_LINUX_SLL.patch
-	"${FILESDIR}"/${PN}-0.9-prefix-fix.patch
-	"${FILESDIR}"/${PN}-0.9-declaration.patch
-	"${FILESDIR}"/${PN}-0.9-includes.patch
-)
-
-src_prepare() {
-	default
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-
-	econf \
-		--with-pcap-inc="${EPREFIX}/usr/include" \
-		--with-pcap-lib="${EPREFIX}/usr/$(get_libdir)" \
-		$(usex ssl --with-openssl-inc="${EPREFIX}/usr/include" '--without-openssl') \
-		$(usex ssl --with-openssl-lib="${EPREFIX}/usr/$(get_libdir)" '--without-openssl')
-}
-
-src_install() {
-	dosbin ssldump
-	doman ssldump.1
-	dodoc ChangeLog CREDITS README
-}
diff --git a/net-analyzer/ssldump/ssldump-1.1.ebuild b/net-analyzer/ssldump/ssldump-1.1.ebuild
index 84bf5b42e215..d1b4be232664 100644
--- a/net-analyzer/ssldump/ssldump-1.1.ebuild
+++ b/net-analyzer/ssldump/ssldump-1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ssl"
 
 RDEPEND="