From a350ea6deacaf9755c8e127285ceac3dfa4ca42b Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 12 Feb 2018 11:40:07 +0000 Subject: [PATCH] Drop mISDN userspace tools This is unsupported for quite a while and nobody should be using this. Signed-off-by: Michael Tremer --- config/rootfiles/common/armv5tel/initscripts | 1 - config/rootfiles/common/i586/initscripts | 1 - config/rootfiles/common/mISDNuser | 26 ------- config/rootfiles/common/x86_64/initscripts | 1 - config/rootfiles/core/119/filelists/setup | 1 + config/rootfiles/core/119/update.sh | 8 +- lfs/mISDNuser | 79 -------------------- make.sh | 1 - src/initscripts/system/mISDN | 68 ----------------- src/setup/main.c | 17 ++--- src/setup/misc.c | 10 --- src/setup/setup.h | 1 - 12 files changed, 13 insertions(+), 201 deletions(-) delete mode 100644 config/rootfiles/common/mISDNuser create mode 120000 config/rootfiles/core/119/filelists/setup delete mode 100644 lfs/mISDNuser delete mode 100644 src/initscripts/system/mISDN diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index d3a3cf829b..43802216d8 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -22,7 +22,6 @@ etc/rc.d/init.d/halt etc/rc.d/init.d/ipsec etc/rc.d/init.d/leds etc/rc.d/init.d/localnet -etc/rc.d/init.d/mISDN etc/rc.d/init.d/modules etc/rc.d/init.d/mountfs etc/rc.d/init.d/mountkernfs diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 67e495c4a7..5463f675d0 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -23,7 +23,6 @@ etc/rc.d/init.d/halt etc/rc.d/init.d/ipsec etc/rc.d/init.d/leds etc/rc.d/init.d/localnet -etc/rc.d/init.d/mISDN etc/rc.d/init.d/modules etc/rc.d/init.d/mountfs etc/rc.d/init.d/mountkernfs diff --git a/config/rootfiles/common/mISDNuser b/config/rootfiles/common/mISDNuser deleted file mode 100644 index 9c424c4a53..0000000000 --- a/config/rootfiles/common/mISDNuser +++ /dev/null @@ -1,26 +0,0 @@ -usr/bin/isdn_text2wireshark -usr/bin/l1oipctrl -usr/bin/misdn_E1test -usr/bin/misdn_bridge -usr/bin/misdn_info -usr/bin/misdn_log -#usr/etc -#usr/etc/udev -#usr/etc/udev/rules.d -#usr/etc/udev/rules.d/45-misdn.rules -#usr/include/mISDN -#usr/include/mISDN/l3dss1.h -#usr/include/mISDN/mISDNcompat.h -#usr/include/mISDN/mISDNif.h -#usr/include/mISDN/mbuffer.h -#usr/include/mISDN/mlayer3.h -#usr/include/mISDN/q931.h -#usr/include/mISDN/suppserv.h -#usr/lib/libmisdn.a -#usr/lib/libmisdn.la -usr/lib/libmisdn.so -usr/lib/libmisdn.so.1 -usr/lib/libmisdn.so.1.0.0 -usr/sbin/misdn_cleanl2 -usr/sbin/misdn_rename -etc/rc.d/init.d/mISDN diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 67e495c4a7..5463f675d0 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -23,7 +23,6 @@ etc/rc.d/init.d/halt etc/rc.d/init.d/ipsec etc/rc.d/init.d/leds etc/rc.d/init.d/localnet -etc/rc.d/init.d/mISDN etc/rc.d/init.d/modules etc/rc.d/init.d/mountfs etc/rc.d/init.d/mountkernfs diff --git a/config/rootfiles/core/119/filelists/setup b/config/rootfiles/core/119/filelists/setup new file mode 120000 index 0000000000..209374bbcf --- /dev/null +++ b/config/rootfiles/core/119/filelists/setup @@ -0,0 +1 @@ +../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/core/119/update.sh b/config/rootfiles/core/119/update.sh index 42245ea454..83c0c6f02b 100644 --- a/config/rootfiles/core/119/update.sh +++ b/config/rootfiles/core/119/update.sh @@ -37,7 +37,13 @@ done rm -vf \ /sbin/capiinit \ /usr/bin/capiinfo \ - /usr/lib/libcapi20* + /usr/lib/libcapi20* \ + /usr/bin/isdn_text2wireshark \ + /usr/bin/l1oipctrl \ + /usr/bin/msidn_* \ + /usr/lib/libmisdn* \ + /usr/sbin/misdn_* \ + /etc/rc.d/init.d/mISDN # Extract files extract_files diff --git a/lfs/mISDNuser b/lfs/mISDNuser deleted file mode 100644 index 923696a80c..0000000000 --- a/lfs/mISDNuser +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 20121008 - -THISAPP = mISDNuser-$(VER) -DL_FILE = $(THISAPP).tar.xz -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 = 86dd2c68ef5b2fdff653f9f635771127 - -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_SRC)/mISDNuser && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_SRC)/mISDNuser && sed -e "s/-Werror//g" -i */Makefile.* - cd $(DIR_SRC)/mISDNuser && make - cd $(DIR_SRC)/mISDNuser && ./configure --prefix=/usr --with-AF_ISDN=34 - cd $(DIR_SRC)/mISDNuser && make MISDNDIR=/usr/src/linux - cd $(DIR_SRC)/mISDNuser && make install MISDNDIR=/usr/src/linux - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 3f3cf8284a..0713c6fadb 100755 --- a/make.sh +++ b/make.sh @@ -1210,7 +1210,6 @@ buildipfire() { lfsmake2 ipaddr lfsmake2 iputils lfsmake2 l7-protocols - lfsmake2 mISDNuser lfsmake2 hwdata lfsmake2 logrotate lfsmake2 logwatch diff --git a/src/initscripts/system/mISDN b/src/initscripts/system/mISDN deleted file mode 100644 index 49f00b020f..0000000000 --- a/src/initscripts/system/mISDN +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -######################################################################## -# Begin $rc_base/init.d/mISDN -# -# Description : Start mISDN v2 -# -# Authors : Arne Fitzenreiter - arne_f@ipfire.org -# -# Version : 01.00 -# -# Notes : -# -######################################################################## - -. /etc/sysconfig/rc -. ${rc_functions} - -case "${1}" in - start) - - boot_mesg "Starting mISDNv2 ... " - - # load mISDN modules - for module in mISDN_core hfcpci hfcsusb hfcmulti avmfritz speedfax mISDNinfineon xhfc; do - modprobe $module > /dev/null 2>&1; - done - - modprobe mISDN_dsp - modprobe mISDN_dsp_oslec - if [ ${?} = 0 ]; then - echo_ok; - else - echo_failure; - fi - exit 0; - ;; - - stop) - - boot_mesg "Stopping mISDNv2 ... " - - # unload mISDN hardware modules - for module in mISDN_dsp_oslec mISDN_dsp hfcpci hfcsusb hfcmulti avmfritz speedfax mISDNinfineon xhfc mISDNipac mISDNisar; do - rmmod $module > /dev/null 2>&1; - done - - rmmod mISDN_core > /dev/null 2>&1 - echo_ok; - exit 0; - ;; - - config) - boot_mesg "mISDNv2 - config not needed!" - exit 0; - ;; - - scan) - boot_mesg "mISDNv2 - scan not supported!" - exit 0; - ;; - - *) - echo "Usage: ${0} {start}{stop}" - exit 1 - ;; -esac - -# End $rc_base/init.d/mISDN diff --git a/src/setup/main.c b/src/setup/main.c index 33f4d21420..adb98a2317 100644 --- a/src/setup/main.c +++ b/src/setup/main.c @@ -25,7 +25,7 @@ struct knic knics[20] = { { "" , "" , "" , "" } }; int main(int argc, char *argv[]) { int choice; - char *sections[11]; /* need to fill this out AFTER knowning lang */ + char *sections[8]; /* need to fill this out AFTER knowning lang */ int rc; struct keyvalue *kv; char lang[STRING_SIZE] = "en_US.utf8"; @@ -69,10 +69,9 @@ int main(int argc, char *argv[]) sections[2] = _("Hostname"); sections[3] = _("Domain name"); sections[4] = _("Networking"); - sections[5] = _("ISDN"); - sections[6] = _("'root' password"); - sections[7] = _("'admin' password"); - sections[8] = NULL; + sections[5] = _("'root' password"); + sections[6] = _("'admin' password"); + sections[7] = NULL; newtInit(); newtCls(); @@ -124,14 +123,10 @@ int main(int argc, char *argv[]) break; case 5: - handleisdn(); - break; - - case 6: handlerootpassword(); break; - case 7: + case 6: handleadminpassword(); break; @@ -154,8 +149,6 @@ int main(int argc, char *argv[]) goto EXIT; if (!(handleadminpassword())) goto EXIT; - if (!(handleisdn())) - goto EXIT; if (!(handlenetworking())) goto EXIT; if (!(handledhcp())) diff --git a/src/setup/misc.c b/src/setup/misc.c index 3b258e0f18..a31b1d8a84 100644 --- a/src/setup/misc.c +++ b/src/setup/misc.c @@ -139,13 +139,3 @@ int writehostsfiles(void) return 1; } - -int handleisdn(void) -{ - char command[STRING_SIZE]; - sprintf(command, "/etc/rc.d/init.d/mISDN config"); - if (runcommandwithstatus(command, _("ISDN"), _("Scanning and configuring ISDN devices."), NULL)) - errorbox(_("Unable to scan for ISDN devices.")); - // Need to write some lines that count the cards and say the names... - return 1; -} diff --git a/src/setup/setup.h b/src/setup/setup.h index a368b78ae1..e44bb1c7a9 100644 --- a/src/setup/setup.h +++ b/src/setup/setup.h @@ -32,7 +32,6 @@ int handleadminpassword(void); /* misc.c */ int writehostsfiles(void); -int handleisdn(void); /* keymap.c */ int handlekeymap(void); -- 2.39.2