From bc9cb7a339450eb1b7a3eb6017d20219e2c02d12 Mon Sep 17 00:00:00 2001
From: schwarze <>
Date: Sat, 9 May 2009 16:29:54 +0000
Subject: [PATCH] revert previous, requested by kettenis@ and deraadt@

---
 src/etc/Makefile      |  4 ++--
 src/etc/crontab       |  5 +++--
 src/etc/monthly       | 11 +++++++++++
 src/etc/mtree/special |  4 +++-
 4 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 src/etc/monthly

diff --git a/src/etc/Makefile b/src/etc/Makefile
index ef4e7088..a36d1082 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.275 2009/05/09 14:21:24 schwarze Exp $
+#	$OpenBSD: Makefile,v 1.276 2009/05/09 16:29:54 schwarze Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -14,7 +14,7 @@ BINOWN= root
 BINGRP= wheel
 BIN1=	changelist ccd.conf csh.cshrc csh.login csh.logout daily dhcpd.conf \
 	exports ftpusers ftpchroot gettytab group hosts hosts.lpd inetd.conf \
-	ksh.kshrc locate.rc man.conf motd mrouted.conf myname \
+	ksh.kshrc locate.rc man.conf monthly motd mrouted.conf myname \
 	netstart networks newsyslog.conf phones printcap protocols \
 	rbootd.conf rc rc.conf rc.local rc.securelevel rc.shutdown \
 	remote rpc security services shells syslog.conf weekly \
diff --git a/src/etc/crontab b/src/etc/crontab
index 3b2c4244..a2b9f802 100644
--- a/src/etc/crontab
+++ b/src/etc/crontab
@@ -1,4 +1,4 @@
-#	$OpenBSD: crontab,v 1.16 2009/05/09 14:21:24 schwarze Exp $
+#	$OpenBSD: crontab,v 1.17 2009/05/09 16:29:54 schwarze Exp $
 #
 # /var/cron/tabs/root - root's crontab
 #
@@ -16,7 +16,8 @@ HOME=/var/log
 # send log file notifications, if necessary
 #1-59	*	*	*	*	/usr/bin/newsyslog -m
 #
-# do daily and weekly maintenance
+# do daily/weekly/monthly maintenance
 30	1	*	*	*	umask 077; /bin/sh /etc/daily 2>&1 | tee /var/log/daily.out | mail -s "`/bin/hostname` daily output" root
 30	3	*	*	6	umask 077; /bin/sh /etc/weekly 2>&1 | tee /var/log/weekly.out | mail -s "`/bin/hostname` weekly output" root
+30	5	1	*	*	umask 077; /bin/sh /etc/monthly 2>&1 | tee /var/log/monthly.out | mail -s "`/bin/hostname` monthly output" root
 #0	*	*	*	*	/usr/libexec/spamd-setup
diff --git a/src/etc/monthly b/src/etc/monthly
new file mode 100644
index 00000000..1a0be6c5
--- /dev/null
+++ b/src/etc/monthly
@@ -0,0 +1,11 @@
+#!/bin/sh -
+#	$OpenBSD: monthly,v 1.9 2009/05/09 16:29:54 schwarze Exp $
+umask 022
+
+if [ -f /etc/monthly.local ];then
+	echo ""
+	echo "Running monthly.local:"
+	. /etc/monthly.local
+else
+	echo "Nothing to do!"
+fi
diff --git a/src/etc/mtree/special b/src/etc/mtree/special
index d09856a2..8fe78123 100644
--- a/src/etc/mtree/special
+++ b/src/etc/mtree/special
@@ -1,4 +1,4 @@
-#	$OpenBSD: special,v 1.83 2009/05/09 14:21:24 schwarze Exp $
+#	$OpenBSD: special,v 1.84 2009/05/09 16:29:54 schwarze Exp $
 #	$NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
@@ -47,6 +47,8 @@ login.conf	type=file mode=0644 uname=root gname=wheel
 mail.rc		type=file mode=0644 uname=root gname=wheel
 mailer.conf	type=file mode=0644 uname=root gname=wheel
 master.passwd	type=file mode=0600 uname=root gname=wheel
+monthly		type=file mode=0644 uname=root gname=wheel
+monthly.local	type=file mode=0644 uname=root gname=wheel optional
 mail		type=dir mode=0755 uname=root gname=wheel
 aliases		type=file mode=0644 uname=root gname=wheel optional
 aliases.db	type=file mode=0644 uname=root gname=wheel optional