From nobody Mon Feb 07 13:51:52 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 242B319AA2EE; Mon, 7 Feb 2022 13:51:53 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jsncm3X2Pz4xp5; Mon, 7 Feb 2022 13:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644241912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oUD3mIZRRBRIb0ULJJmy1VUl5JfCqoaoKJ3RVKmNQ4g=; b=Y1Z0tFLs190zFF4f1TzNfebYtZJUCtgdZTOYQDttoZZY4U3gHjzmFAo/Kd3tJu5HJULSMC DrneeWj0GPaDfJQQJ8vKRP6BQ04qupEsani/Ze85CRWUigZ5Tv4HBCaDsWxostRsrG93Db oNRn4Fx9gu5Aq1wdZ4zaUfxVRvHqHlpjJzuR4PV7FplsNE2aOuddI9PRzqcPtnO2SY1G0z rJGUeaYRBUiFAbs+3Pi7HlfW+H0utDSjuL2Tt/oAvc5ysFYkdvLJd2pmG1E9+xjvHw1HJZ Z6rC6jkZaocO6IGCspvdzL0S0yUnZFuLONEWbb26xs205TWYfBim+uMHjzGNKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3E71226C81; Mon, 7 Feb 2022 13:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 217DpqSO079381; Mon, 7 Feb 2022 13:51:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 217DpqWo079380; Mon, 7 Feb 2022 13:51:52 GMT (envelope-from git) Date: Mon, 7 Feb 2022 13:51:52 GMT Message-Id: <202202071351.217DpqWo079380@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: dd6820161153 - stable/13 - ipfilter userland: Path fixup no longer required List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dd682016115396f99e335b883b6e22368258c2c9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644241912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oUD3mIZRRBRIb0ULJJmy1VUl5JfCqoaoKJ3RVKmNQ4g=; b=PWnvW8UOU4V1ArPEN1euJxE83Qad+uHoi7KOLF8NBKzgYuJdNQMtECb4m5Onl4in8v9zjm LD+kNuv0Oh57yzXgebwEgA03MW8gQv/E/c8n6OPq7uDzSlXbP5d++cEVygyLlCVXVVcq4f 8CS8NkBvFjXKl4wMeWFWeRJ1mNznyiX9UdFic9RbfSMvVtewLJlmvH95H3Kkcu77o9G0Y9 u2zpiGhO+mMD5gguDJvzy7YyGeRu05i3hZgS3GpGZ1pQ38mNSRojigFYzXwTz67RVV6ItH Z/70TWgZcOuuH1Y7dGEsUZotfL1ThoYBs3+8ZuHCSdd9jyg1f9hNyY29hghFgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644241912; a=rsa-sha256; cv=none; b=bMDiW1MGtvKXZC+ZPi+uY4UT0IAxihWB4/cm7US+6BI8j7m86AZxaYcVIWsdHeueRrKOHK xntZ+R9yR0RS5qinTf6vZ4kJglR+ez/lRXxJBAJ24QlRFhAjEly9G1CZQWG0mPOXitNlYv oY5yuzum5bKtUHeVuCRuL7V3RrR+CxHwfTAd36cXBAFHyotXACXjIaZhQie7usXmwWNivJ g/jF9ES1ZiwVKPPLJCxuZqBJL0TTrnQtmcSp+SUcV/MxyRdQblMnwAKQKFfbh0z5JbB7SA jMNIDHUcmzGqqKEPZM9soWD17JUTZ6L++HL0dYDUqryR7qRBuhgNr1nEzy/r0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=dd682016115396f99e335b883b6e22368258c2c9 commit dd682016115396f99e335b883b6e22368258c2c9 Author: Cy Schubert AuthorDate: 2021-12-27 08:18:49 +0000 Commit: Cy Schubert CommitDate: 2022-02-07 13:51:14 +0000 ipfilter userland: Path fixup no longer required Since the move of ipfilter from contrib to sbin adjusting the source path is no longer required. Fixes: 41edb306f05651fcaf6c74f9e3557f59f80292e1 (cherry picked from commit 7cb2d7c41368a662bb5e8db5e12420d4a8a190b1) --- sbin/ipf/ipf/Makefile | 1 - sbin/ipf/ipftest/Makefile | 3 --- sbin/ipf/ipmon/Makefile | 1 - sbin/ipf/ipnat/Makefile | 1 - sbin/ipf/ippool/Makefile | 1 - 5 files changed, 7 deletions(-) diff --git a/sbin/ipf/ipf/Makefile b/sbin/ipf/ipf/Makefile index 7e934ccc5984..f1b87ac20fae 100644 --- a/sbin/ipf/ipf/Makefile +++ b/sbin/ipf/ipf/Makefile @@ -13,7 +13,6 @@ CLEANFILES+= ${GENHDRS} ipf_y.c ipf_l.c ipf_y.c: ipf_y.y ${YACC} -d ${.ALLSRC} sed -e 's/yy/ipf_yy/g' \ - -e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \ y.tab.c > ${.TARGET} sed -e 's/yy/ipf_yy/g' \ y.tab.h > ${.TARGET:.c=.h} diff --git a/sbin/ipf/ipftest/Makefile b/sbin/ipf/ipftest/Makefile index f774c3197978..671d9eeb8046 100644 --- a/sbin/ipf/ipftest/Makefile +++ b/sbin/ipf/ipftest/Makefile @@ -38,7 +38,6 @@ ipnat.tab.c ipnat.tab.h: ipnat_y.y ipnat_y.c: ipnat.tab.c sed -e 's/yy/ipnat_yy/g' \ -e 's/y.tab.c/ipnat_y.c/' \ - -e s/\"ipnat_y.y\"/\"..\\/tools\\/ipnat_y.y\"/ \ ipnat.tab.c > ${.TARGET} ipnat_y.h: ipnat.tab.h @@ -63,7 +62,6 @@ ippool.tab.c ippool.tab.h: ippool_y.y ippool_y.c: ippool.tab.c sed -e 's/yy/ippool_yy/g' \ - -e 's/"ippool_y.y"/"..\/tools\/ippool_y.y"/' \ ippool.tab.c > ${.TARGET} ippool_y.h: ippool.tab.h @@ -87,7 +85,6 @@ ipf.tab.c ipf.tab.h: ipf_y.y ipf_y.c: ipf.tab.c sed -e 's/yy/ipf_yy/g' \ - -e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \ ipf.tab.c > ${.TARGET} ipf_y.h: ipf.tab.h diff --git a/sbin/ipf/ipmon/Makefile b/sbin/ipf/ipmon/Makefile index 8227811db2ad..7225f8c8bcb1 100644 --- a/sbin/ipf/ipmon/Makefile +++ b/sbin/ipf/ipmon/Makefile @@ -14,7 +14,6 @@ CLEANFILES+= ${GENHDRS} ipmon_y.c ipmon_l.c ipmon_y.c: ipmon_y.y ${YACC} -d ${.ALLSRC} sed -e 's/yy/ipmon_yy/g' \ - -e 's/"ipmon_y.y"/"..\/tools\/ipmon_y.y"/' \ y.tab.c > ${.TARGET} sed -e 's/yy/ipmon_yy/g' \ y.tab.h > ${.TARGET:.c=.h} diff --git a/sbin/ipf/ipnat/Makefile b/sbin/ipf/ipnat/Makefile index ba9c50ee70e3..1bdbe61235fb 100644 --- a/sbin/ipf/ipnat/Makefile +++ b/sbin/ipf/ipnat/Makefile @@ -14,7 +14,6 @@ ipnat_y.c: ipnat_y.y ${YACC} -d ${.ALLSRC} sed -e 's/yy/ipnat_yy/g' \ -e 's/y.tab.c/ipnat_y.c/' \ - -e s/\"ipnat_y.y\"/\"..\\/tools\\/ipnat_y.y\"/ \ y.tab.c > ${.TARGET} sed -e 's/yy/ipnat_yy/g' \ -e 's/y.tab.h/ipnat_y.h/' \ diff --git a/sbin/ipf/ippool/Makefile b/sbin/ipf/ippool/Makefile index 674978ed98c2..622952be0477 100644 --- a/sbin/ipf/ippool/Makefile +++ b/sbin/ipf/ippool/Makefile @@ -12,7 +12,6 @@ CLEANFILES+= ${GENHDRS} ippool_y.c ippool_l.c ippool_y.c: ippool_y.y ${YACC} -d ${.ALLSRC} sed -e 's/yy/ippool_yy/g' \ - -e 's/"ippool_y.y"/"..\/tools\/ippool_y.y"/' \ y.tab.c > ${.TARGET} sed -e 's/yy/ippool_yy/g' \ y.tab.h > ${.TARGET:.c=.h}