From nobody Mon Dec 06 10:37:59 2021 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 480CE18B8374; Mon, 6 Dec 2021 10:38:00 +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 4J70J76mWrz4p6j; Mon, 6 Dec 2021 10:37:59 +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 C8A951FDA; Mon, 6 Dec 2021 10:37:59 +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 1B6AbxQ7000612; Mon, 6 Dec 2021 10:37:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B6AbxL2000611; Mon, 6 Dec 2021 10:37:59 GMT (envelope-from git) Date: Mon, 6 Dec 2021 10:37:59 GMT Message-Id: <202112061037.1B6AbxL2000611@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: c59900ee61c3 - main - ObsoleteFiles: Don't remove if_stf.h 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c59900ee61c3075bd5d5464b2727836b9c9d6dc5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638787080; 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=lKtvaQEuMz3Tt/WQF7xy/XZtSYKs69rk7FFls+sd0So=; b=WCO3GstJDOsC5RlspDTO6kbOMdzqBmMzqN/9uZwdKkNapVO9jTd0FnqsZLRGDyDk80xoyK yfmzIFwIxlNhfDFHUOvVWSwIr63X0M6+5nDCVTFPinVVGqhjOhkiCio9wkB7DuVwvTHlps 26bnZtvRjYaNbCkwvGUfePFHG9bqNpkCZAEF3A6n6tLpqWY5nY55sczRstqR7mbSH1pHUc uTzbFLWEPWGuH7BZPM8PMsKCaGdDF02ZjdA6TChy1S6frTS5LIQWmpPFyFfK90LlBgHxNZ 5nRq1tYXxrwQedvUaD++sMN6cZcN9i0TzXb2/X1LgoJ3EDt37GE1FtA/z9av6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638787080; a=rsa-sha256; cv=none; b=rs93CrXb/Dn9C7gr/UH6Nz9lVJ0tMR+gMzqiY4fhfsFtfvVXZWANbE1LDI22R568u30myK x0vG/hTztKKbvBwBGtzfCfVVsUcXMCibRV11748wdVWcAx0S1NBFKWoFXtGe0ru3yTDND4 g3inu2va+2YBP1LGUcM4dvYI325ANxsHUa3AfTJ9LVhq/bJfJg+ol8rf4Cxr0885L2FNO/ VBuJxrRYpcWMWlR+CZu0F5KCCIZfqPVyI5u40o9t/6LZSqKfNxXxTzot8fGota2ojATi8P LvwF5t718i4xDwGgPlzMQpLIshye7ORMBUhwY73Hgs7Yf5oJqSCiomNgfHH0GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c59900ee61c3075bd5d5464b2727836b9c9d6dc5 commit c59900ee61c3075bd5d5464b2727836b9c9d6dc5 Author: Kristof Provost AuthorDate: 2021-12-03 13:29:25 +0000 Commit: Kristof Provost CommitDate: 2021-12-06 10:37:49 +0000 ObsoleteFiles: Don't remove if_stf.h 19dc644511 added if_stf.h, which had previously been removed. We have to remove it from ObsoleteFiles.inc to ensure that it's not unintentionally uninstalled again. Reported by: Herbert J. Skuhra MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D33247 --- ObsoleteFiles.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index fccc7681f3e9..3e36c3f42977 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -11396,8 +11396,7 @@ OLD_FILES+=usr/share/man/man4/pcii.4.gz OLD_FILES+=usr/share/man/man4/tnt4882.4.gz # 20141224: libxo moved to /lib OLD_LIBS+=usr/lib/libxo.so.0 -# 20141223: remove in6_gif.h, in_gif.h and if_stf.h -OLD_FILES+=usr/include/net/if_stf.h +# 20141223: remove in6_gif.h and in_gif.h OLD_FILES+=usr/include/netinet/in_gif.h OLD_FILES+=usr/include/netinet6/in6_gif.h # 20141209: pw tests broken into a file per command