Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fping: update to 4.4

Browse source 
Remove upstreamed patch.

Whitespace Makefile cleanups.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2020-07-28 16:09:39 -07:00
parent 00e6d53c73
commit a445b39bef
No known key found for this signature in database
GPG key ID: 36D31CFA845F0E3B
2 changed files with 9 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
net/fping/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fping PKG_NAME:=fping
PKG_VERSION:=4.3 PKG_VERSION:=4.4
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://fping.org/dist/ PKG_SOURCE_URL:=https://fping.org/dist/
PKG_HASH:=92040ae842f7b8942d5cf26d8f58702a8d84c40a1fd492b415bd01b622bf372d PKG_HASH:=9f854b65a52dc7b1749d6743e35d0a6268179d1a724267339fc9a066b2b72d11
PKG_MAINTAINER:=Nikil Mehta <nikil.mehta@gmail.com> PKG_MAINTAINER:=Nikil Mehta <nikil.mehta@gmail.com>
PKG_LICENSE:=BSD-4-Clause PKG_LICENSE:=BSD-4-Clause
@ -31,17 +31,16 @@ define Package/fping
URL:=https://fping.org/ URL:=https://fping.org/
endef endef
define Package/fping/description define Package/fping/description
fping is a ping like program which uses the Internet Control Message Protocol fping is a ping like program which uses the Internet Control Message Protocol
(ICMP) echo request to determine if a target host is responding. fping (ICMP) echo request to determine if a target host is responding. fping
differs from ping in that you can specify any number of targets on the command differs from ping in that you can specify any number of targets on the command
line, or specify a file containing the lists of targets to ping. Instead of line, or specify a file containing the lists of targets to ping. Instead of
sending to one target until it times out or replies, fping will send out a sending to one target until it times out or replies, fping will send out a
ping packet and move on to the next target in a round-robin fashion. ping packet and move on to the next target in a round-robin fashion.
endef endef
CONFIGURE_ARGS+= \ CONFIGURE_ARGS += \
--enable-ipv4 \ --enable-ipv4 \
$(if $(CONFIG_IPV6),en,dis)able-ipv6 $(if $(CONFIG_IPV6),en,dis)able-ipv6

38
net/fping/patches/010-ipv6.patch
View file

@ -1,38 +0,0 @@
From 54e97d9e393e375820e9c6ca0a56c7a4092ea5de Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Sun, 12 Jul 2020 13:55:44 +0200
Subject: [PATCH] Fix build with --disable-ipv6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Otherwise build breaks with:
fping.c:399:14: error: ‘ident6’ undeclared (first use in this function); did you mean ‘ident4’?
399 | ident4 = ident6 = getpid() & 0xFFFF;
| ^~~~~~
| ident4
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
src/fping.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/fping.c b/src/fping.c
index 3522123..4304531 100644
--- a/src/fping.c
+++ b/src/fping.c
@@ -258,12 +258,12 @@ HOST_ENTRY* ev_last;
char* prog;
int ident4 = 0; /* our icmp identity field */
+int ident6 = 0;
int socket4 = -1;
int using_sock_dgram4 = 0;
#ifndef IPV6
int hints_ai_family = AF_INET;
#else
-int ident6 = 0;
int socket6 = -1;
int hints_ai_family = AF_UNSPEC;
#endif