gentoo resync : 05.02.2020

3 files changed, 178 insertions, 0 deletions

diff --git a/net-analyzer/echoping/Manifest b/net-analyzer/echoping/Manifest
index 7d03e84ec26a..e4cb5baa151e 100644
--- a/net-analyzer/echoping/Manifest
+++ b/net-analyzer/echoping/Manifest
@@ -1,7 +1,9 @@
 AUX echoping-6.0.2_p434-fix_implicit_declarations.patch 422 BLAKE2B be78c11c2665df1b9d1e9ef9f474974f73a6ea682d7db56ba69d014a9eef498dfc9a2c7a9affc66f3b72f0fb22dca38e070a68e7c0704073411d903e5eb61c8d SHA512 533a7da90d5ba39d4d4137d5e00e74b010cdf3ec957a46fdf39588e8b87e2d75382d14cc53f4b0b7c0aea029d5327353cd79975011c637390872bab8a3846be2
+AUX echoping-6.0.2_p434-fno-common.patch 2751 BLAKE2B fe623ef782dbefafc28399af331bc1e991f15734c63976b574b75dd3a26f5e62e63454d93a94609c5934fd4f456c0cc118f0f04565a87fafc8eb0155927e3b1c SHA512 cbc2bde26c4896cbef7249c884c56130458ce493597ff868009b088134873b5e5238323ebd9bea7d783782337688456184db7daffdb2ed9c0a188c5c09f1c731
 AUX echoping-6.0.2_p434-gnutls_certificate_type_set_priority.patch 595 BLAKE2B 76363f96ff38ad793ef55707b59e102c7fac3c75a4437d51d32245f4e06539004cd7303884edf905c4f32d23c7e138ee9d3997c306f7a14167655c599d5f1709 SHA512 4bec1c8a77f17a163437dca9ce2ef49a355db041b08df7eb087352e03eede069f869e271d9414fc62d88a5e36687787e4719e7405f4b5ba96bbf8534af06ca52
 AUX echoping-6.0.2_p434-gnutls_session.patch 492 BLAKE2B 4a3841f87c70147c120b2fb15227c18d18d2db38ae984306c17c83fcc6405ef98417de7c13e6c2b6c23454a27b7d846f98b327298ddff3c0489c5f53465c9b92 SHA512 99362748feb0ab02172ee4f21c9630c505b899c78483077ef4f056e136854037ea165dd57d2637bed791ff3e8407b08733efab864d68e726b0d31d31a4c17525
 DIST echoping-6.0.2_p434.tar.gz 74568 BLAKE2B 881cc0e3d0be0f704968cbc02e4ac6abe73fe1ccf7019bb33dc522934d2f50f2ba5f70845c81024d3f4101c0acc5837599e05ba7a44f34b1453b470ca30d4b9b SHA512 1b4f5f1ea6ba000c558cab3b8e86758d6c539d8cd237620000d837b468861a177ac733441c885eb8ec1c35b49baa33a82e34e3f8b14b05429a075b72233d5799
 EBUILD echoping-6.0.2_p434-r2.ebuild 1333 BLAKE2B d7d37308cd7d3b053dd88efc703ed1b3340a66ae86a6b1da9bb6b247127c26da6b1e0ba38e6757ab12ca73a4de0e38f39ccd1bca06ad86cd5e171bf0340a2aa8 SHA512 9f308e6a3766a8f7d7dc98d6abb70904931f8894c01b6a1e54198ca1205ebd53ebbf7184664bee1e4130ff639bd0dd1790d7d4a01f9dbc6d9041a28f1d69a667
 EBUILD echoping-6.0.2_p434-r3.ebuild 1394 BLAKE2B f852dc2bd286fc2575bb73a612c9c12d348ffabc14b3ed9ad1e012de4fd3aa76e8557d896ddb6e0723689a1d81bf1bad045eee8f4ea07a00cdf4c183dc447139 SHA512 78b79c0238264d0b26c816a622016141624d4d316174f44d200cd39782a793f0bd13cf6cb88395194288ae6021186dcbb2a19b5cd1157f42059880dea019aac0
+EBUILD echoping-6.0.2_p434-r4.ebuild 1458 BLAKE2B f4a9acdba9ae31df1aaa776a0361124fef086369072d0ad30de97f31535e5f688e86592a0d5b2200585979daa47a77fe845d4597f62da2932ce7e75f33a37e37 SHA512 7f358016dd82ebf6897136173a604b371b5dc7093a9a6a60d4ffd9f80029f06a8dec1fcd24b2830e56ce288565cb280bdcadf2a4ae9bd621296fa3570637e7dd
 MISC metadata.xml 702 BLAKE2B 7a3a21935981a54b2fea15c7e02163bedc02e519a1aeca06bf08e61b237bd152cb999a9b1aae62f98499956bf36e2bbf610cf11b1803a25f9f2957e3cc419020 SHA512 db906d89ac30011c740e44f73fad23a4f9b8d8c318b6a0b9240e17dc31c897850ed2f22890b8516633c6a10f44154b77a4c198e851eb8793a55c36497ebb702f
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild
new file mode 100644
index 000000000000..17e0727353a8
--- /dev/null
+++ b/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Small program to test performances of remote servers"
+HOMEPAGE="http://echoping.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="libressl gnutls http icp idn priority smtp ssl tos postgres ldap"
+RESTRICT="test"
+
+RDEPEND="
+	idn? ( net-dns/libidn )
+	ldap? ( net-nds/openldap )
+	postgres? ( dev-db/postgresql:* )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+"
+DEPEND="
+	${RDEPEND}
+	>=sys-devel/libtool-2
+"
+
+REQUIRED_USE="gnutls? ( ssl )"
+DOCS=( AUTHORS ChangeLog DETAILS NEWS README TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch
+	"${FILESDIR}"/${PN}-6.0.2_p434-gnutls_certificate_type_set_priority.patch
+	"${FILESDIR}"/${PN}-6.0.2_p434-gnutls_session.patch
+	"${FILESDIR}"/${PN}-6.0.2_p434-fno-common.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable http)  \
+		$(use_enable icp) \
+		$(use_enable priority) \
+		$(use_enable smtp) \
+		$(use_enable tos) \
+		$(use_with idn libidn) \
+		$(usex gnutls $(use_with gnutls) $(use_with ssl)) \
+		--config-cache \
+		--disable-static \
+		--disable-ttcp
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-analyzer/echoping/files/echoping-6.0.2_p434-fno-common.patch b/net-analyzer/echoping/files/echoping-6.0.2_p434-fno-common.patch
new file mode 100644
index 000000000000..5eafb8a401d2
--- /dev/null
+++ b/net-analyzer/echoping/files/echoping-6.0.2_p434-fno-common.patch
@@ -0,0 +1,111 @@
+--- a/echoping.c
++++ b/echoping.c
+@@ -38,6 +38,25 @@
+ struct timeval  good_results[MAX_ITERATIONS];
+ extern int      tvcmp();
+ 
++char           *server;
++#ifdef LIBIDN
++char           *locale_server, *ace_server, *utf8_server;
++#endif
++
++#ifndef IN_PLUGIN
++init_f          plugin_init;
++start_f         plugin_start;
++start_raw_f     plugin_raw_start;
++execute_f       plugin_execute;
++terminate_f     plugin_terminate;
++#endif
++
++struct timeval  null_timeval;
++struct timeval  max_timeval;
++
++boolean  timeout_flag;
++char     big_recvline[MAXTOREAD];
++
+ int
+ main(argc, argv)
+     int             argc;
+--- a/echoping.h
++++ b/echoping.h
+@@ -118,7 +118,6 @@
+     struct timeval  timevalue;
+ };
+ 
+-boolean         timeout_flag;
+ struct echoping_struct {
+     boolean         udp;        /* Use the UDP protocol (TCP is the default) */
+     boolean         ttcp;
+@@ -132,21 +131,21 @@
+ /* Initializes the plugin with its arguments. Returns the port name or number or NULL if the plugin wants to use the raw interface. */
+ typedef char   *(*init_f) (const int argc, const char **argv,
+                            const echoping_options global_options);
+-init_f          plugin_init;
++extern init_f          plugin_init;
+ typedef void    (*start_f) (struct addrinfo *);
+-start_f         plugin_start;
++extern start_f         plugin_start;
+ typedef void    (*start_raw_f) ();
+-start_raw_f     plugin_raw_start;
++extern start_raw_f     plugin_raw_start;
+ typedef int     (*execute_f) ();
+-execute_f       plugin_execute;
++extern execute_f       plugin_execute;
+ typedef void    (*terminate_f) ();
+-terminate_f     plugin_terminate;
++extern terminate_f     plugin_terminate;
+ #endif
+ 
+ #endif
+ 
+-struct timeval  null_timeval;
+-struct timeval  max_timeval;
++extern struct timeval  null_timeval;
++extern struct timeval  max_timeval;
+ 
+ #define	ECHO_TCP_PORT	"echo"
+ #define	DISCARD_TCP_PORT	"discard"
+@@ -169,9 +168,9 @@
+ 
+ #define CHARGENERATED " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefg";
+ 
+-char           *server;
++extern char           *server;
+ #ifdef LIBIDN
+-char           *locale_server, *ace_server, *utf8_server;
++extern char           *locale_server, *ace_server, *utf8_server;
+ #endif
+ 
+ /* My functions */
+@@ -230,6 +229,9 @@
+ 
+ extern boolean  timeout_flag;
+ 
++extern char     big_recvline[MAXTOREAD];
++
++
+ #include "compilation.h"
+ 
+ #ifndef HEADER_INCLUDED
+--- a/http.c
++++ b/http.c
+@@ -6,8 +6,6 @@
+ #include "HTParse.h"
+ 
+ 
+-char            big_recvline[MAXTOREAD];
+-
+ char           *
+ make_http_sendline(char *url, char *host, int port, int nocache)
+ {
+--- a/smtp.c
++++ b/smtp.c
+@@ -8,8 +8,6 @@
+ 
+ #ifdef SMTP
+ 
+-char            big_recvline[MAXTOREAD];
+-
+ int
+ smtp_read_response_from_server(FILE * fs)
+ {