Added new imspector package.

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index fd04405fee9a0907cd66c530544c848c1fe76c29..abc666f8d3863a6c3bff60f7f87946499321b36d 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -151,7 +151,7 @@
 * igb-2.3.4-kmod-2.6.32.15-ipfire
 * igb-2.3.4-kmod-2.6.32.15-ipfire-xen
 * igmpproxy-0.1
-* imspector-0.9
+* imspector-20101008
 * inetutils-1.4.2
 * ipaddr-1.2
 * iperf-2.0.4
@@ -237,7 +237,7 @@
 * module-init-tools-3.5
 * motion-3.2.11
 * mpc-0.19
-* mpd-0.15.8
+* mpd-0.15.12
 * mpeg2dec-0.4.0b
 * mpfire-ipfire
 * mtd-CVS-20070507

diff --git a/lfs/imspector b/lfs/imspector
index 31e358dcbd97f39bc4917ac46ed7d6aa48e7a1e3..092211bc8c9b8398fd2ce8f8a3b4a4dca990e0fe 100644 (file)
--- a/lfs/imspector
+++ b/lfs/imspector
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.9
+VER        = 20101008
 
 THISAPP    = imspector-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = imspector
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 626abf7c2b8f15d56df679ad66624575
+$(DL_FILE)_MD5 = 032407bb13ccddb77328f83eded102ee
 
 install : $(TARGET)
 
@@ -77,9 +77,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && make install
+       cd $(DIR_SRC)/imspector && make install
        -mv /usr/etc/imspector /etc/imspector
-       install -v -m 755  $(DIR_CONF)/imspector/imspector.conf /etc/imspector.conf
+       -mv /etc/imspector/imspector /etc/imspector
+       install -v -m 755 $(DIR_CONF)/imspector/imspector.conf /etc/imspector.conf
        install -v -m 644 $(DIR_SRC)/config/backup/includes/imspector /var/ipfire/backup/addons/includes/imspector
        chmod 755 /srv/web/ipfire/cgi-bin/imspector.cgi
        chown nobody:nobody -R /var/log/imspector