Capi-Utils entfernt.
authorms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Thu, 16 Aug 2007 21:21:24 +0000 (21:21 +0000)
committerms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Thu, 16 Aug 2007 21:21:24 +0000 (21:21 +0000)
Green-only entfernt.
Snortsnarf entfernt.
Fritz-Card entfernt.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@772 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

20 files changed:
config/kernel/kernel.config.i586
config/kernel/kernel.config.i586.smp
config/rootfiles/common/capi4k-utils [deleted file]
config/rootfiles/common/fcdsl [deleted file]
config/rootfiles/common/fcdsl2 [deleted file]
config/rootfiles/common/fcdslsl [deleted file]
config/rootfiles/common/fcdslusb [deleted file]
doc/packages-list.txt
lfs/capi4k-utils [deleted file]
lfs/fcdsl [deleted file]
lfs/fcdsl2 [deleted file]
lfs/fcdslsl [deleted file]
lfs/fcdslslusb [deleted file]
lfs/fcdslusb [deleted file]
lfs/snortsnarf [deleted file]
make.sh
src/install+setup/setup/Makefile
src/install+setup/setup/isdn.c [deleted file]
src/install+setup/setup/networking.c
tools/make-functions

index 7213069..fc0b460 100644 (file)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16.50-ipfire
-# Wed Aug  1 13:18:33 2007
+# Linux kernel version: 2.6.16.53-ipfire
+# Thu Aug 16 21:07:31 2007
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -1367,14 +1367,7 @@ CONFIG_ISDN_CAPI_CAPIFS=m
 #
 # Active AVM cards
 #
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_T1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
+# CONFIG_CAPI_AVM is not set
 
 #
 # Active Eicon DIVA Server cards
index e10dec1..a421b01 100644 (file)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16.50-ipfire
-# Wed Aug  1 13:18:55 2007
+# Linux kernel version: 2.6.16.53-ipfire
+# Thu Aug 16 21:08:22 2007
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -1371,14 +1371,7 @@ CONFIG_ISDN_CAPI_CAPIFS=m
 #
 # Active AVM cards
 #
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_T1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
+# CONFIG_CAPI_AVM is not set
 
 #
 # Active Eicon DIVA Server cards
diff --git a/config/rootfiles/common/capi4k-utils b/config/rootfiles/common/capi4k-utils
deleted file mode 100644 (file)
index 016f7e8..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#etc/drdsl
-#etc/drdsl/adsl.conf
-#etc/ppp/peers
-#etc/ppp/peers/isdn
-etc/ppp/peers/isdn/arcor
-etc/ppp/peers/isdn/avm
-etc/ppp/peers/isdn/avm-ml
-etc/ppp/peers/isdn/leased
-etc/ppp/peers/isdn/otelo
-etc/ppp/peers/isdn/talkline
-#sbin/avmcapictrl
-sbin/capiinit
-usr/bin/capiinfo
-#usr/include/capi20.h
-#usr/include/capicmd.h
-#usr/include/capiutils.h
-#usr/lib/libcapi20.a
-#usr/lib/libcapi20.la
-usr/lib/libcapi20.so
-usr/lib/libcapi20.so.3
-usr/lib/libcapi20.so.3.0.4
-#usr/lib/libcapi20dyn.a
-#usr/lib/pppd/2.4.4
-usr/lib/pppd/2.4.4/capiplugin.so
-usr/lib/pppd/2.4.4/userpass.so
-#usr/man/man8/avmcapictrl.8
-#usr/man/man8/capiinfo.8
-#usr/man/man8/capiplugin.8
-#usr/share/man/man8/capiplugin.8
diff --git a/config/rootfiles/common/fcdsl b/config/rootfiles/common/fcdsl
deleted file mode 100644 (file)
index 4fdcf3a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#etc/fcdsl
-etc/fcdsl/fcdsl.conf
-#lib/modules/KVER-ipfire/extra
-#lib/modules/KVER-ipfire/extra/fcdsl.ko
-#lib/modules/KVER-ipfire-smp/extra/fcdsl.ko
-#usr/lib/isdn
-usr/lib/isdn/fdslbase.bin
diff --git a/config/rootfiles/common/fcdsl2 b/config/rootfiles/common/fcdsl2
deleted file mode 100644 (file)
index f1c886a..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#etc/drdsl/drdsl
-etc/drdsl/drdsl.ini
-etc/fcdsl/fcdsl2.conf
-#lib/modules/KVER-ipfire/extra/fcdsl2.ko
-#lib/modules/KVER-ipfire-smp/extra/fcdsl2.ko
-usr/lib/isdn/fds2base.bin
diff --git a/config/rootfiles/common/fcdslsl b/config/rootfiles/common/fcdslsl
deleted file mode 100644 (file)
index 6849973..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-etc/fcdsl/fcdslsl.conf
-#lib/modules/KVER-ipfire/extra/fcdslsl.ko
-#lib/modules/KVER-ipfire-smp/extra/fcdslsl.ko
-usr/lib/isdn/fdssbase.bin
diff --git a/config/rootfiles/common/fcdslusb b/config/rootfiles/common/fcdslusb
deleted file mode 100644 (file)
index c3dffc2..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/fcdsl/fcdslusb.conf
-usr/lib/isdn/fdsubase.frm
index 58071f1..ca7aea7 100644 (file)
@@ -60,7 +60,6 @@
 * coreutils-5.96
 * cpio-2.6
 * cups-1.2.12
-* cups-1.2.2
 * curl-7.15.3
 * cyrus-imapd-2.2.12
 * cyrus-sasl-2.1.21
diff --git a/lfs/capi4k-utils b/lfs/capi4k-utils
deleted file mode 100644 (file)
index 3e0808c..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall.                                    #
-#                                                                             #
-# IPCop 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 2 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# IPCop 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 IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 2005-07-18
-
-PPPVER = 2.4.4
-
-THISAPP    = capi4k-utils-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/capi4k-utils
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = c745759b6b3d64e19763727176648cdf
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# 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 zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP)/avmb1 && ./configure
-       cd $(DIR_APP)/avmb1 && make $(MAKETUNING)
-       cd $(DIR_APP)/avmb1 && make install
-       cd $(DIR_APP)/capiinit && ./configure
-       cd $(DIR_APP)/capiinit && make $(MAKETUNING)
-       cd $(DIR_APP)/capiinit && make install
-       cd $(DIR_APP)/capi20 && SED=sed ./configure
-       cd $(DIR_APP)/capi20 && SED=sed make $(MAKETUNING)
-       cd $(DIR_APP)/capi20 && make install
-       cd $(DIR_APP)/pppdcapiplugin && ln -sf ppp-2.4.3 ppp-$(PPPVER)
-       cd $(DIR_APP)/pppdcapiplugin && PPPVERSIONS="$(PPPVER)" make && PPPVERSIONS="$(PPPVER)" make install
-       cd $(DIR_APP)/capiinfo && ./configure
-       cd $(DIR_APP)/capiinfo && make $(MAKETUNING)
-       cd $(DIR_APP)/capiinfo && make install
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)
diff --git a/lfs/fcdsl b/lfs/fcdsl
deleted file mode 100644 (file)
index 9f83d58..0000000
--- a/lfs/fcdsl
+++ /dev/null
@@ -1,114 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall.                                    #
-#                                                                             #
-# IPCop 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 2 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# IPCop 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 IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = suse93-3.11-07
-
-THISAPP    = fcdsl-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/fritz
-
-ifeq "$(SMP)" ""
-       TARGET     = $(DIR_INFO)/$(THISAPP)
-else
-       TARGET     = $(DIR_INFO)/$(THISAPP)-smp
-endif
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 1a9add374a35d5c9e3c1784104e2907b
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# 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 zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/fritz-dsl-gcc-4-fix.patch
-ifeq "$(SMP)" ""
-       cd $(DIR_APP) && sed -i \
-           -e 's/$$(shell uname -m)/$(MACHINE)/' \
-           -e 's/$$(shell uname -r)/$(KVER)-ipfire/' \
-           -e 's/`uname -r`/$(KVER)-ipfire/' \
-           -e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-           -e '\+^CCFLAGS+a\ \
-                 -include \$$(KRNLINCL)/config/modversions.h' \
-           -e '/^DEFINES/a\ \
-                 -DMODVERSIONS \\' src/Makefile
-       cd $(DIR_APP) && sed -i -e 's/$$(shell uname -r)/$(KVER)-ipfire/' Makefile
-else
-       cd $(DIR_APP) && sed -i \
-           -e 's/$$(shell uname -m)/$(MACHINE)/' \
-           -e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' \
-           -e 's/`uname -r`/$(KVER)-ipfire-smp/' \
-           -e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-           -e '\+^CCFLAGS+a\ \
-                 -include \$$(KRNLINCL)/config/modversions.h' \
-           -e '/^DEFINES/a\ \
-                 -DMODVERSIONS \\' src/Makefile
-       cd $(DIR_APP) && sed -i -e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' Makefile
-endif
-       cd $(DIR_APP) && make CC=$(CC)
-       cd $(DIR_APP) && make CC=$(CC) install
-ifeq "$(SMP)" ""
-       -mkdir /usr/lib/isdn
-       cd $(DIR_APP) && install -m 0644 fdslbase.bin /usr/lib/isdn
-       -mkdir /etc/fcdsl
-       echo "# card          file            proto   io      irq     mem     cardnr  options"  >  /etc/fcdsl/fcdsl.conf
-       echo "fcdsl           fdslbase.bin    -       -       -       -       -"                >> /etc/fcdsl/fcdsl.conf
-endif
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)
diff --git a/lfs/fcdsl2 b/lfs/fcdsl2
deleted file mode 100644 (file)
index c9b04bb..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall.                                    #
-#                                                                             #
-# IPCop 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 2 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# IPCop 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 IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: fcdsl2,v 1.9 2006/04/30 23:15:05 chepati Exp $
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = suse93-3.11-07
-
-THISAPP    = fcdsl2-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/fritz
-
-ifeq "$(SMP)" ""
-       TARGET     = $(DIR_INFO)/$(THISAPP)
-else
-       TARGET     = $(DIR_INFO)/$(THISAPP)-smp
-endif
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = ba368e577418e181cffa7c69f960a8eb
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# 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 zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/fritz-dsl-gcc-4-fix.patch
-       #cd $(DIR_APP)/src && patch -Np2 < $(DIR_SRC)/src/patches/fcdslx-irqreturn.patch
-ifeq "$(SMP)" ""
-       cd $(DIR_APP) && sed -i \
-           -e 's/$$(shell uname -m)/$(MACHINE)/' \
-           -e 's/$$(shell uname -r)/$(KVER)-ipfire/' \
-           -e 's/`uname -r`/$(KVER)-ipfire/' \
-           -e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-           -e '\+^CCFLAGS+a\ \
-                 -include \$$(KRNLINCL)/config/modversions.h' \
-           -e '/^DEFINES/a\ \
-                 -DMODVERSIONS \\' src/Makefile
-       cd $(DIR_APP) && sed -i -e 's/$$(shell uname -r)/$(KVER)-ipfire/' Makefile
-else
-       cd $(DIR_APP) && sed -i \
-           -e 's/$$(shell uname -m)/$(MACHINE)/' \
-           -e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' \
-           -e 's/`uname -r`/$(KVER)-ipfire-smp/' \
-           -e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-           -e '\+^CCFLAGS+a\ \
-                 -include \$$(KRNLINCL)/config/modversions.h' \
-           -e '/^DEFINES/a\ \
-                 -DMODVERSIONS \\' src/Makefile
-       cd $(DIR_APP) && sed -i -e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' Makefile
-endif
-       cd $(DIR_APP) && make CC=$(CC)
-       cd $(DIR_APP) && make CC=$(CC) install
-
-ifeq "$(SMP)" ""
-       -mkdir /usr/lib/isdn
-       cd $(DIR_APP) && install -m 0644 fds2base.bin /usr/lib/isdn
-       -mkdir /etc/fcdsl
-       echo "# card          file            proto   io      irq     mem     cardnr  options"  > /etc/fcdsl/fcdsl2.conf
-       echo "fcdsl2           fds2base.bin    -       -       -       -       -"       >> /etc/fcdsl/fcdsl2.conf
-       -mkdir /etc/drdsl # install drdsl.ini from a 3.11.4 version as it has more lines than previous versions
-       cd $(DIR_APP) && install -m 0644 drdsl.ini /etc/drdsl
-       cd $(DIR_APP) && install -m 0755 drdsl /etc/drdsl
-endif
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)
diff --git a/lfs/fcdslsl b/lfs/fcdslsl
deleted file mode 100644 (file)
index 4323102..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall.                                    #
-#                                                                             #
-# IPCop 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 2 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# IPCop 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 IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = suse93-3.11-07
-
-THISAPP    = fcdslsl-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/fritz
-
-ifeq "$(SMP)" ""
-       TARGET     = $(DIR_INFO)/$(THISAPP)
-else
-       TARGET     = $(DIR_INFO)/$(THISAPP)-smp
-endif
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = f643737bb96d83aa57b95ced30a7d4b8
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# 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 zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/fritz-dsl-gcc-4-fix.patch
-ifeq "$(SMP)" ""
-       cd $(DIR_APP) && sed -i \
-           -e 's/$$(shell uname -m)/$(MACHINE)/' \
-           -e 's/$$(shell uname -r)/$(KVER)-ipfire/' \
-           -e 's/`uname -r`/$(KVER)-ipfire/' \
-           -e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-           -e '\+^CCFLAGS+a\ \
-                 -include \$$(KRNLINCL)/config/modversions.h' \
-           -e '/^DEFINES/a\ \
-                 -DMODVERSIONS \\' src/Makefile
-       cd $(DIR_APP) && sed -i -e 's/$$(shell uname -r)/$(KVER)-ipfire/' Makefile
-else
-       cd $(DIR_APP) && sed -i \
-           -e 's/$$(shell uname -m)/$(MACHINE)/' \
-           -e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' \
-           -e 's/`uname -r`/$(KVER)-ipfire-smp/' \
-           -e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-           -e '\+^CCFLAGS+a\ \
-                 -include \$$(KRNLINCL)/config/modversions.h' \
-           -e '/^DEFINES/a\ \
-                 -DMODVERSIONS \\' src/Makefile
-       cd $(DIR_APP) && sed -i -e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' Makefile
-endif
-       cd $(DIR_APP) && make CC=$(CC)
-       cd $(DIR_APP) && make CC=$(CC) install
-ifeq "$(SMP)" ""
-       -mkdir /usr/lib/isdn
-       cd $(DIR_APP) && install -m 0644 fdssbase.bin /usr/lib/isdn
-       -mkdir /etc/fcdsl
-       echo "# card          file            proto   io      irq     mem     cardnr  options"  >  /etc/fcdsl/fcdslsl.conf
-       echo "fcdslsl           fdssbase.bin    -       -       -       -       -"              >> /etc/fcdsl/fcdslsl.conf
-endif
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)
diff --git a/lfs/fcdslslusb b/lfs/fcdslslusb
deleted file mode 100644 (file)
index 10f1206..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall.                                    #
-#                                                                             #
-# IPCop 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 2 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# IPCop 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 IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-
-VER        = suse93-3.11-05
-
-THISAPP    = fcdslslusb-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/fritz
-ifeq "$(SMP)" ""
-  TARGET     = $(DIR_INFO)/$(THISAPP)
-else
-  TARGET     = $(DIR_INFO)/$(THISAPP)-smp
-endif
-
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = b54828edf784767f27954f3af4faff20
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# 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 zxf $(DIR_DL)/$(DL_FILE)
-       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fcdslx-irqreturn.patch
-       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fcdslslusb-singlelock.patch
-       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/fritz-dsl-gcc-4-fix.patch
-       cd $(DIR_APP)/src && patch -Np0 < $(DIR_SRC)/src/patches/fritz-fcdslusb-owner.patch
-ifeq "$(SMP)" ""
-       cd $(DIR_APP) && sed -i \
-           -e 's/$$(shell uname -m)/$(MACHINE)/' \
-           -e 's/$$(shell uname -r)/$(KVER)-ipfire/' \
-           -e 's/`uname -r`/$(KVER)-ipfire/' \
-           -e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-           -e '\+^CCFLAGS+a\ \
-                 -include \$$(KRNLINCL)/linux/modversions.h' \
-           -e '/^DEFINES/a\ \
-                 -DMODVERSIONS \\' src/Makefile
-       cd $(DIR_APP) && sed -i \
-           -e 's/$$(shell uname -r)/$(KVER)-ipfire/' Makefile
-else
-       cd $(DIR_APP) && sed -i \
-           -e 's/$$(shell uname -m)/$(MACHINE)/' \
-           -e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' \
-           -e 's/`uname -r`/$(KVER)-ipfire-smp/' \
-           -e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-           -e '\+^CCFLAGS+a\ \
-                 -include \$$(KRNLINCL)/linux/modversions.h' \
-           -e '/^DEFINES/a\ \
-                 -DMODVERSIONS \\' src/Makefile
-       cd $(DIR_APP) && sed -i \
-           -e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' Makefile
-endif
-       cd $(DIR_APP) && CC="$(KGCC)" make
-       cd $(DIR_APP) && CC="$(KGCC)" make install
-ifeq "$(SMP)" ""
-       -mkdir /usr/lib/isdn
-       cd $(DIR_APP) && install -m 0644 fdlubase.frm /usr/lib/isdn
-       -mkdir /etc/fcdsl
-       echo "# card          file            proto   io      irq     mem     cardnr  options"  >  /etc/fcdsl/fcdslslusb.conf
-       echo "fcdslslusb        fdlubase.frm    -       -       -       -       -"              >> /etc/fcdsl/fcdslslusb.conf
-endif
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)
diff --git a/lfs/fcdslusb b/lfs/fcdslusb
deleted file mode 100644 (file)
index 7b4428b..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall.                                    #
-#                                                                             #
-# IPCop 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 2 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# IPCop 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 IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-
-VER        = suse93-3.11-07
-
-THISAPP    = fcdslusb-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/fritz/1/fritz
-ifeq "$(SMP)" ""
-  TARGET     = $(DIR_INFO)/$(THISAPP)
-else
-  TARGET     = $(DIR_INFO)/$(THISAPP)-smp
-endif
-
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 9f68323005c54c26a11b81803397fa6d
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# 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 zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/fritz-dsl-gcc-4-fix.patch
-       cd $(DIR_APP)/src && patch -Np0 < $(DIR_SRC)/src/patches/fritz-fcdslusb-owner.patch
-ifeq "$(SMP)" ""
-       cd $(DIR_APP) && sed -i \
-           -e 's/$$(shell uname -m)/$(MACHINE)/' \
-           -e 's/$$(shell uname -r)/$(KVER)-ipfire/' \
-           -e 's/`uname -r`/$(KVER)-ipfire/' \
-           -e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-           -e '\+^CCFLAGS+a\ \
-                 -include \$$(KRNLINCL)/linux/modversions.h' \
-           -e '/^DEFINES/a\ \
-                 -DMODVERSIONS \\' src/Makefile
-       cd $(DIR_APP) && sed -i \
-           -e 's/$$(shell uname -r)/$(KVER)-ipfire/' Makefile
-else
-       cd $(DIR_APP) && sed -i \
-           -e 's/$$(shell uname -m)/$(MACHINE)/' \
-           -e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' \
-           -e 's/`uname -r`/$(KVER)-ipfire-smp/' \
-           -e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-           -e '\+^CCFLAGS+a\ \
-                 -include \$$(KRNLINCL)/linux/modversions.h' \
-           -e '/^DEFINES/a\ \
-                 -DMODVERSIONS \\' src/Makefile
-       cd $(DIR_APP) && sed -i \
-           -e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' Makefile
-endif
-       cd $(DIR_APP) && CC="$(KGCC)" make
-       cd $(DIR_APP) && CC="$(KGCC)" make install
-ifeq "$(SMP)" ""
-       -mkdir /usr/lib/isdn
-       cd $(DIR_APP) && install -m 0644 fdsubase.frm /usr/lib/isdn
-       -mkdir /etc/fcdsl
-       echo "# card          file            proto   io      irq     mem     cardnr  options"  >  /etc/fcdsl/fcdslusb.conf
-       echo "fcdslusb        fdsubase.frm    -       -       -       -       -"                >> /etc/fcdsl/fcdslusb.conf
-endif
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)
diff --git a/lfs/snortsnarf b/lfs/snortsnarf
deleted file mode 100644 (file)
index ef6de27..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall.                                    #
-#                                                                             #
-# IPCop 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 2 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# IPCop 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 IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 050314.1
-
-THISAPP    = SnortSnarf-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 28ad6d1c492d69ff519f7cab1549123d
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# 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 zxf $(DIR_DL)/$(DL_FILE)
-       mkdir /etc/snortsnarf
-       cp -R $(DIR_APP)/* /etc/snortsnarf
-       # install -m 0644 $(DIR_SRC)$(DL_FILE) /etc/snortsnarf/
-       chown nobody:nobody /etc/snortsnarf/snortsnarf.pl
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 8abfb88..a7e3e50 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -328,21 +328,11 @@ buildipfire() {
   ipfiremake unzip
   ipfiremake linux                     SMP=1
   ipfiremake ipp2p                     SMP=1
-  ipfiremake fcdsl                     SMP=1
-  ipfiremake fcdsl2                    SMP=1
-  ipfiremake fcdslsl           SMP=1
-  ipfiremake fcdslusb          SMP=1
-  ipfiremake fcdslslusb        SMP=1
   ipfiremake r8169                     SMP=1
   ipfiremake zaptel                    SMP=1
   ipfiremake fuse                              SMP=1
   ipfiremake linux
   ipfiremake ipp2p
-  ipfiremake fcdsl
-  ipfiremake fcdsl2
-  ipfiremake fcdslsl
-  ipfiremake fcdslusb
-  ipfiremake fcdslslusb
   ipfiremake r8169
   ipfiremake zaptel
   ipfiremake fuse
@@ -384,7 +374,6 @@ buildipfire() {
   ipfiremake arping
   ipfiremake beep
   ipfiremake bind
-  ipfiremake capi4k-utils
   ipfiremake cdrtools
   ipfiremake dnsmasq
   ipfiremake dosfstools
@@ -459,7 +448,6 @@ buildipfire() {
   ipfiremake setserial
   ipfiremake setup
   ipfiremake snort
-  ipfiremake snortsnarf
   ipfiremake oinkmaster
   ipfiremake squid
   ipfiremake squid-graph
index 33a61e0..8122e00 100644 (file)
@@ -1,7 +1,3 @@
-#
-# $Id: Makefile,v 1.3 2003/12/11 11:25:54 riddles Exp $
-#
-
 CC      = gcc
 CFLAGS  = -O2 -Wall
 INCLUDE = 
@@ -23,7 +19,7 @@ clean :
 
 ######
 
-OBJS=main.o hostname.o domainname.o passwords.o isdn.o networking.o misc.o \
+OBJS=main.o hostname.o domainname.o passwords.o networking.o misc.o \
        dhcp.o keymap.o timezone.o ../libsmooth/libsmooth.o
 
 setup: $(OBJS)
diff --git a/src/install+setup/setup/isdn.c b/src/install+setup/setup/isdn.c
deleted file mode 100644 (file)
index d702129..0000000
+++ /dev/null
@@ -1,581 +0,0 @@
-/* SmoothWall setup program.\r
- *\r
- * This program is distributed under the terms of the GNU General Public\r
- * Licence.  See the file COPYING for details.\r
- *\r
- * (c) Lawrence Manning, 2001\r
- * ISDN probing.\r
- * \r
- * $Id: isdn.c,v 1.6.2.1 2004/04/14 22:05:41 gespinasse Exp $\r
- * \r
- */\r
\r
-#include "setup.h"\r
\r
-extern FILE *flog;\r
-extern char *mylog;\r
-\r
-extern char **ctr;\r
-\r
-extern int automode;\r
-\r
-struct card\r
-{\r
-       char *name;\r
-       int type;\r
-};\r
-\r
-struct card cards[] = {\r
-       { "", 0 },\r
-       { "Teles 16.0", 1 },\r
-       { "Teles 8.0", 2 },\r
-       { "Teles 16.3 (non PnP)", 3 },\r
-       { "Teles 16.3c", 14 },  \r
-       { "Teles PCI", 21 },    \r
-       { "Creatix/Teles PnP", 4 },\r
-       { "AVM A1 (Fritz)", 5 },\r
-       { "AVM ISA/PCI", 27 },  \r
-       { "AVM PCI/PNP (EXPERIMENTAL driver)", 999 },\r
-       { "ELSA PCC/PCF cards", 6 },\r
-       { "ELSA Quickstep 1000", 7 },\r
-       { "ELSA Quickstep 1000PCI", 18 },\r
-       { "Eicon Diva ISA Pnp and PCI", 11 },\r
-       { "ASUS COM ISDNLink", 12 },\r
-       { "HFC-2BS0 based cards", 13 },\r
-       { "HFC 2BDS0 PCI", 35 },        \r
-       { "Sedlbauer cards", 15 },\r
-       { "USR Sportster internal", 16 },\r
-       { "MIC Card", 17 },\r
-       { "Compaq ISDN S00 ISA", 19 },\r
-       { "NETjet PCI card", 20 },\r
-       { "Dr. Neuhauss Niccy ISA/PCI", 24 },\r
-       { "Teles S0Box", 25 },\r
-       { "Sedlbauer Speed Fax+", 28 },\r
-       { "Siemens I-Surf 1.0", 29 },\r
-       { "ACER P10", 30 },\r
-       { "HST Saphir", 31 },\r
-       { "Telekom A4T", 32 },\r
-       { "Scitel Quadro", 33 },\r
-       { "Gazel ISA/PCI", 34 },\r
-       { "W6692 based PCI cards", 36 },\r
-       { "ITK ix1-micro Rev.2", 9 },   \r
-       { "NETspider U PCI card", 38 },\r
-       { "USB ST5481", 998 },\r
-       { NULL, 0 }\r
-};\r
-\r
-void handleisdnprotocol(char **protocolnames);\r
-int isdnenabledpressed(void);\r
-int isdndisabledpressed(void);\r
-void handleisdncard(void);\r
-void handlemoduleparams(void);\r
-int probeisdncard(void);\r
-int probeusbisdncard(char *s);\r
-void handleisdnmsn(void);\r
-\r
-int handleisdn(void)\r
-{\r
-       char *protocolnames[] = { ctr[TR_GERMAN_1TR6], ctr[TR_EURO_EDSS1],\r
-               ctr[TR_LEASED_LINE], ctr[TR_US_NI1], NULL };\r
-       struct keyvalue *kv;\r
-       int rc;\r
-       char protocolname[STRING_SIZE] = "";\r
-       char cardname[STRING_SIZE] = "";\r
-       char msn[STRING_SIZE] = "";\r
-       char temps[STRING_SIZE];\r
-       int tempd;\r
-       char message[1000];\r
-       int c;\r
-       char *sections[] = { ctr[TR_PROTOCOL_COUNTRY],\r
-               ctr[TR_SET_ADDITIONAL_MODULE_PARAMETERS], ctr[TR_ISDN_CARD],\r
-                ctr[TR_MSN_CONFIGURATION], NULL };\r
-       int choice;\r
-       char enableddisabled[STRING_SIZE];\r
-       FILE *f;\r
-       \r
-       if ((f = fopen(CONFIG_ROOT "/red/active", "r")))\r
-       {\r
-               fclose(f);\r
-               errorbox(ctr[TR_RED_IN_USE]);\r
-               return 1;\r
-       }\r
-       \r
-       /* rc.isdn is a small script to bring down ippp0 and kill ipppd\r
-        * and removes the ISDN modules. */\r
-       mysystem("/etc/rc.d/rc.isdn stop");\r
-\r
-       choice = 0;     \r
-       for (;;)\r
-       {\r
-               kv = initkeyvalues();\r
-               if (!(readkeyvalues(kv, CONFIG_ROOT "/isdn/settings")))\r
-               {\r
-                       freekeyvalues(kv);\r
-                       errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]);\r
-                       return 0;\r
-               }\r
-\r
-               strcpy(enableddisabled, ctr[TR_DISABLED]);\r
-               findkey(kv, "ENABLED", temps);\r
-               if (strcmp(temps, "on") == 0)\r
-                       strcpy(enableddisabled, ctr[TR_ENABLED]);\r
-               \r
-               strcpy(temps, "-1");\r
-               findkey(kv, "PROTOCOL", temps);\r
-               tempd = atol(temps);\r
-               if (tempd < 1 || tempd > 4)\r
-                       strcpy(protocolname, ctr[TR_UNSET]);\r
-               else\r
-                       strcpy(protocolname, protocolnames[tempd - 1]);\r
-                               \r
-               strcpy(temps, "-1");\r
-               findkey(kv, "TYPE", temps);\r
-               tempd = atol(temps);\r
-               c = 0;\r
-               while (cards[c].name)\r
-               {\r
-                       if (cards[c].type == tempd)\r
-                       {\r
-                               strcpy(cardname, cards[c].name);\r
-                               break;\r
-                       }\r
-                       c++;\r
-               }\r
-               if (!strlen(cardname))\r
-                       strcpy(cardname, ctr[TR_UNSET]);                \r
-\r
-               strcpy(temps, "");              \r
-               findkey(kv, "MSN", temps);\r
-               if (strlen(temps))\r
-                       strcpy(msn, temps);\r
-               else\r
-                       strcpy(msn, ctr[TR_UNSET]);\r
-               sprintf(message, ctr[TR_ISDN_STATUS], enableddisabled, protocolname,\r
-                       cardname, msn);\r
-               \r
-               freekeyvalues(kv);\r
-               \r
-               rc = newtWinMenu(ctr[TR_ISDN_CONFIGURATION_MENU], message, 50, 5, 5, 6,\r
-                       sections, &choice, ctr[TR_OK], ctr[TR_ENABLE_ISDN],\r
-                       ctr[TR_DISABLE_ISDN], NULL);\r
-               \r
-               if (rc == 1 || rc == 0)\r
-               {\r
-                       switch (choice)\r
-                       {\r
-                               case 0:\r
-                                       handleisdnprotocol(protocolnames);\r
-                                       break;\r
-                                       \r
-                               case 1:\r
-                                       handlemoduleparams();\r
-                                       break;\r
-                                                       \r
-                               case 2:\r
-                                       handleisdncard();\r
-                                       break;\r
-               \r
-                               case 3:\r
-                                       handleisdnmsn();\r
-                                       break;\r
-                               \r
-                               default:\r
-                                       break;\r
-                       }\r
-               }\r
-\r
-               else if (rc == 2)\r
-               {\r
-                       if (!isdnenabledpressed())\r
-                               break;\r
-               }\r
-               else\r
-               {\r
-                       if (!(isdndisabledpressed()))\r
-                               break;\r
-               }       \r
-       }\r
-       \r
-       return 1;\r
-}\r
-\r
-/* Returns 0 if main ISDN setup loop should exit. */\r
-int isdndisabledpressed(void)\r
-{\r
-       struct keyvalue *kv = initkeyvalues();\r
-\r
-       if (!(readkeyvalues(kv, CONFIG_ROOT "/isdn/settings")))\r
-       {\r
-               freekeyvalues(kv);\r
-               errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]);\r
-               return 0;\r
-       }\r
-\r
-       replacekeyvalue(kv, "ENABLED", "off");\r
-       writekeyvalues(kv, CONFIG_ROOT "/isdn/settings");\r
-\r
-       freekeyvalues(kv);\r
-       \r
-       return 0;\r
-}\r
-\r
-/* Returns 0 if main ISDN setup loop should exit. */\r
-int isdnenabledpressed(void)\r
-{\r
-       struct keyvalue *kv = initkeyvalues();\r
-       char protocol[STRING_SIZE] = "";\r
-       char type[STRING_SIZE] = "";\r
-       char msn[STRING_SIZE] = "";\r
-       char moduleparams[STRING_SIZE] = "";\r
-       char commandstring[STRING_SIZE];\r
-       int result = 0;\r
-\r
-       if (!(readkeyvalues(kv, CONFIG_ROOT "/isdn/settings")))\r
-       {\r
-               freekeyvalues(kv);\r
-               errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]);\r
-               return 0;\r
-       }\r
-\r
-       findkey(kv, "PROTOCOL", protocol);\r
-       findkey(kv, "TYPE", type);\r
-       findkey(kv, "MSN", msn);\r
-       findkey(kv, "MODULE_PARAMS", moduleparams);\r
-                               \r
-       if (strlen(protocol) && strlen(type) && strlen(msn))\r
-       {\r
-               if (atol(type) == 998)\r
-               {\r
-                        sprintf(commandstring, "/sbin/modprobe hisax_st5481 protocol=%s %s",\r
-                               protocol, moduleparams);\r
-               }\r
-               else if (atol(type) == 999)\r
-                {\r
-                        sprintf(commandstring, "/sbin/modprobe hisax_fcpcipnp protocol=%s %s",\r
-                               protocol, moduleparams);\r
-               }\r
-                else\r
-                {\r
-                        sprintf(commandstring, "/sbin/modprobe hisax protocol=%s type=%s %s",\r
-                               protocol, type, moduleparams);\r
-               }\r
-                if (runcommandwithstatus(commandstring, ctr[TR_INITIALISING_ISDN]) != 0)\r
-               {\r
-                       errorbox(ctr[TR_UNABLE_TO_INITIALISE_ISDN]);\r
-                       replacekeyvalue(kv, "ENABLED", "off");\r
-                       result = 1;\r
-               }\r
-               else\r
-                       replacekeyvalue(kv, "ENABLED", "on");\r
-       }\r
-       else\r
-       {\r
-               errorbox(ctr[TR_ISDN_NOT_SETUP]);\r
-               replacekeyvalue(kv, "ENABLED", "off");\r
-               result = 1;\r
-       }\r
-       writekeyvalues(kv, CONFIG_ROOT "/isdn/settings");\r
-\r
-       freekeyvalues(kv);\r
-       \r
-       return result;\r
-}\r
-\r
-void handleisdnprotocol(char **protocolnames)\r
-{\r
-       int rc;\r
-       int choice;\r
-       struct keyvalue *kv = initkeyvalues();\r
-       char temp[STRING_SIZE] = "1";\r
-\r
-       if (!(readkeyvalues(kv, CONFIG_ROOT "/isdn/settings")))\r
-       {\r
-               freekeyvalues(kv);\r
-               errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]);\r
-               return;\r
-       }\r
-       findkey(kv, "PROTOCOL", temp);\r
-       choice = atol(temp) - 1;\r
-       \r
-       rc = newtWinMenu(ctr[TR_ISDN_PROTOCOL_SELECTION], ctr[TR_CHOOSE_THE_ISDN_PROTOCOL],\r
-               50, 5, 5, 6, protocolnames, &choice, ctr[TR_OK], ctr[TR_CANCEL], NULL);\r
-               \r
-       if (rc == 2)\r
-               return;\r
-\r
-       sprintf(temp, "%d", choice + 1);\r
-       replacekeyvalue(kv, "PROTOCOL", temp);\r
-       writekeyvalues(kv, CONFIG_ROOT "/isdn/settings");\r
-       freekeyvalues(kv);\r
-}\r
-               \r
-void handlemoduleparams(void)\r
-{\r
-       struct keyvalue *kv = initkeyvalues();\r
-       char moduleparams[STRING_SIZE] = "";\r
-       char *values[] = { moduleparams, NULL };        /* pointers for the values. */\r
-       struct newtWinEntry entries[] =\r
-               { { "", &values[0], 0,}, { NULL, NULL, 0 } };\r
-       char title[STRING_SIZE];\r
-       int rc;\r
-\r
-       if (!(readkeyvalues(kv, CONFIG_ROOT "/isdn/settings")))\r
-       {\r
-               freekeyvalues(kv);\r
-               errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]);\r
-               return;\r
-       }\r
-\r
-       findkey(kv, "MODULE_PARAMS", moduleparams);\r
-\r
-       for (;;)\r
-       {       \r
-               sprintf (title, "%s v%s - %s", NAME, VERSION, SLOGAN);\r
-               rc = newtWinEntries(title, ctr[TR_ENTER_ADDITIONAL_MODULE_PARAMS],\r
-                       50, 5, 5, 40, entries, ctr[TR_OK], ctr[TR_CANCEL], NULL);       \r
-               \r
-               if (rc == 1)\r
-               {\r
-                       replacekeyvalue(kv, "MODULE_PARAMS", values[0]);\r
-                       writekeyvalues(kv, CONFIG_ROOT "/isdn/settings");\r
-                       free(values[0]);\r
-                       break;\r
-               }\r
-               else\r
-                       break;\r
-       }\r
-       freekeyvalues(kv);\r
-}\r
-\r
-void handleisdncard(void)\r
-{\r
-       char **selection;\r
-       int c;\r
-       int rc;\r
-       int choice;\r
-       int type;\r
-       struct keyvalue *kv = initkeyvalues();\r
-       char temp[STRING_SIZE] = "0";\r
-       int card;\r
-       char message[STRING_SIZE];\r
-       char commandstring[STRING_SIZE];\r
-       char moduleparams[STRING_SIZE] = "";\r
-       int done = 0;\r
-       \r
-       if (!(readkeyvalues(kv, CONFIG_ROOT "/isdn/settings")))\r
-       {\r
-               freekeyvalues(kv);\r
-               errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]);\r
-               return;\r
-       }\r
-       \r
-       findkey(kv, "TYPE", temp);\r
-       type = atol(temp);\r
-       findkey(kv, "MODULE_PARAMS", moduleparams);\r
-       \r
-       /* Count cards. */\r
-       c = 0;\r
-       while (cards[c].name) c++;\r
-       selection = malloc((c + 1) * sizeof(char *));\r
-       \r
-       /* Fill out section. */\r
-       c = 0;\r
-       selection[c] = ctr[TR_AUTODETECT];\r
-       c++;\r
-       while (cards[c].name)\r
-       {\r
-               selection[c] = cards[c].name;\r
-               c++;\r
-       }\r
-       selection[c] = NULL;\r
-       \r
-       /* Determine inital value for choice. */\r
-       c = 0; choice = 0;\r
-       while (cards[c].name)\r
-       {\r
-               if (cards[c].type == type)\r
-               {\r
-                       choice = c;\r
-                       break;\r
-               }\r
-               c++;\r
-       }\r
-       \r
-       while (!done)\r
-       {\r
-               rc = newtWinMenu(ctr[TR_ISDN_CARD_SELECTION], ctr[TR_CHOOSE_THE_ISDN_CARD_INSTALLED],\r
-                       50, 5, 5, 10, selection, &choice, ctr[TR_OK], ctr[TR_CANCEL], NULL);\r
-       \r
-               if (rc == 2)\r
-                       done = 1;\r
-               else\r
-               {       \r
-                       if (choice == 0)\r
-                               card = probeisdncard();\r
-                       else\r
-                       {\r
-                               sprintf(message, ctr[TR_CHECKING_FOR], cards[choice].name);\r
-                               if (cards[choice].type == 998)\r
-                               {\r
-                                        sprintf(commandstring, "/sbin/modprobe hisax_st5481 protocol=1 %s",\r
-                                               moduleparams);\r
-                               }\r
-                               else if (cards[choice].type == 999)\r
-                               {\r
-                                        sprintf(commandstring, "/sbin/modprobe hisax_fcpcipnp protocol=1 %s",\r
-                                               moduleparams);\r
-                               }\r
-                                else\r
-                               {\r
-                                        sprintf(commandstring, "/sbin/modprobe hisax type=%d protocol=1 %s",\r
-                                               cards[choice].type, moduleparams);\r
-                                }\r
-                                if (runcommandwithstatus(commandstring, message) == 0)\r
-                                       card = cards[choice].type;\r
-                               else\r
-                               {\r
-                                       errorbox(ctr[TR_ISDN_CARD_NOT_DETECTED]);\r
-                                       card = -1;\r
-                               }\r
-                               mysystem("/etc/rc.d/rc.isdn stop");\r
-                       }\r
-\r
-                       if (card != -1)\r
-                       {\r
-                               sprintf(temp, "%d", card);\r
-                               replacekeyvalue(kv, "TYPE", temp);\r
-                               writekeyvalues(kv, CONFIG_ROOT "/isdn/settings");\r
-                               done = 1;\r
-                       }\r
-               }\r
-       }\r
-\r
-       free(selection);        \r
-       freekeyvalues(kv);\r
-}\r
-\r
-int probeusbisdncard(char *s)\r
-{\r
-       FILE *file;\r
-       char buf[STRING_SIZE]; \r
-       int found = 0;\r
-\r
-       if (!(file = fopen("/proc/bus/usb/devices", "r")))\r
-       {\r
-               fprintf(flog, "Unable to open /proc/bus/usb/devices in probeusbisdncard()\n");\r
-               return 0;\r
-       }\r
-\r
-       while (fgets(buf, STRING_SIZE, file)) {\r
-               if (strstr(buf, s)) {\r
-                       found = 1;\r
-               }\r
-       }\r
-\r
-       fclose(file);\r
-\r
-       return found;\r
-}\r
-\r
-int probeisdncard(void)\r
-{\r
-       int c;\r
-       char message[STRING_SIZE];\r
-       char commandstring[STRING_SIZE];\r
-       char moduleparams[STRING_SIZE] = "";\r
-       struct keyvalue *kv = initkeyvalues();\r
-       char title[STRING_SIZE];\r
-       int result = -1;\r
-       \r
-       if (!(readkeyvalues(kv, CONFIG_ROOT "/isdn/settings")))\r
-       {\r
-               freekeyvalues(kv);\r
-               errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]);\r
-               return  -1;\r
-       }\r
-       findkey(kv, "MODULE_PARAMS", moduleparams);\r
-               \r
-       c = 1;\r
-       while (cards[c].name)\r
-       {\r
-               sprintf(message, ctr[TR_CHECKING_FOR], cards[c].name);\r
-               if (cards[c].type == 998)\r
-               {\r
-                       /* Try to find if it exists, but should generalize\r
-                        * probeusbisdncard to pass Vendor and ProdID\r
-                        * independently, rather than a string\r
-                        */\r
-                       if (probeusbisdncard("Vendor=0483 ProdID=481"))\r
-                               sprintf(commandstring, "/sbin/modprobe hisax_st5481 protocol=1 %s", moduleparams);\r
-               }\r
-               else if (cards[c].type == 999)\r
-               {\r
-                        sprintf(commandstring, "/sbin/modprobe hisax_fcpcipnp protocol=1 %s", \r
-                               moduleparams);\r
-               }\r
-                else\r
-               {\r
-                        sprintf(commandstring, "/sbin/modprobe hisax type=%d protocol=1 %s", \r
-                               cards[c].type, moduleparams);\r
-               }\r
-               if (runcommandwithstatus(commandstring, message) == 0)\r
-               {\r
-                       mysystem("/etc/rc.d/rc.isdn stop");\r
-                       sprintf (title, "%s v%s - %s", NAME, VERSION, SLOGAN);\r
-                       sprintf(message, ctr[TR_DETECTED], cards[c].name);\r
-                       newtWinMessage(title, ctr[TR_OK], message);\r
-                       result = cards[c].type;\r
-                       goto EXIT;\r
-               }\r
-               c++;\r
-       }\r
-\r
-       errorbox(ctr[TR_UNABLE_TO_FIND_AN_ISDN_CARD]);\r
-       \r
-EXIT:\r
-       freekeyvalues(kv);\r
-       \r
-       return result;\r
-}\r
-\r
-void handleisdnmsn(void)\r
-{\r
-       struct keyvalue *kv = initkeyvalues();\r
-       char msn[STRING_SIZE] = "";\r
-       char *values[] = { msn, NULL }; /* pointers for the values. */\r
-       struct newtWinEntry entries[] =\r
-               { { "", &values[0], 0,}, { NULL, NULL, 0 } };\r
-       char title[STRING_SIZE];\r
-       int rc;\r
-\r
-       if (!(readkeyvalues(kv, CONFIG_ROOT "/isdn/settings")))\r
-       {\r
-               freekeyvalues(kv);\r
-               errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]);\r
-               return;\r
-       }\r
-       findkey(kv, "MSN", msn);\r
-\r
-       for (;;)\r
-       {       \r
-               sprintf (title, "%s v%s - %s", NAME, VERSION, SLOGAN);\r
-               rc = newtWinEntries(title, ctr[TR_ENTER_THE_LOCAL_MSN],\r
-                       50, 5, 5, 40, entries, ctr[TR_OK], ctr[TR_CANCEL], NULL);       \r
-               \r
-               if (rc == 1)\r
-               {\r
-                       if (!(strlen(values[0])))\r
-                               errorbox(ctr[TR_PHONENUMBER_CANNOT_BE_EMPTY]);\r
-                       else\r
-                       {                       \r
-                               replacekeyvalue(kv, "MSN", values[0]);\r
-                               writekeyvalues(kv, CONFIG_ROOT "/isdn/settings");\r
-                               free(values[0]);\r
-                               break;\r
-                       }\r
-               }\r
-               else\r
-                       break;\r
-       }\r
-       freekeyvalues(kv);\r
-}\r
index 29c00cb..6bac6b6 100644 (file)
@@ -6,8 +6,6 @@
  * (c) Lawrence Manning, 2001
  * The big one: networking. 
  * 
- * $Id: networking.c,v 1.5.2.6 2006/02/06 22:00:13 gespinasse Exp $
- * 
  */
  
 #include "setup.h"
@@ -30,34 +28,16 @@ extern int automode;
 #define HAS_BLUE (configtype == 3 || configtype == 4)
 #define RED_IS_NOT_ETH (configtype == 0)
 
-//#define HAS_ORANGE (configtype == 1 || configtype == 3 || configtype == 5 || configtype == 7)
-//#define HAS_RED (configtype == 2 || configtype == 3 || configtype == 6 || configtype == 7)
-//#define HAS_BLUE (configtype == 4 || configtype == 5 || configtype == 6 || configtype == 7)
-//#define RED_IS_NOT_ETH (configtype == 0 || configtype == 1 || configtype == 4 || configtype == 5)
-
 extern struct nic nics[];
 extern struct knic knics[];
 
-/* char *configtypenames[] = { 
-       "GREEN (RED is modem/ISDN)", 
-       "GREEN + ORANGE (RED is modem/ISDN)", 
-       "GREEN + RED",
-       "GREEN + ORANGE + RED", 
-       "GREEN + BLUE (RED is modem/ISDN) ",
-       "GREEN + ORANGE + BLUE (RED is modem/ISDN)",
-       "GREEN + BLUE + RED",
-       "GREEN + ORANGE + BLUE + RED",
-       NULL };
-*/
-char *configtypenames[] = { 
-       "GREEN",
+char *configtypenames[] = {
        "GREEN + RED",
        "GREEN + RED + ORANGE",
        "GREEN + RED + BLUE",
        "GREEN + RED + ORANGE + BLUE",
        NULL };
 int configtypecards[] = {
-       1,      // "GREEN",
        2,      // "GREEN + RED",
        3,      // "GREEN + RED + ORANGE",
        3,      // "GREEN + RED + BLUE",
@@ -85,12 +65,8 @@ int handlenetworking(void)
        
        netaddresschange = 0;
 
-       fprintf(flog,"Enter HandleNetworking\n"); // #### Debug ####
-
        found = scan_network_cards();
-       fprintf(flog,"found %d cards\n",found); // #### Debug ####
        found = init_knics();
-       fprintf(flog,"found %d kcards\n",found); // #### Debug ####
 
        done = 0;
        while (!done)
@@ -304,7 +280,6 @@ int configtypemenu(void)
        }
 
        found = scan_network_cards();
-       fprintf(flog,"found %d Card\'s\n", found ); // #### Debug ####
        
        findkey(kv, "CONFIG_TYPE", temp); choise = atol(temp);
 
@@ -322,8 +297,7 @@ int configtypemenu(void)
 
        if (rc == 0 || rc == 1)
        {
-//     if (automode != 0) runcommandwithstatus("/etc/rc.d/init.d/network stop red blue orange", ctr[TR_PUSHING_NON_LOCAL_NETWORK_DOWN]);
-
+               choise++;
                sprintf(temp, "%d", choise);
                replacekeyvalue(kv, "CONFIG_TYPE", temp);
                clear_card_entry(_RED_CARD_);
@@ -349,8 +323,6 @@ int drivermenu(void)
 
        int configtype;
        int i, rc, kcount = 0, neednics; //i = 0, count = 0,
-       
-       fprintf(flog,"Enter drivermenu\n"); // #### Debug ####
 
        if (!(readkeyvalues(kv, CONFIG_ROOT "/ethernet/settings")))
        {
@@ -404,7 +376,6 @@ int drivermenu(void)
        }
 
        for ( i=0 ; i<4;i++) if (strcmp(knics[i].macaddr, "")) kcount++;
-       fprintf(flog,"found %d knowing Card\'s\n", kcount); // #### DEBUG ####
 
        if (neednics = kcount)
        {
@@ -417,8 +388,6 @@ int drivermenu(void)
                        changedrivers();
                }
        } else {
-//             strcat(message, "\nEs wurden noch nicht alle Netzwerkkarten konfiguriert.\n");
-//             newtWinMessage(ctr[TR_DRIVERS_AND_CARD_ASSIGNMENTS], ctr[TR_OK], message);
                /* Shit, got to do something.. */
                changedrivers();
        }
@@ -449,14 +418,11 @@ int changedrivers(void)
                errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]);
                return 0;
        }
-       fprintf(flog,"stop network on red, blue and orange\n"); // #### Debug ####
        runcommandwithstatus("/etc/rc.d/init.d/network stop red blue orange",
                ctr[TR_PUSHING_NON_LOCAL_NETWORK_DOWN]);
 
        findkey(kv, "CONFIG_TYPE", temp); configtype = atol(temp);
-       if (configtype == 0)
-               { green = 1; }
-       else if (configtype == 1)
+       if (configtype == 1)
                { green = 1; red = 1; }
        else if (configtype == 2)
                { green = 1; red = 1; orange = 1; }
@@ -464,14 +430,6 @@ int changedrivers(void)
                { green = 1; red = 1; blue = 1; }
        else if (configtype == 4)
                { green = 1; red=1; orange=1; blue = 1; }
-//     else if (configtype == 5)
-//             { green = 1; blue = 1; orange = 1; }
-//     else if (configtype == 6)
-//             { green = 1; red = 1; blue = 1; }
-//     else if (configtype == 7)
-//             { green = 1; red = 1; blue = 1; orange = 1; }
-
-       fprintf(flog,"found: g=%d r=%d o=%d b=%d\n",green, red, orange, blue); // #### Debug ####
 
        do
        {
@@ -495,7 +453,6 @@ int changedrivers(void)
                        strcpy(MenuInhalt[count], "RED");
                        pMenuInhalt[count] = MenuInhalt[count];
                        NicEntry[_RED_CARD_] = count;
-//                     fprintf(flog,"found: %s as entry %d\n", MenuInhalt[count], NicEntry[count]); // #### Debug ####
                        sprintf(temp, "RED:    %s\n", knics[_RED_CARD_].description);
                        strcat(message, temp);
                        if ( strlen(knics[_RED_CARD_].macaddr) ) {
@@ -509,7 +466,6 @@ int changedrivers(void)
                        strcpy(MenuInhalt[count], "ORANGE");
                        pMenuInhalt[count] = MenuInhalt[count];
                        NicEntry[_ORANGE_CARD_] = count;
-//                     fprintf(flog,"found: %s as entry %d\n", MenuInhalt[count], NicEntry[count]); // #### Debug ####
                        sprintf(temp, "ORANGE: %s\n", knics[_ORANGE_CARD_].description);
                        strcat(message, temp);
                        if ( strlen(knics[_ORANGE_CARD_].macaddr) ) {
@@ -523,7 +479,6 @@ int changedrivers(void)
                        strcpy(MenuInhalt[count], "BLUE");
                        pMenuInhalt[count] = MenuInhalt[count];
                        NicEntry[_BLUE_CARD_] = count;
-//                     fprintf(flog,"found: %s as entry %d\n", MenuInhalt[count], NicEntry[count]); // #### Debug ####
                        sprintf(temp, "BLUE:   %s\n", knics[_BLUE_CARD_].description);
                        strcat(message, temp);
                        if ( strlen(knics[_BLUE_CARD_].macaddr) ) {
@@ -537,8 +492,6 @@ int changedrivers(void)
                rc = newtWinMenu("(TR) Netcard Farbe", message, 70, 5, 5, 6, pMenuInhalt, &choise, ctr[TR_SELECT], "(TR) Entfernen" , ctr[TR_DONE], NULL);
                        
                if ( rc == 0 || rc == 1) {
-//                     write_configs_netudev(pnics[choise].description, pnics[choise].macaddr, colour);
-                       // insert nic to colourcard
                        if ((green) && ( choise == NicEntry[0])) nicmenu(_GREEN_CARD_);
                        if ((red) && ( choise == NicEntry[1])) nicmenu(_RED_CARD_);
                        if ((orange) && ( choise == NicEntry[2])) nicmenu(_ORANGE_CARD_);
@@ -550,15 +503,9 @@ int changedrivers(void)
                        if ((orange) && ( choise == NicEntry[2])) ask_clear_card_entry(_ORANGE_CARD_);
                        if ((blue) && ( choise == NicEntry[3])) ask_clear_card_entry(_BLUE_CARD_);
                        netaddresschange = 1;
-               } 
-//             else {
-//                     errorbox("Sie haben keine Netzwerkkarte ausgewaehlt.\n");
-//                     return 1;
-//             }
+               }
        }
        while ( rc <= 2);
-       
-       // writekeyvalues(kv, CONFIG_ROOT "/ethernet/settings");
 
        freekeyvalues(kv);
        return 1;
@@ -734,16 +681,6 @@ int dnsgatewaymenu(void)
                return 0;
        }
 
-/*     strcpy(temp, "0"); findkey(kv, "CONFIG_TYPE", temp);
-       configtype = atol(temp);
-       
-       if (RED_IS_NOT_ETH)
-       {
-               freekeyvalues(kv);
-               errorbox(ctr[TR_DNS_GATEWAY_WITH_GREEN]);
-               return 0;
-       }
-*/
        entries[DNS1].text = ctr[TR_PRIMARY_DNS];
        strcpy(temp, ""); findkey(kv, "DNS1", temp);
        values[DNS1] = strdup(temp);
index 53eb7d9..d8518a1 100644 (file)
@@ -543,7 +543,7 @@ END
        esac
        tar cfz $ATTACHMENT log/_build*
        cat /tmp/ipfire_mail_body | tools/sendEmail -q \
-               -f $MAIL_USER \
+               -f $MAIL_FROM \
                -t $MAIL_TO \
                -u $SUBJECT \
                -s $MAIL_SERVER:25 \
@@ -627,6 +627,8 @@ make_config() {
                echo -ne "You should enter a mail server to login...\n"
                echo -ne "Please type the url: "
                read MAIL_SERVER
+               echo -ne "Please type where the email is from: "
+               read MAIL_FROM
                echo -ne "Please type the username: "
                read MAIL_USER
                echo -ne "Please type the password (hidden): "
@@ -647,6 +649,7 @@ FTP_CACHE_USER=$FTP_CACHE_USER
 FTP_CACHE_PASS=$FTP_CACHE_PASS
 ### mail reports
 MAIL_TO="$MAIL_TO"
+MAIL_FROM=$MAIL_FROM
 MAIL_SERVER=$MAIL_SERVER
 MAIL_USER=$MAIL_USER
 MAIL_PASS=$MAIL_PASS