From a358af8c7c383c6fd97941a2ebe254d5ffa1270a Mon Sep 17 00:00:00 2001 From: ms Date: Thu, 16 Aug 2007 21:21:24 +0000 Subject: [PATCH] Capi-Utils entfernt. Green-only entfernt. Snortsnarf entfernt. Fritz-Card entfernt. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@772 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/kernel/kernel.config.i586 | 13 +- config/kernel/kernel.config.i586.smp | 13 +- config/rootfiles/common/capi4k-utils | 29 -- config/rootfiles/common/fcdsl | 7 - config/rootfiles/common/fcdsl2 | 6 - config/rootfiles/common/fcdslsl | 4 - config/rootfiles/common/fcdslusb | 2 - doc/packages-list.txt | 1 - lfs/capi4k-utils | 92 ----- lfs/fcdsl | 114 ------ lfs/fcdsl2 | 125 ------ lfs/fcdslsl | 114 ------ lfs/fcdslslusb | 120 ------ lfs/fcdslusb | 118 ------ lfs/snortsnarf | 80 ---- make.sh | 12 - src/install+setup/setup/Makefile | 6 +- src/install+setup/setup/isdn.c | 581 --------------------------- src/install+setup/setup/networking.c | 71 +--- tools/make-functions | 5 +- 20 files changed, 15 insertions(+), 1498 deletions(-) delete mode 100644 config/rootfiles/common/capi4k-utils delete mode 100644 config/rootfiles/common/fcdsl delete mode 100644 config/rootfiles/common/fcdsl2 delete mode 100644 config/rootfiles/common/fcdslsl delete mode 100644 config/rootfiles/common/fcdslusb delete mode 100644 lfs/capi4k-utils delete mode 100644 lfs/fcdsl delete mode 100644 lfs/fcdsl2 delete mode 100644 lfs/fcdslsl delete mode 100644 lfs/fcdslslusb delete mode 100644 lfs/fcdslusb delete mode 100644 lfs/snortsnarf delete mode 100644 src/install+setup/setup/isdn.c diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586 index 721306909..fc0b4600c 100644 --- a/config/kernel/kernel.config.i586 +++ b/config/kernel/kernel.config.i586 @@ -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 diff --git a/config/kernel/kernel.config.i586.smp b/config/kernel/kernel.config.i586.smp index e10dec109..a421b0181 100644 --- a/config/kernel/kernel.config.i586.smp +++ b/config/kernel/kernel.config.i586.smp @@ -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 index 016f7e854..000000000 --- a/config/rootfiles/common/capi4k-utils +++ /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 index 4fdcf3a9c..000000000 --- a/config/rootfiles/common/fcdsl +++ /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 index f1c886a98..000000000 --- a/config/rootfiles/common/fcdsl2 +++ /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 index 6849973e8..000000000 --- a/config/rootfiles/common/fcdslsl +++ /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 index c3dffc203..000000000 --- a/config/rootfiles/common/fcdslusb +++ /dev/null @@ -1,2 +0,0 @@ -etc/fcdsl/fcdslusb.conf -usr/lib/isdn/fdsubase.frm diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 58071f134..ca7aea70a 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -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 index 3e0808cf1..000000000 --- a/lfs/capi4k-utils +++ /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 # -# # -############################################################################### - -############################################################################### -# 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 index 9f83d58ad..000000000 --- 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 # -# # -############################################################################### - -############################################################################### -# 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 index c9b04bb16..000000000 --- a/lfs/fcdsl2 +++ /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 # -# # -# 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 index 43231024e..000000000 --- a/lfs/fcdslsl +++ /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 # -# # -############################################################################### - -############################################################################### -# 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 index 10f1206f4..000000000 --- a/lfs/fcdslslusb +++ /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 # -# # -############################################################################### - -############################################################################### -# 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 index 7b4428b2b..000000000 --- a/lfs/fcdslusb +++ /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 # -# # -############################################################################### - -############################################################################### -# 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 index ef6de27bb..000000000 --- a/lfs/snortsnarf +++ /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 # -# # -############################################################################### - -############################################################################### -# 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 8abfb885d..a7e3e50e0 100755 --- 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 diff --git a/src/install+setup/setup/Makefile b/src/install+setup/setup/Makefile index 33a61e026..8122e001d 100644 --- a/src/install+setup/setup/Makefile +++ b/src/install+setup/setup/Makefile @@ -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 index d7021295e..000000000 --- a/src/install+setup/setup/isdn.c +++ /dev/null @@ -1,581 +0,0 @@ -/* SmoothWall setup program. - * - * This program is distributed under the terms of the GNU General Public - * Licence. See the file COPYING for details. - * - * (c) Lawrence Manning, 2001 - * ISDN probing. - * - * $Id: isdn.c,v 1.6.2.1 2004/04/14 22:05:41 gespinasse Exp $ - * - */ - -#include "setup.h" - -extern FILE *flog; -extern char *mylog; - -extern char **ctr; - -extern int automode; - -struct card -{ - char *name; - int type; -}; - -struct card cards[] = { - { "", 0 }, - { "Teles 16.0", 1 }, - { "Teles 8.0", 2 }, - { "Teles 16.3 (non PnP)", 3 }, - { "Teles 16.3c", 14 }, - { "Teles PCI", 21 }, - { "Creatix/Teles PnP", 4 }, - { "AVM A1 (Fritz)", 5 }, - { "AVM ISA/PCI", 27 }, - { "AVM PCI/PNP (EXPERIMENTAL driver)", 999 }, - { "ELSA PCC/PCF cards", 6 }, - { "ELSA Quickstep 1000", 7 }, - { "ELSA Quickstep 1000PCI", 18 }, - { "Eicon Diva ISA Pnp and PCI", 11 }, - { "ASUS COM ISDNLink", 12 }, - { "HFC-2BS0 based cards", 13 }, - { "HFC 2BDS0 PCI", 35 }, - { "Sedlbauer cards", 15 }, - { "USR Sportster internal", 16 }, - { "MIC Card", 17 }, - { "Compaq ISDN S00 ISA", 19 }, - { "NETjet PCI card", 20 }, - { "Dr. Neuhauss Niccy ISA/PCI", 24 }, - { "Teles S0Box", 25 }, - { "Sedlbauer Speed Fax+", 28 }, - { "Siemens I-Surf 1.0", 29 }, - { "ACER P10", 30 }, - { "HST Saphir", 31 }, - { "Telekom A4T", 32 }, - { "Scitel Quadro", 33 }, - { "Gazel ISA/PCI", 34 }, - { "W6692 based PCI cards", 36 }, - { "ITK ix1-micro Rev.2", 9 }, - { "NETspider U PCI card", 38 }, - { "USB ST5481", 998 }, - { NULL, 0 } -}; - -void handleisdnprotocol(char **protocolnames); -int isdnenabledpressed(void); -int isdndisabledpressed(void); -void handleisdncard(void); -void handlemoduleparams(void); -int probeisdncard(void); -int probeusbisdncard(char *s); -void handleisdnmsn(void); - -int handleisdn(void) -{ - char *protocolnames[] = { ctr[TR_GERMAN_1TR6], ctr[TR_EURO_EDSS1], - ctr[TR_LEASED_LINE], ctr[TR_US_NI1], NULL }; - struct keyvalue *kv; - int rc; - char protocolname[STRING_SIZE] = ""; - char cardname[STRING_SIZE] = ""; - char msn[STRING_SIZE] = ""; - char temps[STRING_SIZE]; - int tempd; - char message[1000]; - int c; - char *sections[] = { ctr[TR_PROTOCOL_COUNTRY], - ctr[TR_SET_ADDITIONAL_MODULE_PARAMETERS], ctr[TR_ISDN_CARD], - ctr[TR_MSN_CONFIGURATION], NULL }; - int choice; - char enableddisabled[STRING_SIZE]; - FILE *f; - - if ((f = fopen(CONFIG_ROOT "/red/active", "r"))) - { - fclose(f); - errorbox(ctr[TR_RED_IN_USE]); - return 1; - } - - /* rc.isdn is a small script to bring down ippp0 and kill ipppd - * and removes the ISDN modules. */ - mysystem("/etc/rc.d/rc.isdn stop"); - - choice = 0; - for (;;) - { - kv = initkeyvalues(); - if (!(readkeyvalues(kv, CONFIG_ROOT "/isdn/settings"))) - { - freekeyvalues(kv); - errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]); - return 0; - } - - strcpy(enableddisabled, ctr[TR_DISABLED]); - findkey(kv, "ENABLED", temps); - if (strcmp(temps, "on") == 0) - strcpy(enableddisabled, ctr[TR_ENABLED]); - - strcpy(temps, "-1"); - findkey(kv, "PROTOCOL", temps); - tempd = atol(temps); - if (tempd < 1 || tempd > 4) - strcpy(protocolname, ctr[TR_UNSET]); - else - strcpy(protocolname, protocolnames[tempd - 1]); - - strcpy(temps, "-1"); - findkey(kv, "TYPE", temps); - tempd = atol(temps); - c = 0; - while (cards[c].name) - { - if (cards[c].type == tempd) - { - strcpy(cardname, cards[c].name); - break; - } - c++; - } - if (!strlen(cardname)) - strcpy(cardname, ctr[TR_UNSET]); - - strcpy(temps, ""); - findkey(kv, "MSN", temps); - if (strlen(temps)) - strcpy(msn, temps); - else - strcpy(msn, ctr[TR_UNSET]); - sprintf(message, ctr[TR_ISDN_STATUS], enableddisabled, protocolname, - cardname, msn); - - freekeyvalues(kv); - - rc = newtWinMenu(ctr[TR_ISDN_CONFIGURATION_MENU], message, 50, 5, 5, 6, - sections, &choice, ctr[TR_OK], ctr[TR_ENABLE_ISDN], - ctr[TR_DISABLE_ISDN], NULL); - - if (rc == 1 || rc == 0) - { - switch (choice) - { - case 0: - handleisdnprotocol(protocolnames); - break; - - case 1: - handlemoduleparams(); - break; - - case 2: - handleisdncard(); - break; - - case 3: - handleisdnmsn(); - break; - - default: - break; - } - } - - else if (rc == 2) - { - if (!isdnenabledpressed()) - break; - } - else - { - if (!(isdndisabledpressed())) - break; - } - } - - return 1; -} - -/* Returns 0 if main ISDN setup loop should exit. */ -int isdndisabledpressed(void) -{ - struct keyvalue *kv = initkeyvalues(); - - if (!(readkeyvalues(kv, CONFIG_ROOT "/isdn/settings"))) - { - freekeyvalues(kv); - errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]); - return 0; - } - - replacekeyvalue(kv, "ENABLED", "off"); - writekeyvalues(kv, CONFIG_ROOT "/isdn/settings"); - - freekeyvalues(kv); - - return 0; -} - -/* Returns 0 if main ISDN setup loop should exit. */ -int isdnenabledpressed(void) -{ - struct keyvalue *kv = initkeyvalues(); - char protocol[STRING_SIZE] = ""; - char type[STRING_SIZE] = ""; - char msn[STRING_SIZE] = ""; - char moduleparams[STRING_SIZE] = ""; - char commandstring[STRING_SIZE]; - int result = 0; - - if (!(readkeyvalues(kv, CONFIG_ROOT "/isdn/settings"))) - { - freekeyvalues(kv); - errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]); - return 0; - } - - findkey(kv, "PROTOCOL", protocol); - findkey(kv, "TYPE", type); - findkey(kv, "MSN", msn); - findkey(kv, "MODULE_PARAMS", moduleparams); - - if (strlen(protocol) && strlen(type) && strlen(msn)) - { - if (atol(type) == 998) - { - sprintf(commandstring, "/sbin/modprobe hisax_st5481 protocol=%s %s", - protocol, moduleparams); - } - else if (atol(type) == 999) - { - sprintf(commandstring, "/sbin/modprobe hisax_fcpcipnp protocol=%s %s", - protocol, moduleparams); - } - else - { - sprintf(commandstring, "/sbin/modprobe hisax protocol=%s type=%s %s", - protocol, type, moduleparams); - } - if (runcommandwithstatus(commandstring, ctr[TR_INITIALISING_ISDN]) != 0) - { - errorbox(ctr[TR_UNABLE_TO_INITIALISE_ISDN]); - replacekeyvalue(kv, "ENABLED", "off"); - result = 1; - } - else - replacekeyvalue(kv, "ENABLED", "on"); - } - else - { - errorbox(ctr[TR_ISDN_NOT_SETUP]); - replacekeyvalue(kv, "ENABLED", "off"); - result = 1; - } - writekeyvalues(kv, CONFIG_ROOT "/isdn/settings"); - - freekeyvalues(kv); - - return result; -} - -void handleisdnprotocol(char **protocolnames) -{ - int rc; - int choice; - struct keyvalue *kv = initkeyvalues(); - char temp[STRING_SIZE] = "1"; - - if (!(readkeyvalues(kv, CONFIG_ROOT "/isdn/settings"))) - { - freekeyvalues(kv); - errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]); - return; - } - findkey(kv, "PROTOCOL", temp); - choice = atol(temp) - 1; - - rc = newtWinMenu(ctr[TR_ISDN_PROTOCOL_SELECTION], ctr[TR_CHOOSE_THE_ISDN_PROTOCOL], - 50, 5, 5, 6, protocolnames, &choice, ctr[TR_OK], ctr[TR_CANCEL], NULL); - - if (rc == 2) - return; - - sprintf(temp, "%d", choice + 1); - replacekeyvalue(kv, "PROTOCOL", temp); - writekeyvalues(kv, CONFIG_ROOT "/isdn/settings"); - freekeyvalues(kv); -} - -void handlemoduleparams(void) -{ - struct keyvalue *kv = initkeyvalues(); - char moduleparams[STRING_SIZE] = ""; - char *values[] = { moduleparams, NULL }; /* pointers for the values. */ - struct newtWinEntry entries[] = - { { "", &values[0], 0,}, { NULL, NULL, 0 } }; - char title[STRING_SIZE]; - int rc; - - if (!(readkeyvalues(kv, CONFIG_ROOT "/isdn/settings"))) - { - freekeyvalues(kv); - errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]); - return; - } - - findkey(kv, "MODULE_PARAMS", moduleparams); - - for (;;) - { - sprintf (title, "%s v%s - %s", NAME, VERSION, SLOGAN); - rc = newtWinEntries(title, ctr[TR_ENTER_ADDITIONAL_MODULE_PARAMS], - 50, 5, 5, 40, entries, ctr[TR_OK], ctr[TR_CANCEL], NULL); - - if (rc == 1) - { - replacekeyvalue(kv, "MODULE_PARAMS", values[0]); - writekeyvalues(kv, CONFIG_ROOT "/isdn/settings"); - free(values[0]); - break; - } - else - break; - } - freekeyvalues(kv); -} - -void handleisdncard(void) -{ - char **selection; - int c; - int rc; - int choice; - int type; - struct keyvalue *kv = initkeyvalues(); - char temp[STRING_SIZE] = "0"; - int card; - char message[STRING_SIZE]; - char commandstring[STRING_SIZE]; - char moduleparams[STRING_SIZE] = ""; - int done = 0; - - if (!(readkeyvalues(kv, CONFIG_ROOT "/isdn/settings"))) - { - freekeyvalues(kv); - errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]); - return; - } - - findkey(kv, "TYPE", temp); - type = atol(temp); - findkey(kv, "MODULE_PARAMS", moduleparams); - - /* Count cards. */ - c = 0; - while (cards[c].name) c++; - selection = malloc((c + 1) * sizeof(char *)); - - /* Fill out section. */ - c = 0; - selection[c] = ctr[TR_AUTODETECT]; - c++; - while (cards[c].name) - { - selection[c] = cards[c].name; - c++; - } - selection[c] = NULL; - - /* Determine inital value for choice. */ - c = 0; choice = 0; - while (cards[c].name) - { - if (cards[c].type == type) - { - choice = c; - break; - } - c++; - } - - while (!done) - { - rc = newtWinMenu(ctr[TR_ISDN_CARD_SELECTION], ctr[TR_CHOOSE_THE_ISDN_CARD_INSTALLED], - 50, 5, 5, 10, selection, &choice, ctr[TR_OK], ctr[TR_CANCEL], NULL); - - if (rc == 2) - done = 1; - else - { - if (choice == 0) - card = probeisdncard(); - else - { - sprintf(message, ctr[TR_CHECKING_FOR], cards[choice].name); - if (cards[choice].type == 998) - { - sprintf(commandstring, "/sbin/modprobe hisax_st5481 protocol=1 %s", - moduleparams); - } - else if (cards[choice].type == 999) - { - sprintf(commandstring, "/sbin/modprobe hisax_fcpcipnp protocol=1 %s", - moduleparams); - } - else - { - sprintf(commandstring, "/sbin/modprobe hisax type=%d protocol=1 %s", - cards[choice].type, moduleparams); - } - if (runcommandwithstatus(commandstring, message) == 0) - card = cards[choice].type; - else - { - errorbox(ctr[TR_ISDN_CARD_NOT_DETECTED]); - card = -1; - } - mysystem("/etc/rc.d/rc.isdn stop"); - } - - if (card != -1) - { - sprintf(temp, "%d", card); - replacekeyvalue(kv, "TYPE", temp); - writekeyvalues(kv, CONFIG_ROOT "/isdn/settings"); - done = 1; - } - } - } - - free(selection); - freekeyvalues(kv); -} - -int probeusbisdncard(char *s) -{ - FILE *file; - char buf[STRING_SIZE]; - int found = 0; - - if (!(file = fopen("/proc/bus/usb/devices", "r"))) - { - fprintf(flog, "Unable to open /proc/bus/usb/devices in probeusbisdncard()\n"); - return 0; - } - - while (fgets(buf, STRING_SIZE, file)) { - if (strstr(buf, s)) { - found = 1; - } - } - - fclose(file); - - return found; -} - -int probeisdncard(void) -{ - int c; - char message[STRING_SIZE]; - char commandstring[STRING_SIZE]; - char moduleparams[STRING_SIZE] = ""; - struct keyvalue *kv = initkeyvalues(); - char title[STRING_SIZE]; - int result = -1; - - if (!(readkeyvalues(kv, CONFIG_ROOT "/isdn/settings"))) - { - freekeyvalues(kv); - errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]); - return -1; - } - findkey(kv, "MODULE_PARAMS", moduleparams); - - c = 1; - while (cards[c].name) - { - sprintf(message, ctr[TR_CHECKING_FOR], cards[c].name); - if (cards[c].type == 998) - { - /* Try to find if it exists, but should generalize - * probeusbisdncard to pass Vendor and ProdID - * independently, rather than a string - */ - if (probeusbisdncard("Vendor=0483 ProdID=481")) - sprintf(commandstring, "/sbin/modprobe hisax_st5481 protocol=1 %s", moduleparams); - } - else if (cards[c].type == 999) - { - sprintf(commandstring, "/sbin/modprobe hisax_fcpcipnp protocol=1 %s", - moduleparams); - } - else - { - sprintf(commandstring, "/sbin/modprobe hisax type=%d protocol=1 %s", - cards[c].type, moduleparams); - } - if (runcommandwithstatus(commandstring, message) == 0) - { - mysystem("/etc/rc.d/rc.isdn stop"); - sprintf (title, "%s v%s - %s", NAME, VERSION, SLOGAN); - sprintf(message, ctr[TR_DETECTED], cards[c].name); - newtWinMessage(title, ctr[TR_OK], message); - result = cards[c].type; - goto EXIT; - } - c++; - } - - errorbox(ctr[TR_UNABLE_TO_FIND_AN_ISDN_CARD]); - -EXIT: - freekeyvalues(kv); - - return result; -} - -void handleisdnmsn(void) -{ - struct keyvalue *kv = initkeyvalues(); - char msn[STRING_SIZE] = ""; - char *values[] = { msn, NULL }; /* pointers for the values. */ - struct newtWinEntry entries[] = - { { "", &values[0], 0,}, { NULL, NULL, 0 } }; - char title[STRING_SIZE]; - int rc; - - if (!(readkeyvalues(kv, CONFIG_ROOT "/isdn/settings"))) - { - freekeyvalues(kv); - errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]); - return; - } - findkey(kv, "MSN", msn); - - for (;;) - { - sprintf (title, "%s v%s - %s", NAME, VERSION, SLOGAN); - rc = newtWinEntries(title, ctr[TR_ENTER_THE_LOCAL_MSN], - 50, 5, 5, 40, entries, ctr[TR_OK], ctr[TR_CANCEL], NULL); - - if (rc == 1) - { - if (!(strlen(values[0]))) - errorbox(ctr[TR_PHONENUMBER_CANNOT_BE_EMPTY]); - else - { - replacekeyvalue(kv, "MSN", values[0]); - writekeyvalues(kv, CONFIG_ROOT "/isdn/settings"); - free(values[0]); - break; - } - } - else - break; - } - freekeyvalues(kv); -} diff --git a/src/install+setup/setup/networking.c b/src/install+setup/setup/networking.c index 29c00cba1..6bac6b608 100644 --- a/src/install+setup/setup/networking.c +++ b/src/install+setup/setup/networking.c @@ -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); diff --git a/tools/make-functions b/tools/make-functions index 53eb7d918..d8518a148 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -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 -- 2.39.2