From nobody Thu May 15 00:04:12 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZyVn9238Tz5w1mj; Thu, 15 May 2025 00:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZyVn916d4z3qQw; Thu, 15 May 2025 00:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747267453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Ag1ApSJsMj3tbYKtR1n/4Cffn4CXtjDQ3b8xvh8gVg=; b=jeq7G+rLWtzK/dHUz2KqJ94TWza12adUblrELh/2sid4JO4VbWpua4tZxz44xhlqzZf0SR X9RHITkZwiTYC1Y2KanZz1q3K4VqgCPkgaQhF94CCRE4bH/PhF1sl62gM0vZF1NBjOWdSa qpCC/u4VDlE78/C8Vb8kxfgsj/Dr8w6jITGj2oRRahZxM4AdGKkGCfWm1h+Cz1cW5n5iOR T7RspVilMkfXasOuH5zpjrbQL+JJxjBLZ69A7+OWcWlSiEyd8hRB5pQDKqaNh+aJdj5AOA rPPBzmoxUpB2GwjPnnSSzBJ6unIwwQkBVm7o2Bj4ly/vxXlVJ6YzIJE+ZLtgsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747267453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Ag1ApSJsMj3tbYKtR1n/4Cffn4CXtjDQ3b8xvh8gVg=; b=vSxlK06wl3szaIps6YwAjzWQTbzFDQGIg+gfLNtud8m7znZennEn0sxTqBArrkZpU7RODT JsM29qFiAhEw0MjqqZsN7f7kUK2Z6H2GcM7J5ciocRjvMWNhaEGBaJarjYv53rAqB+un5n sjM69Zpn8K/ePlfYzxjwvYLi4JXjz70Y0sN570xCoJBKrkahIE+2SGq/XkmawZ23koUuBj 6gJWVLkJqEecEtK0rtaP0n3bcHNOHarnAyWY57AV0hQ/2ok+neRuJfmXPjSHKX3N93NL8G g+o0yPEZUPYwNvleZLujDqZzqGYI4d8oZ4acYBQHyq8csPjhtMNkMLxDVkG4Lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747267453; a=rsa-sha256; cv=none; b=mmHG8hHxRtQ6mv+N8ZrVM2PXz2Yp4NZ7RdCgxFw4TWPU0s4cTT8eRLkZ9t7qdF9TrbyZED WiVY5SX5o0CAi8XZwPsv9y5/70obuiHwkbjxBm8DiC4UXpwzMw5Jtl7tfrILgIrLeMQbW4 fLnm7TKjp3ClvvW5KD5jrnE/73Nr+ZThBWlvcwDe2hYDpJPUJ0aI5nZlb7XQmsgtg6wQ4K n4Kw5XZw8s7nepnQdpdF3bEphNExWyF2uZf/5/yhMOYrIzs+mmTg54VDiZpiGfmIUthnCm RllbGHsebXnHflZJ2HCphFj1uB6/jyuOUHaqYztEP4WNIn8Z0MR+AT45qxhxBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZyVn90d69zv1T; Thu, 15 May 2025 00:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54F04CRk046829; Thu, 15 May 2025 00:04:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54F04C7V046826; Thu, 15 May 2025 00:04:12 GMT (envelope-from git) Date: Thu, 15 May 2025 00:04:12 GMT Message-Id: <202505150004.54F04C7V046826@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 2b05168eb864 - main - periodic: move some periodic scripts to their packages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b05168eb8647262da7ce3506a3599b8be966845 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=2b05168eb8647262da7ce3506a3599b8be966845 commit 2b05168eb8647262da7ce3506a3599b8be966845 Author: Lexi Winter AuthorDate: 2025-05-14 12:14:58 +0000 Commit: Lexi Winter CommitDate: 2025-05-15 00:02:52 +0000 periodic: move some periodic scripts to their packages Periodic scripts for rwho, geom, zfs and tcpwrappers are only relevant if those packages are installed, so move them to the appropriate package. Reviewed by: manu, des, emaste Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50341 --- usr.sbin/periodic/etc/daily/Makefile | 32 ++++++++++++++++++++------------ usr.sbin/periodic/etc/security/Makefile | 4 +++- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/usr.sbin/periodic/etc/daily/Makefile b/usr.sbin/periodic/etc/daily/Makefile index d1b000df01e4..c92b4ed8a6ee 100644 --- a/usr.sbin/periodic/etc/daily/Makefile +++ b/usr.sbin/periodic/etc/daily/Makefile @@ -7,17 +7,9 @@ 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 \ 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 \ @@ -25,6 +17,20 @@ CONFS= 100.clean-disks \ 510.status-world-kernel \ 999.local +CONFGROUPS+= GEOM +GEOM+= 221.backup-gpart \ + 222.backup-gmirror \ + 401.status-graid \ + 406.status-gmirror \ + 407.status-graid3 \ + 408.status-gstripe \ + 409.status-gconcat +GEOMPACKAGE= geom + +CONFGROUPS+= RCMDS +RCMDS+= 140.clean-rwho +RCMDSPACKAGE= rcmds + # NB: keep these sorted by MK_* knobs .if ${MK_ACCT} != "no" @@ -60,10 +66,12 @@ SENDMAILPACKAGE= sendmail .endif .if ${MK_ZFS} != "no" -CONFS+= 223.backup-zfs \ - 404.status-zfs \ - 800.scrub-zfs \ - 801.trim-zfs +CONFGROUPS+= ZFS +ZFS+= 223.backup-zfs \ + 404.status-zfs \ + 800.scrub-zfs \ + 801.trim-zfs +ZFSPACKAGE= zfs .endif .include diff --git a/usr.sbin/periodic/etc/security/Makefile b/usr.sbin/periodic/etc/security/Makefile index 4c6b39d9062d..c153523d7c39 100644 --- a/usr.sbin/periodic/etc/security/Makefile +++ b/usr.sbin/periodic/etc/security/Makefile @@ -40,7 +40,9 @@ PFPACKAGE= pf .endif .if ${MK_INETD} != "no" && ${MK_TCP_WRAPPERS} != "no" -CONFS+= 900.tcpwrap +CONFGROUPS+= TCPWRAP +TCPWRAP+= 900.tcpwrap +TCPWRAPPACKAGE= tcpd .endif .include