X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fw_scan;h=df8d3ffe9f2d2a3dd2b02f2915fce73a5a6f9177;hb=e902ebe3be6931f6c632b105ad8fe6997afb305c;hp=0fc3ccae9e1097685f76661c94695b7c0cc638d6;hpb=ea317fe337f95e1e9d14dcd85b3cf90b18f89cab;p=ipfire-2.x.git

diff --git a/lfs/w_scan b/lfs/w_scan
index 0fc3ccae9e..df8d3ffe9f 100644
--- a/lfs/w_scan
+++ b/lfs/w_scan
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2020  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        #
@@ -25,7 +25,7 @@
 include Config
 
 
-VER        = 20080105
+VER        = 20170107
 
 THISAPP    = w_scan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -33,9 +33,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = w_scan
-PAK_VER    = 1
+PAK_VER    = 7
 
-DEPS       = ""
+DEPS       =
+
+CFLAGS    += -fcommon
 
 ###############################################################################
 # Top-level Rules
@@ -45,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9541244559d2da9442a137f7891d45d3
+$(DL_FILE)_MD5 = c7f9adf92d46b8da5391be80be6fbd72
 
 install : $(TARGET)
 
@@ -78,9 +80,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch < $(DIR_SRC)/src/patches/w_scan-ipfire.patch 
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && install -m 755 w_scan /opt/vdr/bin/
-	cd $(DIR_APP) && install -m 755 w_scan_start.sh /opt/vdr/bin/w_scan_start
+	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+	install -m 755 $(DIR_SRC)/config/w_scan/w_scan_start /usr/bin/
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)