From 3238513f8740e6457120029f0cd3270eb7c98a7b Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 12 Mar 2019 19:34:33 +0000 Subject: [PATCH] Fix still installing ipfilter rc.d files even when WITHOUT_IPFILTER is specified. When WITHOUT_IPFILTER is specified, delete-old-files fails to delete the optional rc.d files from above. Fix this. WITHOUT_IPFILTER fails to delete the ipfilter.5 optional file during delete-old-files. Fix this. Reported by: Dmitry Luhtionov MFC after: 1 week --- libexec/rc/rc.d/Makefile | 11 +++++++---- tools/build/mk/OptionalObsoleteFiles.inc | 5 +++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index d8d014cb167a..3eef01e58b21 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -46,10 +46,6 @@ CONFS= DAEMON \ hostname \ iovctl \ ip6addrctl \ - ipfilter \ - ipfs \ - ipmon \ - ipnat \ ipsec \ ${_kadmind} \ ${_kdc} \ @@ -215,6 +211,13 @@ HASTPACKAGE= hast CONFS+= inetd .endif +.if ${MK_IPFILTER} != "no" +CONFS+= ipfilter \ + ipfs \ + ipmon \ + ipnat +.endif + .if ${MK_IPFW} != "no" CONFS+= ipfw .if ${MK_NETGRAPH} != "no" diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 72a938cb8765..3e51150786eb 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3127,6 +3127,10 @@ OLD_FILES+=usr/share/man/man8/inetd.8.gz .if ${MK_IPFILTER} == no OLD_FILES+=etc/periodic/security/510.ipfdenied OLD_FILES+=etc/periodic/security/610.ipf6denied +OLD_FILES+=etc/rc.d/ipfilter +OLD_FILES+=etc/rc.d/ipfs +OLD_FILES+=etc/rc.d/ipmon +OLD_FILES+=etc/rc.d/ipnat OLD_FILES+=rescue/ipf OLD_FILES+=sbin/ipf OLD_FILES+=sbin/ipfs @@ -3196,6 +3200,7 @@ OLD_FILES+=usr/share/man/man4/ipnat.4.gz OLD_FILES+=usr/share/man/man5/ipf.5.gz OLD_FILES+=usr/share/man/man5/ipf.conf.5.gz OLD_FILES+=usr/share/man/man5/ipf6.conf.5.gz +OLD_FILES+=usr/share/man/man5/ipfilter.5.gz OLD_FILES+=usr/share/man/man5/ipnat.5.gz OLD_FILES+=usr/share/man/man5/ipnat.conf.5.gz OLD_FILES+=usr/share/man/man5/ippool.5.gz