This file never sets the $locate variable, which means it's broken.  There are
some non-trivial patches to this file, but that happened because the same diffs
were applied to another script in those commits. This is broken since 1996.
FreeBSD fixed it, but since nobody complained for 21 years, perhaps let's just
remove it.

OK?

Index: usr.bin/locate/locate/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/locate/locate/Makefile,v
retrieving revision 1.11
diff -u -p -u -r1.11 Makefile
--- usr.bin/locate/locate/Makefile      21 Nov 2015 19:35:20 -0000      1.11
+++ usr.bin/locate/locate/Makefile      12 Jun 2017 19:33:10 -0000
@@ -7,7 +7,7 @@ PROG=   locate
 SRCS=  util.c locate.c
 CFLAGS+= -I${.CURDIR}
 MAN=   locate.1        locate.updatedb.8
-SCRIPTS= updatedb mklocatedb concatdb
+SCRIPTS= updatedb mklocatedb
 
 
 beforeinstall:
Index: usr.bin/locate/locate/concatdb.sh
===================================================================
RCS file: usr.bin/locate/locate/concatdb.sh
diff -N usr.bin/locate/locate/concatdb.sh
--- usr.bin/locate/locate/concatdb.sh   29 Jun 2003 21:59:28 -0000      1.10
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,73 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: concatdb.sh,v 1.10 2003/06/29 21:59:28 millert Exp $
-#
-# Copyright (c) September 1995 Wolfram Schneider <wo...@freebsd.org>. Berlin.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# concatdb - concatenate locate databases
-# 
-# usage: concatdb database1 ... databaseN > newdb
-#
-# Sequence of databases is important.
-#
-# $Id: concatdb.sh,v 1.10 2003/06/29 21:59:28 millert Exp $
-
-# The directory containing locate subprograms
-: ${LIBEXECDIR=/usr/libexec}; export LIBEXECDIR
-
-PATH=$LIBEXECDIR:/bin:/usr/bin:$PATH; export PATH
-
-umask 077                      # protect temp files
-
-TMPDIR=${TMPDIR:-/tmp}; export TMPDIR;
-if test X"$TMPDIR" = X -o ! -d "$TMPDIR"; then
-       TMPDIR=/tmp; export TMPDIR
-fi
-
-# utilities to built locate database
-: ${bigram=locate.bigram}
-: ${code=locate.code}
-: ${sort=sort -H}
-
-
-case $# in 
-        [01])  echo 'usage: concatdb databases1 ... databaseN > newdb'
-               exit 1
-               ;;
-esac
-
-bigrams=`mktemp ${TMPDIR=/tmp}/_bigrams.XXXXXXXXXX` || exit 1
-
-trap 'rm -f $bigrams' 0 1 2 3 5 10 15
-
-for db 
-do
-       $locate -d $db /
-done | $bigram | $sort -nr | awk 'BEGIN { ORS = "" } NR <= 128 { print $2 }' > 
$bigrams
-
-for db
-do
-       $locate -d $db /
-done | $code $bigrams

-- 
Michal Mazurek

Reply via email to