git: 901c52f13c46 - main - periodic: remove obsolete news.expire

The branch main has been updated by rew:

URL: https://cgit.FreeBSD.org/src/commit/?id=901c52f13c46a755f18f008106c0384cd6fd220c

commit 901c52f13c46a755f18f008106c0384cd6fd220c
Author:     Nils Johannsen <n.johannsen@beckhoff.com>
AuthorDate: 2022-03-08 04:29:26 +0000
Commit:     Robert Wing <rew@FreeBSD.org>
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