Page MenuHomeFreeBSD

D33454.diff
No OneTemporary

D33454.diff

diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -83,6 +83,8 @@
nfs_DESC= NFS Utilities
openssl_COMMENT= OpenSSL Library and Utility
openssl_DESC= OpenSSL Library and Utility
+periodic_COMMENT= Periodic Utility
+periodic_DESC= Periodic Utility
rc_COMMENT= RC Scripts
rc_DESC= RC Scripts
rcmds_COMMENT= Remote Command Utilities
diff --git a/usr.sbin/periodic/Makefile b/usr.sbin/periodic/Makefile
--- a/usr.sbin/periodic/Makefile
+++ b/usr.sbin/periodic/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= periodic
+
CONFS= periodic.conf
CONFSDIR= /etc/defaults
SCRIPTS=periodic.sh
diff --git a/usr.sbin/periodic/etc/daily/Makefile b/usr.sbin/periodic/etc/daily/Makefile
--- a/usr.sbin/periodic/etc/daily/Makefile
+++ b/usr.sbin/periodic/etc/daily/Makefile
@@ -2,6 +2,8 @@
.include <src.opts.mk>
+PACKAGE= periodic
+
CONFGROUPS= CONFS
CONFS= 100.clean-disks \
@@ -49,10 +51,12 @@
.endif
.if ${MK_SENDMAIL} != "no"
-CONFS+= 150.clean-hoststat \
- 440.status-mailq \
- 460.status-mail-rejects \
- 500.queuerun
+CONFGROUPS+= SENDMAIL
+SENDMAIL+= 150.clean-hoststat \
+ 440.status-mailq \
+ 460.status-mail-rejects \
+ 500.queuerun
+SENDMAILPACKAGE= sendmail
.endif
.if ${MK_ZFS} != "no"
diff --git a/usr.sbin/periodic/etc/monthly/Makefile b/usr.sbin/periodic/etc/monthly/Makefile
--- a/usr.sbin/periodic/etc/monthly/Makefile
+++ b/usr.sbin/periodic/etc/monthly/Makefile
@@ -2,6 +2,8 @@
.include <src.opts.mk>
+PACKAGE= periodic
+
CONFGROUPS= CONFS
CONFS= 450.status-security \
diff --git a/usr.sbin/periodic/etc/security/Makefile b/usr.sbin/periodic/etc/security/Makefile
--- a/usr.sbin/periodic/etc/security/Makefile
+++ b/usr.sbin/periodic/etc/security/Makefile
@@ -2,6 +2,8 @@
.include <src.opts.mk>
+PACKAGE= periodic
+
CONFGROUPS= CONFS DATA
CONFS= 100.chksetuid \
@@ -12,23 +14,31 @@
410.logincheck \
700.kernelmsg \
800.loginfail
-DATA= security.functions
+
+DATA= security.functions
DATAMODE= 444
+DATAPACKAGE= periodic
# NB: keep these sorted by MK_* knobs
.if ${MK_IPFILTER} != "no"
-CONFS+= 510.ipfdenied
-CONFS+= 610.ipf6denied
+CONFGROUPS+= IPFILTER
+IPFILTER+= 510.ipfdenied
+IPFILTER+= 610.ipf6denied
+IPFILTERPACKAGE= ipfilter
.endif
.if ${MK_IPFW} != "no"
-CONFS+= 500.ipfwdenied \
- 550.ipfwlimit
+CONFGROUPS+= IPFW
+IPFW+= 500.ipfwdenied \
+ 550.ipfwlimit
+IPFWPACKAGE= ipfw
.endif
.if ${MK_PF} != "no"
-CONFS+= 520.pfdenied
+CONFGROUPS+= PF
+PF+= 520.pfdenied
+PFPACKAGE= pf
.endif
.if ${MK_INETD} != "no" && ${MK_TCP_WRAPPERS} != "no"
diff --git a/usr.sbin/periodic/etc/weekly/Makefile b/usr.sbin/periodic/etc/weekly/Makefile
--- a/usr.sbin/periodic/etc/weekly/Makefile
+++ b/usr.sbin/periodic/etc/weekly/Makefile
@@ -2,6 +2,8 @@
.include <src.opts.mk>
+PACKAGE= periodic
+
CONFS= 340.noid \
450.status-security \
999.local

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 16, 5:48 AM (19 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15820896
Default Alt Text
D33454.diff (2 KB)

Event Timeline