From a1f6652963eda420694c54c4bef354af5f1b9b90 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Wed, 5 Jan 2011 21:48:56 +0000 Subject: [PATCH] - updates for 2.6.37 Changed files: kernel-atmdd.patch -> 1.4 kernel-aufs2.patch -> 1.16 kernel-nf_rtsp.patch -> 1.4 kernel-pom-ng-mms-conntrack-nat.patch -> 1.4 kernel-pom-ng-rpc.patch -> 1.4 kernel-pom-ng-rsh.patch -> 1.3 --- kernel-atmdd.patch | 2 +- kernel-aufs2.patch | 2 +- kernel-nf_rtsp.patch | 12 +++++++++--- kernel-pom-ng-mms-conntrack-nat.patch | 12 +++++++++--- kernel-pom-ng-rpc.patch | 2 +- kernel-pom-ng-rsh.patch | 9 +++++++-- 6 files changed, 28 insertions(+), 11 deletions(-) diff --git a/kernel-atmdd.patch b/kernel-atmdd.patch index be2cb534..71fbbc8d 100644 --- a/kernel-atmdd.patch +++ b/kernel-atmdd.patch @@ -885,7 +885,7 @@ diff -urN linux-2.4.25/drivers/atm/atmdd.c linux-2.4.25-atmdd/drivers/atm/atmdd. + return -ENOMEM; + + /* Register the new device */ -+ myatmdd_dev = atm_dev_register(MYATMDD,&myatmdd_ops,-1,NULL); ++ myatmdd_dev = atm_dev_register(MYATMDD,NULL,&myatmdd_ops,-1,NULL); + + /* Were we able to register this device? */ + if (myatmdd_dev == NULL) diff --git a/kernel-aufs2.patch b/kernel-aufs2.patch index d572cb14..9b5f6f15 100644 --- a/kernel-aufs2.patch +++ b/kernel-aufs2.patch @@ -26402,7 +26402,7 @@ diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c + + au_dbg_verify_kthread(); + if (flags & AuWkq_WAIT) { -+ INIT_WORK_ON_STACK(&wkinfo->wk, wkq_func); ++ INIT_WORK_ONSTACK(&wkinfo->wk, wkq_func); + wkq = au_wkq[AuWkq_INORMAL].wkq; + if (flags & AuWkq_PRE) + wkq = au_wkq[AuWkq_IPRE].wkq; diff --git a/kernel-nf_rtsp.patch b/kernel-nf_rtsp.patch index 4655c9ba..12b13bdb 100644 --- a/kernel-nf_rtsp.patch +++ b/kernel-nf_rtsp.patch @@ -1,7 +1,7 @@ diff -purN linux-2.6.23-rc2.orig/include/linux/netfilter_helpers.h linux-2.6.23-rc2/include/linux/netfilter_helpers.h --- linux-2.6.23-rc2.orig/include/linux/netfilter_helpers.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.23-rc2/include/linux/netfilter_helpers.h 2007-08-05 10:53:55.000000000 +0200 -@@ -0,0 +1,133 @@ +@@ -0,0 +1,139 @@ +/* + * Helpers for netfiler modules. This file provides implementations for basic + * functions such as strncasecmp(), etc. @@ -132,6 +132,12 @@ diff -purN linux-2.6.23-rc2.orig/include/linux/netfilter_helpers.h linux-2.6.23- +} +#endif /* NF_NEED_NEXTLINE */ + ++#define NIPQUAD(addr) \ ++ ((unsigned char *)&addr)[0], \ ++ ((unsigned char *)&addr)[1], \ ++ ((unsigned char *)&addr)[2], \ ++ ((unsigned char *)&addr)[3] ++ +#endif /* __KERNEL__ */ + +#endif /* _NETFILTER_HELPERS_H */ @@ -246,7 +252,7 @@ diff -purN linux-2.6.23-rc2.orig/net/ipv4/netfilter/Kconfig linux-2.6.23-rc2/net diff -purN linux-2.6.23-rc2.orig/net/ipv4/netfilter/Makefile linux-2.6.23-rc2/net/ipv4/netfilter/Makefile --- linux-2.6.23-rc2.orig/net/ipv4/netfilter/Makefile 2007-08-05 21:14:19.000000000 +0200 +++ linux-2.6.23-rc2/net/ipv4/netfilter/Makefile 2007-08-05 10:53:55.000000000 +0200 -@@ -0,0 +0,1 @@ +@@ -0,0 +1 @@ +obj-$(CONFIG_NF_NAT_RTSP) += nf_nat_rtsp.o diff -purN linux-2.6.23-rc2.orig/net/netfilter/Kconfig linux-2.6.23-rc2/net/netfilter/Kconfig --- linux-2.6.23-rc2.orig/net/netfilter/Kconfig 2007-08-05 21:17:02.000000000 +0200 @@ -271,7 +277,7 @@ diff -purN linux-2.6.23-rc2.orig/net/netfilter/Kconfig linux-2.6.23-rc2/net/netf diff -purN linux-2.6.23-rc2.orig/net/netfilter/Makefile linux-2.6.23-rc2/net/netfilter/Makefile --- linux-2.6.23-rc2.orig/net/netfilter/Makefile 2007-08-05 21:17:02.000000000 +0200 +++ linux-2.6.23-rc2/net/netfilter/Makefile 2007-08-05 11:04:59.000000000 +0200 -@@ -0,0 +0,1 @@ +@@ -0,0 +1 @@ +obj-$(CONFIG_NF_CONNTRACK_RTSP) += nf_conntrack_rtsp.o diff -purN linux-2.6.24-rc1.orig/include/linux/netfilter/nf_conntrack_rtsp.h linux-2.6.24-rc1/include/linux/netfilter/nf_conntrack_rtsp.h --- linux-2.6.24-rc1.orig/include/linux/netfilter/nf_conntrack_rtsp.h 1970-01-01 01:00:00.000000000 +0100 diff --git a/kernel-pom-ng-mms-conntrack-nat.patch b/kernel-pom-ng-mms-conntrack-nat.patch index 1b48dc34..a99b6981 100644 --- a/kernel-pom-ng-mms-conntrack-nat.patch +++ b/kernel-pom-ng-mms-conntrack-nat.patch @@ -135,12 +135,12 @@ diff -NurpP --minimal linux-2.6.21.a/net/ipv4/netfilter/Kconfig linux-2.6.21.b/n diff -NurpP --minimal linux-2.6.21.a/net/ipv4/netfilter/Makefile linux-2.6.21.b/net/ipv4/netfilter/Makefile --- linux-2.6.21.a/net/ipv4/netfilter/Makefile 2007-05-30 11:44:12.000000000 +0200 +++ linux-2.6.21.b/net/ipv4/netfilter/Makefile 2007-05-30 11:50:55.000000000 +0200 -@@ -0,0 +0,1 @@ +@@ -0,0 +1 @@ +obj-$(CONFIG_NF_NAT_MMS) += nf_nat_mms.o diff -NurpP --minimal linux-2.6.21.a/net/ipv4/netfilter/nf_nat_mms.c linux-2.6.21.b/net/ipv4/netfilter/nf_nat_mms.c --- linux-2.6.21.a/net/ipv4/netfilter/nf_nat_mms.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.21.b/net/ipv4/netfilter/nf_nat_mms.c 2007-05-30 11:50:55.000000000 +0200 -@@ -0,0 +1,196 @@ +@@ -0,0 +1,202 @@ +/* MMS extension for TCP NAT alteration. + * (C) 2002 by Filip Sneppe + * based on ip_nat_ftp.c and ip_nat_irc.c @@ -193,6 +193,12 @@ diff -NurpP --minimal linux-2.6.21.a/net/ipv4/netfilter/nf_nat_mms.c linux-2.6.2 +#include +#include + ++#define NIPQUAD(addr) \ ++ ((unsigned char *)&addr)[0], \ ++ ((unsigned char *)&addr)[1], \ ++ ((unsigned char *)&addr)[2], \ ++ ((unsigned char *)&addr)[3] ++ +#if 0 +#define DEBUGP printk +#define DUMP_BYTES(address, counter) \ @@ -373,7 +379,7 @@ diff -NurpP --minimal linux-2.6.21.a/net/netfilter/Makefile linux-2.6.21.b/net/n diff -NurpP --minimal linux-2.6.21.a/net/netfilter/nf_conntrack_mms.c linux-2.6.21.b/net/netfilter/nf_conntrack_mms.c --- linux-2.6.21.a/net/netfilter/nf_conntrack_mms.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.21.b/net/netfilter/nf_conntrack_mms.c 2007-05-30 11:50:55.000000000 +0200 -@@ -0,0 +1,374 @@ +@@ -0,0 +1,375 @@ +/* MMS extension for IP connection tracking + * (C) 2002 by Filip Sneppe + * based on ip_conntrack_ftp.c and ip_conntrack_irc.c diff --git a/kernel-pom-ng-rpc.patch b/kernel-pom-ng-rpc.patch index 22fc3605..d4fa27ec 100644 --- a/kernel-pom-ng-rpc.patch +++ b/kernel-pom-ng-rpc.patch @@ -1667,7 +1667,7 @@ diff -Nur --exclude '*.orig' linux/net/ipv4/netfilter/ipt_rpc.c linux/net/ipv4/n + return 0; + } + -+ if (matchsize != IPT_ALIGN(sizeof(struct ipt_rpc_info))) ++ if (matchsize != XT_ALIGN(sizeof(struct ipt_rpc_info))) + return 0; + + return 1; diff --git a/kernel-pom-ng-rsh.patch b/kernel-pom-ng-rsh.patch index 63be4b6c..6460b194 100644 --- a/kernel-pom-ng-rsh.patch +++ b/kernel-pom-ng-rsh.patch @@ -84,12 +84,12 @@ diff -NurpP --minimal linux/net/ipv4/netfilter/Kconfig linux/net/ipv4/netfilter/ diff -NurpP --minimal linux/net/netfilter/Makefile linux/net/netfilter/Makefile --- linux/net/netfilter/Makefile 2007-05-30 11:57:07.000000000 +0200 +++ linux/net/netfilter/Makefile 2007-05-30 11:58:41.000000000 +0200 -@@ -0,0 +0,1 @@ +@@ -0,0 +1 @@ +obj-$(CONFIG_NF_CONNTRACK_RSH) += nf_conntrack_rsh.o diff -NurpP --minimal linux/net/netfilter/nf_conntrack_rsh.c linux/net/netfilter/nf_conntrack_rsh.c --- linux/net/netfilter/nf_conntrack_rsh.c 1970-01-01 01:00:00.000000000 +0100 +++ linux/net/netfilter/nf_conntrack_rsh.c 2007-05-30 11:58:41.000000000 +0200 -@@ -0,0 +1,353 @@ +@@ -0,0 +1,361 @@ +/* RSH extension for IP connection tracking, Version 1.0 + * (C) 2002 by Ian (Larry) Latter + * based on HW's ip_conntrack_irc.c @@ -240,6 +240,11 @@ diff -NurpP --minimal linux/net/netfilter/nf_conntrack_rsh.c linux/net/netfilter +#define DEBUGP(format, args...) +#endif + ++#define NIPQUAD(addr) \ ++ ((unsigned char *)&addr)[0], \ ++ ((unsigned char *)&addr)[1], \ ++ ((unsigned char *)&addr)[2], \ ++ ((unsigned char *)&addr)[3] + +/* FIXME: This should be in userspace. Later. */ +static int help(struct sk_buff **pskb, -- 2.44.0