webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 10:52:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated mISDN,mISDNuser and lcr (20090906).

Browse Source
This commit is contained in:
Arne Fitzenreiter
2009-12-22 00:23:52 +01:00
parent 18d5ecabc2
commit d7211302bf
10 changed files with 64 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/34/filelists/files
View File

@@ -3,6 +3,7 @@ etc/rc.d/init.d/networking/red
etc/rc.d/init.d/networking/dhcpcd.exe
etc/rc.d/helper/getdnsfromdhcpc.pl
etc/rc.d/init.d/tmpfs
etc/rc.d/init.d/mISDN
etc/rc.d/init.d/firewall
boot/grub/grub.conf
srv/web/ipfire/cgi-bin/index.cgi

1
config/rootfiles/core/34/filelists/mISDNuser Symbolic link
View File

@@ -0,0 +1 @@
../../../common/mISDNuser

3
config/udev/blacklist
View File

@@ -25,3 +25,6 @@ blacklist netjetpci
blacklist sedlfax
blacklist w6692pci
blacklist xhfc
blacklist mISDNinfineon
blacklist avmfritz
blacklist speedfax

16
doc/packages-list.txt
View File

@@ -35,8 +35,8 @@
* URI-1.35
* Unix-Syslog-0.100
* XML-Parser-2.34
* alsa-lib-1.0.21a
* alsa-lib-1.0.21a-kmod-2.6.27.42-ipfire
* alsa-lib-1.0.22
* alsa-lib-1.0.22-kmod-2.6.27.42-ipfire
* amavisd-new-2.5.2
* apcupsd-3.14.4
* applejuice-0.31
@@ -169,7 +169,7 @@
* l7-protocols-2009-05-10
* lame-3.97
* lcd4linux-0.10.1-RC2
* lcr.git-64143650bc9c04fadc99694c499cf34750bc2804
* lcr_20090906
* less-394
* libaal-1.0.5
* libart_lgpl-2.3.17
@@ -206,9 +206,9 @@
* lynis-1.2.6
* lzo-2.02
* m4-1.4.4
* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.42-ipfire
* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.42-ipfire-xen
* mISDNuser.git-54928dec57bc846f2c2186f3640e69a053cd3641
* mISDN_20090906-kmod-2.6.27.42-ipfire
* mISDN_20090906-kmod-2.6.27.42-ipfire-xen
* mISDNuser_20090906
* madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.42-ipfire
* madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.42-ipfire-xen
* make-3.81
@@ -341,8 +341,8 @@
* usb_modeswitch-1.0.5
* usbutils-0.72
* util-linux-2.12r
* v4l-dvb-aba823ecaea6-kmod-2.6.27.42-ipfire
* v4l-dvb-aba823ecaea6-kmod-2.6.27.42-ipfire-xen
* v4l-dvb-9defbd461e5f-kmod-2.6.27.42-ipfire
* v4l-dvb-9defbd461e5f-kmod-2.6.27.42-ipfire-xen
* vdr-1.6.0
* vdradmin-am-3.6.4
* vim-7.0

24
lfs/lcr
View File

@@ -24,15 +24,15 @@
include Config
VER = 64143650bc9c04fadc99694c499cf34750bc2804
VER = 20090906
THISAPP = lcr.git-$(VER)
THISAPP = lcr_$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = lcr
PAK_VER = 1
PAK_VER = 2
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 972af4b1f72874700e247db4c12992af
$(DL_FILE)_MD5 = 18554fbe046d349b81113dd90732fdaa
install : $(TARGET)
@@ -76,16 +76,16 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_SRC)/lcr.git && sed -i 's|usr/local/lcr|var/ipfire/lcr|g' Makefile.in
cd $(DIR_SRC)/lcr.git && sed -i 's|usr/local/lcr|var/ipfire/lcr|g' Makefile.am
cd $(DIR_SRC)/lcr.git && ./configure --prefix=/usr
cd $(DIR_SRC)/lcr.git && make $(MAKETUNING)
cd $(DIR_SRC)/lcr.git && make install
@rm -rf $(DIR_SRC)/lcr && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_SRC)/lcr && sed -i 's|usr/local/lcr|var/ipfire/lcr|g' Makefile.in
cd $(DIR_SRC)/lcr && sed -i 's|usr/local/lcr|var/ipfire/lcr|g' Makefile.am
cd $(DIR_SRC)/lcr && ./configure --prefix=/usr
cd $(DIR_SRC)/lcr && make $(MAKETUNING)
cd $(DIR_SRC)/lcr && make install
mv /var/ipfire/lcr/routing.conf /var/ipfire/lcr/routing.conf.org
install -v -m 644 $(DIR_SRC)/config/lcr/routing.conf \
/var/ipfire/lcr/routing.conf
install -v -m 644 $(DIR_SRC)/config/backup/includes/lcr \
/var/ipfire/backup/addons/includes/lcr
@rm -rf $(DIR_APP)
/var/ipfire/backup/addons/includes/lcr
@rm -rf $(DIR_SRC)/lcr
@$(POSTBUILD)

19
lfs/mISDN
View File

@@ -30,9 +30,9 @@ else
VERSUFIX=ipfire
endif
VER = 9bf7deaa4b8829ab8fbccb34529a17aab2ddea93
VER = 20090906
THISAPP = mISDN.git-$(VER)
THISAPP = mISDN_$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = a9e9aaff23cda58c4d71aab8eab9bba5
$(DL_FILE)_MD5 = c5a9daab7fa18734127d481c8cfdac96
install : $(TARGET)
@@ -75,13 +75,14 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_SRC)/mISDN.git && make KVERS=$(KVER)-$(VERSUFIX) force
cd $(DIR_SRC)/mISDN.git && make KVERS=$(KVER)-$(VERSUFIX) $(MAKETUNING)
cd $(DIR_SRC)/mISDN.git && make KVERS=$(KVER)-$(VERSUFIX) \
INSTALL_PREFIX=$(DIR_SRC)/mISDN.git/dest/ \
@rm -rf $(DIR_SRC)/mISDN* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-enable_disabled_cards.patch
cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) force
cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) $(MAKETUNING)
cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) \
INSTALL_PREFIX=$(DIR_SRC)/mISDN/dest/ \
modules-install
mv $(DIR_SRC)/mISDN.git/dest/lib/modules/*/extra \
mv $(DIR_SRC)/mISDN/dest/lib/modules/*/extra \
/lib/modules/$(KVER)-$(VERSUFIX)/mISDN
@rm -rf $(DIR_SRC)/mISDN*
@$(POSTBUILD)

12
lfs/mISDNuser
View File

@@ -24,9 +24,9 @@
include Config
VER = 54928dec57bc846f2c2186f3640e69a053cd3641
VER = 20090906
THISAPP = mISDNuser.git-$(VER)
THISAPP = mISDNuser_$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 04d5252e89fba1e3e58ebb4285222d25
$(DL_FILE)_MD5 = afc28383ac908eddd0219c5efb9b8178
install : $(TARGET)
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_SRC)/mISDNuser.git && make MISDNDIR=/usr/src/linux
cd $(DIR_SRC)/mISDNuser.git && make install MISDNDIR=/usr/src/linux
@rm -rf $(DIR_SRC)/mISDNuser && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_SRC)/mISDNuser && make MISDNDIR=/usr/src/linux
cd $(DIR_SRC)/mISDNuser && make install MISDNDIR=/usr/src/linux
@$(POSTBUILD)

6
src/initscripts/init.d/mISDN
View File

@@ -6,7 +6,7 @@
#
# Authors : Arne Fitzenreiter - arne_f@ipfire.org
#
# Version : 00.00
# Version : 01.00
#
# Notes :
#
@@ -21,7 +21,7 @@ case "${1}" in
boot_mesg "Starting mISDNv2 ... "
# load mISDN modules
for module in mISDN_core hfcpci hfcsusb hfcmulti xhfc; do
for module in mISDN_core hfcpci hfcsusb hfcmulti avmfritz speedfax mISDNinfineon xhfc; do
modprobe $module > /dev/null 2>&1;
done
@@ -39,7 +39,7 @@ case "${1}" in
boot_mesg "Stopping mISDNv2 ... "
# unload mISDN hardware modules
for module in mISDN_dsp hfcpci hfcsusb hfcmulti xhfc; do
for module in mISDN_dsp hfcpci hfcsusb hfcmulti avmfritz speedfax mISDNinfineon xhfc mISDNipac mISDNisar; do
rmmod $module > /dev/null 2>&1;
done

0
src/initscripts/init.d/nut Executable file → Normal file
View File

20
src/patches/mISDN-enable_disabled_cards.patch Normal file
View File

@@ -0,0 +1,20 @@
diff -Naur mISDN.org/Makefile mISDN/Makefile
--- mISDN.org/Makefile 2009-09-06 17:02:14.000000000 +0200
+++ mISDN/Makefile 2009-12-21 20:03:00.000000000 +0100
@@ -37,11 +37,11 @@
CONFIGS+=CONFIG_MISDN_HFCPCI=m
CONFIGS+=CONFIG_MISDN_HFCUSB=m
CONFIGS+=CONFIG_MISDN_XHFC=m
-#CONFIGS+=CONFIG_MISDN_HFCMINI=m
-#CONFIGS+=CONFIG_MISDN_W6692=m
-#CONFIGS+=CONFIG_MISDN_SPEEDFAX=m
-#CONFIGS+=CONFIG_MISDN_AVM_FRITZ=m
-#CONFIGS+=CONFIG_MISDN_NETJET=m
+CONFIGS+=CONFIG_MISDN_SPEEDFAX=m
+CONFIGS+=CONFIG_MISDN_AVMFRITZ=m
+CONFIGS+=CONFIG_MISDN_IPAC=m
+CONFIGS+=CONFIG_MISDN_ISAR=m
+CONFIGS+=CONFIG_MISDN_INFINEON=m
CONFIGS+=CONFIG_MISDN_L1OIP=m
#CONFIGS+=CONFIG_MISDN_DEBUGTOOL=m
#CONFIGS+=CONFIG_MISDN_HWSKEL=m