View | Details | Raw Unified | Return to bug 233046 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/src/tools/build/mk/OptionalObsoleteFiles.inc (+35 lines)
Lines 163-168 Link Here
163
.endif
163
.endif
164
164
165
.if ${MK_AUDIT} == no
165
.if ${MK_AUDIT} == no
166
OLD_FILES+=etc/rc.d/auditd
167
OLD_FILES+=etc/rc.d/auditdistd
166
OLD_FILES+=usr/sbin/audit
168
OLD_FILES+=usr/sbin/audit
167
OLD_FILES+=usr/sbin/auditd
169
OLD_FILES+=usr/sbin/auditd
168
OLD_FILES+=usr/sbin/auditdistd
170
OLD_FILES+=usr/sbin/auditdistd
Lines 436-441 Link Here
436
.endif
438
.endif
437
439
438
.if ${MK_BLACKLIST} == no
440
.if ${MK_BLACKLIST} == no
441
OLD_FILES+=etc/blacklistd.conf
439
OLD_FILES+=etc/rc.d/blacklistd
442
OLD_FILES+=etc/rc.d/blacklistd
440
OLD_FILES+=usr/include/blacklist.h
443
OLD_FILES+=usr/include/blacklist.h
441
OLD_FILES+=usr/lib/libblacklist.a
444
OLD_FILES+=usr/lib/libblacklist.a
Lines 1151-1156 Link Here
1151
OLD_FILES+=etc/casper/system.pwd
1154
OLD_FILES+=etc/casper/system.pwd
1152
OLD_FILES+=etc/casper/system.random
1155
OLD_FILES+=etc/casper/system.random
1153
OLD_FILES+=etc/casper/system.sysctl
1156
OLD_FILES+=etc/casper/system.sysctl
1157
OLD_DIRS+=etc/casper
1154
OLD_FILES+=etc/rc.d/casperd
1158
OLD_FILES+=etc/rc.d/casperd
1155
OLD_LIBS+=lib/libcapsicum.so.0
1159
OLD_LIBS+=lib/libcapsicum.so.0
1156
OLD_LIBS+=lib/libcasper.so.0
1160
OLD_LIBS+=lib/libcasper.so.0
Lines 1313-1318 Link Here
1313
OLD_FILES+=etc/devd/zfs.conf
1317
OLD_FILES+=etc/devd/zfs.conf
1314
OLD_FILES+=etc/periodic/daily/404.status-zfs
1318
OLD_FILES+=etc/periodic/daily/404.status-zfs
1315
OLD_FILES+=etc/periodic/daily/800.scrub-zfs
1319
OLD_FILES+=etc/periodic/daily/800.scrub-zfs
1320
OLD_DIRS+=etc/zfs
1316
OLD_LIBS+=lib/libzfs.so.2
1321
OLD_LIBS+=lib/libzfs.so.2
1317
OLD_LIBS+=lib/libzfs.so.3
1322
OLD_LIBS+=lib/libzfs.so.3
1318
OLD_LIBS+=lib/libzfs_core.so.2
1323
OLD_LIBS+=lib/libzfs_core.so.2
Lines 2277-2282 Link Here
2277
2282
2278
.if ${MK_DMAGENT} == no
2283
.if ${MK_DMAGENT} == no
2279
OLD_FILES+=etc/dma/dma.conf
2284
OLD_FILES+=etc/dma/dma.conf
2285
OLD_DIRS+=etc/dma
2280
OLD_FILES+=usr/libexec/dma
2286
OLD_FILES+=usr/libexec/dma
2281
OLD_FILES+=usr/libexec/dma-mbox-create
2287
OLD_FILES+=usr/libexec/dma-mbox-create
2282
OLD_FILES+=usr/share/man/man8/dma.8.gz
2288
OLD_FILES+=usr/share/man/man8/dma.8.gz
Lines 3068-3073 Link Here
3068
.endif
3074
.endif
3069
3075
3070
.if ${MK_GSSAPI} == no
3076
.if ${MK_GSSAPI} == no
3077
OLD_FILES+=etc/gss/mech
3078
OLD_FILES+=etc/gss/qop
3079
OLD_DIRS+=etc/gss
3080
OLD_FILES+=etc/rc.d/gssd
3071
OLD_FILES+=usr/include/gssapi/gssapi.h
3081
OLD_FILES+=usr/include/gssapi/gssapi.h
3072
OLD_DIRS+=usr/include/gssapi
3082
OLD_DIRS+=usr/include/gssapi
3073
OLD_FILES+=usr/include/gssapi.h
3083
OLD_FILES+=usr/include/gssapi.h
Lines 3270-3275 Link Here
3270
.endif
3280
.endif
3271
3281
3272
.if ${MK_INET6} == no
3282
.if ${MK_INET6} == no
3283
OLD_FILES+=etc/rc.d/route6d
3284
OLD_FILES+=etc/rc.d/rtadvd
3285
OLD_FILES+=etc/rc.d/rtsold
3273
OLD_FILES+=sbin/ping6
3286
OLD_FILES+=sbin/ping6
3274
OLD_FILES+=sbin/rtsol
3287
OLD_FILES+=sbin/rtsol
3275
OLD_FILES+=usr/sbin/ip6addrctl
3288
OLD_FILES+=usr/sbin/ip6addrctl
Lines 3305-3310 Link Here
3305
.endif
3318
.endif
3306
3319
3307
.if ${MK_INETD} == no
3320
.if ${MK_INETD} == no
3321
OLD_FILES+=etc/inetd.conf
3308
OLD_FILES+=etc/rc.d/inetd
3322
OLD_FILES+=etc/rc.d/inetd
3309
OLD_FILES+=usr/sbin/inetd
3323
OLD_FILES+=usr/sbin/inetd
3310
OLD_FILES+=usr/share/man/man5/inetd.conf.5.gz
3324
OLD_FILES+=usr/share/man/man5/inetd.conf.5.gz
Lines 3314-3319 Link Here
3314
.if ${MK_IPFILTER} == no
3328
.if ${MK_IPFILTER} == no
3315
OLD_FILES+=etc/periodic/security/510.ipfdenied
3329
OLD_FILES+=etc/periodic/security/510.ipfdenied
3316
OLD_FILES+=etc/periodic/security/610.ipf6denied
3330
OLD_FILES+=etc/periodic/security/610.ipf6denied
3331
OLD_FILES+=etc/rc.d/ipfilter
3332
OLD_FILES+=etc/rc.d/ipfs
3333
OLD_FILES+=etc/rc.d/ipmon
3334
OLD_FILES+=etc/rc.d/ipnat
3317
OLD_FILES+=rescue/ipf
3335
OLD_FILES+=rescue/ipf
3318
OLD_FILES+=sbin/ipf
3336
OLD_FILES+=sbin/ipf
3319
OLD_FILES+=sbin/ipfs
3337
OLD_FILES+=sbin/ipfs
Lines 3397-3402 Link Here
3397
.if ${MK_IPFW} == no
3415
.if ${MK_IPFW} == no
3398
OLD_FILES+=etc/periodic/security/500.ipfwdenied
3416
OLD_FILES+=etc/periodic/security/500.ipfwdenied
3399
OLD_FILES+=etc/periodic/security/550.ipfwlimit
3417
OLD_FILES+=etc/periodic/security/550.ipfwlimit
3418
OLD_FILES+=etc/rc.d/ipfw
3419
OLD_FILES+=etc/rc.d/ipfw_netflow
3420
OLD_FILES+=etc/rc.d/natd
3400
OLD_FILES+=sbin/ipfw
3421
OLD_FILES+=sbin/ipfw
3401
OLD_FILES+=sbin/natd
3422
OLD_FILES+=sbin/natd
3402
OLD_FILES+=usr/sbin/ipfwpcap
3423
OLD_FILES+=usr/sbin/ipfwpcap
Lines 4451-4456 Link Here
4451
.endif
4472
.endif
4452
4473
4453
.if ${MK_LEGACY_CONSOLE} == no
4474
.if ${MK_LEGACY_CONSOLE} == no
4475
OLD_FILES+=etc/rc.d/moused
4454
OLD_FILES+=usr/sbin/kbdcontrol
4476
OLD_FILES+=usr/sbin/kbdcontrol
4455
OLD_FILES+=usr/sbin/kbdmap
4477
OLD_FILES+=usr/sbin/kbdmap
4456
OLD_FILES+=usr/sbin/moused
4478
OLD_FILES+=usr/sbin/moused
Lines 6017-6022 Link Here
6017
OLD_FILES+=etc/mail.rc
6039
OLD_FILES+=etc/mail.rc
6018
OLD_FILES+=etc/mail/aliases
6040
OLD_FILES+=etc/mail/aliases
6019
OLD_FILES+=etc/mail/mailer.conf
6041
OLD_FILES+=etc/mail/mailer.conf
6042
OLD_DIRS+=etc/mail
6020
OLD_FILES+=etc/periodic/daily/130.clean-msgs
6043
OLD_FILES+=etc/periodic/daily/130.clean-msgs
6021
OLD_FILES+=usr/bin/Mail
6044
OLD_FILES+=usr/bin/Mail
6022
OLD_FILES+=usr/bin/biff
6045
OLD_FILES+=usr/bin/biff
Lines 6457-6462 Link Here
6457
.endif
6480
.endif
6458
6481
6459
.if ${MK_NETGRAPH} == no
6482
.if ${MK_NETGRAPH} == no
6483
OLD_FILES+=etc/rc.d/pppoed
6460
OLD_FILES+=usr/include/netgraph.h
6484
OLD_FILES+=usr/include/netgraph.h
6461
OLD_FILES+=usr/lib/libnetgraph.a
6485
OLD_FILES+=usr/lib/libnetgraph.a
6462
OLD_FILES+=usr/lib/libnetgraph.so
6486
OLD_FILES+=usr/lib/libnetgraph.so
Lines 6714-6720 Link Here
6714
.endif
6738
.endif
6715
6739
6716
.if ${MK_NTP} == no
6740
.if ${MK_NTP} == no
6741
OLD_DIRS+=etc/ntp
6717
OLD_FILES+=etc/ntp.conf
6742
OLD_FILES+=etc/ntp.conf
6743
OLD_FILES+=etc/rc.d/ntpd
6744
OLD_FILES+=etc/rc.d/ntpdate
6745
OLD_FILES+=etc/periodic/daily/480.leapfile-ntpd
6718
OLD_FILES+=etc/periodic/daily/480.status-ntpd
6746
OLD_FILES+=etc/periodic/daily/480.status-ntpd
6719
OLD_FILES+=usr/bin/ntpq
6747
OLD_FILES+=usr/bin/ntpq
6720
OLD_FILES+=usr/sbin/ntp-keygen
6748
OLD_FILES+=usr/sbin/ntp-keygen
Lines 6807-6812 Link Here
6807
OLD_FILES+=etc/ssh/moduli
6835
OLD_FILES+=etc/ssh/moduli
6808
OLD_FILES+=etc/ssh/ssh_config
6836
OLD_FILES+=etc/ssh/ssh_config
6809
OLD_FILES+=etc/ssh/sshd_config
6837
OLD_FILES+=etc/ssh/sshd_config
6838
OLD_DIRS+=etc/ssh
6810
OLD_FILES+=usr/bin/scp
6839
OLD_FILES+=usr/bin/scp
6811
OLD_FILES+=usr/bin/sftp
6840
OLD_FILES+=usr/bin/sftp
6812
OLD_FILES+=usr/bin/slogin
6841
OLD_FILES+=usr/bin/slogin
Lines 6949-6954 Link Here
6949
OLD_FILES+=etc/periodic/security/520.pfdenied
6978
OLD_FILES+=etc/periodic/security/520.pfdenied
6950
OLD_FILES+=etc/pf.os
6979
OLD_FILES+=etc/pf.os
6951
OLD_FILES+=etc/rc.d/ftp-proxy
6980
OLD_FILES+=etc/rc.d/ftp-proxy
6981
OLD_FILES+=etc/rc.d/pf
6982
OLD_FILES+=etc/rc.d/pflog
6983
OLD_FILES+=etc/rc.d/pfsync
6952
OLD_FILES+=sbin/pfctl
6984
OLD_FILES+=sbin/pfctl
6953
OLD_FILES+=sbin/pflogd
6985
OLD_FILES+=sbin/pflogd
6954
OLD_FILES+=usr/include/netpfil/pf/pf.h
6986
OLD_FILES+=usr/include/netpfil/pf/pf.h
Lines 7086-7091 Link Here
7086
7118
7087
.if ${MK_PPP} == no
7119
.if ${MK_PPP} == no
7088
OLD_FILES+=etc/ppp/ppp.conf
7120
OLD_FILES+=etc/ppp/ppp.conf
7121
OLD_FILES+=etc/rc.d/ppp
7089
OLD_DIRS+=etc/ppp
7122
OLD_DIRS+=etc/ppp
7090
OLD_FILES+=usr/sbin/ppp
7123
OLD_FILES+=usr/sbin/ppp
7091
OLD_FILES+=usr/sbin/pppctl
7124
OLD_FILES+=usr/sbin/pppctl
Lines 7201-7206 Link Here
7201
.endif
7234
.endif
7202
7235
7203
.if ${MK_QUOTAS} == no
7236
.if ${MK_QUOTAS} == no
7237
OLD_FILES+=etc/rc.d/quota
7204
OLD_FILES+=sbin/quotacheck
7238
OLD_FILES+=sbin/quotacheck
7205
OLD_FILES+=usr/bin/quota
7239
OLD_FILES+=usr/bin/quota
7206
OLD_FILES+=usr/sbin/edquota
7240
OLD_FILES+=usr/sbin/edquota
Lines 9244-9249 Link Here
9244
9278
9245
.if ${MK_UTMPX} == no
9279
.if ${MK_UTMPX} == no
9246
OLD_FILES+=etc/periodic/monthly/200.accounting
9280
OLD_FILES+=etc/periodic/monthly/200.accounting
9281
OLD_FILES+=etc/rc.d/utx
9247
OLD_FILES+=usr/bin/last
9282
OLD_FILES+=usr/bin/last
9248
OLD_FILES+=usr/bin/users
9283
OLD_FILES+=usr/bin/users
9249
OLD_FILES+=usr/bin/who
9284
OLD_FILES+=usr/bin/who

Return to bug 233046