packages: kernel/kernel-atmdd.patch, kernel/kernel-aufs2.patch, kernel/kern...
arekm
arekm at pld-linux.org
Wed Jan 5 22:49:01 CET 2011
Author: arekm Date: Wed Jan 5 21:49:01 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updates for 2.6.37
---- Files affected:
packages/kernel:
kernel-atmdd.patch (1.3 -> 1.4) , kernel-aufs2.patch (1.15 -> 1.16) , kernel-nf_rtsp.patch (1.3 -> 1.4) , kernel-pom-ng-mms-conntrack-nat.patch (1.3 -> 1.4) , kernel-pom-ng-rpc.patch (1.3 -> 1.4) , kernel-pom-ng-rsh.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/kernel/kernel-atmdd.patch
diff -u packages/kernel/kernel-atmdd.patch:1.3 packages/kernel/kernel-atmdd.patch:1.4
--- packages/kernel/kernel-atmdd.patch:1.3 Tue Mar 31 14:04:37 2009
+++ packages/kernel/kernel-atmdd.patch Wed Jan 5 22:48:56 2011
@@ -885,7 +885,7 @@
+ 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)
================================================================
Index: packages/kernel/kernel-aufs2.patch
diff -u packages/kernel/kernel-aufs2.patch:1.15 packages/kernel/kernel-aufs2.patch:1.16
--- packages/kernel/kernel-aufs2.patch:1.15 Mon Nov 22 12:36:06 2010
+++ packages/kernel/kernel-aufs2.patch Wed Jan 5 22:48:56 2011
@@ -26402,7 +26402,7 @@
+
+ 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;
================================================================
Index: packages/kernel/kernel-nf_rtsp.patch
diff -u packages/kernel/kernel-nf_rtsp.patch:1.3 packages/kernel/kernel-nf_rtsp.patch:1.4
--- packages/kernel/kernel-nf_rtsp.patch:1.3 Tue Mar 31 14:02:32 2009
+++ packages/kernel/kernel-nf_rtsp.patch Wed Jan 5 22:48:56 2011
@@ -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 @@
+}
+#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/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/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
================================================================
Index: packages/kernel/kernel-pom-ng-mms-conntrack-nat.patch
diff -u packages/kernel/kernel-pom-ng-mms-conntrack-nat.patch:1.3 packages/kernel/kernel-pom-ng-mms-conntrack-nat.patch:1.4
--- packages/kernel/kernel-pom-ng-mms-conntrack-nat.patch:1.3 Mon Jul 20 23:48:07 2009
+++ packages/kernel/kernel-pom-ng-mms-conntrack-nat.patch Wed Jan 5 22:48:56 2011
@@ -135,12 +135,12 @@
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 <filip.sneppe at cronos.be>
+ * based on ip_nat_ftp.c and ip_nat_irc.c
@@ -193,6 +193,12 @@
+#include <net/netfilter/nf_conntrack_expect.h>
+#include <linux/netfilter/nf_conntrack_mms.h>
+
++#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/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 <filip.sneppe at cronos.be>
+ * based on ip_conntrack_ftp.c and ip_conntrack_irc.c
================================================================
Index: packages/kernel/kernel-pom-ng-rpc.patch
diff -u packages/kernel/kernel-pom-ng-rpc.patch:1.3 packages/kernel/kernel-pom-ng-rpc.patch:1.4
--- packages/kernel/kernel-pom-ng-rpc.patch:1.3 Sun Nov 7 11:19:06 2010
+++ packages/kernel/kernel-pom-ng-rpc.patch Wed Jan 5 22:48:56 2011
@@ -1667,7 +1667,7 @@
+ return 0;
+ }
+
-+ if (matchsize != IPT_ALIGN(sizeof(struct ipt_rpc_info)))
++ if (matchsize != XT_ALIGN(sizeof(struct ipt_rpc_info)))
+ return 0;
+
+ return 1;
================================================================
Index: packages/kernel/kernel-pom-ng-rsh.patch
diff -u packages/kernel/kernel-pom-ng-rsh.patch:1.2 packages/kernel/kernel-pom-ng-rsh.patch:1.3
--- packages/kernel/kernel-pom-ng-rsh.patch:1.2 Tue Mar 31 14:04:32 2009
+++ packages/kernel/kernel-pom-ng-rsh.patch Wed Jan 5 22:48:56 2011
@@ -84,12 +84,12 @@
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 <Ian.Latter at mq.edu.au>
+ * based on HW's ip_conntrack_irc.c
@@ -240,6 +240,11 @@
+#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,
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-atmdd.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-aufs2.patch?r1=1.15&r2=1.16&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-nf_rtsp.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-pom-ng-mms-conntrack-nat.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-pom-ng-rpc.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-pom-ng-rsh.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list