diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index a64ee77b0617..bef0a753cdd9 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -1,128 +1,130 @@ # # $FreeBSD$ # acct_COMMENT= System Accounting Utilities acct_DESC= System Accounting Utilities acpi_COMMENT= ACPI Utilities acpi_DESC= ACPI Utilities amd_COMMENT= AMD Utilities amd_DESC= AMD Utilities apm_COMMENT= APM Utilities apm_DESC= APM Utilities at_COMMENT= AT Utilities at_DESC= AT Utilities autofs_COMMENT= Autofs Utilities autofs_DESC= Autofs Utilities bhyve_COMMENT= Bhyve Utilities bhyve_DESC= Bhyve Utilities binutils_COMMENT= Binutils binutils_DESC= Binutils bluetooth_COMMENT= Bluetooth Utilities bluetooth_DESC= Bluetooth Utilities bootloader_COMMENT= Bootloader bootloader_DESC= Bootloader and configuration files bsdinstall_COMMENT= BSDInstall Utilities bsdinstall_DESC= BSDInstall Utilities bsnmp_COMMENT= BSNMP Utilities bsnmp_DESC= BSNMP Utilities clang_COMMENT= Clang Utilities clang_DESC= Clang Utilities clibs_COMMENT= Core C Libraries clibs_DESC= Core C Libraries cxgbe-tools_COMMENT= Chelsio cxbge Utilities cxgbe-tools_DESC= Chelsio cxbge Utilities dma_COMMENT= DMA Mail Agent Utilities dma_DESC= DMA Mail Agent Utilities docs_COMMENT= Documentation docs_DESC= Documentation dtrace_COMMENT= Dtrace Utilities dtrace_DESC= Dtrace Utilities dwatch_COMMENT= Dwatch Utilities dwatch_DESC= Dwatch Utilities ee_COMMENT= Easy Editor Utilities ee_DESC= Easy Editor Utilities efi-tools_COMMENT= UEFI Utilities efi-tools_DESC= UEFI Utilities ftp_COMMENT= FTP Utilities ftp_DESC= FTP Utilities ftpd_COMMENT= FTP Daemon ftpd_DESC= FTP Daemon gdb_COMMENT= GDB Utilities gdb_DESC= GDB Utilities ggate_COMMENT= GEOM Gate Utilities ggate_DESC= GEOM Gate Utilities groff_COMMENT= Groff Utilities groff_DESC= Groff Utilities hast_COMMENT= Highly Available Storage daemon hast_DESC= Highly Available Storage daemon hostapd_COMMENT= 802.11 Access Point Daemon an Utilities hostapd_DESC= 802.11 Access Point Daemon an Utilities hyperv-tools_COMMENT= Microsoft HyperV Utilities hyperv-tools_DESC= Microsoft HyperV Utilities jail_COMMENT= Jail Utilities jail_DESC= Jail Utilities jail-debug_DESCR= Debugging Symbols jail-development_DESCR=Development Files jail-profile_DESCR= Profiling Libraries jail-lib32_DESCR= 32-bit Libraries jail-lib32-debug_DESCR=32-bit Debugging Symbols jail-lib32-development_DESCR=32-bit Development Files jail-lib32-profile_DESCR=32-bit Profiling Libraries kerberos_COMMENT= Kerberos Utilities kerberos_DESC= Kerberos Utilities kernel_COMMENT= FreeBSD Kernel kernel_DESC= FreeBSD Kernel manuals_COMMENT= Manual Pages manuals_DESC= Manual Pages mlx-tools_COMMENT= Mellanox Utilities mlx-tools_DESC= Mellanox Utilities mtree_COMMENT= MTREE Files mtree_DESC= MTREE Files nfs_COMMENT= NFS Utilities 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 rcmds_DESC= Remote Command Utilities rdma_COMMENT= RDMA Utilities rdma_DESC= RDMA Utilities rescue_COMMENT= Rescue Utilities rescue_DESC= Rescue Utilities runtime_COMMENT= FreeBSD Base System runtime_DESC= FreeBSD Base System runtime-debug_DESCR= Debugging Symbols runtime-development_DESCR=Development Files runtime-profile_DESCR= Profiling Libraries runtime-lib32_DESCR= 32-bit Libraries runtime-lib32-debug_DESCR=32-bit Debugging Symbols runtime-lib32-development_DESCR=32-bit Development Files runtime-lib32-profile_DESCR=32-bit Profiling Libraries sendmail_COMMENT= Sendmail Utilities sendmail_DESC= Sendmail Utilities ssh_COMMENT= Secure Shell Utilities ssh_DESC= Secure Shell Utilities svn_COMMENT= Subversion Version Control System svn_DESC= Subversion Version Control System syscons_COMMENT= Syscons Console syscons_DESC= Syscons Console tcpd_COMMENT= TCP Wrapper utilities tcpd_DESC= TCP Wrapper utilities telnet_COMMENT= Telnet and telnetd telnet_DESC= Telnet and telnetd tests_COMMENT= Test Suite tests_DESC= Test Suite unbound_COMMENT= Unbound DNS Resolver unbound_DESC= Unbound DNS Resolver utilities_COMMENT= Non-vital programs and libraries utilities_DESC= Non-vital programs and libraries vi_COMMENT= Vi Editor vi_DESC= Vi Editor vt_COMMENT= VT fonts and keyboard files vt_DESC= VT fonts and keyboard files wpa_COMMENT= 802.11 Supplicant wpa_DESC= 802.11 Supplicant yp_COMMENT= Yellow Pages programs yp_DESC= Yellow Pages programs diff --git a/usr.sbin/periodic/Makefile b/usr.sbin/periodic/Makefile index 6b2da5b1e03c..62a1cff105a2 100644 --- a/usr.sbin/periodic/Makefile +++ b/usr.sbin/periodic/Makefile @@ -1,10 +1,12 @@ # $FreeBSD$ +PACKAGE= periodic + CONFS= periodic.conf CONFSDIR= /etc/defaults SCRIPTS=periodic.sh MAN= periodic.8 SUBDIR= etc .include diff --git a/usr.sbin/periodic/etc/daily/Makefile b/usr.sbin/periodic/etc/daily/Makefile index f6557a10ba80..2bffdba05d2b 100644 --- a/usr.sbin/periodic/etc/daily/Makefile +++ b/usr.sbin/periodic/etc/daily/Makefile @@ -1,64 +1,68 @@ # $FreeBSD$ .include +PACKAGE= periodic + CONFGROUPS= CONFS CONFS= 100.clean-disks \ 110.clean-tmps \ 120.clean-preserve \ 140.clean-rwho \ 200.backup-passwd \ 210.backup-aliases \ 221.backup-gpart \ 222.backup-gmirror \ 330.news \ 400.status-disks \ 401.status-graid \ 406.status-gmirror \ 407.status-graid3 \ 408.status-gstripe \ 409.status-gconcat \ 410.status-mfi \ 420.status-network \ 430.status-uptime \ 450.status-security \ 510.status-world-kernel \ 999.local # NB: keep these sorted by MK_* knobs .if ${MK_ACCT} != "no" CONFGROUPS+= ACCT ACCT+= 310.accounting ACCTMODE= ${BINMODE} ACCTPACKAGE= acct .endif .if ${MK_CALENDAR} != "no" CONFS+= 300.calendar .endif .if ${MK_MAIL} != "no" CONFS+= 130.clean-msgs .endif .if ${MK_NTP} != "no" CONFS+= 480.status-ntpd \ 480.leapfile-ntpd .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" CONFS+= 223.backup-zfs \ 404.status-zfs \ 800.scrub-zfs .endif .include diff --git a/usr.sbin/periodic/etc/monthly/Makefile b/usr.sbin/periodic/etc/monthly/Makefile index ddcc9d9372c1..b4aaf6967891 100644 --- a/usr.sbin/periodic/etc/monthly/Makefile +++ b/usr.sbin/periodic/etc/monthly/Makefile @@ -1,20 +1,22 @@ # $FreeBSD$ .include +PACKAGE= periodic + CONFGROUPS= CONFS CONFS= 450.status-security \ 999.local # NB: keep these sorted by MK_* knobs .if ${MK_UTMPX} != "no" CONFGROUPS+= ACCT ACCT+= 200.accounting ACCTDIR= /etc/periodic/monthly ACCTMODE= ${BINMODE} ACCTPACKAGE= acct .endif .include diff --git a/usr.sbin/periodic/etc/security/Makefile b/usr.sbin/periodic/etc/security/Makefile index ce9e5f7ba5c5..02d2264be15a 100644 --- a/usr.sbin/periodic/etc/security/Makefile +++ b/usr.sbin/periodic/etc/security/Makefile @@ -1,38 +1,48 @@ # $FreeBSD$ .include +PACKAGE= periodic + CONFGROUPS= CONFS DATA CONFS= 100.chksetuid \ 110.neggrpperm \ 200.chkmounts \ 300.chkuid0 \ 400.passwdless \ 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" CONFS+= 900.tcpwrap .endif .include diff --git a/usr.sbin/periodic/etc/weekly/Makefile b/usr.sbin/periodic/etc/weekly/Makefile index 9c54eaa6483f..74ab84f3684e 100644 --- a/usr.sbin/periodic/etc/weekly/Makefile +++ b/usr.sbin/periodic/etc/weekly/Makefile @@ -1,19 +1,21 @@ # $FreeBSD$ .include +PACKAGE= periodic + CONFS= 340.noid \ 450.status-security \ 999.local # NB: keep these sorted by MK_* knobs .if ${MK_LOCATE} != "no" CONFS+= 310.locate .endif .if ${MK_MAN_UTILS} != "no" CONFS+= 320.whatis .endif .include