svn commit: r345079 - in head: libexec/rc/rc.d tools/build/mk
Cy Schubert
cy at FreeBSD.org
Tue Mar 12 19:34:34 UTC 2019
Author: cy
Date: Tue Mar 12 19:34:33 2019
New Revision: 345079
URL: https://svnweb.freebsd.org/changeset/base/345079
Log:
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 <dmitryluhtionov at gmail.com>
MFC after: 1 week
Modified:
head/libexec/rc/rc.d/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/libexec/rc/rc.d/Makefile
==============================================================================
--- head/libexec/rc/rc.d/Makefile Tue Mar 12 19:33:25 2019 (r345078)
+++ head/libexec/rc/rc.d/Makefile Tue Mar 12 19:34:33 2019 (r345079)
@@ -46,10 +46,6 @@ CONFS= DAEMON \
hostname \
iovctl \
ip6addrctl \
- ipfilter \
- ipfs \
- ipmon \
- ipnat \
ipsec \
${_kadmind} \
${_kdc} \
@@ -213,6 +209,13 @@ HASTPACKAGE= hast
.if ${MK_INETD} != "no"
CONFS+= inetd
+.endif
+
+.if ${MK_IPFILTER} != "no"
+CONFS+= ipfilter \
+ ipfs \
+ ipmon \
+ ipnat
.endif
.if ${MK_IPFW} != "no"
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Mar 12 19:33:25 2019 (r345078)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Mar 12 19:34:33 2019 (r345079)
@@ -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
More information about the svn-src-all
mailing list