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@gmail.com> MFC after: 1 week
This commit is contained in:
parent
22d7708455
commit
77e6f9282e
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=345079
@ -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"
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user