diff --git a/.gitignore b/.gitignore index fcd2f3a..59d21c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /fping-3.0.tar.gz +/fping-3.2.tar.gz diff --git a/fping-3.0-capnetraw.patch b/fping-3.0-capnetraw.patch deleted file mode 100644 index 2d3cf9e..0000000 --- a/fping-3.0-capnetraw.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -up fping-3.0/fping.8.capnetraw fping-3.0/fping.8 ---- fping-3.0/fping.8.capnetraw 2011-12-28 08:32:17.000000000 -0500 -+++ fping-3.0/fping.8 2012-02-18 14:58:14.023533041 -0500 -@@ -87,10 +87,7 @@ fping a list of IP addresses as input an - .IP \fB-e\fR 5 - Show elapsed (round-trip) time of packets. - .IP \fB-f\fR 5 --Read list of targets from a file. This option can only be used by the --root user. Regular users should pipe in the file via stdin: -- --% fping < targets_file -+Read list of targets from a file. - - .IP \fB-g\fR 5 - Generate a target list from a supplied IP netmask, or a starting and ending IP. -@@ -211,11 +208,9 @@ command line arguments, and 4 for a syst - Ha! If we knew of any we would have fixed them! - .SH RESTRICTIONS - If certain options are used (i.e, a low value for -i and -t, and a --high value for -r) it is possible to flood the network. This program --must be installed as setuid root in order to open up a raw socket, --or must be run by root. In order to stop mere mortals from hosing the --network (when fping is installed setuid root) , normal users can't specify --the following: -+high value for -r) it is possible to flood the network. In order to -+stop mere mortals from hosing the network (when fping is installed -+setuid root), normal users can't specify the following: - .nf - - -i n where n < 10 msec -diff -up fping-3.0/fping.c.capnetraw fping-3.0/fping.c ---- fping-3.0/fping.c.capnetraw 2011-12-22 10:05:18.000000000 -0500 -+++ fping-3.0/fping.c 2012-02-18 15:01:04.188654114 -0500 -@@ -415,7 +415,6 @@ int main( int argc, char **argv ) - #endif - struct protoent *proto; - char *buf; -- uid_t uid; - int tos = 0; - - #ifndef IPV6 -@@ -425,17 +424,6 @@ int main( int argc, char **argv ) - #endif - HOST_ENTRY *cursor; - -- /* check if we are root */ -- -- if( geteuid() ) -- { -- fprintf( stderr, -- "This program can only be run by root, or it must be setuid root.\n" ); -- -- exit( 3 ); -- -- }/* IF */ -- - /* confirm that ICMP is available on this machine */ - #ifndef IPV6 - if( ( proto = getprotobyname( "icmp" ) ) == NULL ) -@@ -522,12 +510,6 @@ int main( int argc, char **argv ) - #endif - #endif - -- if( ( uid = getuid() ) ) -- { -- seteuid( getuid() ); -- -- }/* IF */ -- - prog = argv[0]; - ident = getpid() & 0xFFFF; - diff --git a/fping.spec b/fping.spec index a5f7da8..df45e93 100644 --- a/fping.spec +++ b/fping.spec @@ -5,14 +5,13 @@ %endif Name: fping -Version: 3.0 -Release: 2%{?dist} +Version: 3.2 +Release: 1%{?dist} Summary: Scriptable, parallelized ping-like utility Group: Applications/Internet License: BSD with advertising URL: http://www.fping.org/ Source0: http://fping.org/dist/%{name}-%{version}.tar.gz -Patch0: fping-3.0-capnetraw.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -23,14 +22,11 @@ use in scripting in mind. %prep %setup -q -n %{name}-%{version} -%if 0%{?use_capnetraw} -%patch0 -p1 -b .capnetraw -%endif %build %configure make CFLAGS="-DIPV6 %{?use_capnetraw:-DENABLE_F_OPTION} $RPM_OPT_FLAGS" -mv fping fping6 +mv src/fping src/fping6 make clean make CFLAGS="%{?use_capnetraw:-DENABLE_F_OPTION} $RPM_OPT_FLAGS" @@ -38,7 +34,7 @@ make CFLAGS="%{?use_capnetraw:-DENABLE_F_OPTION} $RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT make DESTDIR="$RPM_BUILD_ROOT" install -install -p -m 4755 fping6 "$RPM_BUILD_ROOT"/%{_sbindir} +install -p -m 4755 src/fping6 "$RPM_BUILD_ROOT"/%{_sbindir} %clean rm -rf $RPM_BUILD_ROOT @@ -56,6 +52,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/* %changelog +* Thu Jul 26 2012 Charles R. Anderson - 3.2-1 +- update to 3.2 +- no longer need capnetraw patch + * Thu Jul 19 2012 Fedora Release Engineering - 3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 9f5bc4e..05ea6dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e937c9a2b1d65b6f5294fec57891645b fping-3.0.tar.gz +efc86557e9b54e5c3becb598a50684a0 fping-3.2.tar.gz