Changeset b917538 in freewrt for target/linux/generic-2.4/patches


Ignore:
Timestamp:
Oct 1, 2006, 10:31:51 AM (19 years ago)
Author:
Waldemar Brodkorb <wbx@…>
Branches:
freewrt_1_0, freewrt_2_0
Children:
edaeca5
Parents:
2f09cbe
Message:
  • sync with changes in trunk
  • lzo2 instead of lzo
  • fix tinc/vtun build
  • security update for openssh/openssl
  • update for iproute2,openvpn,openntpd, iptables and ipp, openswan
  • disable ipv6 in busybox, autoselect this feature for all ipv6 related packages
  • add better startup scripts for openssh and openntpd

git-svn-id: ​svn://www.freewrt.org/branches/freewrt_1_0@800 afb5a338-a214-0410-bd46-81f09a774fd1

File:
1 moved

Legend:

Unmodified
Added
Removed

  • target/linux/generic-2.4/patches/601-netfilter_ipp2p.patch

    r2f09cbe rb917538  
    1 diff -urN linux.old/include/linux/netfilter_ipv4/ipt_ipp2p.h linux.dev/include/linux/netfilter_ipv4/ipt_ipp2p.h
    2 --- linux.old/include/linux/netfilter_ipv4/ipt_ipp2p.h  1970-01-01 01:00:00.000000000 +0100
    3 +++ linux.dev/include/linux/netfilter_ipv4/ipt_ipp2p.h  2006-03-23 14:37:56.000000000 +0100
     1diff -Nur linux-2.4.33.3/include/linux/netfilter_ipv4/ipt_ipp2p.h linux-2.4.33.3.ipp2p/include/linux/netfilter_ipv4/ipt_ipp2p.h
     2--- linux-2.4.33.3/include/linux/netfilter_ipv4/ipt_ipp2p.h     1970-01-01 01:00:00.000000000 +0100
     3+++ linux-2.4.33.3.ipp2p/include/linux/netfilter_ipv4/ipt_ipp2p.h       2006-09-30 13:48:52.000000000 +0200
    44@@ -0,0 +1,31 @@
    55+#ifndef __IPT_IPP2P_H
    66+#define __IPT_IPP2P_H
    7 +#define IPP2P_VERSION "0.8.1_rc1"
     7+#define IPP2P_VERSION "0.8.2"
    88+
    99+struct ipt_p2p_info {
    … …  
    3434+#define IPP2P_WASTE            (1 << 15)
    3535+#define IPP2P_XDCC             (1 << 16)
    36 diff -urN linux.old/net/ipv4/netfilter/Config.in linux.dev/net/ipv4/netfilter/Config.in
    37 --- linux.old/net/ipv4/netfilter/Config.in      2006-03-23 14:35:20.000000000 +0100
    38 +++ linux.dev/net/ipv4/netfilter/Config.in      2006-03-23 14:35:58.000000000 +0100
    39 @@ -29,6 +29,7 @@
     36diff -Nur linux-2.4.33.3/net/ipv4/netfilter/Config.in linux-2.4.33.3.ipp2p/net/ipv4/netfilter/Config.in
     37--- linux-2.4.33.3/net/ipv4/netfilter/Config.in 2006-08-31 19:03:20.000000000 +0200
     38+++ linux-2.4.33.3.ipp2p/net/ipv4/netfilter/Config.in   2006-09-30 13:45:19.000000000 +0200
     39@@ -26,6 +26,7 @@
    4040   dep_tristate '  TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES
    4141   dep_tristate '  recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES
    … …  
    4545   dep_tristate '  DSCP match support' CONFIG_IP_NF_MATCH_DSCP $CONFIG_IP_NF_IPTABLES
    4646 
    47 diff -urN linux.old/net/ipv4/netfilter/Makefile linux.dev/net/ipv4/netfilter/Makefile
    48 --- linux.old/net/ipv4/netfilter/Makefile       2006-03-23 14:35:20.000000000 +0100
    49 +++ linux.dev/net/ipv4/netfilter/Makefile       2006-03-23 14:35:58.000000000 +0100
    50 @@ -76,6 +76,7 @@
    51  obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o
    52  obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o
    53  obj-$(CONFIG_IP_NF_MATCH_MAC) += ipt_mac.o
    54 +obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
    55  
    56  obj-$(CONFIG_IP_NF_MATCH_PKTTYPE) += ipt_pkttype.o
    57  obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o
    58 diff -urN linux.old/net/ipv4/netfilter/ipt_ipp2p.c linux.dev/net/ipv4/netfilter/ipt_ipp2p.c
    59 --- linux.old/net/ipv4/netfilter/ipt_ipp2p.c    1970-01-01 01:00:00.000000000 +0100
    60 +++ linux.dev/net/ipv4/netfilter/ipt_ipp2p.c    2006-03-23 14:37:18.000000000 +0100
    61 @@ -0,0 +1,868 @@
     47diff -Nur linux-2.4.33.3/net/ipv4/netfilter/ipt_ipp2p.c linux-2.4.33.3.ipp2p/net/ipv4/netfilter/ipt_ipp2p.c
     48--- linux-2.4.33.3/net/ipv4/netfilter/ipt_ipp2p.c       1970-01-01 01:00:00.000000000 +0100
     49+++ linux-2.4.33.3.ipp2p/net/ipv4/netfilter/ipt_ipp2p.c 2006-09-30 13:47:58.000000000 +0200
     50@@ -0,0 +1,894 @@
    6251+#if defined(MODVERSIONS)
    6352+#include <linux/modversions.h>
    … …  
    790779+      const struct net_device *in,
    791780+      const struct net_device *out,
     781+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
     782+      const struct xt_match  *mymatch,
    792783+      const void *matchinfo,
    793784+      int offset,
     785+      unsigned int myprotoff,
     786+#else
     787+      const void *matchinfo,
     788+      int offset,
     789+#endif
    794790+
    795791+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
    … …  
    878874+static int
    879875+checkentry(const char *tablename,
    880 +            const struct ipt_ip *ip,
    881 +           void *matchinfo,
    882 +           unsigned int matchsize,
    883 +           unsigned int hook_mask)
     876+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
     877+           const void *ip,
     878+           const struct xt_match *mymatch,
     879+#else
     880+           const struct ipt_ip *ip,
     881+#endif
     882+          void *matchinfo,
     883+          unsigned int matchsize,
     884+          unsigned int hook_mask)
    884885+{
    885886+        /* Must specify -p tcp */
    … …  
    892893+                                                                           
    893894+
    894 +
     895+// TODO: find out what this structure is for (scheme taken
     896+// from kernel sources)
     897+// content seems to have a length of 8 bytes
     898+// (at least on my x86 machine)
     899+struct ipp2p_match_info {
     900+       long int dunno_what_this_is_for;
     901+       long int i_also_dunno_what_this_is_for;
     902+};
    895903+
    896904+static struct ipt_match ipp2p_match = {
    … …  
    903911+       THIS_MODULE
    904912+#endif
    905 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
     913+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17))
    906914+       .name           = "ipp2p",
    907915+       .match          = &match,
    908916+       .checkentry     = &checkentry,
    909917+       .me             = THIS_MODULE,
     918+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
     919+       .name           = "ipp2p",
     920+       .match          = &match,
     921+       .family         = AF_INET,
     922+       .matchsize      = sizeof(struct ipp2p_match_info),
     923+       .checkentry     = &checkentry,
     924+       .me             = THIS_MODULE,
    910925+#endif
    911926+};
    … …  
    928943+
    929944+
     945diff -Nur linux-2.4.33.3/net/ipv4/netfilter/Makefile linux-2.4.33.3.ipp2p/net/ipv4/netfilter/Makefile
     946--- linux-2.4.33.3/net/ipv4/netfilter/Makefile  2006-08-31 19:03:20.000000000 +0200
     947+++ linux-2.4.33.3.ipp2p/net/ipv4/netfilter/Makefile    2006-09-30 13:45:19.000000000 +0200
     948@@ -67,6 +67,7 @@
     949 obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o
     950 obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o
     951 obj-$(CONFIG_IP_NF_MATCH_MAC) += ipt_mac.o
     952+obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
     953 
     954 obj-$(CONFIG_IP_NF_MATCH_PKTTYPE) += ipt_pkttype.o
     955 obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o
Note: See TracChangeset for help on using the changeset viewer.