From 99e498d8db53aaee7dbba346d75ab0cb6860a025 Mon Sep 17 00:00:00 2001 From: David Schweikert Date: Tue, 30 Sep 2014 21:22:58 +1000 Subject: [PATCH 1/4] travis fix --- ci/build-2-install.sh | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/ci/build-2-install.sh b/ci/build-2-install.sh index 41c7d4b..a27794f 100755 --- a/ci/build-2-install.sh +++ b/ci/build-2-install.sh @@ -11,13 +11,19 @@ fi autoreconf -i ./configure --enable-ipv4 --enable-ipv6 --prefix=/opt/fping make CFLAGS="-g -fprofile-arcs -ftest-coverage" -pwd -df -k . -which setcap -uname -a -mount -sudo setcap cap_net_raw+ep src/fping -sudo setcap cap_net_raw+ep src/fping6 +## setcap currently doesn't worn anymore on travis-ci +#sudo setcap cap_net_raw+ep src/fping +#sudo setcap cap_net_raw+ep src/fping6 +## setcap debugging: +#pwd +#df -k . +#which setcap +#uname -a +#mount +# +#sudo apt-get install strace +#sudo strace setcap cap_net_raw+ep src/fping -sudo apt-get install strace -sudo strace setcap cap_net_raw+ep src/fping +# use setuid, since setcap is not available +chmod +s src/fping +chmod +s src/fping6 From 964941f7fa28c96059974785db769884c8bd9126 Mon Sep 17 00:00:00 2001 From: David Schweikert Date: Tue, 30 Sep 2014 21:38:54 +1000 Subject: [PATCH 2/4] travis fix --- ci/build-2-install.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/build-2-install.sh b/ci/build-2-install.sh index a27794f..a894e48 100755 --- a/ci/build-2-install.sh +++ b/ci/build-2-install.sh @@ -25,5 +25,6 @@ make CFLAGS="-g -fprofile-arcs -ftest-coverage" #sudo strace setcap cap_net_raw+ep src/fping # use setuid, since setcap is not available -chmod +s src/fping -chmod +s src/fping6 +sudo chown root src/fping +sudo chmod u+s src/fping +sudo chmod u+s src/fping6 From 97705a649cfe593e2e542f995a7f33524236acd1 Mon Sep 17 00:00:00 2001 From: David Schweikert Date: Tue, 30 Sep 2014 21:50:49 +1000 Subject: [PATCH 3/4] travis fix --- ci/build-2-install.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/build-2-install.sh b/ci/build-2-install.sh index a894e48..a019b12 100755 --- a/ci/build-2-install.sh +++ b/ci/build-2-install.sh @@ -26,5 +26,6 @@ make CFLAGS="-g -fprofile-arcs -ftest-coverage" # use setuid, since setcap is not available sudo chown root src/fping -sudo chmod u+s src/fping -sudo chmod u+s src/fping6 +sudo chown root src/fping6 +sudo chmod u+s src/fping +sudo chmod u+s src/fping6 From 3313c3619d4d35ce321ec61a7b33cd77997f8218 Mon Sep 17 00:00:00 2001 From: David Schweikert Date: Tue, 30 Sep 2014 22:01:38 +1000 Subject: [PATCH 4/4] travis fix --- ci/test-2-help.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/test-2-help.pl b/ci/test-2-help.pl index a821c1f..fde3e58 100755 --- a/ci/test-2-help.pl +++ b/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