Merge pull request #236 from schweikert/travis-fix

Prepare 5.1 release

CHANGELOG.md

@@ -1,6 +1,20 @@
-fping 5.1 (UNRELEASED)
+fping 5.1 (2021-12-31)
 ======================
 
+## Bugfixes and other changes
+
+- Use setcap to specify specific files in fping.spec (#232, thanks @zdyxry)
+- Netdata: use host instead name as family label (#226, thanks @k0ste)
+- Netdata: use formatstring macro PRId64 (#229, thanks @gsnw)
+- Allow -4 option to be given multiple times (#215, thanks @normanr)
+- Documentation fix (#208, thanks @timgates42)
+- Retain privileges until after privileged setsockopt (#200, thanks @simetnicbr)
+- Set bind to source only when option is set (#198, thanks @dinoex)
+- Update Azure test pipeline (#197, thanks @gsnw)
+- Fix getnameinfo not called properly for IPv4 (#227, thanks @aafbsd)
+- Fixed wrong timestamp under Free- and OpenBSD and macOS (#217, thanks @gsnw)
+
+
 fping 5.0 (2020-08-05)
 ======================
 

ci/test-04-options-a-b.pl

@@ -85,14 +85,17 @@ $cmd->stderr_is_eq("");
 }
 
 # fping -B
-{
-my $t0 = [gettimeofday];
-my $cmd = Test::Command->new(cmd => "fping  -t 100 -r 3 -B 2  8.8.8.7");
-$cmd->exit_is_num(1);
-$cmd->stdout_is_eq("8.8.8.7 is unreachable\n");
-$cmd->stderr_like(qr{^(|(8.8.8.7: error while sending ping: No route to host\n)+)$});
-my $elapsed = tv_interval($t0);
-# 0.1 + 0.2 + 0.4 + 0.8 = 1.5
-cmp_ok($elapsed, '>=', 1.5);
-cmp_ok($elapsed, '<', 1.9);
+SKIP: {
+    if($^O eq 'darwin') {
+        skip 'timing test not reliable on macOS', 5;
+    }
+    my $t0 = [gettimeofday];
+    my $cmd = Test::Command->new(cmd => "fping  -t 100 -r 3 -B 2  8.8.8.7");
+    $cmd->exit_is_num(1);
+    $cmd->stdout_is_eq("8.8.8.7 is unreachable\n");
+    $cmd->stderr_like(qr{^(|(8.8.8.7: error while sending ping: No route to host\n)+)$});
+    my $elapsed = tv_interval($t0);
+    # 0.1 + 0.2 + 0.4 + 0.8 = 1.5
+    cmp_ok($elapsed, '>=', 1.5);
+    cmp_ok($elapsed, '<', 1.9);
 }

ci/test-14-ping-internet-hosts.pl

@@ -18,9 +18,9 @@ my $re_num = qr{\d+(?:\.\d+)?};
 my $cmd = Test::Command->new(cmd => "fping -q -i 10 -p 20 -c 3 -t200  8.8.8.8 www.france-telecom.fr www.google.com");
 $cmd->exit_is_num(0);
 $cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{8\.8\.8\.8\s*: xmt/rcv/%loss = [123]/3/\d+%, min/avg/max = $re_num/$re_num/$re_num
-www\.france-telecom\.fr\s*: xmt/rcv/%loss = [123]/3/\d+%, min/avg/max = $re_num/$re_num/$re_num
-www\.google\.com\s*: xmt/rcv/%loss = [123]/3/\d+%, min/avg/max = $re_num/$re_num/$re_num
+$cmd->stderr_like(qr{8\.8\.8\.8\s*: xmt/rcv/%loss = [123]/[123]/\d+%, min/avg/max = $re_num/$re_num/$re_num
+www\.france-telecom\.fr\s*: xmt/rcv/%loss = [123]/[123]/\d+%, min/avg/max = $re_num/$re_num/$re_num
+www\.google\.com\s*: xmt/rcv/%loss = [123]/[123]/\d+%, min/avg/max = $re_num/$re_num/$re_num
 });
 }
 

configure.ac

@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Minimum Autoconf version required.
 AC_PREREQ(2.59)
 
-AC_INIT([fping],[5.0])
+AC_INIT([fping],[5.1])
 AC_GNU_SOURCE
 
 dnl --disable-ipv4