From: schwarze <schwarze@openbsd.org>
Date: Sat, 15 Apr 2017 13:12:08 +0000 (+0000)
Subject: Build full mandoc.db(5) databases by default using makewhatis(8)
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=78be3774fe644a631f73b69741209a34d43285ea;p=openbsd

Build full mandoc.db(5) databases by default using makewhatis(8)
without -Q during the build and in weekly(8).  According to tests
by many developers, makewhatis(8) takes a few minutes at most even
on slower hardware like octeon, loongson, ALIX, RPI3, Soekris,
cubox, softiron etc., and security(8) is often worse than makewhatis(8).

In case this causes excessive weekly(8) run times on even slower
(~50 MHz-class) CPUs, consider adding "MAKEWHATISARGS=-Q" to
/etc/weekly.local on machines that feel unhappy.

OK sthen@ kettenis@ millert@ deraadt@
---

diff --git a/etc/weekly b/etc/weekly
index d0170ba28d2..f4609e4e66b 100644
--- a/etc/weekly
+++ b/etc/weekly
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: weekly,v 1.27 2015/08/14 03:02:07 rzalamena Exp $
+#	$OpenBSD: weekly,v 1.28 2017/04/15 13:12:08 schwarze Exp $
 #
 # For local additions, create the file /etc/weekly.local.
 # To get section headers, use the function next_part in weekly.local.
@@ -63,7 +63,7 @@ if [ -f /var/db/locate.database ]; then
 fi
 
 next_part "Rebuilding whatis databases:"
-/usr/sbin/makewhatis ${MAKEWHATISARGS:--Q}
+/usr/sbin/makewhatis $MAKEWHATISARGS
 
 next_part "Doing login accounting:"
 [ "X$LOGINACCOUNTING" = X1 ] && {
diff --git a/share/man/Makefile b/share/man/Makefile
index 6b3e3de8b59..f88fe3c483a 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 2016/11/08 19:33:58 tb Exp $
+#	$OpenBSD: Makefile,v 1.13 2017/04/15 13:12:08 schwarze Exp $
 #	from: @(#)Makefile	5.9 (Berkeley) 7/1/91
 
 SUBDIR=	man1 man3 man4 man5 man6 man7 man8 man9
@@ -8,7 +8,7 @@ afterinstall:
 	    man0/COPYRIGHT ${DESTDIR}/usr/share/man/COPYRIGHT
 
 makedb:
-	/usr/sbin/makewhatis -Qv ${DESTDIR}/usr/share/man
+	/usr/sbin/makewhatis ${DESTDIR}/usr/share/man
 	chown root:wheel ${DESTDIR}/usr/share/man/mandoc.db
 	chmod 644 ${DESTDIR}/usr/share/man/mandoc.db
 
diff --git a/share/man/man8/daily.8 b/share/man/man8/daily.8
index 9fb421de076..2d7bbe0e90c 100644
--- a/share/man/man8/daily.8
+++ b/share/man/man8/daily.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: daily.8,v 1.24 2016/04/29 13:05:33 schwarze Exp $
+.\"	$OpenBSD: daily.8,v 1.25 2017/04/15 13:12:08 schwarze Exp $
 .\"
 .\" Copyright (c) 2003 Jason McIntyre <jmc@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 29 2016 $
+.Dd $Mdocdate: April 15 2017 $
 .Dt DAILY 8
 .Os
 .Sh NAME
@@ -225,11 +225,9 @@ If set to 1, run
 .Xr ac 8
 to report login accounting.
 .It Ev MAKEWHATISARGS
-If set to a string containing at least one character (even a blank),
-use that string as the arguments to
-.Xr makewhatis 8 .
-If unset or empty, use the default argument
-.Fl Q .
+Arguments for
+.Xr makewhatis 8 ;
+empty by default.
 .El
 .Sh FILES
 .Bl -tag -width "/var/cron/tabs/root" -compact