From nobody Mon Feb 07 13:55:51 2022 X-Original-To: dev-commits-src-branches@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 8C53019B05B2; Mon, 7 Feb 2022 13:55:51 +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 4JsnjM37hCz51W7; Mon, 7 Feb 2022 13:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644242151; 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=LeOL1YaRJ9rwOiYXiUE7h8FNG9aRBpd8ts9e+o50Ch4=; b=I/FqicflZbZvVIgk3G0Ab9XIrpEtQIRnVJMBCcO94MXClazOas9UzMdmcaTKzKQnXKbbPg XU6prVNhyNFBxhlINKr/vrXCRQYw8AA+hgge033rhM8E11CEmcv42ssN+MJFc7aOQfDr8N IAXwKmiuha0AcYSXr28HYAUPK42bzCnjZvr11+jx5THVwJSjq0exlGXitgxndVZWdIQb5/ HvYSChjl4GEg8rF343il44Pl0gHXrli7RJ/9c/82Jme4dHM/cEoYGUiWXW/ES6Boko8Xw+ zsvCcxHc16mM7mbU9Q8O12KN6zlQPUpmHcPt16PmKRD+Iw/b9cLNrfTiUc7DaQ== 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 4B89E26B54; Mon, 7 Feb 2022 13:55:51 +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 217Dtplk085118; Mon, 7 Feb 2022 13:55:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 217DtpAV085117; Mon, 7 Feb 2022 13:55:51 GMT (envelope-from git) Date: Mon, 7 Feb 2022 13:55:51 GMT Message-Id: <202202071355.217DtpAV085117@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: c9950d1ec287 - stable/12 - ipfilter userland: Path fixup no longer required List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/12 X-Git-Reftype: branch X-Git-Commit: c9950d1ec287b0529d24fe3e4aba86bcdc430650 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644242151; 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=LeOL1YaRJ9rwOiYXiUE7h8FNG9aRBpd8ts9e+o50Ch4=; b=mGp1wqXLVMaa7ADzH9zih8NZ3RKsq6K3SKSOUpBDGvsas4lxcWEhuPBlv7znCq9fm7McUZ MQYJSz9Xc7UlAjFI2Bl198kSuYbZv4RZWYpk1KTmTcBiocGYJ1OjlwXtUZlG44MfSdFgjh GhEsPfBJsJj4ZbPDwxRaLunChd1A20DLIAQyMgH/F+wBZJ+FYdpAgvz5xVv0D+PdraCTeM 6ZDQ84PLZmPl+Qjm99d8sU5ADd3pMNJqtlEacC1fo4PUGH/ROw/dKklHYzXPF9jVNJ8A1c R1NqSAHTQnwTYU/8JAG4IWBJRuLQNNybFS+DBJKFyocfES/4Rz7rwurlk53P0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644242151; a=rsa-sha256; cv=none; b=XHn2+p8uXYRrdCKWWfY3Rau4GDPTDkIIVMNpjRrpr5BVOs9q/SsZ/xtwQyaJkiiETAnt9h o3B5+MN9GQgAuePpG0+wAOmYVC3Ps/r21VDsiny8dTE1LEP0p6c5M7TOnFfzaNAK3cQpTf EefCkypfxVB1AroZKw0he5Dd515s8jKw2WEIsS2RdsFB0m47uoc7lI+dv4+c28WRjjG3Y4 SQS+J+8SgnteUHBplv2nZkCa6d1yqXt7zKRG25CmXyHTOVvkXO6JW95C5PrG6Ngy4pNjQK G++dWvdf07ySEeF5PJZrdNzj1M7HYZBWLsLmPZAscaCHWNwSlJ6XzuYDT2Gm5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=c9950d1ec287b0529d24fe3e4aba86bcdc430650 commit c9950d1ec287b0529d24fe3e4aba86bcdc430650 Author: Cy Schubert AuthorDate: 2021-12-27 08:18:49 +0000 Commit: Cy Schubert CommitDate: 2022-02-07 13:55:11 +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}