X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Ffindutils;h=1ec69c99a519eab4b831a62a7d097d4b62083ccb;hp=c05aca3cb712f853996ef290898d29a264ea5141;hb=b57220aacdc2868f2ffab38348cf6f04af5c02a0;hpb=e2929cde1203ebeb194264bb7d7b9ca4e484e525

diff --git a/lfs/findutils b/lfs/findutils
index c05aca3cb7..1ec69c99a5 100644
--- a/lfs/findutils
+++ b/lfs/findutils
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
+# Copyright (C) 2007-2018  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,26 +24,22 @@
 
 include Config
 
-VER        = 4.4.2
+VER        = 4.6.0
 
 THISAPP    = findutils-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
-# Normal build or /tools build.
+# Normal build or $(TOOLS_DIR) build.
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --libexecdir=/usr/lib/findutils \
     --localstatedir=/var/lib/locate --disable-nls
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=/tools --disable-nls
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
+  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls --build=$(BUILDTARGET)
 endif
 
 ###############################################################################
@@ -54,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 351cc4adb07d54877fa15f75fb77d39f
+$(DL_FILE)_MD5 = 9936aa8009438ce185bea2694a997fc1
 
 install : $(TARGET)
 
@@ -84,13 +80,24 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+	# Newer C libraries omit this include from sys/types.h.
+	# https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html
+	cd $(DIR_APP) && sed -i gl/lib/mountlist.c \
+		-e "/include.*config.h/a#ifdef MAJOR_IN_SYSMACROS\n#include <sys/sysmacros.h>\n#endif\n"
+
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/findutils-4.6.0-glibc2.28.patch
 	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
 ifeq "$(ROOT)" ""
 	mv -v /usr/bin/find /bin
 	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)