Merge branch 'kernel2.6.32.8' into next

Conflicts: doc/packages-list.txt lfs/linux
2026-04-12 20:16:49 +02:00 · 2010-02-14 11:33:02 +01:00
parent e74f970fc1 422983d95e
commit 2e5acb59e9
54 changed files with 5207 additions and 818 deletions
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
--- a/config/rootfiles/common/compat-wireless
+++ b/config/rootfiles/common/compat-wireless
@@ -1,2 +0,0 @@
-etc/modprobe.d/cfg80211
-etc/modprobe.d/hostap
--- a/config/rootfiles/common/iptables
+++ b/config/rootfiles/common/iptables
@@ -1,66 +1,130 @@
+#lib/libip4tc.la
+lib/libip4tc.so
+lib/libip4tc.so.0
+lib/libip4tc.so.0.0.0
+#lib/libip6tc.la
+lib/libip6tc.so
+lib/libip6tc.so.0
+lib/libip6tc.so.0.0.0
+#lib/libipq.a
+#lib/libiptc.la
+lib/libiptc.so
+lib/libiptc.so.0
+lib/libiptc.so.0.0.0
+#lib/libxtables.la
+lib/libxtables.so
+lib/libxtables.so.4
+lib/libxtables.so.4.0.0
+#lib/pkgconfig
+#lib/pkgconfig/libiptc.pc
+#lib/pkgconfig/xtables.pc
 lib/xtables
-#lib/xtables/libipt_CLASSIFY.so
-#lib/xtables/libipt_CONNMARK.so
+#lib/xtables/libip6t_HL.so
+#lib/xtables/libip6t_LOG.so
+#lib/xtables/libip6t_REJECT.so
+#lib/xtables/libip6t_ah.so
+#lib/xtables/libip6t_dst.so
+#lib/xtables/libip6t_eui64.so
+#lib/xtables/libip6t_frag.so
+#lib/xtables/libip6t_hbh.so
+#lib/xtables/libip6t_hl.so
+#lib/xtables/libip6t_icmp6.so
+#lib/xtables/libip6t_ipv6header.so
+#lib/xtables/libip6t_mh.so
+#lib/xtables/libip6t_rt.so
+#lib/xtables/libipt_CLUSTERIP.so
 #lib/xtables/libipt_DNAT.so
-#lib/xtables/libipt_DSCP.so
 #lib/xtables/libipt_ECN.so
+#lib/xtables/libipt_IMQ.so
 #lib/xtables/libipt_LOG.so
-#lib/xtables/libipt_MARK.so
 #lib/xtables/libipt_MASQUERADE.so
 #lib/xtables/libipt_MIRROR.so
 #lib/xtables/libipt_NETMAP.so
-#lib/xtables/libipt_NFQUEUE.so
-#lib/xtables/libipt_NOTRACK.so
 #lib/xtables/libipt_REDIRECT.so
 #lib/xtables/libipt_REJECT.so
 #lib/xtables/libipt_SAME.so
+#lib/xtables/libipt_SET.so
 #lib/xtables/libipt_SNAT.so
-#lib/xtables/libipt_TARPIT.so
-#lib/xtables/libipt_TCPMSS.so
-#lib/xtables/libipt_TOS.so
-#lib/xtables/libipt_TRACE.so
 #lib/xtables/libipt_TTL.so
 #lib/xtables/libipt_ULOG.so
 #lib/xtables/libipt_addrtype.so
 #lib/xtables/libipt_ah.so
-#lib/xtables/libipt_comment.so
-#lib/xtables/libipt_connlimit.so
-#lib/xtables/libipt_connmark.so
-#lib/xtables/libipt_conntrack.so
-#lib/xtables/libipt_dscp.so
 #lib/xtables/libipt_ecn.so
-#lib/xtables/libipt_esp.so
-#lib/xtables/libipt_hashlimit.so
-#lib/xtables/libipt_helper.so
 #lib/xtables/libipt_icmp.so
-#lib/xtables/libipt_iprange.so
-#lib/xtables/libipt_length.so
-#lib/xtables/libipt_limit.so
-#lib/xtables/libipt_mac.so
-#lib/xtables/libipt_mark.so
-#lib/xtables/libipt_multiport.so
-#lib/xtables/libipt_owner.so
-#lib/xtables/libipt_physdev.so
-#lib/xtables/libipt_pkttype.so
-#lib/xtables/libipt_policy.so
 #lib/xtables/libipt_realm.so
-#lib/xtables/libipt_rpc.so
-#lib/xtables/libipt_sctp.so
-#lib/xtables/libipt_standard.so
-#lib/xtables/libipt_state.so
-#lib/xtables/libipt_tcp.so
-#lib/xtables/libipt_tcpmss.so
-#lib/xtables/libipt_tos.so
+#lib/xtables/libipt_set.so
 #lib/xtables/libipt_ttl.so
-#lib/xtables/libipt_udp.so
 #lib/xtables/libipt_unclean.so
+#lib/xtables/libxt_CLASSIFY.so
+#lib/xtables/libxt_CONNMARK.so
+#lib/xtables/libxt_CONNSECMARK.so
+#lib/xtables/libxt_DSCP.so
+#lib/xtables/libxt_MARK.so
+#lib/xtables/libxt_NFLOG.so
+#lib/xtables/libxt_NFQUEUE.so
+#lib/xtables/libxt_NOTRACK.so
+#lib/xtables/libxt_RATEEST.so
+#lib/xtables/libxt_SECMARK.so
+#lib/xtables/libxt_TCPMSS.so
+#lib/xtables/libxt_TCPOPTSTRIP.so
+#lib/xtables/libxt_TOS.so
+#lib/xtables/libxt_TPROXY.so
+#lib/xtables/libxt_TRACE.so
+#lib/xtables/libxt_cluster.so
+#lib/xtables/libxt_comment.so
+#lib/xtables/libxt_connbytes.so
+#lib/xtables/libxt_connlimit.so
+#lib/xtables/libxt_connmark.so
+#lib/xtables/libxt_conntrack.so
+#lib/xtables/libxt_dscp.so
+#lib/xtables/libxt_esp.so
+#lib/xtables/libxt_hashlimit.so
+#lib/xtables/libxt_helper.so
+#lib/xtables/libxt_iprange.so
+#lib/xtables/libxt_layer7.so
+#lib/xtables/libxt_length.so
+#lib/xtables/libxt_limit.so
+#lib/xtables/libxt_mac.so
+#lib/xtables/libxt_mark.so
+#lib/xtables/libxt_multiport.so
+#lib/xtables/libxt_osf.so
+#lib/xtables/libxt_owner.so
+#lib/xtables/libxt_physdev.so
+#lib/xtables/libxt_pkttype.so
+#lib/xtables/libxt_policy.so
+#lib/xtables/libxt_quota.so
+#lib/xtables/libxt_rateest.so
+#lib/xtables/libxt_recent.so
+#lib/xtables/libxt_sctp.so
+#lib/xtables/libxt_socket.so
+#lib/xtables/libxt_standard.so
+#lib/xtables/libxt_state.so
+#lib/xtables/libxt_statistic.so
+#lib/xtables/libxt_string.so
+#lib/xtables/libxt_tcp.so
+#lib/xtables/libxt_tcpmss.so
+#lib/xtables/libxt_time.so
+#lib/xtables/libxt_tos.so
+#lib/xtables/libxt_u32.so
+#lib/xtables/libxt_udp.so
+#sbin/ip6tables
+#sbin/ip6tables-multi
+#sbin/ip6tables-restore
+#sbin/ip6tables-save
 sbin/iptables
+sbin/iptables-multi
 #sbin/iptables-restore
 #sbin/iptables-save
-#usr/share/man/man8/iptables-restore.8
-#usr/share/man/man8/iptables-save.8
-#usr/share/man/man8/iptables.8
-#lib/iptables/libipt_IMQ.so
+#sbin/iptables-xml
+#usr/include/asm-generic
+#usr/include/asm-generic/errno-base.h
+#usr/include/asm-generic/errno.h
+#usr/include/libipq.h
+#usr/include/libiptc
+#usr/include/libiptc/ipt_kernel_headers.h
+#usr/include/libiptc/libip6tc.h
+#usr/include/libiptc/libiptc.h
+#usr/include/libiptc/libxtc.h
 #usr/include/libnetfilter_queue
 #usr/include/libnetfilter_queue/libipq.h
 #usr/include/libnetfilter_queue/libnetfilter_queue.h
@@ -68,6 +132,82 @@ sbin/iptables
 #usr/include/libnfnetlink
 #usr/include/libnfnetlink/libnfnetlink.h
 #usr/include/libnfnetlink/linux_nfnetlink.h
+#usr/include/libnfnetlink/linux_nfnetlink_compat.h
+#usr/include/linux/netfilter
+#usr/include/linux/netfilter/Kbuild
+#usr/include/linux/netfilter/nf_conntrack_amanda.h
+#usr/include/linux/netfilter/nf_conntrack_common.h
+#usr/include/linux/netfilter/nf_conntrack_dccp.h
+#usr/include/linux/netfilter/nf_conntrack_ftp.h
+#usr/include/linux/netfilter/nf_conntrack_h323.h
+#usr/include/linux/netfilter/nf_conntrack_h323_asn1.h
+#usr/include/linux/netfilter/nf_conntrack_h323_types.h
+#usr/include/linux/netfilter/nf_conntrack_irc.h
+#usr/include/linux/netfilter/nf_conntrack_pptp.h
+#usr/include/linux/netfilter/nf_conntrack_proto_gre.h
+#usr/include/linux/netfilter/nf_conntrack_sane.h
+#usr/include/linux/netfilter/nf_conntrack_sctp.h
+#usr/include/linux/netfilter/nf_conntrack_sip.h
+#usr/include/linux/netfilter/nf_conntrack_tcp.h
+#usr/include/linux/netfilter/nf_conntrack_tftp.h
+#usr/include/linux/netfilter/nf_conntrack_tuple_common.h
+#usr/include/linux/netfilter/nfnetlink.h
+#usr/include/linux/netfilter/nfnetlink_compat.h
+#usr/include/linux/netfilter/nfnetlink_conntrack.h
+#usr/include/linux/netfilter/nfnetlink_log.h
+#usr/include/linux/netfilter/nfnetlink_queue.h
+#usr/include/linux/netfilter/x_tables.h
+#usr/include/linux/netfilter/xt_CLASSIFY.h
+#usr/include/linux/netfilter/xt_CONNMARK.h
+#usr/include/linux/netfilter/xt_CONNSECMARK.h
+#usr/include/linux/netfilter/xt_DSCP.h
+#usr/include/linux/netfilter/xt_IMQ.h
+#usr/include/linux/netfilter/xt_LED.h
+#usr/include/linux/netfilter/xt_MARK.h
+#usr/include/linux/netfilter/xt_NFLOG.h
+#usr/include/linux/netfilter/xt_NFQUEUE.h
+#usr/include/linux/netfilter/xt_RATEEST.h
+#usr/include/linux/netfilter/xt_SECMARK.h
+#usr/include/linux/netfilter/xt_TCPMSS.h
+#usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
+#usr/include/linux/netfilter/xt_TPROXY.h
+#usr/include/linux/netfilter/xt_cluster.h
+#usr/include/linux/netfilter/xt_comment.h
+#usr/include/linux/netfilter/xt_connbytes.h
+#usr/include/linux/netfilter/xt_connlimit.h
+#usr/include/linux/netfilter/xt_connmark.h
+#usr/include/linux/netfilter/xt_conntrack.h
+#usr/include/linux/netfilter/xt_dccp.h
+#usr/include/linux/netfilter/xt_dscp.h
+#usr/include/linux/netfilter/xt_esp.h
+#usr/include/linux/netfilter/xt_hashlimit.h
+#usr/include/linux/netfilter/xt_helper.h
+#usr/include/linux/netfilter/xt_iprange.h
+#usr/include/linux/netfilter/xt_layer7.h
+#usr/include/linux/netfilter/xt_length.h
+#usr/include/linux/netfilter/xt_limit.h
+#usr/include/linux/netfilter/xt_mac.h
+#usr/include/linux/netfilter/xt_mark.h
+#usr/include/linux/netfilter/xt_multiport.h
+#usr/include/linux/netfilter/xt_osf.h
+#usr/include/linux/netfilter/xt_owner.h
+#usr/include/linux/netfilter/xt_physdev.h
+#usr/include/linux/netfilter/xt_pkttype.h
+#usr/include/linux/netfilter/xt_policy.h
+#usr/include/linux/netfilter/xt_quota.h
+#usr/include/linux/netfilter/xt_rateest.h
+#usr/include/linux/netfilter/xt_realm.h
+#usr/include/linux/netfilter/xt_recent.h
+#usr/include/linux/netfilter/xt_sctp.h
+#usr/include/linux/netfilter/xt_socket.h
+#usr/include/linux/netfilter/xt_state.h
+#usr/include/linux/netfilter/xt_statistic.h
+#usr/include/linux/netfilter/xt_string.h
+#usr/include/linux/netfilter/xt_tcpmss.h
+#usr/include/linux/netfilter/xt_tcpudp.h
+#usr/include/linux/netfilter/xt_time.h
+#usr/include/linux/netfilter/xt_u32.h
+#usr/include/xtables.h
 #usr/lib/libnetfilter_queue.a
 #usr/lib/libnetfilter_queue.la
 usr/lib/libnetfilter_queue.so
@@ -85,161 +225,6 @@ usr/lib/libnfnetlink.so.0
 usr/lib/libnfnetlink.so.0.2.0
 #usr/lib/pkgconfig/libnetfilter_queue.pc
 #usr/lib/pkgconfig/libnfnetlink.pc
-#lib/libip4tc.o
-#lib/libip6tc.o
-#lib/libipq.a
-#lib/libiptc.a
-#lib/xtables/libip6t_HL.so
-#lib/xtables/libip6t_IMQ.so
-#lib/xtables/libip6t_LOG.so
-#lib/xtables/libip6t_REJECT.so
-#lib/xtables/libip6t_ah.so
-#lib/xtables/libip6t_dst.so
-#lib/xtables/libip6t_eui64.so
-#lib/xtables/libip6t_frag.so
-#lib/xtables/libip6t_hbh.so
-#lib/xtables/libip6t_hl.so
-#lib/xtables/libip6t_icmp6.so
-#lib/xtables/libip6t_ipv6header.so
-#lib/xtables/libip6t_mh.so
-#lib/xtables/libip6t_policy.so
-#lib/xtables/libip6t_rt.so
-#lib/xtables/libipt_CLUSTERIP.so
-#lib/xtables/libipt_IMQ.so
-#lib/xtables/libipt_SET.so
-#lib/xtables/libipt_ipp2p.so
-#lib/xtables/libipt_recent.so
-#lib/xtables/libipt_set.so
-#lib/xtables/libxt_CLASSIFY.so
-#lib/xtables/libxt_CONNMARK.so
-#lib/xtables/libxt_CONNSECMARK.so
-#lib/xtables/libxt_DSCP.so
-#lib/xtables/libxt_MARK.so
-#lib/xtables/libxt_NFLOG.so
-#lib/xtables/libxt_NFQUEUE.so
-#lib/xtables/libxt_NOTRACK.so
-#lib/xtables/libxt_RATEEST.so
-#lib/xtables/libxt_SECMARK.so
-#lib/xtables/libxt_TCPMSS.so
-#lib/xtables/libxt_TCPOPTSTRIP.so
-#lib/xtables/libxt_TOS.so
-#lib/xtables/libxt_TRACE.so
-#lib/xtables/libxt_comment.so
-#lib/xtables/libxt_connbytes.so
-#lib/xtables/libxt_connlimit.so
-#lib/xtables/libxt_connmark.so
-#lib/xtables/libxt_conntrack.so
-#lib/xtables/libxt_dscp.so
-#lib/xtables/libxt_esp.so
-#lib/xtables/libxt_hashlimit.so
-#lib/xtables/libxt_helper.so
-#lib/xtables/libxt_iprange.so
-#lib/xtables/libxt_layer7.so
-#lib/xtables/libxt_length.so
-#lib/xtables/libxt_limit.so
-#lib/xtables/libxt_mac.so
-#lib/xtables/libxt_mark.so
-#lib/xtables/libxt_multiport.so
-#lib/xtables/libxt_owner.so
-#lib/xtables/libxt_physdev.so
-#lib/xtables/libxt_pkttype.so
-#lib/xtables/libxt_quota.so
-#lib/xtables/libxt_rateest.so
-#lib/xtables/libxt_sctp.so
-#lib/xtables/libxt_standard.so
-#lib/xtables/libxt_state.so
-#lib/xtables/libxt_statistic.so
-#lib/xtables/libxt_string.so
-#lib/xtables/libxt_tcp.so
-#lib/xtables/libxt_tcpmss.so
-#lib/xtables/libxt_time.so
-#lib/xtables/libxt_tos.so
-#lib/xtables/libxt_u32.so
-#lib/xtables/libxt_udp.so
-#sbin/ip6tables
-#sbin/ip6tables-multi
-#sbin/ip6tables-restore
-#sbin/ip6tables-save
-#sbin/iptables-multi
-#sbin/iptables-xml
-#usr/include/ip6tables.h
-#usr/include/iptables.h
-#usr/include/libipq
-#usr/include/libipq.h
-#usr/include/libipq/libipq.h
-#usr/include/libiptc
-#usr/include/libiptc/ipt_kernel_headers.h
-#usr/include/libiptc/libip6tc.h
-#usr/include/libiptc/libiptc.h
-#usr/include/libiptc/libxtc.h
-#usr/include/libipulog
-#usr/include/libipulog/libipulog.h
-#usr/include/libnfnetlink/linux_nfnetlink_compat.h
-#usr/include/linux/netfilter
-#usr/include/linux/netfilter/nf_conntrack_common.h
-#usr/include/linux/netfilter/nf_conntrack_tuple.h
-#usr/include/linux/netfilter/nf_conntrack_tuple_common.h
-#usr/include/linux/netfilter/nf_nat.h
-#usr/include/linux/netfilter/x_tables.h
-#usr/include/linux/netfilter/xt_CLASSIFY.h
-#usr/include/linux/netfilter/xt_CONNMARK.h
-#usr/include/linux/netfilter/xt_CONNSECMARK.h
-#usr/include/linux/netfilter/xt_DSCP.h
-#usr/include/linux/netfilter/xt_MARK.h
-#usr/include/linux/netfilter/xt_NFLOG.h
-#usr/include/linux/netfilter/xt_NFQUEUE.h
-#usr/include/linux/netfilter/xt_RATEEST.h
-#usr/include/linux/netfilter/xt_SECMARK.h
-#usr/include/linux/netfilter/xt_TCPMSS.h
-#usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
-#usr/include/linux/netfilter/xt_comment.h
-#usr/include/linux/netfilter/xt_connbytes.h
-#usr/include/linux/netfilter/xt_connlimit.h
-#usr/include/linux/netfilter/xt_connmark.h
-#usr/include/linux/netfilter/xt_conntrack.h
-#usr/include/linux/netfilter/xt_dccp.h
-#usr/include/linux/netfilter/xt_dscp.h
-#usr/include/linux/netfilter/xt_esp.h
-#usr/include/linux/netfilter/xt_hashlimit.h
-#usr/include/linux/netfilter/xt_helper.h
-#usr/include/linux/netfilter/xt_iprange.h
-#usr/include/linux/netfilter/xt_length.h
-#usr/include/linux/netfilter/xt_limit.h
-#usr/include/linux/netfilter/xt_mac.h
-#usr/include/linux/netfilter/xt_mark.h
-#usr/include/linux/netfilter/xt_multiport.h
-#usr/include/linux/netfilter/xt_owner.h
-#usr/include/linux/netfilter/xt_physdev.h
-#usr/include/linux/netfilter/xt_pkttype.h
-#usr/include/linux/netfilter/xt_policy.h
-#usr/include/linux/netfilter/xt_quota.h
-#usr/include/linux/netfilter/xt_rateest.h
-#usr/include/linux/netfilter/xt_realm.h
-#usr/include/linux/netfilter/xt_sctp.h
-#usr/include/linux/netfilter/xt_state.h
-#usr/include/linux/netfilter/xt_statistic.h
-#usr/include/linux/netfilter/xt_string.h
-#usr/include/linux/netfilter/xt_tcpmss.h
-#usr/include/linux/netfilter/xt_tcpudp.h
-#usr/include/linux/netfilter/xt_time.h
-#usr/include/linux/netfilter/xt_u32.h
-#usr/include/linux/netfilter_ipv4/ip_set.h
-#usr/include/linux/netfilter_ipv4/ipt_FTOS.h
-#usr/include/linux/netfilter_ipv4/ipt_TTL.h
-#usr/include/linux/netfilter_ipv4/ipt_connlimit.h
-#usr/include/linux/netfilter_ipv4/ipt_dstlimit.h
-#usr/include/linux/netfilter_ipv4/ipt_policy.h
-#usr/include/linux/netfilter_ipv4/ipt_rpc.h
-#usr/include/linux/netfilter_ipv4/ipt_set.h
-#usr/include/linux/netfilter_ipv6/ip6t_HL.h
-#usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
-#usr/include/linux/netfilter_ipv6/ip6t_TCPMSS.h
-#usr/include/linux/netfilter_ipv6/ip6t_mh.h
-#usr/include/linux/netfilter_ipv6/ip6t_policy.h
-#usr/include/xtables
-#usr/include/xtables.h
-#usr/include/xtables.h.in
-#usr/include/xtables/internal.h
 #usr/share/man/man3/ipq_create_handle.3
 #usr/share/man/man3/ipq_destroy_handle.3
 #usr/share/man/man3/ipq_errstr.3
@@ -254,10 +239,7 @@ usr/lib/libnfnetlink.so.0.2.0
 #usr/share/man/man8/ip6tables-restore.8
 #usr/share/man/man8/ip6tables-save.8
 #usr/share/man/man8/ip6tables.8
+#usr/share/man/man8/iptables-restore.8
+#usr/share/man/man8/iptables-save.8
 #usr/share/man/man8/iptables-xml.8
-#lib/libxtables.la
-lib/libxtables.so
-lib/libxtables.so.0
-lib/libxtables.so.0.0.0
-#lib/pkgconfig
-#lib/pkgconfig/xtables.pc
+#usr/share/man/man8/iptables.8
--- a/config/rootfiles/common/linux
+++ b/config/rootfiles/common/linux
--- a/config/rootfiles/common/linux-firmware
+++ b/config/rootfiles/common/linux-firmware
@@ -1,12 +1,62 @@
+#lib/firmware/3com
+lib/firmware/3com/3C359.bin
+lib/firmware/3com/typhoon.bin
+#lib/firmware/acenic
+lib/firmware/acenic/tg1.bin
+lib/firmware/acenic/tg2.bin
+#lib/firmware/adaptec
+lib/firmware/adaptec/starfire_rx.bin
+lib/firmware/adaptec/starfire_tx.bin
+#lib/firmware/advansys
+lib/firmware/advansys/3550.bin
+lib/firmware/advansys/38C0800.bin
+lib/firmware/advansys/38C1600.bin
+lib/firmware/advansys/mcode.bin
 lib/firmware/atmsar11.fw
-#lib/firmware/cpia2
+#lib/firmware/av7110
 lib/firmware/av7110/bootcode.bin
+#lib/firmware/bnx2
+lib/firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw
+lib/firmware/bnx2/bnx2-mips-09-5.0.0.j3.fw
+lib/firmware/bnx2/bnx2-rv2p-06-5.0.0.j3.fw
+lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j3.fw
+lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw
+lib/firmware/bnx2x-e1-5.0.21.0.fw
+lib/firmware/bnx2x-e1h-5.0.21.0.fw
+#lib/firmware/cis
+lib/firmware/cis/3CCFEM556.cis
+lib/firmware/cis/3CXEM556.cis
+lib/firmware/cis/COMpad2.cis
+lib/firmware/cis/COMpad4.cis
+lib/firmware/cis/DP83903.cis
+lib/firmware/cis/LA-PCM.cis
+lib/firmware/cis/MT5634ZLX.cis
+lib/firmware/cis/NE2K.cis
+lib/firmware/cis/PCMLM28.cis
+lib/firmware/cis/PE-200.cis
+lib/firmware/cis/RS-COM-2P.cis
+lib/firmware/cis/SW_555_SER.cis
+lib/firmware/cis/SW_7xx_SER.cis
+lib/firmware/cis/SW_8xx_SER.cis
+lib/firmware/cis/tamarack.cis
+#lib/firmware/cpia2
 lib/firmware/cpia2/stv0672_vp4.bin
+#lib/firmware/cxgb3
+lib/firmware/cxgb3/ael2005_opt_edc.bin
+lib/firmware/cxgb3/ael2005_twx_edc.bin
+lib/firmware/cxgb3/ael2020_twx_edc.bin
+lib/firmware/cxgb3/t3b_psram-1.1.0.bin
+lib/firmware/cxgb3/t3c_psram-1.1.0.bin
+lib/firmware/cxgb3/t3fw-7.4.0.bin
 #lib/firmware/dabusb
 lib/firmware/dabusb/bitstream.bin
 lib/firmware/dabusb/firmware.fw
 #lib/firmware/dsp56k
 lib/firmware/dsp56k/bootstrap.bin
+#lib/firmware/e100
+lib/firmware/e100/d101m_ucode.bin
+lib/firmware/e100/d101s_ucode.bin
+lib/firmware/e100/d102e_ucode.bin
 #lib/firmware/edgeport
 lib/firmware/edgeport/boot.fw
 lib/firmware/edgeport/boot2.fw
@@ -49,23 +99,79 @@ lib/firmware/keyspan_pda/keyspan_pda.fw
 lib/firmware/keyspan_pda/xircom_pgs.fw
 #lib/firmware/korg
 lib/firmware/korg/k1212.dsp
+#lib/firmware/matrox
+lib/firmware/matrox/g200_warp.fw
+lib/firmware/matrox/g400_warp.fw
+lib/firmware/mts_cdma.fw
+lib/firmware/mts_edge.fw
+lib/firmware/mts_gsm.fw
+#lib/firmware/myricom
+lib/firmware/myricom/lanai.bin
+#lib/firmware/ositech
+lib/firmware/ositech/Xilinx7OD.bin
+#lib/firmware/qlogic
+lib/firmware/qlogic/1040.bin
+lib/firmware/qlogic/12160.bin
+lib/firmware/qlogic/1280.bin
+lib/firmware/qlogic/isp1000.bin
+#lib/firmware/r128
+lib/firmware/r128/r128_cce.bin
+#lib/firmware/radeon
+lib/firmware/radeon/R100_cp.bin
+lib/firmware/radeon/R200_cp.bin
+lib/firmware/radeon/R300_cp.bin
+lib/firmware/radeon/R420_cp.bin
+lib/firmware/radeon/R520_cp.bin
+lib/firmware/radeon/R600_me.bin
+lib/firmware/radeon/R600_pfp.bin
+lib/firmware/radeon/RS600_cp.bin
+lib/firmware/radeon/RS690_cp.bin
+lib/firmware/radeon/RS780_me.bin
+lib/firmware/radeon/RS780_pfp.bin
+lib/firmware/radeon/RV610_me.bin
+lib/firmware/radeon/RV610_pfp.bin
+lib/firmware/radeon/RV620_me.bin
+lib/firmware/radeon/RV620_pfp.bin
+lib/firmware/radeon/RV630_me.bin
+lib/firmware/radeon/RV630_pfp.bin
+lib/firmware/radeon/RV635_me.bin
+lib/firmware/radeon/RV635_pfp.bin
+lib/firmware/radeon/RV670_me.bin
+lib/firmware/radeon/RV670_pfp.bin
+lib/firmware/radeon/RV710_me.bin
+lib/firmware/radeon/RV710_pfp.bin
+lib/firmware/radeon/RV730_me.bin
+lib/firmware/radeon/RV730_pfp.bin
+lib/firmware/radeon/RV770_me.bin
+lib/firmware/radeon/RV770_pfp.bin
 #lib/firmware/sb16
 lib/firmware/sb16/alaw_main.csp
 lib/firmware/sb16/ima_adpcm_capture.csp
 lib/firmware/sb16/ima_adpcm_init.csp
 lib/firmware/sb16/ima_adpcm_playback.csp
 lib/firmware/sb16/mulaw_main.csp
+#lib/firmware/sun
+lib/firmware/sun/cassini.bin
+#lib/firmware/tehuti
+lib/firmware/tehuti/bdx.bin
 lib/firmware/ti_3410.fw
 lib/firmware/ti_5052.fw
+#lib/firmware/tigon
+lib/firmware/tigon/tg3.bin
+lib/firmware/tigon/tg3_tso.bin
+lib/firmware/tigon/tg3_tso5.bin
 lib/firmware/tr_smctr.bin
 #lib/firmware/ttusb-budget
 lib/firmware/ttusb-budget/dspbootcode.bin
-lib/firmware/av7110/bootcode.bin
 #lib/firmware/vicam
 lib/firmware/vicam/firmware.fw
 lib/firmware/whiteheat.fw
 lib/firmware/whiteheat_loader.fw
+#lib/firmware/yam
+lib/firmware/yam/1200.bin
+lib/firmware/yam/9600.bin
 #lib/firmware/yamaha
 lib/firmware/yamaha/ds1_ctrl.fw
 lib/firmware/yamaha/ds1_dsp.fw
 lib/firmware/yamaha/ds1e_ctrl.fw
+lib/firmware/yamaha/yss225_registers.bin
--- a/config/rootfiles/common/openswan
+++ b/config/rootfiles/common/openswan
@@ -44,14 +44,11 @@ usr/lib/ipsec
 #usr/lib/ipsec/_realsetup
 #usr/lib/ipsec/_secretcensor
 #usr/lib/ipsec/_startklips
-#usr/lib/ipsec/_startklips.old
 #usr/lib/ipsec/_startnetkey
 #usr/lib/ipsec/_updown
 #usr/lib/ipsec/_updown.klips
-#usr/lib/ipsec/_updown.klips.old
 #usr/lib/ipsec/_updown.klips~
 #usr/lib/ipsec/_updown.mast
-#usr/lib/ipsec/_updown.mast.old
 #usr/lib/ipsec/_updown.netkey
 usr/libexec/ipsec
 #usr/libexec/ipsec/_pluto_adns
@@ -185,6 +182,7 @@ usr/sbin/ipsec
 #usr/share/doc/openswan/index.html
 #usr/share/doc/openswan/ipsec.8.html
 #usr/share/doc/openswan/ipsec.conf-sample
+#usr/share/doc/openswan/ipsec.conf.5.html
 #usr/share/doc/openswan/ipsec.secrets.5.html
 #usr/share/doc/openswan/ipsec__confread.8.html
 #usr/share/doc/openswan/ipsec__copyright.8.html
--- a/config/rootfiles/core/36/exclude
+++ b/config/rootfiles/core/36/exclude
--- a/config/rootfiles/oldcore/34/exclude
+++ b/config/rootfiles/oldcore/34/exclude
--- a/config/rootfiles/oldcore/34/filelists/dhcpcd
+++ b/config/rootfiles/oldcore/34/filelists/dhcpcd
--- a/config/rootfiles/oldcore/34/filelists/files
+++ b/config/rootfiles/oldcore/34/filelists/files
--- a/config/rootfiles/oldcore/34/filelists/linux
+++ b/config/rootfiles/oldcore/34/filelists/linux
--- a/config/rootfiles/oldcore/34/filelists/linux-firmware
+++ b/config/rootfiles/oldcore/34/filelists/linux-firmware
--- a/config/rootfiles/oldcore/34/filelists/mISDNuser
+++ b/config/rootfiles/oldcore/34/filelists/mISDNuser
--- a/config/rootfiles/oldcore/34/filelists/mkinitcpio
+++ b/config/rootfiles/oldcore/34/filelists/mkinitcpio
--- a/config/rootfiles/oldcore/34/filelists/ncurses
+++ b/config/rootfiles/oldcore/34/filelists/ncurses
--- a/config/rootfiles/oldcore/34/filelists/smartmontools
+++ b/config/rootfiles/oldcore/34/filelists/smartmontools
--- a/config/rootfiles/oldcore/34/filelists/usb_modeswitch
+++ b/config/rootfiles/oldcore/34/filelists/usb_modeswitch
--- a/config/rootfiles/oldcore/34/meta
+++ b/config/rootfiles/oldcore/34/meta
--- a/config/rootfiles/oldcore/34/update.sh
+++ b/config/rootfiles/oldcore/34/update.sh
--- a/config/rootfiles/oldcore/35/exclude
+++ b/config/rootfiles/oldcore/35/exclude
@@ -0,0 +1,2 @@
+etc/ipsec.conf
+etc/ipsec.secrets
--- a/config/rootfiles/oldcore/35/filelists/files
+++ b/config/rootfiles/oldcore/35/filelists/files
--- a/config/rootfiles/oldcore/35/filelists/openswan
+++ b/config/rootfiles/oldcore/35/filelists/openswan
@@ -0,0 +1 @@
+../../../common/openswan
--- a/config/rootfiles/oldcore/35/filelists/openswan-modules
+++ b/config/rootfiles/oldcore/35/filelists/openswan-modules
@@ -0,0 +1,2 @@
+lib/modules/2.6.27.42-ipfire-xen/kernel/net/ipsec/ipsec.ko
+lib/modules/2.6.27.42-ipfire/kernel/net/ipsec/ipsec.ko
--- a/config/rootfiles/oldcore/35/meta
+++ b/config/rootfiles/oldcore/35/meta
--- a/config/rootfiles/oldcore/35/update.sh
+++ b/config/rootfiles/oldcore/35/update.sh
--- a/config/rootfiles/oldcore/36/exclude
+++ b/config/rootfiles/oldcore/36/exclude
--- a/config/rootfiles/oldcore/36/filelists/cyrus-sasl
+++ b/config/rootfiles/oldcore/36/filelists/cyrus-sasl
--- a/config/rootfiles/oldcore/36/filelists/files
+++ b/config/rootfiles/oldcore/36/filelists/files
--- a/config/rootfiles/oldcore/36/filelists/openssh
+++ b/config/rootfiles/oldcore/36/filelists/openssh
--- a/config/rootfiles/oldcore/36/filelists/openssl
+++ b/config/rootfiles/oldcore/36/filelists/openssl
--- a/config/rootfiles/oldcore/36/meta
+++ b/config/rootfiles/oldcore/36/meta
--- a/config/rootfiles/oldcore/36/update.sh
+++ b/config/rootfiles/oldcore/36/update.sh
--- a/config/rootfiles/oldcore/37/exclude
+++ b/config/rootfiles/oldcore/37/exclude
--- a/config/rootfiles/oldcore/37/filelists/files
+++ b/config/rootfiles/oldcore/37/filelists/files
--- a/config/rootfiles/oldcore/37/filelists/lm_sensors
+++ b/config/rootfiles/oldcore/37/filelists/lm_sensors
--- a/config/rootfiles/oldcore/37/filelists/madwifi
+++ b/config/rootfiles/oldcore/37/filelists/madwifi
--- a/config/rootfiles/oldcore/37/meta
+++ b/config/rootfiles/oldcore/37/meta
--- a/config/rootfiles/oldcore/37/update.sh
+++ b/config/rootfiles/oldcore/37/update.sh
--- a/config/rootfiles/packages/dahdi
+++ b/config/rootfiles/packages/dahdi
@@ -65,6 +65,7 @@ usr/lib/perl5/site_perl/5.8.8/Dahdi/Xpp/Xbus.pm
 usr/lib/perl5/site_perl/5.8.8/Dahdi/Xpp/Xpd.pm
 usr/sbin/astribank_allow
 usr/sbin/astribank_hexload
+usr/sbin/astribank_is_starting
 usr/sbin/astribank_tool
 usr/sbin/dahdi_cfg
 usr/sbin/dahdi_genconf
@@ -79,6 +80,7 @@ usr/sbin/fpga_load
 usr/sbin/fxotune
 usr/sbin/lsdahdi
 usr/sbin/sethdlc
+usr/sbin/twinstar
 usr/sbin/xpp_blink
 usr/sbin/xpp_sync
 #usr/share/dahdi
@@ -101,6 +103,7 @@ usr/share/dahdi/waitfor_xpds
 usr/share/dahdi/xpp_fxloader
 #usr/share/man/man8/astribank_allow.8
 #usr/share/man/man8/astribank_hexload.8
+#usr/share/man/man8/astribank_is_starting.8
 #usr/share/man/man8/astribank_tool.8
 #usr/share/man/man8/dahdi_cfg.8
 #usr/share/man/man8/dahdi_genconf.8
@@ -113,6 +116,7 @@ usr/share/dahdi/xpp_fxloader
 #usr/share/man/man8/fpga_load.8
 #usr/share/man/man8/fxotune.8
 #usr/share/man/man8/lsdahdi.8
+#usr/share/man/man8/twinstar.8
 #usr/share/man/man8/xpp_blink.8
 #usr/share/man/man8/xpp_sync.8
 #var/ipfire/asterisk
--- a/config/rootfiles/packages/linux-xen-disabled
+++ b/config/rootfiles/packages/linux-xen-disabled
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -1,4 +1,4 @@
-== List of softwares used to build IPFire Version: 2.5 ==
+== List of softwares used to build IPFire Version: 2.6 ==
 * Archive-Tar-1.29
 * Archive-Zip-1.16
 * BerkeleyDB-0.27
@@ -36,17 +36,13 @@
 * Unix-Syslog-0.100
 * XML-Parser-2.34
 * alsa-lib-1.0.22
-* alsa-lib-1.0.22-kmod-2.6.27.45-ipfire
+* alsa-lib-1.0.22-kmod-2.6.32.8-ipfire
 * amavisd-new-2.5.2
 * apcupsd-3.14.4
 * applejuice-0.31
 * arping-2.05
 * as86-0.16.17
 * asterisk-1.4.28
-* atl1c-kmod-2.6.27.45-ipfire
-* atl1c-kmod-2.6.27.45-ipfire-xen
-* atl2-2.0.5-kmod-2.6.27.45-ipfire
-* atl2-2.0.5-kmod-2.6.27.45-ipfire-xen
 * autoconf-2.59
 * automake-1.9.6
 * backup-ipfire
@@ -71,8 +67,6 @@
 * clamav-0.95.3
 * cmake-2.4.8
 * collectd-4.5.3
-* compat-wireless-2.6.32.3-kmod-2.6.27.45-ipfire
-* compat-wireless-2.6.32.3-kmod-2.6.27.45-ipfire-xen
 * coreutils-5.96
 * cpio-2.6
 * cpufrequtils-007
@@ -80,9 +74,8 @@
 * curl-7.19.5
 * cyrus-imapd-2.2.12
 * cyrus-sasl-2.1.21
-* dahdi-2.2.0.2
-* dahdi-2.2.0.2-kmod-2.6.27.45-ipfire
-* dahdi-2.2.0.2-kmod-2.6.27.45-ipfire-xen
+* dahdi-2.2.1
+* dahdi-2.2.1-kmod-2.6.32.8-ipfire
 * db-4.4.20
 * dbus-1.0.3
 * dhcp-3.1.0
@@ -90,16 +83,12 @@
 * diffutils-2.8.1
 * dnsmasq-2.45
 * dosfstools-2.11
-* e1000e-1.0.2.5-kmod-2.6.27.45-ipfire
-* e1000e-1.0.2.5-kmod-2.6.27.45-ipfire-xen
 * e2fsprogs-1.39
 * ebtables-v2.0.8-2
 * ed-0.2
 * elinks-0.11.6
 * esniper-2-19-0
 * espgs-8.15.1
-* et131x-kmod-2.6.27.45-ipfire
-* et131x-kmod-2.6.27.45-ipfire-xen
 * etherwake-1.09
 * ethtool-3
 * expat-2.0.0
@@ -139,8 +128,6 @@
 * hdparm-8.9
 * hostapd-0.6.9
 * hplip-2.7.10
-* hso-1.9-kmod-2.6.27.45-ipfire
-* hso-1.9-kmod-2.6.27.45-ipfire-xen
 * htop-0.8.1
 * httpd-2.2.11
 * hwdata
@@ -155,7 +142,7 @@
 * iperf-2.0.4
 * ipfireseeder-1.00
 * iproute2-2.6.16-060323
-* iptables-1.4.2
+* iptables-1.4.6
 * iptstate-2.1
 * iputils-ss020927
 * iw-0.9.15
@@ -164,10 +151,8 @@
 * jpegsrc.v6b
 * kbd-1.12
 * klibc-1.5.14
-* kqemu-1.4.0pre1-kmod-2.6.27.45-ipfire
-* kqemu-1.4.0pre1-kmod-2.6.27.45-ipfire-xen
+* kqemu-1.4.0pre1-kmod-2.6.32.8-ipfire
 * kudzu-1.2.64
-* kvm-kmod-2.6.31.5-kmod-2.6.27.45-ipfire
 * l7-protocols-2009-05-10
 * lame-3.97
 * lcd4linux-0.10.1-RC2
@@ -198,8 +183,7 @@
 * libwww-perl-5.803
 * libxml2-2.6.26
 * libxslt-1.1.17
-* linux-2.6.27.45-ipfire
-* linux-2.6.27.45-ipfire-xen
+* linux-2.6.32.8-ipfire
 * linux-atm-2.4.1
 * linux-libc-headers-2.6.12.0
 * lm_sensors-3.1.2
@@ -209,11 +193,8 @@
 * lynis-1.2.6
 * lzo-2.02
 * m4-1.4.4
-* mISDN_20090906-kmod-2.6.27.45-ipfire
-* mISDN_20090906-kmod-2.6.27.45-ipfire-xen
 * mISDNuser_20090906
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.27.45-ipfire
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.27.45-ipfire-xen
+* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.8-ipfire
 * make-3.81
 * man-db-2.4.3
 * man-pages-2.34
@@ -261,9 +242,8 @@
 * openmailadmin-1.0.0
 * openssh-5.3p1
 * openssl-0.9.8l
-* openswan-2.6.23
-* openswan-2.6.23-kmod-2.6.27.45-ipfire
-* openswan-2.6.23-kmod-2.6.27.45-ipfire-xen
+* openswan-2.6.24
+* openswan-2.6.24-kmod-2.6.32.8-ipfire
 * openvpn-2.1_rc20
 * p7zip_4.65
 * pam_mysql-0.7RC1
@@ -284,12 +264,6 @@
 * procps-3.2.6
 * psmisc-22.2
 * qemu-0.12.2
-* r8101-kmod-2.6.27.45-ipfire
-* r8101-kmod-2.6.27.45-ipfire-xen
-* r8168-8.014.00-kmod-2.6.27.45-ipfire
-* r8168-8.014.00-kmod-2.6.27.45-ipfire-xen
-* r8169-6.011.00-kmod-2.6.27.45-ipfire
-* r8169-6.011.00-kmod-2.6.27.45-ipfire-xen
 * readline-5.1
 * reiser4progs-1.0.5
 * reiserfsprogs-3.6.19
@@ -345,8 +319,7 @@
 * usb_modeswitch-1.0.6
 * usbutils-0.72
 * util-linux-2.12r
-* v4l-dvb-690055993011-kmod-2.6.27.45-ipfire
-* v4l-dvb-690055993011-kmod-2.6.27.45-ipfire-xen
+* v4l-dvb-9defbd461e5f-kmod-2.6.32.8-ipfire
 * vdr-1.6.0
 * vdradmin-am-3.6.5
 * vim-7.0
--- a/lfs/dahdi
+++ b/lfs/dahdi
@@ -30,10 +30,10 @@ else
 	VERSUFIX=ipfire
 endif

-VER        = 2.2.0.2
-TVER       = 2.2.0
+VER        = 2.2.1
+TVER       = 2.2.1

-DL_FILE    = dahdi-linux-$(VER)-with-vpmadt032-1.17.0.tar.gz
+DL_FILE    = dahdi-linux-$(VER).tar.gz
 DL_FILE1   = dahdi-tools-$(TVER).tar.gz

 THISAPP    = dahdi-$(VER)
@@ -58,16 +58,16 @@ endif
 # Top-level Rules
 ###############################################################################

-objects = $(DL_FILE) $(DL_FILE1) dahdi-linux-2.2.0.2-firmware.tar.bz2
+objects = $(DL_FILE) $(DL_FILE1) dahdi-linux-2.2.1-firmware.tar.bz2

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 $(DL_FILE1) = $(DL_FROM)/$(DL_FILE1)
-dahdi-linux-2.2.0.2-firmware.tar.bz2 = $(DL_FROM)/dahdi-linux-2.2.0.2-firmware.tar.bz2
+dahdi-linux-2.2.1-firmware.tar.bz2 = $(DL_FROM)/dahdi-linux-2.2.1-firmware.tar.bz2
+
+$(DL_FILE)_MD5 = 46e4abbe743830045364fc716d293e88
+$(DL_FILE1)_MD5 = 04e7097929851f744f777400125180db
+dahdi-linux-2.2.1-firmware.tar.bz2_MD5 = ccc50ded1641cd619e8d3a4615a6ad19

-$(DL_FILE)_MD5 = 5cbabd47cf780305e2cba6ccec42c754
-$(DL_FILE1)_MD5 = a018f452f3851a312ff51705ac44de37
-dahdi-linux-2.2.0.2-firmware.tar.bz2_MD5 = 7d7c774d214a528b49c9a08b5350a652
- 

 install : $(TARGET)

@@ -100,15 +100,14 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)

-ifeq "$(KMOD)" "1"
 	rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_SRC) && tar jxf $(DIR_DL)/dahdi-linux-2.2.1-firmware.tar.bz2
 	cd $(DIR_APP) && make $(MAKETUNING) clean all KVERS=$(KVER)
+
+ifeq "$(KMOD)" "1"
 	cd $(DIR_APP) && make install-modules KVERS=$(KVER)-$(VERSUFIX)
 	@rm -rf $(DIR_APP)
 else
-	rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_SRC) && tar jxf $(DIR_DL)/dahdi-linux-2.2.0.2-firmware.tar.bz2
-	cd $(DIR_APP) && make $(MAKETUNING) clean all KVERS=$(KVER)
 	cd $(DIR_APP) && make install-devices install-include \
 		install-firmware install-xpp-firm KVERS=$(KVER)-$(VERSUFIX)
 	@rm -rf $(DIR_APP)
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -70,9 +70,9 @@ $(TARGET) :
 		/install/initrd/lib/modules/$(KVER)-ipfire/dahdi

 	# ... acpi/dock.ko is needed for libata
-	-mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/acpi
-	cp -a /lib/modules/$(KVER)-ipfire/kernel/drivers/acpi/dock.ko \
-		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/acpi/dock.ko
+#	-mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/acpi
+#	cp -a /lib/modules/$(KVER)-ipfire/kernel/drivers/acpi/dock.ko \
+#		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/acpi/dock.ko

 	cp /opt/$(MACHINE)-uClibc/lib/libgcc_s.so.1 /install/initrd/lib/

--- a/lfs/iptables
+++ b/lfs/iptables
@@ -24,7 +24,7 @@

 include Config

-VER        = 1.4.2
+VER        = 1.4.6

 THISAPP    = iptables-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -36,17 +36,17 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 objects = 	$(DL_FILE) \
-			netfilter-layer7-v2.21.tar.gz \
+			netfilter-layer7-v2.22.tar.gz \
 			libnfnetlink-0.0.41.tar.bz2 \
 			libnetfilter_queue-0.0.17.tar.bz2

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-netfilter-layer7-v2.21.tar.gz 		= $(URL_IPFIRE)/netfilter-layer7-v2.21.tar.gz
+netfilter-layer7-v2.22.tar.gz 		= $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz
 libnfnetlink-0.0.41.tar.bz2		= $(URL_IPFIRE)/libnfnetlink-0.0.41.tar.bz2
 libnetfilter_queue-0.0.17.tar.bz2	= $(URL_IPFIRE)/libnetfilter_queue-0.0.17.tar.bz2

-$(DL_FILE)_MD5 = a138d1c2e74321e0e4e228a9fb301c9a
-netfilter-layer7-v2.21.tar.gz_MD5 = 838422e7d9a06b42e682e9064e5210b5
+$(DL_FILE)_MD5 = c67cf30e281a924def6426be0973df56
+netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f
 libnfnetlink-0.0.41.tar.bz2_MD5 = 5d844ea1f557bad0364d5b85cd10c796
 libnetfilter_queue-0.0.17.tar.bz2_MD5 = 2cde35e678ead3a8f9eb896bf807a159

@@ -80,18 +80,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.41 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17

 	@cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.21.tar.gz
-	cd $(DIR_APP) && cp -vf $(DIR_SRC)/netfilter-layer7-v2.21/iptables-1.4.1.1-for-kernel-2.6.20forward/* \
+	-cd /usr/include && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.6-errorno_includes.patch
+	cp -rf /usr/src/linux/include/linux/netfilter /usr/include/linux
+
+	# Layer7
+	cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.22.tar.gz
+	cd $(DIR_APP) && cp -vf $(DIR_SRC)/netfilter-layer7-v2.22/iptables-1.4.3forward-for-kernel-2.6.20forward/* \
 	                 ./extensions/

 	# ipp2p 0.8.2-pomng
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.1.1-ipp2p-0.8.2-pomng.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.6-ipp2p-0.8.2-pomng.patch

-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.2-imq.patch
+	# imq
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.6-imq_test1.patch
 	chmod +x $(DIR_APP)/extensions/.IMQ-test*

-	# hack to disable IPv6 compilation as the configuration variable does not work when ip6.h is present
-	# cd $(DIR_APP) && sed -i -e 's/DO_IPV6:=1/DO_IPV6:=0/' Makefile
 	cd $(DIR_APP) && ./configure  --prefix=/usr --with-ksource=/usr/src/linux \
 				    --libdir=/lib --includedir=/usr/include --enable-libipq \
 				    --libexecdir=/lib --bindir=/sbin \
@@ -99,13 +102,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install

-	cd $(DIR_APP) && cp -fva include/* /usr/include
-	-mkdir /usr/include/libiptc
-	cd $(DIR_APP) && cp -vf include/libiptc/{libiptc.h,ipt_kernel_headers.h} \
-		/usr/include/libiptc
-	cd $(DIR_APP) && cp -vf libiptc/{*.o,*.a} \
-		/lib
-
 	cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-0.0.41.tar.bz2
 	cd $(DIR_SRC)/libnfnetlink-0.0.41 && ./configure --prefix=/usr
 	cd $(DIR_SRC)/libnfnetlink-0.0.41 && make $(MAKETUNING) $(EXTRA_MAKE)
@@ -115,5 +111,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_SRC)/libnetfilter_queue-0.0.17 && ./configure --prefix=/usr
 	cd $(DIR_SRC)/libnetfilter_queue-0.0.17 && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_SRC)/libnetfilter_queue-0.0.17 && make install
+
 	@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.41 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17
 	@$(POSTBUILD)
--- a/lfs/klibc
+++ b/lfs/klibc
@@ -37,13 +37,16 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 ###############################################################################

 objects = $(DL_FILE) \
-		klibc-extras-2.2.tar.gz
+		klibc-extras-2.2.tar.gz \
+		klibc-1.5.14-linux2.6.27-includes.tar.bz2

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 klibc-extras-2.2.tar.gz = $(DL_FROM)/klibc-extras-2.2.tar.gz
+klibc-1.5.14-linux2.6.27-includes.tar.bz2 = $(DL_FROM)/klibc-1.5.14-linux2.6.27-includes.tar.bz2

 $(DL_FILE)_MD5 = 030d978a7f16800e8ccae12d6fb5e7ba
 klibc-extras-2.2.tar.gz_MD5 = 7e5042978531048c369f59ca1a13055b
+klibc-1.5.14-linux2.6.27-includes.tar.bz2_MD5 = 1f875129d35193e35d27ed2b61a80bb6

 install : $(TARGET)

@@ -74,14 +77,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) $(DIR_SRC)/klibc* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) && \
 		tar zxf $(DIR_DL)/klibc-extras-2.2.tar.gz
-	cd $(DIR_APP) && ln -fs ../linux linux
+	cd $(DIR_SRC) && tar jxf $(DIR_DL)/klibc-1.5.14-linux2.6.27-includes.tar.bz2
+
 	cd $(DIR_SRC)/klibc-extras && sed -i "s|^INSTALL = .*|INSTALL = /usr/bin/install -c -m 755|g" Makefile
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
 	cd $(DIR_SRC)/klibc-extras && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_SRC)/klibc-extras && make install
 	ln -sf sh.shared /usr/lib/klibc/bin/sh
-	#mv /lib/klibc-*.so /lib/klibc-pFXBYGYRiBAAryaZ7Zw_ISKpcTk.so
-	#mv /usr/lib/klibc/lib/klibc-*.so /usr/lib/klibc/lib/klibc-pFXBYGYRiBAAryaZ7Zw_ISKpcTk.so
 	@rm -rf $(DIR_APP) $(DIR_SRC)/klibc*
 	@$(POSTBUILD)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@

 include Config

-PATCHLEVEL = .42
-VER        = 2.6.27.42
+PATCHLEVEL = .8
+VER        = 2.6.32.8

 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -35,42 +35,42 @@ CFLAGS     =
 CXXFLAGS   =

 PROG	   = linux-xen
-PAK_VER    = 7
+PAK_VER    = 8
 DEPS	   = ""

 # Normal build or XEN build.
 #
+
 ifeq "$(XEN)" "1"
 	VERSUFIX=ipfire-xen
 else
 	VERSUFIX=ipfire
 endif
+
 TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)

 ###############################################################################
 # Top-level Rules
 ###############################################################################
 objects =$(DL_FILE) \
-	squashfs3.4.tar.gz \
-	netfilter-layer7-v2.21.tar.gz \
+	netfilter-layer7-v2.22.tar.gz \
 	patch-2.6.16-nath323-1.3.bz2 \
-	reiser4-for-2.6.27.19.patch.bz2 \
-	linux-$(VER)-suse_xen_patches-1.tar.bz2
+	reiser4-for-2.6.32.patch.bz2 \
+#	linux-$(VER)-suse_xen_patches-1.tar.bz2

 $(DL_FILE)				= $(URL_IPFIRE)/$(DL_FILE)
-netfilter-layer7-v2.21.tar.gz		= $(URL_IPFIRE)/netfilter-layer7-v2.21.tar.gz
+netfilter-layer7-v2.22.tar.gz		= $(URL_IPFIRE)/netfilter-layer7-v2.21.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
-reiser4-for-2.6.27.19.patch.bz2		= $(URL_IPFIRE)/reiser4-for-2.6.27.19.patch.bz2
-linux-$(VER)-suse_xen_patches-1.tar.bz2	= $(URL_IPFIRE)/linux-$(VER)-suse_xen_patches-1.tar.bz2
+reiser4-for-2.6.32.patch.bz2		= $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2
+#linux-$(VER)-suse_xen_patches-1.tar.bz2	= $(URL_IPFIRE)/linux-$(VER)-suse_xen_patches-1.tar.bz2


-$(DL_FILE)_MD5				= a33e6b22d70dd010525fc43cdda36792
-netfilter-layer7-v2.21.tar.gz_MD5	= 838422e7d9a06b42e682e9064e5210b5
+$(DL_FILE)_MD5				= 82023ede52f067fcc55c5e70b02e48ae
+
+netfilter-layer7-v2.22.tar.gz_MD5	= 98dff8a3d5a31885b73341633f69501f
 patch-2.6.16-nath323-1.3.bz2_MD5	= f926409ff703a307baf54b57ab75d138
-squashfs3.4.tar.gz_MD5			= 2a4d2995ad5aa6840c95a95ffa6b1da6
-reiser4-for-2.6.27.19.patch.bz2_MD5	= 22988387f64f299489b90b484b2642cc
-linux-$(VER)-suse_xen_patches-1.tar.bz2_MD5 = ddbde50f3bc303d947531402017a3055
+reiser4-for-2.6.32.patch.bz2_MD5	= 3246397973d9271eb8e6d7c97c5d2d91
+#linux-$(VER)-suse_xen_patches-1.tar.bz2_MD5 = ddbde50f3bc303d947531402017a3055

 install : $(TARGET)

@@ -102,6 +102,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/linux-*-suse_xen_patches $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+
 	ln -s linux-$(VER) /usr/src/linux

 ifeq "$(XEN)" "1"
@@ -120,45 +121,29 @@ ifeq "$(XEN)" "1"
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.21-imq-test3-xen.patch
 else
 	# Linux Intermediate Queueing Device
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.21-imq-test3.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-imq-test2.patch
 endif

-	# Add Vodafone K3565-Z USB ID's to option driver
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.25-option_add_vf-k3565-z_usbids.patch
-
-	# Add Alix to Led Driver
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.24-leds-alix.patch
-
-	# Patch to fix Intel e100 wake on lan
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.39_e100-wakeonlan-fix.patch
+#	# Add Vodafone K3565-Z USB ID's to option driver
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.25-option_add_vf-k3565-z_usbids.patch

 	# Not report deprecated syscall 1.23 (for kudzu)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch
+
 ifeq "$(XEN)" ""
 	# Reiser4
-	-cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/reiser4-for-2.6.27.19.patch.bz2 | patch -Np1
-
-	# SquashFS (already in Suse Patchset)
-	cd $(DIR_SRC) && rm -rf squashfs*
-	cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.4.tar.gz
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.4/kernel-patches/linux-2.6.27-rc4/squashfs3.4-patch
+	cd $(DIR_APP) && bzcat $(DIR_DL)/reiser4-for-2.6.32.patch.bz2 | patch -Np1
 endif

 	# ipp2p 0.8.2-pomng
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.19-ipp2p-0.8.2-pomng.patch
-
-	# Intel Atom Coretemp Patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27-atom-coretemp.patch
-	# Intel Atom P4-clockmod Patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27-atom-clockmod.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-ipp2p-0.8.2-pomng.patch

 	# Layer7-patch
-	cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.21
-	cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.21.tar.gz
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.21/kernel-2.6.25-2.6.28-layer7-2.21.patch
+	cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.22
+	cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.22.tar.gz
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.22/kernel-2.6.25-2.6.28-layer7-2.22.patch

 	# Cleanup kernel source
-	cd $(DIR_APP) && make mrproper

 	cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config
 	cd $(DIR_APP) && make CC="$(KGCC)" oldconfig
@@ -188,10 +173,12 @@ endif
 	# Rename ide-cd module to match with old kernel
 	mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-cd_mod.ko \
 	   /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-cd.ko
+	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

 	@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*
 	@$(POSTBUILD)
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -30,7 +30,7 @@ else
 	VERSUFIX=ipfire
 endif

-VER        = 2.6.23
+VER        = 2.6.24

 THISAPP    = openswan-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -51,7 +51,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = c83053471e639bf3b97e3cf7796b7e83
+$(DL_FILE)_MD5 = 1c76b6982c05392f7c360afb92699661

 install : $(TARGET)

@@ -92,7 +92,7 @@ else
 		-e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' \
 		-e 's%^XMLTO.*$$%#&%' Makefile.inc

-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/openswan-2.6.20_noxmlto.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/openswan-2.6.24_noxmlto.patch

 	cd $(DIR_APP) && sed -i 's/-Werror//' programs/Makefile.program
 	
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@

 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
-VERSION="2.5"							# Version number
+VERSION="2.6"							# Version number
 CORE="37"							# Core Level (Filename)
 PAKFIRE_CORE="36"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
@@ -340,42 +340,26 @@ buildipfire() {
  ipfiremake pptp
  ipfiremake unzip
  ipfiremake which
-  ipfiremake linux			XEN=1
-  ipfiremake atl1c			XEN=1
-  ipfiremake atl2			XEN=1
-  ipfiremake hso			XEN=1
-  ipfiremake e1000e			XEN=1
-  ipfiremake et131x			XEN=1
-  ipfiremake r8101			XEN=1
-  ipfiremake r8169			XEN=1
-  ipfiremake r8168			XEN=1
-  ipfiremake kqemu			XEN=1
-  #ipfiremake kvm-kmod			XEN=1
-  ipfiremake v4l-dvb			XEN=1
-  ipfiremake madwifi			XEN=1
-  #ipfiremake alsa			XEN=1 KMOD=1
-  ipfiremake dahdi			XEN=1 KMOD=1
-  ipfiremake openswan			XEN=1 KMOD=1
-  ipfiremake mISDN			XEN=1
-  ipfiremake compat-wireless		XEN=1
+#  ipfiremake linux			XEN=1
+#  ipfiremake kqemu			XEN=1
+#  #ipfiremake kvm-kmod			XEN=1
+#  ipfiremake v4l-dvb			XEN=1
+#  ipfiremake madwifi			XEN=1
+#  #ipfiremake alsa			XEN=1 KMOD=1
+#  ipfiremake dahdi			XEN=1 KMOD=1
+#  ipfiremake openswan			XEN=1 KMOD=1
+#  ipfiremake mISDN			XEN=1
+#  ipfiremake compat-wireless		XEN=1
  ipfiremake linux
-  ipfiremake atl1c
-  ipfiremake atl2
-  ipfiremake hso
-  ipfiremake e1000e
-  ipfiremake et131x
-  ipfiremake r8101
-  ipfiremake r8169
-  ipfiremake r8168
  ipfiremake kqemu
-  ipfiremake kvm-kmod
+  #ipfiremake kvm-kmod
  ipfiremake v4l-dvb
  ipfiremake madwifi
  ipfiremake alsa			KMOD=1
  ipfiremake dahdi			KMOD=1
  ipfiremake openswan			KMOD=1
-  ipfiremake mISDN
-  ipfiremake compat-wireless
+  #ipfiremake mISDN
+  #ipfiremake compat-wireless
  ipfiremake pkg-config
  ipfiremake linux-atm
  ipfiremake cpio
@@ -655,7 +639,7 @@ buildipfire() {
  echo >> $BASEDIR/build/var/ipfire/firebuild
  cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
  echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
-  if [ "$GIT_BRANCH" = "master" ]; then
+  if [ "$GIT_BRANCH" = "next" ]; then
 	echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
  else
 	echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
@@ -740,15 +724,15 @@ buildpackages() {

  ipfirepackages

-  # Check if there is a loop device for building in virtual environments
-  if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
-        cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
-        cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
-	ipfiremake xen-image ED=$IPFVER
-	rm -rf $LFS/install/packages/linux-xen-*.ipfire
-	rm -rf $LFS/install/packages/meta-linux-xen
-  fi
-  mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
+#  # Check if there is a loop device for building in virtual environments
+#  if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
+#        cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
+#        cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
+#	ipfiremake xen-image ED=$IPFVER
+#	rm -rf $LFS/install/packages/linux-xen-*.ipfire
+#	rm -rf $LFS/install/packages/meta-linux-xen
+#  fi
+#  mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1

  # Cleanup
  stdumount
--- a/src/patches/iptables-1.4.6-errorno_includes.patch
+++ b/src/patches/iptables-1.4.6-errorno_includes.patch
@@ -0,0 +1,170 @@
+diff -Naur include.org/asm/errno.h include/asm/errno.h
+--- include.org/asm/errno.h	2010-02-12 18:21:40.000000000 +0100
+++ include/asm/errno.h	2010-02-12 18:19:41.000000000 +0100
+@@ -5,4 +5,8 @@
+  #include <linux/errno.h>
+ #endif
+ 
+#ifndef _ASM_GENERIC_ERRNO_H
+ #include <asm-generic/errno.h>
+#endif
+
+ #endif
+diff -Naur include.org/asm-generic/errno-base.h include/asm-generic/errno-base.h
+--- include.org/asm-generic/errno-base.h	1970-01-01 01:00:00.000000000 +0100
+++ include/asm-generic/errno-base.h	2010-02-09 13:57:19.000000000 +0100
+@@ -0,0 +1,39 @@
+#ifndef _ASM_GENERIC_ERRNO_BASE_H
+#define _ASM_GENERIC_ERRNO_BASE_H
+
+#define	EPERM		 1	/* Operation not permitted */
+#define	ENOENT		 2	/* No such file or directory */
+#define	ESRCH		 3	/* No such process */
+#define	EINTR		 4	/* Interrupted system call */
+#define	EIO		 5	/* I/O error */
+#define	ENXIO		 6	/* No such device or address */
+#define	E2BIG		 7	/* Argument list too long */
+#define	ENOEXEC		 8	/* Exec format error */
+#define	EBADF		 9	/* Bad file number */
+#define	ECHILD		10	/* No child processes */
+#define	EAGAIN		11	/* Try again */
+#define	ENOMEM		12	/* Out of memory */
+#define	EACCES		13	/* Permission denied */
+#define	EFAULT		14	/* Bad address */
+#define	ENOTBLK		15	/* Block device required */
+#define	EBUSY		16	/* Device or resource busy */
+#define	EEXIST		17	/* File exists */
+#define	EXDEV		18	/* Cross-device link */
+#define	ENODEV		19	/* No such device */
+#define	ENOTDIR		20	/* Not a directory */
+#define	EISDIR		21	/* Is a directory */
+#define	EINVAL		22	/* Invalid argument */
+#define	ENFILE		23	/* File table overflow */
+#define	EMFILE		24	/* Too many open files */
+#define	ENOTTY		25	/* Not a typewriter */
+#define	ETXTBSY		26	/* Text file busy */
+#define	EFBIG		27	/* File too large */
+#define	ENOSPC		28	/* No space left on device */
+#define	ESPIPE		29	/* Illegal seek */
+#define	EROFS		30	/* Read-only file system */
+#define	EMLINK		31	/* Too many links */
+#define	EPIPE		32	/* Broken pipe */
+#define	EDOM		33	/* Math argument out of domain of func */
+#define	ERANGE		34	/* Math result not representable */
+
+#endif
+diff -Naur include.org/asm-generic/errno.h include/asm-generic/errno.h
+--- include.org/asm-generic/errno.h	1970-01-01 01:00:00.000000000 +0100
+++ include/asm-generic/errno.h	2010-02-09 13:57:19.000000000 +0100
+@@ -0,0 +1,111 @@
+#ifndef _ASM_GENERIC_ERRNO_H
+#define _ASM_GENERIC_ERRNO_H
+
+#include <asm-generic/errno-base.h>
+
+#define	EDEADLK		35	/* Resource deadlock would occur */
+#define	ENAMETOOLONG	36	/* File name too long */
+#define	ENOLCK		37	/* No record locks available */
+#define	ENOSYS		38	/* Function not implemented */
+#define	ENOTEMPTY	39	/* Directory not empty */
+#define	ELOOP		40	/* Too many symbolic links encountered */
+#define	EWOULDBLOCK	EAGAIN	/* Operation would block */
+#define	ENOMSG		42	/* No message of desired type */
+#define	EIDRM		43	/* Identifier removed */
+#define	ECHRNG		44	/* Channel number out of range */
+#define	EL2NSYNC	45	/* Level 2 not synchronized */
+#define	EL3HLT		46	/* Level 3 halted */
+#define	EL3RST		47	/* Level 3 reset */
+#define	ELNRNG		48	/* Link number out of range */
+#define	EUNATCH		49	/* Protocol driver not attached */
+#define	ENOCSI		50	/* No CSI structure available */
+#define	EL2HLT		51	/* Level 2 halted */
+#define	EBADE		52	/* Invalid exchange */
+#define	EBADR		53	/* Invalid request descriptor */
+#define	EXFULL		54	/* Exchange full */
+#define	ENOANO		55	/* No anode */
+#define	EBADRQC		56	/* Invalid request code */
+#define	EBADSLT		57	/* Invalid slot */
+
+#define	EDEADLOCK	EDEADLK
+
+#define	EBFONT		59	/* Bad font file format */
+#define	ENOSTR		60	/* Device not a stream */
+#define	ENODATA		61	/* No data available */
+#define	ETIME		62	/* Timer expired */
+#define	ENOSR		63	/* Out of streams resources */
+#define	ENONET		64	/* Machine is not on the network */
+#define	ENOPKG		65	/* Package not installed */
+#define	EREMOTE		66	/* Object is remote */
+#define	ENOLINK		67	/* Link has been severed */
+#define	EADV		68	/* Advertise error */
+#define	ESRMNT		69	/* Srmount error */
+#define	ECOMM		70	/* Communication error on send */
+#define	EPROTO		71	/* Protocol error */
+#define	EMULTIHOP	72	/* Multihop attempted */
+#define	EDOTDOT		73	/* RFS specific error */
+#define	EBADMSG		74	/* Not a data message */
+#define	EOVERFLOW	75	/* Value too large for defined data type */
+#define	ENOTUNIQ	76	/* Name not unique on network */
+#define	EBADFD		77	/* File descriptor in bad state */
+#define	EREMCHG		78	/* Remote address changed */
+#define	ELIBACC		79	/* Can not access a needed shared library */
+#define	ELIBBAD		80	/* Accessing a corrupted shared library */
+#define	ELIBSCN		81	/* .lib section in a.out corrupted */
+#define	ELIBMAX		82	/* Attempting to link in too many shared libraries */
+#define	ELIBEXEC	83	/* Cannot exec a shared library directly */
+#define	EILSEQ		84	/* Illegal byte sequence */
+#define	ERESTART	85	/* Interrupted system call should be restarted */
+#define	ESTRPIPE	86	/* Streams pipe error */
+#define	EUSERS		87	/* Too many users */
+#define	ENOTSOCK	88	/* Socket operation on non-socket */
+#define	EDESTADDRREQ	89	/* Destination address required */
+#define	EMSGSIZE	90	/* Message too long */
+#define	EPROTOTYPE	91	/* Protocol wrong type for socket */
+#define	ENOPROTOOPT	92	/* Protocol not available */
+#define	EPROTONOSUPPORT	93	/* Protocol not supported */
+#define	ESOCKTNOSUPPORT	94	/* Socket type not supported */
+#define	EOPNOTSUPP	95	/* Operation not supported on transport endpoint */
+#define	EPFNOSUPPORT	96	/* Protocol family not supported */
+#define	EAFNOSUPPORT	97	/* Address family not supported by protocol */
+#define	EADDRINUSE	98	/* Address already in use */
+#define	EADDRNOTAVAIL	99	/* Cannot assign requested address */
+#define	ENETDOWN	100	/* Network is down */
+#define	ENETUNREACH	101	/* Network is unreachable */
+#define	ENETRESET	102	/* Network dropped connection because of reset */
+#define	ECONNABORTED	103	/* Software caused connection abort */
+#define	ECONNRESET	104	/* Connection reset by peer */
+#define	ENOBUFS		105	/* No buffer space available */
+#define	EISCONN		106	/* Transport endpoint is already connected */
+#define	ENOTCONN	107	/* Transport endpoint is not connected */
+#define	ESHUTDOWN	108	/* Cannot send after transport endpoint shutdown */
+#define	ETOOMANYREFS	109	/* Too many references: cannot splice */
+#define	ETIMEDOUT	110	/* Connection timed out */
+#define	ECONNREFUSED	111	/* Connection refused */
+#define	EHOSTDOWN	112	/* Host is down */
+#define	EHOSTUNREACH	113	/* No route to host */
+#define	EALREADY	114	/* Operation already in progress */
+#define	EINPROGRESS	115	/* Operation now in progress */
+#define	ESTALE		116	/* Stale NFS file handle */
+#define	EUCLEAN		117	/* Structure needs cleaning */
+#define	ENOTNAM		118	/* Not a XENIX named type file */
+#define	ENAVAIL		119	/* No XENIX semaphores available */
+#define	EISNAM		120	/* Is a named type file */
+#define	EREMOTEIO	121	/* Remote I/O error */
+#define	EDQUOT		122	/* Quota exceeded */
+
+#define	ENOMEDIUM	123	/* No medium found */
+#define	EMEDIUMTYPE	124	/* Wrong medium type */
+#define	ECANCELED	125	/* Operation Canceled */
+#define	ENOKEY		126	/* Required key not available */
+#define	EKEYEXPIRED	127	/* Key has expired */
+#define	EKEYREVOKED	128	/* Key has been revoked */
+#define	EKEYREJECTED	129	/* Key was rejected by service */
+
+/* for robust mutexes */
+#define	EOWNERDEAD	130	/* Owner died */
+#define	ENOTRECOVERABLE	131	/* State not recoverable */
+
+#define ERFKILL		132	/* Operation not possible due to RF-kill */
+
+#endif
--- a/src/patches/iptables-1.4.6-imq_test1.patch
+++ b/src/patches/iptables-1.4.6-imq_test1.patch
@@ -0,0 +1,126 @@
+diff -Naurw iptables-1.4.1/extensions/.IMQ-testx iptables-1.4.1.imq/extensions/.IMQ-testx
+--- iptables-1.4.1/extensions/.IMQ-testx	1969-12-31 21:00:00.000000000 -0300
+++ iptables-1.4.1.imq/extensions/.IMQ-testx	2008-06-24 22:20:06.000000000 -0300
+@@ -0,0 +1,3 @@
+#!/bin/sh
+# True if IMQ target patch is applied.
+[ -f $KERNEL_DIR/include/linux/netfilter/xt_IMQ.h ] && echo IMQ
+diff -Naurw iptables-1.4.1/extensions/libxt_IMQ.c iptables-1.4.1.imq/extensions/libxt_IMQ.c
+--- iptables-1.4.1/extensions/libxt_IMQ.c	1969-12-31 21:00:00.000000000 -0300
+++ iptables-1.4.1.imq/extensions/libxt_IMQ.c	2008-06-24 22:31:02.000000000 -0300
+@@ -0,0 +1,103 @@
+/* Shared library add-on to iptables to add IMQ target support. */
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <getopt.h>
+
+#include <xtables.h>
+#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter/xt_IMQ.h>
+
+/* Function which prints out usage message. */
+static void IMQ_help(void)
+{
+	printf(
+"IMQ target options:\n"
+"  --todev <N>		enqueue to imq<N>, defaults to 0\n");
+
+}
+
+static struct option IMQ_opts[] = {
+	{ "todev", 1, 0, '1' },
+	{ 0 }
+};
+
+/* Initialize the target. */
+static void IMQ_init(struct xt_entry_target *t)
+{
+	struct xt_imq_info *mr = (struct xt_imq_info*)t->data;
+
+	mr->todev = 0;
+}
+
+/* Function which parses command options; returns true if it
+   ate an option */
+static int IMQ_parse(int c, char **argv, int invert, unsigned int *flags,
+      const void *entry, struct xt_entry_target **target)
+{
+	struct xt_imq_info *mr = (struct xt_imq_info*)(*target)->data;
+	
+	switch(c) {
+	case '1':
+		if (xtables_check_inverse(optarg, &invert, NULL, 0, argv))
+			xtables_error(PARAMETER_PROBLEM,
+				   "Unexpected `!' for --todev");
+		mr->todev=atoi(optarg);
+		break;
+	default:
+		return 0;
+	}
+	return 1;
+}
+
+/* Prints out the targinfo. */
+static void IMQ_print(const void *ip,
+      const struct xt_entry_target *target,
+      int numeric)
+{
+	struct xt_imq_info *mr = (struct xt_imq_info*)target->data;
+
+	printf("IMQ: todev %u ", mr->todev);
+}
+
+/* Saves the union ipt_targinfo in parsable form to stdout. */
+static void IMQ_save(const void *ip, const struct xt_entry_target *target)
+{
+	struct xt_imq_info *mr = (struct xt_imq_info*)target->data;
+
+	printf("--todev %u", mr->todev);
+}
+
+static struct xtables_target imq_target = {
+	.name		= "IMQ",
+	.version	= XTABLES_VERSION,
+	.family		= NFPROTO_IPV4,
+	.size		= XT_ALIGN(sizeof(struct xt_imq_info)),
+	.userspacesize	= XT_ALIGN(sizeof(struct xt_imq_info)),
+	.help		= IMQ_help,
+	.init		= IMQ_init,
+	.parse		= IMQ_parse,
+	.print		= IMQ_print,
+	.save		= IMQ_save,
+	.extra_opts	= IMQ_opts,
+};
+
+static struct xtables_target imq_target6 = {
+	.name		= "IMQ",
+	.version	= XTABLES_VERSION,
+	.family		= NFPROTO_IPV6,
+	.size		= XT_ALIGN(sizeof(struct xt_imq_info)),
+	.userspacesize	= XT_ALIGN(sizeof(struct xt_imq_info)),
+	.help		= IMQ_help,
+	.init		= IMQ_init,
+	.parse		= IMQ_parse,
+	.print		= IMQ_print,
+	.save		= IMQ_save,
+	.extra_opts	= IMQ_opts,
+};
+
+// void __attribute((constructor)) nf_ext_init(void){
+void _init(void){
+	xtables_register_target(&imq_target);
+	xtables_register_target(&imq_target6);
+}
+--- iptables-1.4.1.1/include/linux/netfilter/xt_IMQ.h	1970-01-01 02:00:00.000000000 +0200
+++ iptables-1.4.1.1.new/include/linux/netfilter/xt_IMQ.h	2008-08-05 00:41:28.000000000 +0300
+@@ -0,0 +1,9 @@
+#ifndef _XT_IMQ_H
+#define _XT_IMQ_H
+
+struct xt_imq_info {
+	unsigned int todev;     /* target imq device */
+};
+
+#endif /* _XT_IMQ_H */
+
--- a/src/patches/iptables-1.4.6-ipp2p-0.8.2-pomng.patch
+++ b/src/patches/iptables-1.4.6-ipp2p-0.8.2-pomng.patch
@@ -0,0 +1,481 @@
+diff -Naur iptables-1.4.6.org/extensions/.ipp2p-test iptables-1.4.6/extensions/.ipp2p-test
+--- iptables-1.4.6.org/extensions/.ipp2p-test	1970-01-01 01:00:00.000000000 +0100
+++ iptables-1.4.6/extensions/.ipp2p-test	2010-02-13 20:02:52.000000000 +0100
+@@ -0,0 +1,2 @@
+#! /bin/sh
+[ -f $KERNEL_DIR/include/linux/netfilter_ipv4/ipt_ipp2p.h ] && echo ipp2p
+diff -Naur iptables-1.4.6.org/extensions/libipt_ipp2p.c iptables-1.4.6/extensions/libipt_ipp2p.c
+--- iptables-1.4.6.org/extensions/libipt_ipp2p.c	1970-01-01 01:00:00.000000000 +0100
+++ iptables-1.4.6/extensions/libipt_ipp2p.c	2010-02-13 20:02:52.000000000 +0100
+@@ -0,0 +1,424 @@
+#include <stdio.h>
+#include <netdb.h>
+#include <string.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <ctype.h>
+
+#include <iptables.h>
+
+#include <linux/netfilter_ipv4/ipt_ipp2p.h>
+
+#ifndef XTABLES_VERSION
+#define XTABLES_VERSION IPTABLES_VERSION
+#endif
+
+#ifdef IPT_LIB_DIR
+#define xtables_target iptables_target
+#define xtables_register_target register_target
+#endif
+
+static void
+help(void)
+{
+    printf(
+    "IPP2P v%s options:\n"
+    " --ipp2p	Grab all known p2p packets\n"
+    " --edk		[TCP&UDP]	All known eDonkey/eMule/Overnet packets\n"
+    " --dc		[TCP] 		All known Direct Connect packets\n"
+    " --kazaa	[TCP&UDP] 	All known KaZaA packets\n"
+    " --gnu		[TCP&UDP]	All known Gnutella packets\n"
+    " --bit		[TCP&UDP]	All known BitTorrent packets\n"
+    " --apple	[TCP] 		All known AppleJuice packets\n"
+    " --winmx	[TCP] 		All known WinMX\n"
+    " --soul		[TCP] 		All known SoulSeek\n"
+    " --ares		[TCP] 		All known Ares\n\n"
+    " EXPERIMENTAL protocols (please send feedback to: ipp2p@ipp2p.org) :\n"
+    " --mute		[TCP]		All known Mute packets\n"
+    " --waste	[TCP]		All known Waste packets\n"
+    " --xdcc		[TCP]		All known XDCC packets (only xdcc login)\n\n"
+    " DEBUG SUPPPORT, use only if you know why\n"
+    " --debug		Generate kernel debug output, THIS WILL SLOW DOWN THE FILTER\n"
+    "\nNote that the follwing options will have the same meaning:\n"
+    " '--ipp2p' is equal to '--edk --dc --kazaa --gnu --bit --apple --winmx --soul --ares'\n"
+    "\nIPP2P was intended for TCP only. Due to increasing usage of UDP we needed to change this.\n"
+    "You can now use -p udp to search UDP packets only or without -p switch to search UDP and TCP packets.\n"
+    "\nSee README included with this package for more details or visit http://www.ipp2p.org\n"
+    "\nExamples:\n"
+    " iptables -A FORWARD -m ipp2p --ipp2p -j MARK --set-mark 0x01\n"
+    " iptables -A FORWARD -p udp -m ipp2p --kazaa --bit -j DROP\n"
+    " iptables -A FORWARD -p tcp -m ipp2p --edk --soul -j DROP\n\n"
+    , IPP2P_VERSION);
+}
+
+static struct option opts[] = {
+        { "ipp2p", 0, 0, '1' },
+        { "edk", 0, 0, '2' },	
+	{ "dc", 0, 0, '7' },
+	{ "gnu", 0, 0, '9' },
+	{ "kazaa", 0, 0, 'a' },
+	{ "bit", 0, 0, 'b' },
+	{ "apple", 0, 0, 'c' },	
+	{ "soul", 0, 0, 'd' },	
+	{ "winmx", 0, 0, 'e' },	
+	{ "ares", 0, 0, 'f' },
+	{ "mute", 0, 0, 'g' },
+	{ "waste", 0, 0, 'h' },
+	{ "xdcc", 0, 0, 'i' },
+	{ "debug", 0, 0, 'j' },
+        {0}
+};
+
+
+static void
+#ifdef _XTABLES_H
+init(struct xt_entry_match *m)
+#else
+init(struct ipt_entry_match *t, unsigned int *nfcache)
+#endif
+{
+    struct ipt_p2p_info *info = (struct ipt_p2p_info *)m->data;
+
+#ifndef _XTABLES_H
+    *nfcache |= NFC_UNKNOWN;
+#endif
+
+    /*init the module with default values*/
+    info->cmd = 0;
+    info->debug = 0;
+
+}
+
+
+static int
+parse(int c, char **argv, int invert, unsigned int *flags,
+#ifdef _XTABLES_H
+      const void *entry, struct xt_entry_match **match)
+#else
+      const struct ipt_entry *entry, unsigned int *nfcache, struct ipt_entry_match **match)
+#endif
+{
+    struct ipt_p2p_info *info = (struct ipt_p2p_info *)(*match)->data;
+    
+    switch (c) {
+	case '1':		/*cmd: ipp2p*/
+	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
+		    exit_error(PARAMETER_PROBLEM,
+				"ipp2p: `--ipp2p' may only be "
+				"specified once!");
+
+/*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
+		    exit_error(PARAMETER_PROBLEM,
+				"ipp2p: `--ipp2p-data' may only be "
+				"specified alone!");
+*/
+
+	    if ((*flags) != 0)
+		    exit_error(PARAMETER_PROBLEM,
+				"ipp2p: `--ipp2p' may only be "
+				"specified alone!");
+	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+	    *flags += SHORT_HAND_IPP2P;
+	    info->cmd = *flags;
+	    break;
+	    
+	case '2':		/*cmd: edk*/
+	    if ((*flags & IPP2P_EDK) == IPP2P_EDK)
+		    exit_error(PARAMETER_PROBLEM,
+				"ipp2p: `--edk' may only be "
+				"specified once");
+	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
+		    exit_error(PARAMETER_PROBLEM,
+				"ipp2p: `--ipp2p' may only be "
+				"specified alone!");
+/*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
+		    exit_error(PARAMETER_PROBLEM,
+				"ipp2p: `--ipp2p-data' may only be "
+				"specified alone!");*/
+            if ((*flags & IPP2P_DATA_EDK) == IPP2P_DATA_EDK)
+            exit_error(PARAMETER_PROBLEM,
+                                "ipp2p: use `--edk' OR `--edk-data' but not both of them!");
+	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+	    *flags += IPP2P_EDK;
+	    info->cmd = *flags;	    
+	    break;
+
+
+	case '7':		/*cmd: dc*/
+            if ((*flags & IPP2P_DC) == IPP2P_DC)
+            exit_error(PARAMETER_PROBLEM,
+                                "ipp2p: `--dc' may only be "
+                                "specified once!");
+	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
+		    exit_error(PARAMETER_PROBLEM,
+				"ipp2p: `--ipp2p' may only be "
+				"specified alone!");
+/*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
+		    exit_error(PARAMETER_PROBLEM,
+				"ipp2p: `--ipp2p-data' may only be "
+				"specified alone!");*/
+            if ((*flags & IPP2P_DATA_DC) == IPP2P_DATA_DC)
+            exit_error(PARAMETER_PROBLEM,
+                                "ipp2p: use `--dc' OR `--dc-data' but not both of them!");
+	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+            *flags += IPP2P_DC;
+	    info->cmd = *flags;
+	    break;
+
+
+	case '9':		/*cmd: gnu*/
+            if ((*flags & IPP2P_GNU) == IPP2P_GNU)
+            exit_error(PARAMETER_PROBLEM,
+                                "ipp2p: `--gnu' may only be "
+                                "specified once!");
+/*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
+		    exit_error(PARAMETER_PROBLEM,
+				"ipp2p: `--ipp2p-data' may only be "
+				"specified alone!");*/
+	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
+		    exit_error(PARAMETER_PROBLEM,
+				"ipp2p: `--ipp2p' may only be "
+				"specified alone!");
+            if ((*flags & IPP2P_DATA_GNU) == IPP2P_DATA_GNU)
+            exit_error(PARAMETER_PROBLEM,
+                                "ipp2p: use `--gnu' OR `--gnu-data' but not both of them!");
+	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+            *flags += IPP2P_GNU;
+	    info->cmd = *flags;
+	    break;
+
+	case 'a':		/*cmd: kazaa*/
+            if ((*flags & IPP2P_KAZAA) == IPP2P_KAZAA)
+            exit_error(PARAMETER_PROBLEM,
+                                "ipp2p: `--kazaa' may only be "
+                                "specified once!");
+/*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
+		    exit_error(PARAMETER_PROBLEM,
+				"ipp2p: `--ipp2p-data' may only be "
+				"specified alone!");*/
+	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
+		    exit_error(PARAMETER_PROBLEM,
+				"ipp2p: `--ipp2p' may only be "
+				"specified alone!");
+            if ((*flags & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA)
+            exit_error(PARAMETER_PROBLEM,
+                                "ipp2p: use `--kazaa' OR `--kazaa-data' but not both of them!");
+	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+            *flags += IPP2P_KAZAA;
+	    info->cmd = *flags;
+	    break;																											
+
+	case 'b':		/*cmd: bit*/
+            if ((*flags & IPP2P_BIT) == IPP2P_BIT)
+            exit_error(PARAMETER_PROBLEM,
+                                "ipp2p: `--bit' may only be "
+                                "specified once!");
+	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
+		    exit_error(PARAMETER_PROBLEM,
+				"ipp2p: `--ipp2p' may only be "
+				"specified alone!");
+	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+            *flags += IPP2P_BIT;
+	    info->cmd = *flags;
+	    break;																											
+
+	case 'c':		/*cmd: apple*/
+            if ((*flags & IPP2P_APPLE) == IPP2P_APPLE)
+            exit_error(PARAMETER_PROBLEM,
+                                "ipp2p: `--apple' may only be "
+                                "specified once!");
+	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
+		    exit_error(PARAMETER_PROBLEM,
+				"ipp2p: `--ipp2p' may only be "
+				"specified alone!");
+	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+            *flags += IPP2P_APPLE;
+	    info->cmd = *flags;
+	    break;																											
+
+
+	case 'd':		/*cmd: soul*/
+            if ((*flags & IPP2P_SOUL) == IPP2P_SOUL)
+            exit_error(PARAMETER_PROBLEM,
+                                "ipp2p: `--soul' may only be "
+                                "specified once!");
+	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
+		    exit_error(PARAMETER_PROBLEM,
+				"ipp2p: `--ipp2p' may only be "
+				"specified alone!");
+	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+            *flags += IPP2P_SOUL;
+	    info->cmd = *flags;
+	    break;																											
+
+
+	case 'e':		/*cmd: winmx*/
+            if ((*flags & IPP2P_WINMX) == IPP2P_WINMX)
+            exit_error(PARAMETER_PROBLEM,
+                                "ipp2p: `--winmx' may only be "
+                                "specified once!");
+	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
+		    exit_error(PARAMETER_PROBLEM,
+				"ipp2p: `--ipp2p' may only be "
+				"specified alone!");
+	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+            *flags += IPP2P_WINMX;
+	    info->cmd = *flags;
+	    break;																											
+
+	case 'f':		/*cmd: ares*/
+            if ((*flags & IPP2P_ARES) == IPP2P_ARES)
+            exit_error(PARAMETER_PROBLEM,
+                                "ipp2p: `--ares' may only be "
+                                "specified once!");
+	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
+		    exit_error(PARAMETER_PROBLEM,
+				"ipp2p: `--ipp2p' may only be "
+				"specified alone!");
+	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+            *flags += IPP2P_ARES;
+	    info->cmd = *flags;
+	    break;																											
+	
+	case 'g':		/*cmd: mute*/
+            if ((*flags & IPP2P_MUTE) == IPP2P_MUTE)
+            exit_error(PARAMETER_PROBLEM,
+                                "ipp2p: `--mute' may only be "
+                                "specified once!");
+	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+            *flags += IPP2P_MUTE;
+	    info->cmd = *flags;
+	    break;																											
+	case 'h':		/*cmd: waste*/
+            if ((*flags & IPP2P_WASTE) == IPP2P_WASTE)
+            exit_error(PARAMETER_PROBLEM,
+                                "ipp2p: `--waste' may only be "
+                                "specified once!");
+	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+            *flags += IPP2P_WASTE;
+	    info->cmd = *flags;
+	    break;																											
+	case 'i':		/*cmd: xdcc*/
+            if ((*flags & IPP2P_XDCC) == IPP2P_XDCC)
+            exit_error(PARAMETER_PROBLEM,
+                                "ipp2p: `--ares' may only be "
+                                "specified once!");
+	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+            *flags += IPP2P_XDCC;
+	    info->cmd = *flags;
+	    break;																											
+
+	case 'j':		/*cmd: debug*/
+	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+	    info->debug = 1;
+	    break;																											
+
+	default:
+//            exit_error(PARAMETER_PROBLEM,
+//	    "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n");
+	    return 0;
+    }
+    return 1;
+}
+
+
+static void
+final_check(unsigned int flags)
+{
+    if (!flags)
+            exit_error(PARAMETER_PROBLEM,
+	    "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n");
+}
+
+static void
+#ifdef _XTABLES_H
+print(const void *ip,
+      const struct xt_entry_match *match,
+#else
+print(const struct ipt_ip *ip,
+      const struct ipt_entry_match *match,
+#endif
+	int numeric)
+{
+    struct ipt_p2p_info *info = (struct ipt_p2p_info *)match->data;
+    
+    printf("ipp2p v%s", IPP2P_VERSION);
+    if ((info->cmd & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) printf(" --ipp2p");
+//    if ((info->cmd & SHORT_HAND_DATA) == SHORT_HAND_DATA) printf(" --ipp2p-data");
+    if ((info->cmd & IPP2P_KAZAA) == IPP2P_KAZAA) printf(" --kazaa");
+//    if ((info->cmd & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA) printf(" --kazaa-data");
+//    if ((info->cmd & IPP2P_DATA_GNU) == IPP2P_DATA_GNU) printf(" --gnu-data");
+    if ((info->cmd & IPP2P_GNU) == IPP2P_GNU) printf(" --gnu");
+    if ((info->cmd & IPP2P_EDK) == IPP2P_EDK) printf(" --edk");
+//    if ((info->cmd & IPP2P_DATA_EDK) == IPP2P_DATA_EDK) printf(" --edk-data");
+//    if ((info->cmd & IPP2P_DATA_DC) == IPP2P_DATA_DC) printf(" --dc-data");
+    if ((info->cmd & IPP2P_DC) == IPP2P_DC) printf(" --dc");
+    if ((info->cmd & IPP2P_BIT) == IPP2P_BIT) printf(" --bit");
+    if ((info->cmd & IPP2P_APPLE) == IPP2P_APPLE) printf(" --apple");
+    if ((info->cmd & IPP2P_SOUL) == IPP2P_SOUL) printf(" --soul");
+    if ((info->cmd & IPP2P_WINMX) == IPP2P_WINMX) printf(" --winmx");
+    if ((info->cmd & IPP2P_ARES) == IPP2P_ARES) printf(" --ares");
+    if ((info->cmd & IPP2P_MUTE) == IPP2P_MUTE) printf(" --mute");
+    if ((info->cmd & IPP2P_WASTE) == IPP2P_WASTE) printf(" --waste");
+    if ((info->cmd & IPP2P_XDCC) == IPP2P_XDCC) printf(" --xdcc");
+    if (info->debug != 0) printf(" --debug");
+    printf(" ");
+}
+
+static void
+#ifdef _XTABLES_H
+save(const void *ip,
+     const struct xt_entry_match *match)
+#else
+save(const struct ipt_ip *ip,
+     const struct ipt_entry_match *match)
+#endif
+{
+    struct ipt_p2p_info *info = (struct ipt_p2p_info *)match->data;
+    
+    if ((info->cmd & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) printf("--ipp2p ");
+//    if ((info->cmd & SHORT_HAND_DATA) == SHORT_HAND_DATA) printf("--ipp2p-data ");
+    if ((info->cmd & IPP2P_KAZAA) == IPP2P_KAZAA) printf("--kazaa ");
+//    if ((info->cmd & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA) printf("--kazaa-data ");
+//    if ((info->cmd & IPP2P_DATA_GNU) == IPP2P_DATA_GNU) printf("--gnu-data ");
+    if ((info->cmd & IPP2P_GNU) == IPP2P_GNU) printf("--gnu ");
+    if ((info->cmd & IPP2P_EDK) == IPP2P_EDK) printf("--edk ");
+//    if ((info->cmd & IPP2P_DATA_EDK) == IPP2P_DATA_EDK) printf("--edk-data ");
+//    if ((info->cmd & IPP2P_DATA_DC) == IPP2P_DATA_DC) printf("--dc-data ");
+    if ((info->cmd & IPP2P_DC) == IPP2P_DC) printf("--dc ");
+    if ((info->cmd & IPP2P_BIT) == IPP2P_BIT) printf("--bit ");
+    if ((info->cmd & IPP2P_APPLE) == IPP2P_APPLE) printf("--apple ");
+    if ((info->cmd & IPP2P_SOUL) == IPP2P_SOUL) printf("--soul ");
+    if ((info->cmd & IPP2P_WINMX) == IPP2P_WINMX) printf("--winmx ");
+    if ((info->cmd & IPP2P_ARES) == IPP2P_ARES) printf("--ares ");
+    if ((info->cmd & IPP2P_MUTE) == IPP2P_MUTE) printf(" --mute");
+    if ((info->cmd & IPP2P_WASTE) == IPP2P_WASTE) printf(" --waste");
+    if ((info->cmd & IPP2P_XDCC) == IPP2P_XDCC) printf(" --xdcc");
+    if (info->debug != 0) printf("--debug ");
+}
+
+		
+static 
+struct xtables_match ipp2p= 
+{ 
+    .next           = NULL,
+    .name           = "ipp2p",
+    .version        = XTABLES_VERSION,
+    .size           = IPT_ALIGN(sizeof(struct ipt_p2p_info)),
+    .userspacesize  = IPT_ALIGN(sizeof(struct ipt_p2p_info)),
+    .help           = &help,
+    .init           = &init,
+    .parse          = &parse,
+    .final_check    = &final_check,
+    .print          = &print,
+    .save           = &save,
+    .extra_opts     = opts
+};
+					    
+
+
+void _init(void)
+{
+    xtables_register_match(&ipp2p);
+}
+
+diff -Naur iptables-1.4.6.org/extensions/libipt_ipp2p.man iptables-1.4.6/extensions/libipt_ipp2p.man
+--- iptables-1.4.6.org/extensions/libipt_ipp2p.man	1970-01-01 01:00:00.000000000 +0100
+++ iptables-1.4.6/extensions/libipt_ipp2p.man	2010-02-13 20:02:52.000000000 +0100
+@@ -0,0 +1,43 @@
+This module matches certain packets in P2P flows. It is not
+designed to match all packets belonging to a P2P connection - 
+use IPP2P together with CONNMARK for this purpose. Also visit
+http://www.ipp2p.org for detailed information.
+
+Use it together with -p tcp or -p udp to search these protocols
+only or without -p switch to search packets of both protocols.
+
+IPP2P provides the following options:
+.TP
+.B "--edk "
+Matches as many eDonkey/eMule packets as possible.
+.TP
+.B "--kazaa "
+Matches as many KaZaA packets as possible.
+.TP
+.B "--gnu "
+Matches as many Gnutella packets as possible.
+.TP
+.B "--dc "
+Matches as many Direct Connect packets as possible.
+.TP
+.B "--bit "
+Matches BitTorrent packets.
+.TP
+.B "--apple "
+Matches AppleJuice packets.
+.TP
+.B "--soul "
+Matches some SoulSeek packets. Considered as beta, use careful!
+.TP
+.B "--winmx "
+Matches some WinMX packets. Considered as beta, use careful!
+.TP
+.B "--ares "
+Matches Ares and AresLite packets. Use together with -j DROP only.
+.TP
+.B "--ipp2p "
+Short hand for: --edk --kazaa --gnu --dc
+.TP
+.B "--debug "
+Prints some information about each hit into kernel logfile. May 
+produce huge logfiles so beware!
--- a/src/patches/linux-2.6.32-imq-test2.patch
+++ b/src/patches/linux-2.6.32-imq-test2.patch
--- a/src/patches/linux-2.6.32.8-ipp2p-0.8.2-pomng.patch
+++ b/src/patches/linux-2.6.32.8-ipp2p-0.8.2-pomng.patch
--- a/src/patches/openswan-2.6.24_noxmlto.patch
+++ b/src/patches/openswan-2.6.24_noxmlto.patch
@@ -1,7 +1,25 @@
-diff -Nur openswan-2.6.20dr2.old/programs/pluto/Makefile openswan-2.6.20dr2/programs/pluto/Makefile
--- openswan-2.6.20dr2.old/programs/pluto/Makefile	2008-12-20 19:53:00.000000000 +0100
-+++ openswan-2.6.20dr2/programs/pluto/Makefile	2008-12-20 20:14:07.000000000 +0100
-@@ -171,7 +171,7 @@
+diff -Naur openswan-2.6.24.org/programs/_confread/Makefile openswan-2.6.24/programs/_confread/Makefile
+--- openswan-2.6.24.org/programs/_confread/Makefile	2010-01-10 02:34:38.000000000 +0100
+++ openswan-2.6.24/programs/_confread/Makefile	2010-01-10 22:44:33.000000000 +0100
+@@ -16,7 +16,13 @@
+ OPENSWANSRCDIR?=$(shell cd ../..; pwd)
+ include ${OPENSWANSRCDIR}/Makefile.inc
+ 
+-EXTRA5MAN=ipsec.conf.5
+SUBDIRS=doc lib programs testing
+ifeq ($(findstring $(SUBDIRS),doc),doc)
+  EXTRA5MAN=ipsec.conf.5
+else
+  EXTRA5MAN=
+endif
+
+ CONFFILES=ipsec.conf
+ EXCONFILES=ipsec.win2k.conf
+ SOURCEDIR=_confread
+diff -Naur openswan-2.6.24.org/programs/pluto/Makefile openswan-2.6.24/programs/pluto/Makefile
+--- openswan-2.6.24.org/programs/pluto/Makefile	2010-01-10 02:34:38.000000000 +0100
+++ openswan-2.6.24/programs/pluto/Makefile	2010-01-10 22:51:15.000000000 +0100
+@@ -172,7 +172,7 @@
 all: $(BINNAMEPLUTO) $(BINNAMEADNSIFNEEDED) $(BINNAMEWHACK) #$(BINNAMEWHACKINIT) 
 programs: $(BINNAMEPLUTO) $(BINNAMEADNSIFNEEDED) $(BINNAMEWHACK) #$(BINNAMEWHACKINIT)
 clean:	cleanall
@@ -10,16 +28,16 @@ diff -Nur openswan-2.6.20dr2.old/programs/pluto/Makefile openswan-2.6.20dr2/prog
 endif
 
 doinstall: all
-@@ -187,6 +187,9 @@
+@@ -188,6 +188,9 @@
 	$(INSTALL) $(INSTBINFLAGS) $(BINNAMEPLUTO) $(BINNAMEWHACK) $(LIBEXECDIR)
 	#$(INSTALL) $(INSTSUIDFLAGS) $(BINNAMEWHACKINIT) $(LIBEXECDIR)
 	if $(USE_ADNS) ; then $(INSTALL) $(INSTBINFLAGS) $(BINNAMEADNS)  $(LIBEXECDIR) ; fi
 +
 +ifeq ($(findstring $(SUBDIRS),doc),doc)
 +doinstalldoc:
- 	( cd ${OPENSWANSRCDIR}/programs/pluto ; xmlto man pluto.8.xml ; mv ipsec_pluto.8 pluto.8; xmlto man ipsec.secrets.5.xml)
 	$(INSTALL) $(INSTMANFLAGS) ${srcdir}pluto.8 $(PMANDIR)/ipsec_pluto.8
 	sh ${OPENSWANSRCDIR}/packaging/utils/manlink ${srcdir}pluto.8 | \
+ 		while read from to ; \
@@ -201,10 +204,7 @@
 		 ln -s -f $$from $(FMANDIR)/$$to; \
 		done
@@ -48,21 +66,3 @@ diff -Nur openswan-2.6.20dr2.old/programs/pluto/Makefile openswan-2.6.20dr2/prog
 
 alg_info_test: alg_info_test.o ike_alg.o constants.o defs.o log.o db_ops.o crypto.o $(LIBDESLITE) $(OPENSWANLIB)
 	$(CC) -o $@ $^ $(LDFLAGS) $(LIBSPLUTO)
-diff -Nur openswan-2.6.20dr2.old/programs/_confread/Makefile openswan-2.6.20dr2/programs/_confread/Makefile
--- openswan-2.6.20dr2.old/programs/_confread/Makefile	2008-12-20 19:53:00.000000000 +0100
-+++ openswan-2.6.20dr2/programs/_confread/Makefile	2008-12-21 00:13:23.000000000 +0100
-@@ -16,7 +16,13 @@
- OPENSWANSRCDIR?=$(shell cd ../..; pwd)
- include ${OPENSWANSRCDIR}/Makefile.inc
- 
-EXTRA5MAN=ipsec.conf.5
-+SUBDIRS=doc lib programs testing
-+ifeq ($(findstring $(SUBDIRS),doc),doc)
-+  EXTRA5MAN=ipsec.conf.5
-+else
-+  EXTRA5MAN=
-+endif
-+
- CONFFILES=ipsec.conf
- EXCONFILES=ipsec.win2k.conf
- SOURCEDIR=_confread