From owner-svn-ports-all@freebsd.org Wed Jun 19 20:07:45 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CC98315C892D; Wed, 19 Jun 2019 20:07:45 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 726E480571; Wed, 19 Jun 2019 20:07:45 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2F789150A; Wed, 19 Jun 2019 20:07:45 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5JK7iOf036148; Wed, 19 Jun 2019 20:07:44 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5JK7i2r036145; Wed, 19 Jun 2019 20:07:44 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201906192007.x5JK7i2r036145@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Wed, 19 Jun 2019 20:07:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r504585 - in head/net/fping: . files X-SVN-Group: ports-head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: in head/net/fping: . files X-SVN-Commit-Revision: 504585 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 726E480571 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.953,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jun 2019 20:07:46 -0000 Author: eugen Date: Wed Jun 19 20:07:44 2019 New Revision: 504585 URL: https://svnweb.freebsd.org/changeset/ports/504585 Log: net/fping: fix WITHOUT_IPV6 mode If one builds and uses net/fping version 4.2 with option IPV6 disabled, the command fping -4 always fails with wrong error message: fping: can't specify both -4 and -6 This makes it impossible using fping probes with SmokePing as it runs fping with -4 option. This change fixes this. Also, do not install symlinks for fping6 and manual in this case. PORTREVISION not bumped as default build is not affected. PR: 238327 Approved by: jharris@widomaker.com (maintainter timeout, 2 weeks) Added: head/net/fping/files/ head/net/fping/files/patch-src_fping.c (contents, props changed) Modified: head/net/fping/Makefile head/net/fping/pkg-plist Modified: head/net/fping/Makefile ============================================================================== --- head/net/fping/Makefile Wed Jun 19 17:50:35 2019 (r504584) +++ head/net/fping/Makefile Wed Jun 19 20:07:44 2019 (r504585) @@ -24,10 +24,11 @@ CONFIGURE_ARGS= --bindir="${PREFIX}/sbin" \ --enable-ipv4 INSTALL_TARGET= install-strip -OPTIONS_DEFINE=IPV6 +OPTIONS_DEFINE= IPV6 +OPTIONS_SUB= yes IPV6_CONFIGURE_OFF=--disable-ipv6 -post-install: +post-install-IPV6-on: ${RLN} ${STAGEDIR}${PREFIX}/sbin/fping ${STAGEDIR}${PREFIX}/sbin/fping6 ${RLN} ${STAGEDIR}${PREFIX}/man/man8/fping.8 ${STAGEDIR}${PREFIX}/man/man8/fping6.8 Added: head/net/fping/files/patch-src_fping.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/fping/files/patch-src_fping.c Wed Jun 19 20:07:44 2019 (r504585) @@ -0,0 +1,11 @@ +--- src/fping.c.orig 2019-02-19 20:54:45 UTC ++++ src/fping.c +@@ -427,7 +427,7 @@ int main(int argc, char** argv) + while ((c = optparse_long(&optparse_state, longopts, NULL)) != EOF) { + switch (c) { + case '4': +- if (hints_ai_family != AF_UNSPEC) { ++ if (hints_ai_family == AF_INET6) { + fprintf(stderr, "%s: can't specify both -4 and -6\n", prog); + exit(1); + } Modified: head/net/fping/pkg-plist ============================================================================== --- head/net/fping/pkg-plist Wed Jun 19 17:50:35 2019 (r504584) +++ head/net/fping/pkg-plist Wed Jun 19 20:07:44 2019 (r504585) @@ -1,6 +1,6 @@ @mode 4555 sbin/fping -sbin/fping6 +%%IPV6%%sbin/fping6 @mode man/man8/fping.8.gz -man/man8/fping6.8.gz +%%IPV6%%man/man8/fping6.8.gz