Merge branch 'master' into kernel-4.9

[people/pmueller/ipfire-2.x.git] / lfs / findutils

diff --git a/lfs/findutils b/lfs/findutils
index 07658f231c4939cbe27d2c7da0c625073ec8b7e0..d1a520b3f6837b01dcded126413d21ad7dcfe3fa 100644 (file)
--- a/lfs/findutils
+++ b/lfs/findutils
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.2.27
+VER        = 4.6.0
 
 THISAPP    = findutils-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ ifeq "$(ROOT)" ""
   EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=/tools --disable-nls
+  EXTRA_CONFIG = --prefix=/tools --disable-nls --build=$(BUILDTARGET)
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
@@ -54,7 +54,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f1e0ddf09f28f8102ff3b90f3b5bc920
+$(DL_FILE)_MD5 = 9936aa8009438ce185bea2694a997fc1
 
 install : $(TARGET)
 
@@ -89,7 +89,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(EXTRA_INSTALL) install
 ifeq "$(ROOT)" ""
        mv -v /usr/bin/find /bin
-       sed -i -e 's/find:=${BINDIR}/find:=\/bin/' /usr/bin/updatedb
+       sed -i -e 's|BINDIR=/usr/bin|BINDIR=/bin|' /usr/bin/updatedb
+       -mkdir -p /var/lib/locate
+
+       -mkdir -pv /etc/fcron.weekly
+       install -v -m 754 $(DIR_SRC)/config/findutils/updatedb \
+               /etc/fcron.weekly/updatedb
 endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)