Hello,
Attached patch should fix the pptp conntrack patch to
make it apply properly again. Let me know if I rediffed wrongly..
Have a nice day,
Fabrice.
diff -uNr cvs/netfilter/userspace/patch-o-matic/extra/pptp-conntrack-nat.patch
netfilter/userspace/patch-o-matic/extra/pptp-conntrack-nat.patch
--- cvs/netfilter/userspace/patch-o-matic/extra/pptp-conntrack-nat.patch
2002-06-15 21:30:49.000000000 +0800
+++ netfilter/userspace/patch-o-matic/extra/pptp-conntrack-nat.patch 2002-07-04
+11:56:23.000000000 +0800
@@ -1,22 +1,23 @@
-diff -Nru --exclude .depend --exclude '*.o' --exclude '*.ver' --exclude '.*.flags'
--exclude '*.orig' --exclude '*.rej' --exclude '*~'
linux-2.4.18-newnat/include/linux/netfilter_ipv4/ip_conntrack.h
linux-2.4.18-pptp3.01//include/linux/netfilter_ipv4/ip_conntrack.h
---- linux-2.4.18-newnat/include/linux/netfilter_ipv4/ip_conntrack.h Tue Apr 2
13:01:37 2002
-+++ linux-2.4.18-pptp3.01//include/linux/netfilter_ipv4/ip_conntrack.h Mon Apr 8
12:42:36 2002
-@@ -102,9 +105,15 @@
+diff -uNr original/linux/include/linux/netfilter_ipv4/ip_conntrack.h
+linux/include/linux/netfilter_ipv4/ip_conntrack.h
+--- original/linux/include/linux/netfilter_ipv4/ip_conntrack.h 2002-07-04
+11:39:37.000000000 +0800
++++ linux/include/linux/netfilter_ipv4/ip_conntrack.h 2002-07-04 11:47:02.000000000
++0800
+@@ -104,9 +104,15 @@
/* At which sequence number did this expectation occur */
u_int32_t seq;
+-
++
++ union {
++ /* insert l4proto helper private data (expect) here */
++ struct ip_ct_gre_expect gre;
++ } proto;
+
-+ union {
-+ /* insert l4proto helper private data (expect) herre */
-+ struct ip_ct_gre_expect gre;
-+ } proto;
-
union {
/* insert conntrack helper private data (expect) here */
+ struct ip_ct_pptp_expect exp_pptp_info;
+ struct ip_ct_h225_expect exp_h225_info;
struct ip_ct_ftp_expect exp_ftp_info;
struct ip_ct_irc_expect exp_irc_info;
-
diff -Nru --exclude .depend --exclude '*.o' --exclude '*.ver' --exclude '.*.flags'
--exclude '*.orig' --exclude '*.rej' --exclude '*~'
linux-2.4.18-newnat/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
linux-2.4.18-pptp3.01//include/linux/netfilter_ipv4/ip_conntrack_pptp.h
--- linux-2.4.18-newnat/include/linux/netfilter_ipv4/ip_conntrack_pptp.h Thu
Jan 1 01:00:00 1970
+++ linux-2.4.18-pptp3.01//include/linux/netfilter_ipv4/ip_conntrack_pptp.h Mon Apr
+ 8 12:42:36 2002
http://fabnetwork.ifrance.com/
--
Fabrice MARIE
Senior R&D Engineer
Celestix Networks
http://www.celestix.com/
"Silly hacker, root is for administrators"
-Unknown
diff -uNr cvs/netfilter/userspace/patch-o-matic/extra/pptp-conntrack-nat.patch netfilter/userspace/patch-o-matic/extra/pptp-conntrack-nat.patch
--- cvs/netfilter/userspace/patch-o-matic/extra/pptp-conntrack-nat.patch 2002-06-15 21:30:49.000000000 +0800
+++ netfilter/userspace/patch-o-matic/extra/pptp-conntrack-nat.patch 2002-07-04 11:56:23.000000000 +0800
@@ -1,22 +1,23 @@
-diff -Nru --exclude .depend --exclude '*.o' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*~' linux-2.4.18-newnat/include/linux/netfilter_ipv4/ip_conntrack.h linux-2.4.18-pptp3.01//include/linux/netfilter_ipv4/ip_conntrack.h
---- linux-2.4.18-newnat/include/linux/netfilter_ipv4/ip_conntrack.h Tue Apr 2 13:01:37 2002
-+++ linux-2.4.18-pptp3.01//include/linux/netfilter_ipv4/ip_conntrack.h Mon Apr 8 12:42:36 2002
-@@ -102,9 +105,15 @@
+diff -uNr original/linux/include/linux/netfilter_ipv4/ip_conntrack.h linux/include/linux/netfilter_ipv4/ip_conntrack.h
+--- original/linux/include/linux/netfilter_ipv4/ip_conntrack.h 2002-07-04 11:39:37.000000000 +0800
++++ linux/include/linux/netfilter_ipv4/ip_conntrack.h 2002-07-04 11:47:02.000000000 +0800
+@@ -104,9 +104,15 @@
/* At which sequence number did this expectation occur */
u_int32_t seq;
+-
++
++ union {
++ /* insert l4proto helper private data (expect) here */
++ struct ip_ct_gre_expect gre;
++ } proto;
+
-+ union {
-+ /* insert l4proto helper private data (expect) herre */
-+ struct ip_ct_gre_expect gre;
-+ } proto;
-
union {
/* insert conntrack helper private data (expect) here */
+ struct ip_ct_pptp_expect exp_pptp_info;
+ struct ip_ct_h225_expect exp_h225_info;
struct ip_ct_ftp_expect exp_ftp_info;
struct ip_ct_irc_expect exp_irc_info;
-
diff -Nru --exclude .depend --exclude '*.o' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*~' linux-2.4.18-newnat/include/linux/netfilter_ipv4/ip_conntrack_pptp.h linux-2.4.18-pptp3.01//include/linux/netfilter_ipv4/ip_conntrack_pptp.h
--- linux-2.4.18-newnat/include/linux/netfilter_ipv4/ip_conntrack_pptp.h Thu Jan 1 01:00:00 1970
+++ linux-2.4.18-pptp3.01//include/linux/netfilter_ipv4/ip_conntrack_pptp.h Mon Apr 8 12:42:36 2002
