Date: Tue, 19 Jul 2005 19:28:33 -0400 (EDT) From: Jason Harris <jharris@widomaker.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Jason Harris <jharris@widomaker.com>, Pav Lucistnik <pav@FreeBSD.org>, Andre Albsmeier <Andre.Albsmeier@siemens.com> Subject: ports/83757: [MAINTAINER] ports/net/fping - cleanup Message-ID: <200507192328.j6JNSXwI011784@wilma.widomaker.com> Resent-Message-ID: <200507192330.j6JNUDBT092454@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 83757
>Category: ports
>Synopsis: [MAINTAINER] ports/net/fping - cleanup
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jul 19 23:30:12 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Jason Harris
>Release: FreeBSD 4.3-RELEASE i386
>Organization:
none here
>Environment:
System: FreeBSD 4.3-RELEASE i386
>Description:
The patch in PR ports/83339 doesn't apply cleanly.
Please close that PR and use the patch below instead.
As requested in PR ports/83339:
allow 0 retries, i.e., "fping -r 0"
remove s/microsecond/millisecond/ in files/patch-03 so fping.8
reflects current reality
Maintainer's updates:
use PLIST_FILES, remove pkg-plist
add SHA256 hash to distinfo
>How-To-Repeat:
Apply patch below.
NB: %cvs rm pkg-plist
NB: Committer, watch CRs (^M) in files/patch-03
>Fix:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
NotDashEscaped: You need GnuPG to verify this message
? work
? fping-2.4b2.tgz
cvs server: Diffing .
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/fping/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile 5 Jan 2004 20:06:18 -0000 1.21
+++ Makefile 19 Jul 2005 23:14:12 -0000
@@ -15,6 +15,8 @@
MAINTAINER= jharris@widomaker.com
COMMENT= Quickly ping N hosts w/o flooding the network
+PLIST_FILES= sbin/fping
+
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --bindir="${PREFIX}/sbin"
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/fping/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 6 Jan 2004 09:47:22 -0000 1.6
+++ distinfo 19 Jul 2005 23:14:12 -0000
@@ -1,4 +1,5 @@
MD5 (fping-2.4b2_to-ipv6.tar.gz) = 3ad516765514249a40d3c5b6caab812a
SHA1 (fping-2.4b2_to-ipv6.tar.gz) = d310c6fe951f64660d4c0a5f2bd1c5379c1e5bde
RMD160 (fping-2.4b2_to-ipv6.tar.gz) = cff101a53baec9cc23063ff2004db69a3510c51f
+SHA256 (fping-2.4b2_to-ipv6.tar.gz) = 77e1a90af4fff4a5ffc4b70542c6ff44130558357e7d549f99a9eff23108d172
SIZE (fping-2.4b2_to-ipv6.tar.gz) = 63333
cvs server: cannot find pkg-plist
cvs server: Diffing files
Index: files/patch-02
===================================================================
RCS file: /home/ncvs/ports/net/fping/files/patch-02,v
retrieving revision 1.8
diff -u -r1.8 patch-02
--- files/patch-02 25 Oct 2003 19:38:56 -0000 1.8
+++ files/patch-02 19 Jul 2005 23:14:13 -0000
@@ -1,5 +1,5 @@
--- fping.c.orig Mon Jan 21 02:06:30 2002
-+++ fping.c Sat Oct 25 21:33:01 2003
++++ fping.c Tue Jul 12 18:11:30 2005
@@ -42,7 +42,6 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -63,6 +63,17 @@
ident = getpid() & 0xFFFF;
verbose_flag = 1;
+@@ -502,8 +504,8 @@
+ break;
+
+ case 'r':
+- if( !( retry = ( u_int )atoi( optarg ) ) )
+- usage();
++ retry = ( u_int )atoi( optarg );
++
+
+ break;
+
@@ -823,6 +825,7 @@
while( fgets( line, 132, ping_file ) )
Index: files/patch-03
===================================================================
RCS file: /home/ncvs/ports/net/fping/files/patch-03,v
retrieving revision 1.4
diff -u -r1.4 patch-03
--- files/patch-03 7 Jul 2002 22:08:19 -0000 1.4
+++ files/patch-03 19 Jul 2005 23:14:13 -0000
@@ -6,42 +6,6 @@
.SH NAME
fping \- send ICMP ECHO_REQUEST packets to network hosts
.SH SYNOPSIS
-@@ -79,7 +79,7 @@
-
- somehost : 91.7 37.0 29.2 - 36.8
-
--shows the response time in milliseconds for each of the five requests,
-+shows the response time in microseconds for each of the five requests,
- with the "-" indicating that no response was received to the fourth
- request.
- .IP \fB-d\fR 5
-@@ -107,7 +107,7 @@
- .IP \fB-h\fR 5
- Print usage message.
- .IP \fB-i\fIn\fR 5
--The minimum amount of time (in milliseconds) between sending a ping packet to any target (default is 25).
-+The minimum amount of time (in microseconds) between sending a ping packet to any target (default is 25).
- .IP \fB-l\fR 5
- Loop sending packets to each target indefinitely. Can be interrupted
- with ctl-C; statistics about responses for each target are then displayed.
-@@ -117,7 +117,7 @@
- Same as -d.
- .IP \fB-p\fR 5
- In looping or counting modes (-l, -c, or -C), this parameter sets the
--time in milliseconds that
-+time in microseconds that
- .B fping
- waits between successive packets to an individual target. Default is
- 1000.
-@@ -131,7 +131,7 @@
- .IP \fB-s\fR 5
- Print cumulative statistics upon exit.
- .IP \fB-t\fIn\fR 5
--Initial target timeout in milliseconds (default 500). In the default
-+Initial target timeout in microseconds (default 2500). In the default
- mode, this is the amount of time that
- .B fping
- waits for a response to its first request. Successive timeouts are
@@ -152,12 +152,12 @@
example none the less.
.nf
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (FreeBSD)
iJ0EARECAF0FAkLdiXxWGGh0dHA6Ly9rZXlzZXJ2ZXIua2pzbC5jb206MTEzNzEv
cGtzL2xvb2t1cD9vcD1nZXQmc2VhcmNoPTB4RDM5REEwRTMmd2VoYXZleW91bm93
PXRydWUACgkQSypIl9OdoONZeACfXisNfEO+M0ofB0ht8l/VUcpyq3MAn3knURqD
h62L9YBbdRcV36sJZd57
=11Yp
-----END PGP SIGNATURE-----
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507192328.j6JNSXwI011784>