Restore 2.4_beta2_p161-r1 as net-analyzer/zabbix still requires it. Fix a missing include and do an EAPI bump in -r2.

(Portage version: 2.2.10/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key A792A613)

5 files changed, 185 insertions, 1 deletions

diff --git a/net-analyzer/fping/ChangeLog b/net-analyzer/fping/ChangeLog
index 4b9db08b89b8..6ee3748d1fdf 100644
--- a/net-analyzer/fping/ChangeLog
+++ b/net-analyzer/fping/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/fping
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fping/ChangeLog,v 1.63 2014/07/11 12:47:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fping/ChangeLog,v 1.64 2014/07/11 18:11:23 jer Exp $
+
+*fping-2.4_beta2_p161-r2 (11 Jul 2014)
+
+  11 Jul 2014; Jeroen Roovers <jer@gentoo.org> +fping-2.4_beta2_p161-r1.ebuild,
+  +fping-2.4_beta2_p161-r2.ebuild, +files/fping-2.4_beta2_p161-err.h.patch,
+  +files/fping-2.4_beta2_p161-min-time.patch:
+  Restore 2.4_beta2_p161-r1 as net-analyzer/zabbix still requires it. Fix a
+  missing include and do an EAPI bump in -r2.
 
   11 Jul 2014; Jeroen Roovers <jer@gentoo.org> -fping-2.4_beta2_p161-r1.ebuild,
   -fping-3.1.ebuild, -fping-3.2.ebuild, -fping-3.4.ebuild, -fping-3.5.ebuild,
diff --git a/net-analyzer/fping/files/fping-2.4_beta2_p161-err.h.patch b/net-analyzer/fping/files/fping-2.4_beta2_p161-err.h.patch
new file mode 100644
index 000000000000..38946ac38524
--- /dev/null
+++ b/net-analyzer/fping/files/fping-2.4_beta2_p161-err.h.patch
@@ -0,0 +1,10 @@
+--- a/fping.c
++++ b/fping.c
+@@ -106,6 +106,7 @@
+ 
+ #include <arpa/inet.h>
+ #include <netdb.h>
++#include <err.h> /* err() warnx() */
+ 
+ /* RS6000 has sys/select.h */
+ #ifdef HAVE_SYS_SELECT_H
diff --git a/net-analyzer/fping/files/fping-2.4_beta2_p161-min-time.patch b/net-analyzer/fping/files/fping-2.4_beta2_p161-min-time.patch
new file mode 100644
index 000000000000..a101fd4ae0e1
--- /dev/null
+++ b/net-analyzer/fping/files/fping-2.4_beta2_p161-min-time.patch
@@ -0,0 +1,47 @@
+--- a/fping.c
++++ b/fping.c
+@@ -25,6 +25,7 @@
+  * Original author:  Roland Schemers  <schemers@stanford.edu>
+  * IPv6 Support:     Jeroen Massar    <jeroen@unfix.org / jeroen@ipng.nl>
+  * Bugfixes, byte order & senseful seq.-numbers: Stephan Fuhrmann (stephan.fuhrmann AT 1und1.de)
++ * Fixes: min_reply_i in splits and compiler warning. Alex Ghoth (alex AT ghoth.net)
+  *
+  *
+  * RCS header information no longer used.  It has been moved to the
+@@ -743,7 +744,7 @@
+ 	
+ 	if( ( ping_data_size > MAX_PING_DATA ) || ( ping_data_size < MIN_PING_DATA ) )
+ 	{
+-		fprintf( stderr, "%s: data size %u not valid, must be between %u and %u\n",
++		fprintf( stderr, "%s: data size %u not valid, must be between %lu and %u\n",
+ 			prog, ping_data_size, MIN_PING_DATA, MAX_PING_DATA );
+ 		usage();
+ 	
+@@ -1112,7 +1113,7 @@
+ 		ht = timeval_diff( &current_time, &cursor->last_send_time );
+ 
+ 		if( report_interval && ( loop_flag || count_flag ) &&
+-			( timeval_diff ( &current_time, &last_report_time )	> report_interval ) )
++			( timeval_diff ( &current_time, &last_report_time )	>= report_interval ) )
+ 		{
+ 			print_per_system_splits();
+ 			gettimeofday( &current_time, &tz );
+@@ -1487,8 +1488,8 @@
+ 		}/* IF */
+ 		
+ 		fprintf( stderr, "\n" );
+-		h->num_sent_i = h->num_recv_i = h->max_reply_i =
+-			h->min_reply_i = h->total_time_i = 0;
++		h->num_sent_i = h->num_recv_i = h->max_reply_i = h->total_time_i = 0;
++		h->min_reply_i = 10000000;
+ 	
+ 	}/* FOR */
+ 
+@@ -2377,6 +2378,7 @@
+ 	p->timeout = timeout;
+ 	p->running = 1;
+ 	p->min_reply = 10000000;
++	p->min_reply_i = 10000000;
+ 
+ 	if( strlen( p->host ) > max_hostname_len )
+ 		max_hostname_len = strlen( p->host );
diff --git a/net-analyzer/fping/fping-2.4_beta2_p161-r1.ebuild b/net-analyzer/fping/fping-2.4_beta2_p161-r1.ebuild
new file mode 100644
index 000000000000..a6ec2565112e
--- /dev/null
+++ b/net-analyzer/fping/fping-2.4_beta2_p161-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fping/fping-2.4_beta2_p161-r1.ebuild,v 1.11 2014/07/11 18:11:23 jer Exp $
+
+EAPI="2"
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="A utility to ping multiple hosts at once"
+SRC_URI="
+	mirror://debian/pool/main/f/${PN}/${PN}_2.4b2-to-ipv6.orig.tar.gz
+	mirror://debian/pool/main/f/${PN}/${PN}_2.4b2-to-ipv6-16.1.diff.gz
+	"
+HOMEPAGE="http://fping.sourceforge.net/ http://packages.qa.debian.org/f/fping.html"
+
+SLOT="0"
+LICENSE="fping"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="ipv6"
+
+S="${WORKDIR}/fping-2.4b2_to-ipv6"
+
+src_prepare() {
+	epatch \
+		"${WORKDIR}"/fping_2.4b2-to-ipv6-16.1.diff \
+		"${FILESDIR}"/${P}-min-time.patch
+	eautoreconf
+
+	if use ipv6; then
+		cp -a "${S}" "${S}-6"
+	fi
+}
+
+src_configure() {
+	econf || die "econf failed"
+	if use ipv6; then
+		cd "${S}-6"
+		append-flags -DIPV6
+		econf || die "econf failed"
+	fi
+}
+
+src_compile() {
+	emake || die "econf failed"
+	if use ipv6; then
+		cd "${S}-6"
+		emake || die "econf failed"
+	fi
+}
+
+src_install () {
+	dosbin "${S}"/${PN} || die "Failed to install fping."
+	if use ipv6; then
+		newsbin "${S}"-6/fping fping6 || die "Failed to install fping."
+	fi
+	fperms 4555 /usr/sbin/fping /usr/sbin/fping6 #241930
+	doman fping.8
+	dodoc ChangeLog README
+}
diff --git a/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild b/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild
new file mode 100644
index 000000000000..30bc4919c036
--- /dev/null
+++ b/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild,v 1.1 2014/07/11 18:11:23 jer Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="A utility to ping multiple hosts at once"
+SRC_URI="
+	mirror://debian/pool/main/f/${PN}/${PN}_2.4b2-to-ipv6.orig.tar.gz
+	mirror://debian/pool/main/f/${PN}/${PN}_2.4b2-to-ipv6-16.1.diff.gz
+	"
+HOMEPAGE="http://fping.sourceforge.net/ http://packages.qa.debian.org/f/fping.html"
+
+SLOT="0"
+LICENSE="fping"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="ipv6"
+
+S="${WORKDIR}/fping-2.4b2_to-ipv6"
+
+src_prepare() {
+	epatch \
+		"${WORKDIR}"/fping_2.4b2-to-ipv6-16.1.diff \
+		"${FILESDIR}"/${P}-err.h.patch \
+		"${FILESDIR}"/${P}-min-time.patch
+	eautoreconf
+
+	if use ipv6; then
+		cp -a "${S}" "${S}-6"
+	fi
+}
+
+src_configure() {
+	econf
+	if use ipv6; then
+		cd "${S}-6"
+		append-flags -DIPV6
+		econf
+	fi
+}
+
+src_compile() {
+	emake
+	if use ipv6; then
+		cd "${S}-6"
+		emake
+	fi
+}
+
+src_install () {
+	dosbin "${S}"/${PN}
+	if use ipv6; then
+		newsbin "${S}"-6/fping fping6
+	fi
+	fperms 4555 /usr/sbin/fping /usr/sbin/fping6 #241930
+	doman fping.8
+	dodoc ChangeLog README
+}