From nobody Tue Mar 08 04:47:54 2022 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 05C191A02631; Tue, 8 Mar 2022 04:47:55 +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 4KCN9k49mhz3npd; Tue, 8 Mar 2022 04:47:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646714874; 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=+qyWRwFvsV5+a1Ye1qCwYgbcDBlkQ0DyGe6fa5unB8Y=; b=D6ya3FHpBdCATP7JrUQGBzfXF9KtwdiYVhWtf9fijENeLffpWVEItLIIcWIHhBYNxfBWE9 YcqoualbCnFOgeY2TDMOKHt/rabIary+IleVGLmPGJU/EaXRcHXH+gUMJvoF+Si0aqVYMY d87FJy0TLiWMIGkOeXUPG44uqNZbS5UvFm6321ZmBmJzJAvpRziM6+7A0vt7UR2NfaC8hx X0PwJVpEJx9PhEm0CJNGXDLOY6/0eAJP0/qTkOCYvuUTcpYm6lW8yGtk24EBVez0tbu4pF 2NR+qlXEIObLYmlKS0YBdW4VRluk0cR4WBztok15JDKG/jU9APiPhl8CN6Ga0A== 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 53EAD1631C; Tue, 8 Mar 2022 04:47:54 +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 2284lsNA026807; Tue, 8 Mar 2022 04:47:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2284lsQ9026806; Tue, 8 Mar 2022 04:47:54 GMT (envelope-from git) Date: Tue, 8 Mar 2022 04:47:54 GMT Message-Id: <202203080447.2284lsQ9026806@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: 901c52f13c46 - main - periodic: remove obsolete news.expire 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 901c52f13c46a755f18f008106c0384cd6fd220c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646714874; 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=+qyWRwFvsV5+a1Ye1qCwYgbcDBlkQ0DyGe6fa5unB8Y=; b=JWiSJdY0saDwU0Dx0VG41bnijhxWfZ++0c87Q5FZRUxUQpnM1DJahxzeIAODSksIiHOY1A rAO7Ai1MlYjsKiVklA5M+vOZY/PbJSQ6ILqL46eb1YVe3J5PA+2nQvD3evLkkPHRRXejVA XjD8s4FOOuWUDftTUL91tQaM0qe8z1qWVgVnT+I9gRzc2Y1U1U7b4/pdIx97Vs0WV/Ei6J e+ct1WW9J+UM/v6YQHYbD5Lxhg3MIxGj1oYWW4C8Yn5IDVnAJERaFHWq97q6b3kwH5+8sA KudVwqKtjexxAsDQGzE6DRMFtNOLfbZfqKlSyheZbJH0oXjbEiLzk7BHzIT9aA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646714874; a=rsa-sha256; cv=none; b=uie0R35B6J0c9RAHYcSVP1xKfeYV60PyvWZaelZ5dWNmK2Hblf7DU1i+EMJgPV2gZHHvmD 8YiX1INPLoTTOWtwboKVKuu4hfmKdvUOG4x9m4rSrO1Z/R9DuY8hvnQ7CE+cp7qwqyQPpE Y4AZOvPvAbjC/2LQlZ5wc7lm8dc/ajBRTBOtP2oPOb3kbfWmY4v0zQBiJbpddScoSOpHev qBna2JagT/CvJjPMfjiv5eQft4ZwXIKgGV8xVSm6y2He/9LXqWcT9+ZbLUmBCnPasyL7UX XVCIavPb4nPCJvznT2syAN4qmABGQgZa78E5agWGbrpVUKJ1NRWQY8Fvyfp5sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=901c52f13c46a755f18f008106c0384cd6fd220c commit 901c52f13c46a755f18f008106c0384cd6fd220c Author: Nils Johannsen AuthorDate: 2022-03-08 04:29:26 +0000 Commit: Robert Wing CommitDate: 2022-03-08 04:37:42 +0000 periodic: remove obsolete news.expire With the initial import of 386BSD 0.1 in 1993, the daily execution of /etc/news.expire was introduced (see commit 1bf9d5d9518e). In 1997, this was brought into periodic resulting in daily/330.news (see commit 28dce04d1975). But as far as I see, /etc/news.expire has never existed. PR: 256238 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D30631 --- ObsoleteFiles.inc | 3 +++ share/man/man5/periodic.conf.5 | 8 +------- usr.sbin/periodic/etc/daily/330.news | 34 ---------------------------------- usr.sbin/periodic/etc/daily/Makefile | 1 - usr.sbin/periodic/periodic.conf | 3 --- 5 files changed, 4 insertions(+), 45 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 2cac44bbd715..c59d6464c63e 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20220307: remove 330.news +OLD_FILES+=etc/periodic/daily/330.news + # 20220210: unwind.h moved to /usr/include OLD_FILES+=usr/include/c++/v1/unwind-arm.h OLD_FILES+=usr/include/c++/v1/unwind-itanium.h diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5 index ef80578e5372..293a6a3e0cc3 100644 --- a/share/man/man5/periodic.conf.5 +++ b/share/man/man5/periodic.conf.5 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 7, 2020 +.Dd March 7, 2022 .Dt PERIODIC.CONF 5 .Os .Sh NAME @@ -396,12 +396,6 @@ is set to .Dq Li YES . The default is .Fl q . -.It Va daily_news_expire_enable -.Pq Vt bool -Set to -.Dq Li YES -if you want to run -.Pa /etc/news.expire . .It Va daily_status_disks_enable .Pq Vt bool Set to diff --git a/usr.sbin/periodic/etc/daily/330.news b/usr.sbin/periodic/etc/daily/330.news deleted file mode 100755 index ec064376d78f..000000000000 --- a/usr.sbin/periodic/etc/daily/330.news +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Expire news articles -# (This is present only for backwards compatibility, usually the news -# system handles this on its own). - -# If there is a global system configuration file, suck it in. -# -if [ -r /etc/defaults/periodic.conf ] -then - . /etc/defaults/periodic.conf - source_periodic_confs -fi - -case "$daily_news_expire_enable" in - [Yy][Ee][Ss]) - if [ ! -f /etc/news.expire ] - then - echo '$daily_news_expire_enable is set but /etc/news.expire' \ - "doesn't exist" - rc=2 - else - echo "" - echo "Running news.expire:" - - /etc/news.expire && rc=0 || rc=3 - fi;; - - *) rc=0;; -esac - -exit $rc diff --git a/usr.sbin/periodic/etc/daily/Makefile b/usr.sbin/periodic/etc/daily/Makefile index 2bffdba05d2b..fefe35eebe18 100644 --- a/usr.sbin/periodic/etc/daily/Makefile +++ b/usr.sbin/periodic/etc/daily/Makefile @@ -14,7 +14,6 @@ CONFS= 100.clean-disks \ 210.backup-aliases \ 221.backup-gpart \ 222.backup-gmirror \ - 330.news \ 400.status-disks \ 401.status-graid \ 406.status-gmirror \ diff --git a/usr.sbin/periodic/periodic.conf b/usr.sbin/periodic/periodic.conf index 4429c8d48eea..ade62be10e96 100644 --- a/usr.sbin/periodic/periodic.conf +++ b/usr.sbin/periodic/periodic.conf @@ -109,9 +109,6 @@ daily_accounting_compress="NO" # Gzip rotated files daily_accounting_flags=-q # Flags to /usr/sbin/sa daily_accounting_save=3 # How many files to save -# 330.news -daily_news_expire_enable="YES" # Run news.expire - # 400.status-disks daily_status_disks_enable="YES" # Check disk status daily_status_disks_df_flags="-l -h" # df(1) flags for check