Merge remote-tracking branch 'mfischer/snort' into next

[ipfire-2.x.git] / lfs / grep

diff --git a/lfs/grep b/lfs/grep
index 7d62f8b8dfb1b4a162b8fff618cb7c6d74a1de8e..ac201613d684520f699cf5f24c8ddad67d20ba73 100644 (file)
--- a/lfs/grep
+++ b/lfs/grep
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.5.1a
+VER        = 2.21
 
 THISAPP    = grep-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
@@ -54,7 +54,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 52202fe462770fa6be1bb667bd6cf30c
+$(DL_FILE)_MD5 = 43c48064d6409862b8a850db83c8038a
 
 install : $(TARGET)
 
@@ -83,11 +83,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(ROOT)" ""
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-redhat_fixes-2.patch
-       cd $(DIR_APP) && chmod +x tests/fmbtest.sh
-endif
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make $(EXTRA_INSTALL) install