H323 Conntrack hinzugefuegt

Bootsplash reaktiviert.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@367 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586
index a01c4d2ade16ff7dbcc4333c87e0df065255587b..debe08f10bdece5116e0518731085b1e46355023 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.16
-# Tue Dec 12 17:10:37 2006
+# Wed Dec 13 03:25:20 2006
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -419,6 +419,7 @@ CONFIG_IP_NF_IRC=m
 # CONFIG_IP_NF_TFTP is not set
 # CONFIG_IP_NF_AMANDA is not set
 CONFIG_IP_NF_PPTP=m
+CONFIG_IP_NF_H323=m
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_IPRANGE=m
@@ -450,6 +451,7 @@ CONFIG_IP_NF_NAT_SNMP_BASIC=m
 CONFIG_IP_NF_NAT_IRC=m
 CONFIG_IP_NF_NAT_FTP=m
 CONFIG_IP_NF_NAT_PPTP=m
+CONFIG_IP_NF_NAT_H323=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m
@@ -1640,7 +1642,7 @@ CONFIG_LOGO_LINUX_CLUT224=y
 #
 # Bootsplash configuration
 #
-# CONFIG_BOOTSPLASH is not set
+CONFIG_BOOTSPLASH=y
 
 #
 # Sound

diff --git a/config/kernel/kernel.config.i586.smp b/config/kernel/kernel.config.i586.smp
index 1d510d0d9041792946fc2be5e09c3053e65bd12a..82175bdfd0f8a53acc10aa72c68a1205b6ac48cf 100644 (file)
--- 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
-# Tue Dec 12 17:10:59 2006
+# Wed Dec 13 03:25:32 2006
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -425,6 +425,7 @@ CONFIG_IP_NF_IRC=m
 # CONFIG_IP_NF_TFTP is not set
 # CONFIG_IP_NF_AMANDA is not set
 CONFIG_IP_NF_PPTP=m
+CONFIG_IP_NF_H323=m
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_IPRANGE=m
@@ -456,6 +457,7 @@ CONFIG_IP_NF_NAT_SNMP_BASIC=m
 CONFIG_IP_NF_NAT_IRC=m
 CONFIG_IP_NF_NAT_FTP=m
 CONFIG_IP_NF_NAT_PPTP=m
+CONFIG_IP_NF_NAT_H323=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m
@@ -1635,7 +1637,7 @@ CONFIG_LOGO_LINUX_CLUT224=y
 #
 # Bootsplash configuration
 #
-# CONFIG_BOOTSPLASH is not set
+CONFIG_BOOTSPLASH=y
 
 #
 # Sound

diff --git a/lfs/linux b/lfs/linux
index 93a6dc28bb6a1f8ca6f55c8cab6a3cf253926141..93a92e35e7a10298767af4878e618539160e3785 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -55,6 +55,7 @@ objects =$(DL_FILE) \
        kbc_option_2420.patch \
        net4801.kernel.patch_2.4.31 \
        netfilter-layer7-v2.6.tar.gz \
+       patch-2.6.16-nath323-1.3.bz2 \
        patch-$(PATCHLEVEL).gz
 
 $(DL_FILE)                                     = $(DL_FROM)/$(DL_FILE)
@@ -66,6 +67,7 @@ iptables-1.3.5.tar.bz2                        = $(URL_IPFIRE)/iptables-1.3.5.tar.bz2
 kbc_option_2420.patch                  = $(URL_IPFIRE)/kbc_option_2420.patch
 net4801.kernel.patch_2.4.31                    = $(URL_IPFIRE)/net4801.kernel.patch_2.4.31
 netfilter-layer7-v2.6.tar.gz           = $(URL_IPFIRE)/netfilter-layer7-v2.6.tar.gz
+patch-2.6.16-nath323-1.3.bz2           = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
 
 $(DL_FILE)_MD5                                 = 50695965725367f39007023feac5e256
 patch-$(PATCHLEVEL).gz_MD5                             = 1355ebc25ea57df398d20e1c1726ec9b
@@ -76,6 +78,7 @@ iptables-1.3.5.tar.bz2_MD5                            = 00fb916fa8040ca992a5ace56d905ea5
 kbc_option_2420.patch_MD5                              = 6d37870344f7fcf97ace1fbf43323c60
 net4801.kernel.patch_2.4.31_MD5                        = c7d64e3caedb2f2b10e1c11db7f73a04
 netfilter-layer7-v2.6.tar.gz_MD5                       = 58135cd1aafaf4ae2fa478159206f064
+patch-2.6.16-nath323-1.3.bz2_MD5                       = f926409ff703a307baf54b57ab75d138
 
 install : $(TARGET)
 
@@ -124,6 +127,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && gzip -dc $(DIR_DL)/openswan-2.4.7.kernel-2.6-klips.patch.gz | patch -Np1
        cd $(DIR_SRC)/openswan-* && sed -i -e 's/INC_USRLOCAL=\/usr\/local/INC_USRLOCAL=\/usr/' Makefile.inc
 
+       # H323 conntrack
+       cd $(DIR_APP) && bunzip2 -cd $(DIR_DL)/patch-2.6.16-nath323-1.3.bz2 | patch -Np1
+
        # Patch-o-matic
        cd $(DIR_SRC) && rm -rf iptables-*
        cd $(DIR_SRC) && tar xfj $(DIR_DL)/iptables-1.3.5.tar.bz2
@@ -132,8 +138,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_SRC) && tar xfj $(DIR_DL)/patch-o-matic-ng-20061210.tar.bz2
        cd $(DIR_SRC)/patch-o-matic-ng* && \
                ./runme --batch --kernel-path=$(ROOT)/usr/src/$(THISAPP)/ --iptables-path=$(ROOT)/usr/src/iptables/ \
-                       TARPIT h323-conntrack-nat cuseeme-nat \
-                       sip-conntrack-nat rtsp-conntrack-nat \
+                       TARPIT sip-conntrack-nat rtsp-conntrack-nat \
                        mms-conntrack-nat #quake3-conntrack-nat
 
        # Layer7-patch