118 lines
4.2 KiB
Diff
118 lines
4.2 KiB
Diff
From dc92679e2c363f8c0d659fa428c138684455a6bd Mon Sep 17 00:00:00 2001
|
|
From: Kamil Dudka <kdudka@redhat.com>
|
|
Date: Wed, 11 May 2011 16:46:13 +0200
|
|
Subject: [PATCH 1/4] findutils-4.4.0-no-locate.patch
|
|
|
|
---
|
|
Makefile.am | 2 +-
|
|
configure.ac | 2 --
|
|
doc/find.texi | 24 ++++++++----------------
|
|
3 files changed, 9 insertions(+), 19 deletions(-)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index c7f8f39..0dacb93 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -9,7 +9,7 @@ DISTCLEANFILES = tool-versions.txt
|
|
|
|
|
|
# "tests" is the gnulib unit test dir.
|
|
-SUBDIRS = gl tests build-aux lib find xargs locate doc po m4
|
|
+SUBDIRS = gl tests build-aux lib find xargs doc po m4
|
|
|
|
ACLOCAL_AMFLAGS = -I gl/m4 -I m4
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index f31dd37..431f0ce 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -244,8 +244,6 @@ find/testsuite/Makefile
|
|
gl/Makefile
|
|
gl/lib/Makefile
|
|
lib/Makefile
|
|
-locate/Makefile
|
|
-locate/testsuite/Makefile
|
|
m4/Makefile
|
|
po/Makefile.in
|
|
po/Makefile
|
|
diff --git a/doc/find.texi b/doc/find.texi
|
|
index 1f278de..c584298 100644
|
|
--- a/doc/find.texi
|
|
+++ b/doc/find.texi
|
|
@@ -7,7 +7,6 @@
|
|
@c %**end of header
|
|
|
|
@include version.texi
|
|
-@include ../locate/dblocation.texi
|
|
|
|
@iftex
|
|
@finalout
|
|
@@ -571,8 +570,7 @@ the databases are updated, and the directories for which they contain
|
|
entries.
|
|
|
|
Here is how to select which file name databases @code{locate}
|
|
-searches. The default is system-dependent. At the time this document
|
|
-was generated, the default was @file{@value{LOCATE_DB}}.
|
|
+searches. The default is system-dependent.
|
|
|
|
@table @code
|
|
@item --database=@var{path}
|
|
@@ -2840,13 +2838,9 @@ thrashing the network.
|
|
directories are indexed by each database file.
|
|
|
|
The default location for the locate database depends on how findutils
|
|
-is built, but the findutils installation accompanying this manual uses
|
|
-the default location @file{@value{LOCATE_DB}}.
|
|
-
|
|
-If no database exists at @file{@value{LOCATE_DB}} but the user did not
|
|
-specify where to look (by using @samp{-d} or setting
|
|
-@code{LOCATE_PATH}), then @code{locate} will also check for a
|
|
-``secure'' database in @file{/var/lib/slocate/slocate.db}.
|
|
+is built. If user did not specify where to look (by using @samp{-d}
|
|
+or setting @code{LOCATE_PATH}), then @code{locate} will also check for
|
|
+a ``secure'' database in @file{/var/lib/slocate/slocate.db}.
|
|
|
|
@node Database Formats
|
|
@section Database Formats
|
|
@@ -3389,8 +3383,7 @@ present.
|
|
|
|
@item --database=@var{path}
|
|
@itemx -d @var{path}
|
|
-Instead of searching the default @code{locate} database
|
|
-@file{@value{LOCATE_DB}}, @code{locate} searches the file
|
|
+@code{locate} searches the file
|
|
name databases in @var{path}, which is a colon-separated list of
|
|
database file names. You can also use the environment variable
|
|
@code{LOCATE_PATH} to set the list of database files to search. The
|
|
@@ -3575,8 +3568,7 @@ The environment variable @code{PRUNEFS} also sets this value. Default
|
|
is @file{nfs NFS proc}.
|
|
|
|
@item --output=@var{dbfile}
|
|
-The database file to build. The default is system-dependent, but
|
|
-when this document was formatted it was @file{@value{LOCATE_DB}}.
|
|
+The database file to build.
|
|
|
|
@item --localuser=@var{user}
|
|
The user to search the non-network directories as, using @code{su}.
|
|
@@ -5583,7 +5575,7 @@ why @code{xargs} is confused by your operating system).
|
|
@section Error Messages From @code{locate}
|
|
|
|
@table @samp
|
|
-@item warning: database @file{@value{LOCATE_DB}} is more than 8 days old
|
|
+@item warning: database @file{LOCATE_DB} is more than 8 days old
|
|
The @code{locate} program relies on a database which is periodically
|
|
built by the @code{updatedb} program. That hasn't happened in a long
|
|
time. To fix this problem, run @code{updatedb} manually. This can
|
|
@@ -5591,7 +5583,7 @@ often happen on systems that are generally not left on, so the
|
|
periodic ``cron'' task which normally does this doesn't get a chance
|
|
to run.
|
|
|
|
-@item locate database @file{@value{LOCATE_DB}} is corrupt or invalid
|
|
+@item locate database @file{LOCATE_DB} is corrupt or invalid
|
|
This should not happen. Re-run @code{updatedb}. If that works, but
|
|
@code{locate} still produces this error, run @code{locate --version}
|
|
and @code{updatedb --version}. These should produce the same output.
|
|
--
|
|
1.7.4.4
|
|
|