summaryrefslogtreecommitdiffstats
path: root/source/a/findutils/patches/findutils-4.5.15-no-locate.patch
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/findutils/patches/findutils-4.5.15-no-locate.patch')
-rw-r--r--source/a/findutils/patches/findutils-4.5.15-no-locate.patch185
1 files changed, 185 insertions, 0 deletions
diff --git a/source/a/findutils/patches/findutils-4.5.15-no-locate.patch b/source/a/findutils/patches/findutils-4.5.15-no-locate.patch
new file mode 100644
index 000000000..7bf1f3361
--- /dev/null
+++ b/source/a/findutils/patches/findutils-4.5.15-no-locate.patch
@@ -0,0 +1,185 @@
+From 3e5e311d23ac0a5bd5930ddb4094f7555b886329 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Sat, 19 Dec 2015 22:56:40 +0100
+Subject: [PATCH 1/2] Revert "Don't include dblocation.texi from original spot,
+ symlink it."
+
+This reverts commit f59d88e456553dfe0b5185caf75e4041285fd595.
+---
+ configure.ac | 2 +-
+ doc/Makefile.am | 8 +-------
+ doc/find.texi | 2 +-
+ 3 files changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7962719..ce0e768 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -70,7 +70,7 @@ AC_PROG_CPP
+
+ dnl for gnulib
+ gl_EARLY
+-AC_PROG_LN_S
++
+ AC_PROG_INSTALL
+ AC_CHECK_TOOLS([AR], [ar])
+ AC_CHECK_TOOLS([RANLIB], [ranlib], [:])
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index f6f7443..6fbf57b 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -16,11 +16,9 @@ AM_CFLAGS = $(WARN_CFLAGS)
+
+ info_TEXINFOS = find.texi find-maint.texi
+ find_TEXINFOS = perm.texi parse-datetime.texi regexprops.texi fdl.texi
+-BUILT_SOURCES = dblocation.texi
+-nodist_find_TEXINFOS = dblocation.texi
+ find_maint_TEXINFOS = fdl.texi
+ MOSTLYCLEANFILES = find.cps
+-CLEANFILES = find.txt find_mono.html findutils.texi_html_node.tar.gz dblocation.texi
++CLEANFILES = find.txt find_mono.html findutils.texi_html_node.tar.gz
+
+ MAKEINFOTXT = $(MAKEINFO) --plaintext
+
+@@ -69,7 +67,3 @@ find_mono.html: find.texi
+ # for "make all" or "make install" (or even "make check").
+ findutils.texi_html_node.tar.gz: find.html
+ tar zcf $@ $<
+-
+-
+-dblocation.texi: ../locate/dblocation.texi
+- $(LN_S) ../locate/dblocation.texi $@
+diff --git a/doc/find.texi b/doc/find.texi
+index a83a645..c2714dd 100644
+--- a/doc/find.texi
++++ b/doc/find.texi
+@@ -7,7 +7,7 @@
+ @c %**end of header
+
+ @include version.texi
+-@include dblocation.texi
++@include ../locate/dblocation.texi
+
+ @iftex
+ @finalout
+--
+2.5.0
+
+
+From d5473caa86f689ebcadacc593f5a71781c99e829 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Wed, 11 May 2011 16:46:13 +0200
+Subject: [PATCH 2/2] 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 af82d54..6ad453b 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 ce0e768..521e665 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -248,8 +248,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 c2714dd..01367a4 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}
+@@ -2892,13 +2890,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
+@@ -3438,8 +3432,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
+@@ -3614,8 +3607,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}.
+@@ -5635,7 +5627,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
+@@ -5643,7 +5635,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.
+--
+2.5.0
+