X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Ffireinfo;h=f1ee58a13c64488ff7099cbcff74b30bdecc4669;hp=97b5a87056ba33301eae841166be42cb2c0b98da;hb=429c1a3fc9b169f4fe26c163129b907ed473dbe1;hpb=769469ac75365a712cea77dd7089c20a709395b4

diff --git a/lfs/fireinfo b/lfs/fireinfo
index 97b5a8705..f1ee58a13 100644
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -24,11 +24,11 @@
 
 include Config
 
-VER        = 2.0.2
+VER        = 2.1.9
 
-THISAPP    = fireinfo-$(VER)
+THISAPP    = fireinfo-v$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
+DL_FROM    = http://source.ipfire.org/releases/fireinfo/
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ed29f591ccfeeb6386a61eafcc5dc398
+$(DL_FILE)_MD5 = a4dbb3a4111f263b5059b2f76b14b32c
 
 install : $(TARGET)
 
@@ -71,14 +71,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
-	# Fix for braindead board vendors.
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-invalid-id.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-0001-Exclude-some-more-invalid-patterns.patch
 
-	cd $(DIR_APP) && python setup.py build
-	cd $(DIR_APP) && python setup.py install
-
-	# Remove egg-info
-	rm -rvf /usr/lib/python*/site-packages/fireinfo*.egg-info
+	cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
+	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)