Index: stable/10/usr.bin/locate/locate/locate.rc
===================================================================
--- stable/10/usr.bin/locate/locate/locate.rc	(revision 294778)
+++ stable/10/usr.bin/locate/locate/locate.rc	(revision 294779)
@@ -1,33 +1,33 @@
 #
 # /etc/locate.rc -  command script for updatedb(8)
 #
 # $FreeBSD$
 
 #
 # All commented values are the defaults
 #
 # temp directory
 #TMPDIR="/tmp"
 
 # the actual database
 #FCODES="/var/db/locate.database"
 
 # directories to be put in the database
 #SEARCHPATHS="/"
 
 # paths unwanted in output
-#PRUNEPATHS="/tmp /usr/tmp /var/tmp /var/db/portsnap"
+#PRUNEPATHS="/tmp /usr/tmp /var/tmp /var/db/portsnap /var/db/freebsd-update"
 
 # directories unwanted in output
 #PRUNEDIRS=".zfs"
 
 # filesystems allowed. Beware: a non-listed filesystem will be pruned
 # and if the SEARCHPATHS starts in such a filesystem locate will build
 # an empty database.
 #
 # the default list contains all local file systems that are not synthetic,
 # loopback mounts, or read-only, according to lsvfs.
 #
 # be careful if you add 'nfs' or other network file system types or file
 # systems that generally reside on slow or removable devices like cd9660
 #FILESYSTEMS="ufs ext2fs zfs xfs"
Index: stable/10/usr.bin/locate/locate/updatedb.sh
===================================================================
--- stable/10/usr.bin/locate/locate/updatedb.sh	(revision 294778)
+++ stable/10/usr.bin/locate/locate/updatedb.sh	(revision 294779)
@@ -1,102 +1,102 @@
 #!/bin/sh
 #
 # Copyright (c) September 1995 Wolfram Schneider <wosch@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.
 #
 # updatedb - update locate database for local mounted filesystems
 #
 # $FreeBSD$
 
 if [ "$(id -u)" = "0" ]; then
 	echo ">>> WARNING" 1>&2
 	echo ">>> Executing updatedb as root.  This WILL reveal all filenames" 1>&2
 	echo ">>> on your machine to all login users, which is a security risk." 1>&2
 fi
 : ${LOCATE_CONFIG="/etc/locate.rc"}
 if [ -f "$LOCATE_CONFIG" -a -r "$LOCATE_CONFIG" ]; then
        . $LOCATE_CONFIG
 fi
 
 # The directory containing locate subprograms
 : ${LIBEXECDIR:=/usr/libexec}; export LIBEXECDIR
 : ${TMPDIR:=/tmp}; export TMPDIR
 if ! TMPDIR=`mktemp -d $TMPDIR/locateXXXXXXXXXX`; then
 	exit 1
 fi
 
 PATH=$LIBEXECDIR:/bin:/usr/bin:$PATH; export PATH
 
 
 : ${mklocatedb:=locate.mklocatedb}	 # make locate database program
 : ${FCODES:=/var/db/locate.database}	 # the database
 : ${SEARCHPATHS="/"}		# directories to be put in the database
-: ${PRUNEPATHS="/tmp /usr/tmp /var/tmp /var/db/portsnap"} # unwanted directories
+: ${PRUNEPATHS="/tmp /usr/tmp /var/tmp /var/db/portsnap /var/db/freebsd-update"} # unwanted directories
 : ${PRUNEDIRS=".zfs"}	# unwanted directories, in any parent
 : ${FILESYSTEMS="$(lsvfs | tail -n +3 | \
 	egrep -vw "loopback|network|synthetic|read-only|0" | \
 	cut -d " " -f1)"}		# allowed filesystems
 : ${find:=find}
 
 if [ -z "$SEARCHPATHS" ]; then
 	echo "$0: empty variable SEARCHPATHS" >&2; exit 1
 fi
 if [ -z "$FILESYSTEMS" ]; then
 	echo "$0: empty variable FILESYSTEMS" >&2; exit 1
 fi
 
 # Make a list a paths to exclude in the locate run
 excludes="! (" or=""
 for fstype in $FILESYSTEMS
 do
        excludes="$excludes $or -fstype $fstype"
        or="-or"
 done
 excludes="$excludes ) -prune"
 
 if [ -n "$PRUNEPATHS" ]; then
 	for path in $PRUNEPATHS; do 
 		excludes="$excludes -or -path $path -prune"
 	done
 fi
 
 if [ -n "$PRUNEDIRS" ]; then
 	for dir in $PRUNEDIRS; do
 		excludes="$excludes -or -name $dir -type d -prune"
 	done
 fi
 
 tmp=$TMPDIR/_updatedb$$
 trap 'rm -f $tmp; rmdir $TMPDIR' 0 1 2 3 5 10 15
 		
 # search locally
 if $find -s $SEARCHPATHS $excludes -or -print 2>/dev/null |
         $mklocatedb -presort > $tmp
 then
 	if [ -n "$($find $tmp -size -257c -print)" ]; then
 		echo "updatedb: locate database $tmp is empty" >&2
 		exit 1
 	else
 		cat $tmp > $FCODES		# should be cp?
 	fi
 fi
Index: stable/10
===================================================================
--- stable/10	(revision 294778)
+++ stable/10	(revision 294779)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r290742