Date: Wed, 3 Apr 2013 03:50:01 GMT From: Jason Harris <jharris@widomaker.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/177368: [PATCH] net/fping: Add option to compile in timestamps patch Message-ID: <201304030350.r333o1jq064201@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/177368; it has been noted by GNATS. From: Jason Harris <jharris@widomaker.com> To: bug-followup@FreeBSD.org Cc: Lars Eggert <lars@eggert.org>, toke@toke.dk, Jason Harris <jharris@widomaker.com> Subject: Re: ports/177368: [PATCH] net/fping: Add option to compile in timestamps patch Date: Tue, 2 Apr 2013 23:13:24 -0400 On Mon, Mar 25, 2013 at 10:50:08AM +0000, Edwin Groothuis wrote: > Maintainer of net/fping, > > Please note that PR ports/177368 has just been submitted. > The full text of the PR can be found at: > http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/177368 I had to change the github URL to httpS, and merged this patch with my (MAINTAINER-written/approved) patch from ports/176439. So, please disregard my patch in ports/176439 and commit the following to close both PRs: ports/177368 and ports/176439. NB: You'll need to: %mv patch-fping.c files/; svn add files/patch-fping.c Thanks. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 NotDashEscaped: You need GnuPG to verify this message diff -r 830ac78f8d7f Makefile --- a/Makefile Tue Mar 05 08:51:42 2013 -0400 +++ b/Makefile Tue Apr 02 22:49:25 2013 -0400 @@ -8,9 +8,13 @@ PORTNAME= fping PORTVERSION= 3.4 +PORTREVISION= 2 CATEGORIES= net ipv6 MASTER_SITES= http://fping.org/dist/ +PATCH_SITES= https://raw.github.com/tohojo/netperf-wrapper/master/misc/ +PATCH_DIST_STRIP= -p1 + MAINTAINER= jharris@widomaker.com COMMENT= Quickly ping N hosts w/o flooding the network @@ -18,6 +22,9 @@ OPTIONS_MULTI_NET= IPV4 IPV6 OPTIONS_DEFAULT= IPV4 +OPTIONS_DEFINE= TIMESTAMPS +TIMESTAMPS_DESC= Enable timestamps patch + GNU_CONFIGURE= yes CONFIGURE_ARGS= --bindir="${PREFIX}/sbin" @@ -39,6 +46,10 @@ CONFIGURE_ARGS+=--disable-ipv6 .endif +.if ${PORT_OPTIONS:MTIMESTAMPS} +PATCHFILES= fping_timestamps.patch +.endif + post-install: .if ${PORT_OPTIONS:MIPV4} @${STRIP_CMD} ${PREFIX}/sbin/fping diff -r 830ac78f8d7f files/patch-fping.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/files/patch-fping.c Tue Apr 02 22:49:25 2013 -0400 @@ -0,0 +1,16 @@ +diff -r c564b3055165 src/fping.c +--- src/fping.c Tue Mar 05 08:13:11 2013 -0400 ++++ src/fping.c Tue Mar 05 08:45:33 2013 -0400 +@@ -1572,7 +1572,11 @@ + n = sendto( s, buffer, ping_pkt_size, 0, + ( struct sockaddr* )&h->saddr, sizeof( FPING_SOCKADDR ) ); + +- if( n < 0 || n != ping_pkt_size ) ++ if(( n < 0 || n != ping_pkt_size) ++#if defined( EHOSTDOWN ) ++ && errno != EHOSTDOWN ++#endif ++ ) + { + if( verbose_flag || unreachable_flag ) + { -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (FreeBSD) iJ0EARECAF0FAlFbmMlWGGh0dHA6Ly9rZXlzZXJ2ZXIua2pzbC5jb206MTEzNzEv cGtzL2xvb2t1cD9vcD1nZXQmc2VhcmNoPTB4RDM5REEwRTMmd2VoYXZleW91bm93 PXRydWUACgkQSypIl9OdoOO2tQCgnP/uj6D1I2byvrz52JTExfEKTWUAn2N9n/bU FAQptrKKpeuKoOk5zZEY =NsSl -----END PGP SIGNATURE----- -- Jason Harris | PGP: This _is_ PGP-signed, isn't it? jharris@widomaker.com _|_ Got photons? (TM), (C) 2004
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304030350.r333o1jq064201>