The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c59900ee61c3075bd5d5464b2727836b9c9d6dc5
commit c59900ee61c3075bd5d5464b2727836b9c9d6dc5 Author: Kristof Provost <[email protected]> AuthorDate: 2021-12-03 13:29:25 +0000 Commit: Kristof Provost <[email protected]> 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 <[email protected]> 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
