webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated mISDN,mISDNuser (25.5.2010) and lcr (1.7).

Browse Source
This commit is contained in:
Arne Fitzenreiter
2010-06-20 13:46:10 +02:00
parent e2e106be56
commit b29c22a433
13 changed files with 169 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
config/rootfiles/common/mISDN
View File

@@ -1,17 +1,23 @@
#lib/modules/2.6.27.21-ipfire/mISDN
#lib/modules/2.6.27.21-ipfire/mISDN/hfcmulti.ko
#lib/modules/2.6.27.21-ipfire/mISDN/hfcpci.ko
#lib/modules/2.6.27.21-ipfire/mISDN/hfcsusb.ko
#lib/modules/2.6.27.21-ipfire/mISDN/l1oip.ko
#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_core.ko
#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dsp.ko
#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dsp_kb1ec.ko
#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dsp_mec2.ko
#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dsp_mg2ec.ko
#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dsp_octwareec.ko
#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dsp_oslec.ko
#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dtmf.ko
#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_l1loop.ko
#lib/modules/2.6.27.21-ipfire/mISDN/octvqe
#lib/modules/2.6.27.21-ipfire/mISDN/octvqe/octvqe.ko
#lib/modules/2.6.27.21-ipfire/mISDN/xhfc.ko
etc/modprobe.d/mISDN
#lib/modules/2.6.32.15-ipfire/mISDN
#lib/modules/2.6.32.15-ipfire/mISDN/avmfritz.ko
#lib/modules/2.6.32.15-ipfire/mISDN/hfcmulti.ko
#lib/modules/2.6.32.15-ipfire/mISDN/hfcpci.ko
#lib/modules/2.6.32.15-ipfire/mISDN/hfcsusb.ko
#lib/modules/2.6.32.15-ipfire/mISDN/l1oip.ko
#lib/modules/2.6.32.15-ipfire/mISDN/mISDN_core.ko
#lib/modules/2.6.32.15-ipfire/mISDN/mISDN_dsp.ko
#lib/modules/2.6.32.15-ipfire/mISDN/mISDN_dsp_kb1ec.ko
#lib/modules/2.6.32.15-ipfire/mISDN/mISDN_dsp_mec2.ko
#lib/modules/2.6.32.15-ipfire/mISDN/mISDN_dsp_mg2ec.ko
#lib/modules/2.6.32.15-ipfire/mISDN/mISDN_dsp_octwareec.ko
#lib/modules/2.6.32.15-ipfire/mISDN/mISDN_dsp_oslec.ko
#lib/modules/2.6.32.15-ipfire/mISDN/mISDN_l1loop.ko
#lib/modules/2.6.32.15-ipfire/mISDN/mISDNinfineon.ko
#lib/modules/2.6.32.15-ipfire/mISDN/mISDNipac.ko
#lib/modules/2.6.32.15-ipfire/mISDN/mISDNisar.ko
#lib/modules/2.6.32.15-ipfire/mISDN/octvqe
#lib/modules/2.6.32.15-ipfire/mISDN/octvqe/octvqe.ko
#lib/modules/2.6.32.15-ipfire/mISDN/speedfax.ko
#lib/modules/2.6.32.15-ipfire/mISDN/w6692.ko
#lib/modules/2.6.32.15-ipfire/mISDN/xhfc.ko

31
config/rootfiles/common/mISDNuser
View File

@@ -1,18 +1,25 @@
etc/rc.d/init.d/mISDN
usr/bin/l1oipctrl
usr/bin/misdn_bridge
usr/bin/misdn_cleanl2
usr/bin/misdn_info
usr/bin/misdn_log
usr/bin/misdn_rename
#usr/include/mISDNuser
#usr/include/mISDNuser/compat_af_isdn.h
#usr/include/mISDNuser/isdn_net.h
#usr/include/mISDNuser/l3dss1.h
#usr/include/mISDNuser/mISDNif.h
#usr/include/mISDNuser/mbuffer.h
#usr/include/mISDNuser/mlayer3.h
#usr/include/mISDNuser/q931.h
#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_pic.a
usr/lib/libmisdn.so.0
usr/lib/libmisdn.so.0.2.1
#usr/lib/libsuppserv.a
#usr/lib/libsuppserv.la
usr/lib/libsuppserv.so
usr/lib/libsuppserv.so.0
usr/lib/libsuppserv.so.0.1.1
usr/sbin/misdn_cleanl2
usr/sbin/misdn_rename
etc/rc.d/init.d/mISDN

1
config/rootfiles/core/38/filelists/mISDN Symbolic link
View File

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

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

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

6
config/rootfiles/core/38/update.sh
View File

@@ -95,7 +95,11 @@ rm -rf /usr/libexec/ipsec
#
rm -rf /usr/lib/snort_*
rm -rf /etc/snort
#
# mISDN Files that was moved to sbin
#
rm -rf /usr/bin/misdn_rename
rm -rf /usr/bin/misdn_cleanl2
#
# Backup grub.conf
#

8
doc/packages-list.txt
View File

@@ -1,4 +1,4 @@
== List of softwares used to build IPFire Version: 2.6 ==
== List of softwares used to build IPFire Version: 2.7 ==
* Archive-Tar-1.29
* Archive-Zip-1.16
* BerkeleyDB-0.27
@@ -169,7 +169,7 @@
* l7-protocols-2009-05-10
* lame-3.97
* lcd4linux-0.10.1-RC2
* lcr_20090906
* lcr-20100601
* less-394
* libaal-1.0.5
* libart_lgpl-2.3.17
@@ -209,7 +209,9 @@
* lynis-1.2.9
* lzo-2.02
* m4-1.4.4
* mISDNuser_20090906
* mISDN-20100525-kmod-2.6.32.15-ipfire
* mISDN-20100525-kmod-2.6.32.15-ipfire-xen
* mISDNuser-20100525
* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.15-ipfire
* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.15-ipfire-xen
* make-3.81

10
lfs/lcr
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
# #
# 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 #
@@ -24,15 +24,15 @@
include Config
VER = 20090906
VER = 20100601
THISAPP = lcr_$(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 = 2
PAK_VER = 3
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 18554fbe046d349b81113dd90732fdaa
$(DL_FILE)_MD5 = 68ccdcbe741df38c0f79d14c1b5473f5
install : $(TARGET)

11
lfs/linux
View File

@@ -141,10 +141,6 @@ endif
# Squashfs LZMA support
cd $(DIR_APP) && bzcat $(DIR_DL)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 | patch -Np1
# mISDN hfcusb fixes
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb_bchannels.patch
# Add some more LED triggers
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-netdev-1.patch
@@ -184,9 +180,9 @@ endif
mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-gd_mod.ko \
/lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-disk.ko
# # Remove mISDN modules
# rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
# rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
# Remove mISDN modules
rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
ifneq "$(XEN)" "1"
# Blacklist matroxfb_base
@@ -205,6 +201,7 @@ ifneq "$(XEN)" "1"
for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn -name *.ko); do \
echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn ; \
done
sed -i -e "s|.ko||g" /etc/modprobe.d/isdn
endif
@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*

97
lfs/mISDN Normal file
View File

@@ -0,0 +1,97 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
# #
# 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 <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
ifeq "$(XEN)" "1"
VERSUFIX=ipfire-xen
else
VERSUFIX=ipfire
endif
VER = 20100525
THISAPP = mISDN-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 0f91aa47ee95833d74c8a81ffc6f6fd3
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)/mISDN* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch
cd $(DIR_SRC)/mISDN && ./configure --with-kerneldir=/usr/src/linux
cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) modules
cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) \
INSTALL_PREFIX=$(DIR_SRC)/mISDN/dest/ \
modules-install
mv $(DIR_SRC)/mISDN/dest/lib/modules/*/extra \
/lib/modules/$(KVER)-$(VERSUFIX)/mISDN
ifneq "$(XEN)" "1"
# Blacklist misdn modules
for f in $$(find /lib/modules/$(KVER)-$(VERSUFIX)/mISDN -name *.ko); do \
echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/mISDN ; \
done
sed -i -e "s|.ko||g" /etc/modprobe.d/mISDN
endif
@rm -rf $(DIR_SRC)/mISDN*
@$(POSTBUILD)

9
lfs/mISDNuser
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
# #
# 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 #
@@ -24,9 +24,9 @@
include Config
VER = 20090906
VER = 20100525
THISAPP = mISDNuser_$(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 = afc28383ac908eddd0219c5efb9b8178
$(DL_FILE)_MD5 = 8e9b507c3f576cefb857329f72e62318
install : $(TARGET)
@@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_SRC)/mISDNuser && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
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
@$(POSTBUILD)

2
make.sh
View File

@@ -347,6 +347,7 @@ buildipfire() {
ipfiremake kqemu XEN=1
ipfiremake v4l-dvb XEN=1
ipfiremake madwifi XEN=1
ipfiremake mISDN XEN=1
ipfiremake dahdi XEN=1 KMOD=1
ipfiremake cryptodev XEN=1
ipfiremake compat-wireless XEN=1
@@ -361,6 +362,7 @@ buildipfire() {
ipfiremake v4l-dvb
ipfiremake madwifi
ipfiremake alsa KMOD=1
ipfiremake mISDN
ipfiremake dahdi KMOD=1
ipfiremake cryptodev
ipfiremake compat-wireless

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

@@ -26,6 +26,7 @@ case "${1}" in
done
modprobe mISDN_dsp
modprobe mISDN_dsp_oslec
if [ ${?} = 0 ]; then
echo_ok;
else
@@ -39,7 +40,7 @@ case "${1}" in
boot_mesg "Stopping mISDNv2 ... "
# unload mISDN hardware modules
for module in mISDN_dsp hfcpci hfcsusb hfcmulti avmfritz speedfax mISDNinfineon xhfc mISDNipac mISDNisar; do
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

56
src/patches/mISDN-hfcusb_bchannels.patch
View File

@@ -1,56 +0,0 @@
From: mbachem <info@colognechip.com>
Date: Thu, 17 Dec 2009 01:45:58 +0000 (+0100)
Subject: mISDN: Bugfix hfcsusb: usb endpoint activation/deactivation
X-Git-Url: http://git.misdn.org/?p=mISDN.git;a=commitdiff_plain;h=e29960990df531faff42023dd663e8d6e2bf55fe;hp=5f0f8aed322de56932da90810062f46170443553
mISDN: Bugfix hfcsusb: usb endpoint activation/deactivation
fixed activation/deactivation of B1/B2's USB endpoints
Signed-off-by: mbachem <info@colognechip.com>
---
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c
index c5f29db..e8c5754 100644
--- a/drivers/isdn/hardware/mISDN/hfcsusb.c
+++ b/drivers/isdn/hardware/mISDN/hfcsusb.c
@@ -36,7 +36,7 @@
#include <linux/isdn_compat.h>
#include "hfcsusb.h"
-static const char *hfcsusb_rev = "Revision: 0.3.3 (socket), 2008-11-05";
+static const char *hfcsusb_rev = "Revision: 0.3.4 (socket), 2009-12-16";
static unsigned int debug;
static int poll = DEFAULT_TRANSP_BURST_SZ;
@@ -239,7 +239,7 @@ hfcusb_l2l1B(struct mISDNchannel *ch, struct sk_buff *skb)
return ret;
case PH_ACTIVATE_REQ:
if (!test_and_set_bit(FLG_ACTIVE, &bch->Flags)) {
- hfcsusb_start_endpoint(hw, bch->nr);
+ hfcsusb_start_endpoint(hw, bch->nr-1);
ret = hfcsusb_setup_bch(bch, ch->protocol);
} else
ret = 0;
@@ -502,12 +502,6 @@ open_bchannel(struct hfcsusb *hw, struct channel_req *rq)
bch->ch.protocol = rq->protocol;
rq->ch = &bch->ch;
- /* start USB endpoint for bchannel */
- if (rq->adr.channel == 1)
- hfcsusb_start_endpoint(hw, HFC_CHAN_B1);
- else
- hfcsusb_start_endpoint(hw, HFC_CHAN_B2);
-
if (!try_module_get(THIS_MODULE))
printk(KERN_WARNING "%s: %s:cannot get module\n",
hw->name, __func__);
@@ -1813,7 +1807,7 @@ deactivate_bchannel(struct bchannel *bch)
mISDN_clear_bchannel(bch);
spin_unlock_irqrestore(&hw->lock, flags);
hfcsusb_setup_bch(bch, ISDN_P_NONE);
- hfcsusb_stop_endpoint(hw, bch->nr);
+ hfcsusb_stop_endpoint(hw, bch->nr-1);
}
/*