Merge branch 'develop' into feature/unify

ci/build-2-install.sh

@@ -11,13 +11,21 @@ fi
 autoreconf -i
 ./configure --enable-ipv4 --enable-ipv6 --prefix=/opt/fping
 make CFLAGS="-g -fprofile-arcs -ftest-coverage"
-pwd
+## setcap currently doesn't worn anymore on travis-ci
-df -k .
+#sudo setcap cap_net_raw+ep src/fping
-which setcap
+#sudo setcap cap_net_raw+ep src/fping6
-uname -a
+## setcap debugging:
-mount
+#pwd
-sudo setcap cap_net_raw+ep src/fping
+#df -k .
-sudo setcap cap_net_raw+ep src/fping6
+#which setcap
+#uname -a
+#mount
+#
+#sudo apt-get install strace
+#sudo strace setcap cap_net_raw+ep src/fping
 
-sudo apt-get install strace
+# use setuid, since setcap is not available
-sudo strace setcap cap_net_raw+ep src/fping
+sudo chown root src/fping
+sudo chown root src/fping6
+sudo chmod u+s  src/fping
+sudo chmod u+s  src/fping6

ci/test-2-help.pl

@@ -2,7 +2,7 @@
 
 use Test::Command tests => 9;
 
-my $I_HELP = "  -I if      bind to a particular interface\n";
+my $I_HELP = "   -I if      bind to a particular interface\n";
 $I_HELP = '' if $^O eq 'darwin';
 
 # fping -h