Summary: | net/fping update and maintenership request | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|
Product: | Ports & Packages | Reporter: | Rodrigo OSORIO <rodrigo> | ||||||||
Component: | Individual Port(s) | Assignee: | Niclas Zeising <zeising> | ||||||||
Status: | Closed FIXED | ||||||||||
Severity: | Affects Only Me | ||||||||||
Priority: | Normal | ||||||||||
Version: | Latest | ||||||||||
Hardware: | Any | ||||||||||
OS: | Any | ||||||||||
Attachments: |
|
Description
Rodrigo OSORIO
2012-07-17 20:40:12 UTC
Maintainer of net/fping, Please note that PR ports/169949 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/169949 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool) I approve everything except the change of MAINTAINER. I still wish to maintain ports/net/fping (and ports/net/fping+ipv6). Thanks. -- Jason Harris | PGP: This _is_ PGP-signed, isn't it? jharris@widomaker.com _|_ Got photons? (TM), (C) 2004 Responsible Changed From-To: freebsd-ports-bugs->zeising I'll take it. State Changed From-To: feedback->open partially approved: maintainer wishes to retain the port. ----- Forwarded message from Rodrigo OSORIO <rodrigo@bebik.net> ----- Date: Tue, 17 Jul 2012 23:52:43 +0200 From: Rodrigo OSORIO <rodrigo@bebik.net> To: linimon@FreeBSD.org CC: jharris@widomaker.com, zeising@FreeBSD.org Subject: Re: ports/169949: net/fping update and maintenership request User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:13.0) Gecko/20120628 Thunderbird/13.0.1 On 07/17/12 23:24, linimon@FreeBSD.org wrote: > Synopsis: net/fping update and maintenership request > > State-Changed-From-To: feedback->open > State-Changed-By: linimon > State-Changed-When: Tue Jul 17 21:23:16 UTC 2012 > State-Changed-Why: > partially approved: maintainer wishes to retain the port. > > http://www.freebsd.org/cgi/query-pr.cgi?pr=169949 > > Also good for me . Regards, - rodrigo ----- End forwarded message ----- Hi! I find it unnecessary to have two versions of fping in the ports system, one with IPv4 support and one with IPv6 support, so I hacked fping's configure script to add --enable-ipv4 and --enable-ipv6 instead. This way we have one port, that installs fping (IPv4 fping) and fping6 (IPv6 fping) depending on how the user sets the ports options. Is this approach ok with you Jason? If so, I will remove fping+ipv6 as part of this. The patch to add --enable-[ipv4,ipv6] has been sent upstream as well. The attached patch is based on the patch to update fping to 3.2, but adds these configure script hacks and ports options as well. Regards! -- Niclas Zeising On Wed, Jul 18, 2012 at 10:05:31PM +0200, Niclas Zeising wrote: > I find it unnecessary to have two versions of fping in the ports system, > one with IPv4 support and one with IPv6 support, so I hacked fping's > configure script to add --enable-ipv4 and --enable-ipv6 instead. This > way we have one port, that installs fping (IPv4 fping) and fping6 (IPv6 > fping) depending on how the user sets the ports options. Is this > approach ok with you Jason? If so, I will remove fping+ipv6 as part of > this. The patch to add --enable-[ipv4,ipv6] has been sent upstream as well. Excellent auto*-foo! I like it and want to see it merged upstream. However, you seem to have removed my fping -> fping6 REINPLACE_CMD (sed 's/fping/fping6/g') to generate fping6.8. That should be added upstream as well. So, let's hold off on approval/churning the repo. until we give upstream a chance to merge both our patches. David, would you mind merging Niclas' aforementioned patch and also creating an fping6.8 using sed at install time? Look for fping6.8 in the first patch here: http://www.freebsd.org/cgi/query-pr.cgi?pr=169950 Thanks. -- Jason Harris | PGP: This _is_ PGP-signed, isn't it? jharris@widomaker.com _|_ Got photons? (TM), (C) 2004 I did mail David with the auto* patch around the same time I updated the PR. So far no response though. Regarding the fping6.8 hackery, currently I create a link to fping.8 if the ipv6 version is installed, but this can probably be improved :) I'll wait for reaction from upstream before moving further. Regards! -- Niclas Zeising Hi everybody,
On Thu, Jul 19, 2012 at 09:04:31 -0400, Jason Harris wrote:
> David, would you mind merging Niclas' aforementioned patch and
> also creating an fping6.8 using sed at install time? Look for
> fping6.8 in the first patch here:
>
> http://www.freebsd.org/cgi/query-pr.cgi?pr=169950
I said to Niclas: I like the patch too, but I am thinking about removing
the need of having a separate fping6 binary, which would also solve this
issue.
Cheers
David
Hi! Apologies for sitting on this for so long. Attached is a patch that updates fping to 3.4. This patch adds options to build a ipv4 enabled and an ipv6 enabled fping6. The plan is to commit this, and remove the fping+ipv6 port, since it won't be needed any more. Do I have your approval for this? Regards! -- Niclas Zeising On Mon, Sep 17, 2012 at 01:25:22PM +0200, Niclas Zeising wrote: > I just updated the patch in pr ports/169949 and forgot to ping you as > the port maintainer. The details can be found in this link to the pr > http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/169949 > The patch is slightly wrong in that it replaces you as maintainer, this > is unintentional and the attached patch is updated to not change maintainer. Looks good, but tested only on IPv4. (Note that I had to remove files/* manually - empty files, *.orig, *.rej - before testing.) Approved. Thanks! -- Jason Harris | PGP: This _is_ PGP-signed, isn't it? jharris@widomaker.com _|_ Got photons? (TM), (C) 2004 Author: zeising Date: Mon Sep 24 09:15:59 2012 New Revision: 304773 URL: http://svn.freebsd.org/changeset/ports/304773 Log: Update net/fping to version 3.4 and point to the new home. Merge IPv4 and IPv6 support into net/fping, selectable via options. Remove the now un-needed net/fping+ipv6 Add common description for IPV4 option, analogous to the IPV6 option PR: ports/169949 [1], ports/169950 [2] Submitted by: Rodrigo OSORIO <rodrigo@bebik.net> [1] Jason Harris <jharris@widomaker.com> [2] zeising (final patch version) Approved by: maintainer, kwm (mentor) Deleted: head/net/fping+ipv6/ head/net/fping/files/ Modified: head/MOVED head/Mk/bsd.options.desc.mk head/net/Makefile head/net/fping/Makefile head/net/fping/distinfo head/net/fping/pkg-descr Modified: head/MOVED ============================================================================== --- head/MOVED Mon Sep 24 08:38:44 2012 (r304772) +++ head/MOVED Mon Sep 24 09:15:59 2012 (r304773) @@ -3712,3 +3712,4 @@ print/pips-spr300_310||2012-09-22|Remove print/pips930||2012-09-22|Removed print/pips770||2012-09-22|Removed www/linuxpluginwrapper||2012-09-22|Has expired: doesn't support ELF symbol versioning, yet. +net/fping+ipv6|net/fping|2012-09-24|IPv6 support has been merged Modified: head/Mk/bsd.options.desc.mk ============================================================================== --- head/Mk/bsd.options.desc.mk Mon Sep 24 08:38:44 2012 (r304772) +++ head/Mk/bsd.options.desc.mk Mon Sep 24 09:15:59 2012 (r304773) @@ -127,6 +127,7 @@ IMAGEMAGICK_DESC?= ImageMagick support IMLIB_DESC?= imlib image library support IMLIB2_DESC?= imlib2 image library support IODBC_DESC?= ODBC backend via iODBC +IPV4_DESC?= IPv4 protocol support IPV6_DESC?= IPv6 protocol support JABBER_DESC?= Jabber support JACK_DESC?= JACK audio server support Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Mon Sep 24 08:38:44 2012 (r304772) +++ head/net/Makefile Mon Sep 24 09:15:59 2012 (r304773) @@ -140,7 +140,6 @@ SUBDIR += fpc-ldap SUBDIR += fpc-pcap SUBDIR += fping - SUBDIR += fping+ipv6 SUBDIR += freebsd-tftp SUBDIR += freebsd-uucp SUBDIR += freedbd Modified: head/net/fping/Makefile ============================================================================== --- head/net/fping/Makefile Mon Sep 24 08:38:44 2012 (r304772) +++ head/net/fping/Makefile Mon Sep 24 09:15:59 2012 (r304773) @@ -7,33 +7,46 @@ # PORTNAME= fping -PORTVERSION= 2.4b2 -PORTREVISION= 1 +PORTVERSION= 3.4 CATEGORIES= net ipv6 -MASTER_SITES= http://keyserver.kjsl.com/~jharris/distfiles/ -#MASTER_SITES= http://www.fping.com/download/ -DISTNAME= ${PORTNAME}-${PORTVERSION}_to-ipv6 +MASTER_SITES= http://fping.org/dist/ MAINTAINER= jharris@widomaker.com COMMENT= Quickly ping N hosts w/o flooding the network -PLIST_FILES= sbin/fping +OPTIONS_MULTI= NET +OPTIONS_MULTI_NET= IPV4 IPV6 +OPTIONS_DEFAULT= IPV4 GNU_CONFIGURE= yes CONFIGURE_ARGS= --bindir="${PREFIX}/sbin" -MAN8= fping.8 -.if defined(WITH_IPV6) -# IPv6 not enabled by default, as it does not work together with IPv4. -CFLAGS+= -DIPV6 +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MIPV4} +CONFIGURE_ARGS+=--enable-ipv4 +PLIST_FILES+=sbin/fping +MAN8+= fping.8 +.else +CONFIGURE_ARGS+=--disable-ipv4 .endif -post-patch: - @${REINPLACE_CMD} -e 's/fping@/${MAINTAINER:S/@/\\@/g} or fping@/g' \ - ${WRKSRC}/fping.c +.if ${PORT_OPTIONS:MIPV6} +CONFIGURE_ARGS+=--enable-ipv6 +PLIST_FILES+=sbin/fping6 +MAN8+= fping6.8 +.else +CONFIGURE_ARGS+=--disable-ipv6 +.endif post-install: +.if ${PORT_OPTIONS:MIPV4} @${STRIP_CMD} ${PREFIX}/sbin/fping @${CHMOD} 4555 ${PREFIX}/sbin/fping +.endif +.if ${PORT_OPTIONS:MIPV6} + @${STRIP_CMD} ${PREFIX}/sbin/fping6 + @${CHMOD} 4555 ${PREFIX}/sbin/fping6 +.endif .include <bsd.port.mk> Modified: head/net/fping/distinfo ============================================================================== --- head/net/fping/distinfo Mon Sep 24 08:38:44 2012 (r304772) +++ head/net/fping/distinfo Mon Sep 24 09:15:59 2012 (r304773) @@ -1,2 +1,2 @@ -SHA256 (fping-2.4b2_to-ipv6.tar.gz) = 77e1a90af4fff4a5ffc4b70542c6ff44130558357e7d549f99a9eff23108d172 -SIZE (fping-2.4b2_to-ipv6.tar.gz) = 63333 +SHA256 (fping-3.4.tar.gz) = d42528af4931f16a8e3438bd4a45cfdd72163ad8835a3c95351c336a26e56afe +SIZE (fping-3.4.tar.gz) = 142986 Modified: head/net/fping/pkg-descr ============================================================================== --- head/net/fping/pkg-descr Mon Sep 24 08:38:44 2012 (r304772) +++ head/net/fping/pkg-descr Mon Sep 24 09:15:59 2012 (r304773) @@ -13,4 +13,4 @@ without flooding the network. Unlike ping, fping is meant to be used in scripts and its output is easy to parse. -WWW: http://www.fping.com/ +WWW: http://www.fping.org/ _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" State Changed From-To: open->closed Committed with changed patch, thanks! |