From nobody Wed Jan 05 17:24:30 2022 X-Original-To: dev-commits-src-branches@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 4263619211CE; Wed, 5 Jan 2022 17:24:34 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JTbvN39Tzz3HFP; Wed, 5 Jan 2022 17:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9C7A4108E8; Wed, 5 Jan 2022 17:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 205HOUSk097492; Wed, 5 Jan 2022 17:24:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 205HOUvS097491; Wed, 5 Jan 2022 17:24:30 GMT (envelope-from git) Date: Wed, 5 Jan 2022 17:24:30 GMT Message-Id: <202201051724.205HOUvS097491@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: d11dfcf2b07e - stable/13 - pkgbase: Create a FreeBSD-periodic package List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d11dfcf2b07e19630588404b30d48e545c83c99c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641403473; 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=mH9rCXzR+8LS7Zh4U1WDkVQZRj2Ek3CCvrIS+racA3E=; b=My/xwyX4QUBk6ngC5bNeePQE8r551yCl43PszmjuAf7aJY86sYrzOzOk77tYDV/LLKdmDd z5YT5S5k8B/olEDzKTvtRcQsnOM1J0uGzpGyic6jT/IR8d8WfrzrmyIV2Yc6lVbg20Wn3Y xFFLCutoFZFoaNMwVV/pyBBKczNoGGJIl1AVYrmo8qd2dCcswZ1vLMaTfwNt7Vlpz3Alpd z/2pgctf0nFv9n4Zb0/M2Kaky5MrSxM7PWPLwPRN7s5YyU1u1l7tIDFk7dxo1/aV5cvahy 43sLKk2P0SZNcJAD4HedkLxwOnAJTMg3GIDcuvqt1go+3qnajRXF2hJei4Brow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641403473; a=rsa-sha256; cv=none; b=gdeZ4e5AipjkWhHUdVl4gwE6IA3RabsLW9Q1x1uPsvJ3/zQ9WmAgD+MG2LfqJd4h7J44N+ abe7UE7BuVFCyw8rcwi5gDccow2HUSZiDa+DwPfDJLRnjw9029xH80HJs97icN8z5vXI5h z3222CcxbUyaBZizAi/x9yt91KzxrLJzuYVM5brab//Ym/r/Gc5Rf9QLfBIwx5YpdVnrXe PFqCzQJFAUh21Wx/EguQtiro8T0yFPBS0xa+cIBVZHoPfvto4m0OR6JF8V4V0a5mgX/KuS +AKoiGH26TjlpdWHC+E1kfdaerG/X9yidA+CRz8i2v96DTcHRxs6MQre5JBXxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=d11dfcf2b07e19630588404b30d48e545c83c99c commit d11dfcf2b07e19630588404b30d48e545c83c99c Author: Emmanuel Vadot AuthorDate: 2021-12-15 09:08:20 +0000 Commit: Emmanuel Vadot CommitDate: 2022-01-05 17:23:52 +0000 pkgbase: Create a FreeBSD-periodic package While here put the periodic files for some utilities in their own packages. MFC after: 2 weeks Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D33454 (cherry picked from commit b3d14eaccc5f606690d99b1998bfdf32a22404f6) --- release/packages/Makefile.package | 2 ++ usr.sbin/periodic/Makefile | 2 ++ usr.sbin/periodic/etc/daily/Makefile | 12 ++++++++---- usr.sbin/periodic/etc/monthly/Makefile | 2 ++ usr.sbin/periodic/etc/security/Makefile | 22 ++++++++++++++++------ usr.sbin/periodic/etc/weekly/Makefile | 2 ++ 6 files changed, 32 insertions(+), 10 deletions(-) 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 @@ -83,6 +83,8 @@ 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 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,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 index f6557a10ba80..2bffdba05d2b 100644 --- a/usr.sbin/periodic/etc/daily/Makefile +++ b/usr.sbin/periodic/etc/daily/Makefile @@ -2,6 +2,8 @@ .include +PACKAGE= periodic + CONFGROUPS= CONFS CONFS= 100.clean-disks \ @@ -49,10 +51,12 @@ CONFS+= 480.status-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" 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 @@ -2,6 +2,8 @@ .include +PACKAGE= periodic + CONFGROUPS= CONFS CONFS= 450.status-security \ 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 @@ -2,6 +2,8 @@ .include +PACKAGE= periodic + CONFGROUPS= CONFS DATA CONFS= 100.chksetuid \ @@ -12,23 +14,31 @@ CONFS= 100.chksetuid \ 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 index 9c54eaa6483f..74ab84f3684e 100644 --- a/usr.sbin/periodic/etc/weekly/Makefile +++ b/usr.sbin/periodic/etc/weekly/Makefile @@ -2,6 +2,8 @@ .include +PACKAGE= periodic + CONFS= 340.noid \ 450.status-security \ 999.local