From 75d098ef810d11a1b6f16550847fc468939ab11d Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 12 Apr 2008 18:33:55 +0200 Subject: [PATCH] missed w_scan files --- lfs/w_scan | 86 +++++++++++++++++++++++++++++++++ src/patches/w_scan-ipfire.patch | 24 +++++++++ 2 files changed, 110 insertions(+) create mode 100644 lfs/w_scan create mode 100644 src/patches/w_scan-ipfire.patch diff --git a/lfs/w_scan b/lfs/w_scan new file mode 100644 index 0000000000..508562e9a0 --- /dev/null +++ b/lfs/w_scan @@ -0,0 +1,86 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + + +VER = 20080105 + +THISAPP = w_scan-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = w_scan +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 9541244559d2da9442a137f7891d45d3 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(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 + cd $(DIR_APP) && install -m 755 w_scan /opt/vdr/bin/ + cd $(DIR_APP) && install -m 755 w_scan_start.sh /opt/vdr/bin/ + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/src/patches/w_scan-ipfire.patch b/src/patches/w_scan-ipfire.patch new file mode 100644 index 0000000000..96c87afab8 --- /dev/null +++ b/src/patches/w_scan-ipfire.patch @@ -0,0 +1,24 @@ +--- w_scan_start.sh.org 2008-01-05 19:58:44.000000000 +0100 ++++ w_scan_start.sh 2008-04-12 18:18:19.000000000 +0200 +@@ -224,7 +224,7 @@ + echo "Checking for ct-vdr style startscript.." + if [ -e /etc/init.d/vdr ]; then # c't-vdr + echo_yes +- $(/etc/init.d/vdr stop) ++ /etc/init.d/vdr stop + stopped=true + else + echo_no +@@ -692,9 +692,9 @@ + echo "" + echo -e -n $NORMAL + else +- if [ -d /etc/vdr ]; then +- mv /etc/vdr/channels.conf /etc/vdr/channels.conf-backup$DATE +- cp channels.conf-$DATE /etc/vdr/channels.conf ++ if [ -d /opt/vdr/etc ]; then ++ mv /opt/vdr/etc/channels.conf /opt/vdr/etc/channels.conf-backup$DATE ++ cp channels.conf-$DATE /opt/vdr/etc/channels.conf + fi + if [ -d /var/lib/vdr ]; then + mv /var/lib/vdr/channels.conf /var/lib/vdr/channels.conf-backup$DATE -- 2.39.2