svn commit: r345309 - in stable/11: etc/rc.d tools/build/mk
Cy Schubert
cy at FreeBSD.org
Tue Mar 19 19:57:38 UTC 2019
Author: cy
Date: Tue Mar 19 19:57:37 2019
New Revision: 345309
URL: https://svnweb.freebsd.org/changeset/base/345309
Log:
Partially MFC r345079 + direct commit to stable/11.
The MFC updates tools/build/mk/OptionalObsoleteFiles.inc.
The direct commit updates etc/rc.d/Makefile becasue this file was moved
in HEAD to libexec/rc/rc.d/Makefile, making svn merge impossible.
The original log message follows:
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>
Modified:
stable/11/etc/rc.d/Makefile
stable/11/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/etc/rc.d/Makefile
==============================================================================
--- stable/11/etc/rc.d/Makefile Tue Mar 19 19:52:32 2019 (r345308)
+++ stable/11/etc/rc.d/Makefile Tue Mar 19 19:57:37 2019 (r345309)
@@ -45,10 +45,6 @@ FILES= DAEMON \
hostname \
iovctl \
ip6addrctl \
- ipfilter \
- ipfs \
- ipmon \
- ipnat \
ipsec \
${_kadmind} \
${_kdc} \
@@ -212,6 +208,13 @@ HASTPACKAGE= hast
.if ${MK_INETD} != "no"
FILES+= inetd
+.endif
+
+.if ${MK_IPFILTER} != "no"
+CONFS+= ipfilter \
+ ipfs \
+ ipmon \
+ ipnat
.endif
.if ${MK_IPFW} != "no"
Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/11/tools/build/mk/OptionalObsoleteFiles.inc Tue Mar 19 19:52:32 2019 (r345308)
+++ stable/11/tools/build/mk/OptionalObsoleteFiles.inc Tue Mar 19 19:57:37 2019 (r345309)
@@ -3331,6 +3331,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
@@ -3400,6 +3404,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-stable
mailing list