From nobody Mon Dec 27 09:17:06 2021 X-Original-To: dev-commits-src-main@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 7C0C21919D91; Mon, 27 Dec 2021 09:17:06 +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 4JMsW61mY7z4mVV; Mon, 27 Dec 2021 09:17:06 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1CE471B81B; Mon, 27 Dec 2021 09:17:06 +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 1BR9H66c037314; Mon, 27 Dec 2021 09:17:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BR9H6dn037313; Mon, 27 Dec 2021 09:17:06 GMT (envelope-from git) Date: Mon, 27 Dec 2021 09:17:06 GMT Message-Id: <202112270917.1BR9H6dn037313@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 7cb2d7c41368 - main - ipfilter userland: Path fixup no longer required List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 7cb2d7c41368a662bb5e8db5e12420d4a8a190b1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640596626; 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=EFkXwjCO5/DyGjnAcBTC65A4vXo4IBPAVMkj/j+4Ing=; b=c3VEe9E0/N8pxU5IiGbJu3RdBeqIdZvehNFV2H3vo6+YWr+lMrYSAsZfG7BmFaTFVaXUMr CnwyyIGkSoUvu8mgWO0urxpDSQlsGnlC2sPe7iB3OIlsD+sAkljXQKFqReAoZfZGitRhXF UDgo+FlJlOrMfxJk7u8lcPWxYJOYc8z+FLkXrG+3QORXiDLzf1aw+jx5shS+1sPrix0jVK GtNWAua7J8kg8IQQwSQG1G78NtKa6L5oeXSSA09EvwndyKUs1pAeoBlk/B9q0uHZDXsmOn 77/Yu381vK6BSgUIO45smJvglWiE3XUdpJEN8UnhLDxsTYnrNOG9pmAutHr1Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640596626; a=rsa-sha256; cv=none; b=OMO/VxlVOxMVl3EhQq1c+EN/jBnwXo0+3167k0msw+ForKIC+6/BhUCX8ZhNO0WzhVZnm9 VDe3Fi0whW/sq/1J/OD1TdVm1h4Ppx1eIpVw/UPRfNdM+jR+afN6F0RWd/v0KOWoFDvU5Y 5S3eQjDbz4vPZjko3C0OlJ3KLcCWje01jGaAZ7gPYrzh3eAzDP5/rZ6r1qC40T80T+paCN Rno26h++zkD58rscvj6E4uk7JEPybFT2dyKbFWiw5E9sDRzUuKc0PQ9WbAohRT6XlXRRBF dWsxsBuCVvnE48CVFz2UU1uwGpVmqIlOBR8EwrhSEdE5/0wN/LnEFg8Ev754Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=7cb2d7c41368a662bb5e8db5e12420d4a8a190b1 commit 7cb2d7c41368a662bb5e8db5e12420d4a8a190b1 Author: Cy Schubert AuthorDate: 2021-12-27 08:18:49 +0000 Commit: Cy Schubert CommitDate: 2021-12-27 08:40:18 +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 MFC after: 1 month --- 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}