Update mISDN to current git version

diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586
index 7a60a5541bd9d2bb0e434ce2a66cba9a5d131732..8a7a95621b5aa30f6a2b58d10133929dfd777457 100644 (file)
--- 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.25.19-ipfire
-# Fri Oct 24 05:17:37 2008
+# Thu Nov  6 10:24:53 2008
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -1771,15 +1771,13 @@ CONFIG_MISDN_DRV=m
 CONFIG_MISDN_AVM_FRITZ=y
 CONFIG_MISDN_NETJET=y
 CONFIG_MISDN_HFCPCI=y
-CONFIG_MISDN_HFCMULTI=y
-CONFIG_HFCMULTI_PCIMEM=y
+# CONFIG_MISDN_HFCMULTI is not set
 CONFIG_MISDN_HFCUSB=y
 CONFIG_MISDN_HFCMINI=y
 CONFIG_MISDN_XHFC=y
 CONFIG_MISDN_SPEEDFAX=y
 CONFIG_MISDN_W6692=y
 CONFIG_MISDN_DSP=y
-CONFIG_MISDN_LOOP=y
 CONFIG_MISDN_L1OIP=y
 # CONFIG_PHONE is not set
 

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 496dfe0b5539627219898e38f3e3dba8eef782d8..31f81745ea845689a748b0c9c000da001c08b987 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -184,6 +184,7 @@
 * lzo-2.02
 * m4-1.4.4
 * mISDNuser-1_1_8
+* mISDNuser.git-8e7bf2f11cc108d4b52949c2a26e38df24821b01
 * madwifi-hal-2008-08-15-r3862-20080903-kmod-2.6.25.19
 * make-3.81
 * man-db-2.4.3

diff --git a/lfs/linux b/lfs/linux
index bd35201db5ba1d6a3dab2fd266efae0680c5f39e..ec4e3a01551ae6028eee37e3c1e02fc0ddeee74e 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -46,7 +46,7 @@ endif
 # Top-level Rules
 ###############################################################################
 objects =$(DL_FILE) \
-       mISDN-1_1_8.tar.gz \
+       mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz \
        squashfs3.4.tar.gz \
        netfilter-layer7-v2.20.tar.gz \
        patch-2.6.16-nath323-1.3.bz2 \
@@ -56,14 +56,14 @@ $(DL_FILE)                          = $(URL_IPFIRE)/$(DL_FILE)
 netfilter-layer7-v2.20.tar.gz          = $(URL_IPFIRE)/netfilter-layer7-v2.20.tar.gz
 patch-2.6.16-nath323-1.3.bz2           = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
 squashfs3.4.tar.gz                     = $(URL_IPFIRE)/squashfs3.4.tar.gz
-mISDN-1_1_8.tar.gz                     = $(URL_IPFIRE)/mISDN-1_1_8.tar.gz
+mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz = $(URL_IPFIRE)/mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz
 reiser4-for-2.6.25.patch.bz2           = $(URL_IPFIRE)/reiser4-for-2.6.25.patch.bz2
 
 $(DL_FILE)_MD5                         = 1b20d2d2a5a0f119372a166eaf816e13
 netfilter-layer7-v2.20.tar.gz_MD5      = 525a821c973b730c8feaf9eedb57d1e4
 patch-2.6.16-nath323-1.3.bz2_MD5       = f926409ff703a307baf54b57ab75d138
 squashfs3.4.tar.gz_MD5                 = 2a4d2995ad5aa6840c95a95ffa6b1da6
-mISDN-1_1_8.tar.gz_MD5                 = 29c55ffe0b35668a41eaed3b1c3ddfe2
+mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz_MD5 = a46a2d15bd0341edfbd77d257ed3fe4d
 reiser4-for-2.6.25.patch.bz2_MD5       = 4294bbcb39e5ee859b94b09ff4fb1e0c
 
 install : $(TARGET)
@@ -133,10 +133,10 @@ endif
 
        # mISDN
        cd $(DIR_SRC) && rm -rf mISDN-*
-       cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN-1_1_8.tar.gz
-       cd $(DIR_SRC)/mISDN-1_1_8 && yes 'yes' | ./std2kern -k /usr/src/linux
+       cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz
+       cd $(DIR_SRC)/mISDN.git && yes 'yes' | ./std2kern -k /usr/src/linux
        
-       cd $(DIR_APP)/drivers/isdn/hardware/mISDN && patch -Np0 < $(DIR_SRC)/src/patches/mISDN-avmfritz.patch
+#      cd $(DIR_APP)/drivers/isdn/hardware/mISDN && patch -Np0 < $(DIR_SRC)/src/patches/mISDN-avmfritz.patch
 
        # Cleanup kernel source
        cd $(DIR_APP) && make mrproper

diff --git a/lfs/mISDN b/lfs/mISDN
index b597ed6ab161ac272bd976ebbfb815c1781c72cb..10f28ebaf59f739be06a25a0c600169fcb3155b4 100644 (file)
--- a/lfs/mISDN
+++ b/lfs/mISDN
@@ -24,12 +24,12 @@
 
 include Config
 
-VER        = 1_1_8
+VER        = git-081106
 
-THISAPP    = mISDNuser-$(VER)
+THISAPP    = mISDNuser.git-8e7bf2f11cc108d4b52949c2a26e38df24821b01
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
+DIR_APP    = $(DIR_SRC)/mISDNuser.git
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7cf66625608736eb939cfcb2308f3edf
+$(DL_FILE)_MD5 = 4eddac75aac4b997e6f2061e10f20862
 
 install : $(TARGET)
 
@@ -73,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make MISDNDIR=/usr/src/linux
        cd $(DIR_APP) && make install MISDNDIR=/usr/src/linux
        -mkdir -p /usr/lib/mISDN
-       cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN-$(VER).tar.gz
-       cd $(DIR_SRC)/mISDN-$(VER) && cp -v config/*.xsl /usr/lib/mISDN
+       cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz
+       cd $(DIR_SRC)/mISDN.git && cp -v config/*.xsl /usr/lib/mISDN
        @rm -rf $(DIR_SRC)/mISDN*
        @$(POSTBUILD)