From 957a1f044c122895a23627dc4e9a64c9bae4815b Mon Sep 17 00:00:00 2001 From: "Alan J. Wylie" <alan@wylie.me.uk> Date: Wed, 26 Jan 2005 15:58:14 +0000 Subject: [PATCH] alanw: Update findutils to latest version - fixes serious bug where pattern matching fails. # ./locate/locate --version GNU locate version 4.2.3 # ./locate/locate "*/monodoc-1.0.5.*" (no results returned) # locate --version GNU locate version 4.2.11 # locate "*/monodoc-1.0.5.*" /work/rock/2.1/rock/download/mirror/m/monodoc-1.0.5.tar.bz2 [2005010412202916257] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5498 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/findutils/findutils.desc | 4 +-- package/base/findutils/var_state.patch | 37 +++++--------------------- 2 files changed, 9 insertions(+), 32 deletions(-) diff --git a/package/base/findutils/findutils.desc b/package/base/findutils/findutils.desc index 9f16b98ae..49fca84d4 100644 --- a/package/base/findutils/findutils.desc +++ b/package/base/findutils/findutils.desc @@ -37,8 +37,8 @@ [L] GPL [S] Stable -[V] 4.2.3 +[V] 4.2.11 [P] X X1---5---9 107.200 -[D] 780490195 findutils-4.2.3.tar.gz ftp://alpha.gnu.org/gnu/findutils/ +[D] 3311135745 findutils-4.2.11.tar.gz ftp://alpha.gnu.org/gnu/findutils/ diff --git a/package/base/findutils/var_state.patch b/package/base/findutils/var_state.patch index a0b5bb641..0806e94fa 100644 --- a/package/base/findutils/var_state.patch +++ b/package/base/findutils/var_state.patch @@ -1,35 +1,12 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/findutils/var_state.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - - -Just following the FHS ... - - - Clifford - ---- ./locate/Makefile.in -+++ ./locate/Makefile.in -@@ -144,7 +144,7 @@ +diff -Naur findutils-4.2.11/locate/Makefile.in findutils-4.2.11.new/locate/Makefile.in +--- findutils-4.2.11/locate/Makefile.in 2005-01-03 00:42:34.000000000 +0000 ++++ findutils-4.2.11.new/locate/Makefile.in 2005-01-04 10:45:43.000000000 +0000 +@@ -286,7 +286,7 @@ # The default database to build and search. - AUTOMAKE_OPTIONS = ../lib/ansi2knr + AUTOMAKE_OPTIONS = std-options -LOCATE_DB = $(localstatedir)/locatedb +LOCATE_DB = /var/state/locatedb localedir = $(datadir)/locale - - bin_PROGRAMS = locate + AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = frcode code bigram + bin_SCRIPTS = updatedb