* pending/69_amanda-helpers.patch does not apply to 2.4.22? @ 2003-10-11 21:22 Henrik Nordstrom 2003-10-11 23:00 ` Martin Josefsson 0 siblings, 1 reply; 6+ messages in thread From: Henrik Nordstrom @ 2003-10-11 21:22 UTC (permalink / raw) To: netfilter-devel After a recent CVS update of my pom tree the pending patch set no longer applies to 2.4.22, failing in pending/69_amanda-helpers.patch Regards Henrik ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pending/69_amanda-helpers.patch does not apply to 2.4.22? 2003-10-11 21:22 pending/69_amanda-helpers.patch does not apply to 2.4.22? Henrik Nordstrom @ 2003-10-11 23:00 ` Martin Josefsson 2003-10-12 3:25 ` Patrick McHardy 0 siblings, 1 reply; 6+ messages in thread From: Martin Josefsson @ 2003-10-11 23:00 UTC (permalink / raw) To: Henrik Nordstrom; +Cc: Netfilter-devel, Patrick McHardy On Sat, 2003-10-11 at 23:22, Henrik Nordstrom wrote: > After a recent CVS update of my pom tree the pending patch set no longer > applies to 2.4.22, failing in pending/69_amanda-helpers.patch I havn't had time to do my usual checking to see if everything applies. I usually catch these things fairly quickly. After a very quick look, I'd say it looks like a conflict between 61-remove-memsets.patch and 69_amanda-helpers.patch Both by Patrick. Patrick, do you think you could fix it up? -- /Martin ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pending/69_amanda-helpers.patch does not apply to 2.4.22? 2003-10-11 23:00 ` Martin Josefsson @ 2003-10-12 3:25 ` Patrick McHardy 2003-10-12 10:52 ` Martin Josefsson 0 siblings, 1 reply; 6+ messages in thread From: Patrick McHardy @ 2003-10-12 3:25 UTC (permalink / raw) To: Martin Josefsson; +Cc: Henrik Nordstrom, Netfilter-devel [-- Attachment #1: Type: text/plain, Size: 587 bytes --] Martin Josefsson wrote: >On Sat, 2003-10-11 at 23:22, Henrik Nordstrom wrote: > > >>After a recent CVS update of my pom tree the pending patch set no longer >>applies to 2.4.22, failing in pending/69_amanda-helpers.patch >> >> > >I havn't had time to do my usual checking to see if everything applies. >I usually catch these things fairly quickly. > >After a very quick look, I'd say it looks like a conflict between >61-remove-memsets.patch and 69_amanda-helpers.patch >Both by Patrick. > >Patrick, do you think you could fix it up? > This should do it. Best regards, Patrick [-- Attachment #2: x --] [-- Type: text/plain, Size: 1969 bytes --] Index: cvs/patch-o-matic/pending/61-remove-memsets.patch =================================================================== RCS file: /cvspublic/netfilter/patch-o-matic/pending/61-remove-memsets.patch,v retrieving revision 1.1 diff -u -r1.1 61-remove-memsets.patch --- cvs/patch-o-matic/pending/61-remove-memsets.patch 23 Aug 2003 18:37:41 -0000 1.1 +++ cvs/patch-o-matic/pending/61-remove-memsets.patch 12 Oct 2003 03:22:02 -0000 @@ -1,14 +1,3 @@ -===== net/ipv4/netfilter/ip_conntrack_amanda.c 1.2 vs edited ===== ---- 1.2/net/ipv4/netfilter/ip_conntrack_amanda.c Mon Apr 28 03:52:54 2003 -+++ edited/net/ipv4/netfilter/ip_conntrack_amanda.c Sun Jun 29 21:30:43 2003 -@@ -205,7 +205,6 @@ - { - int ret; - -- memset(&amanda_helper, 0, sizeof(struct ip_conntrack_helper)); - amanda_helper.tuple.src.u.udp.port = htons(10080); - amanda_helper.tuple.dst.protonum = IPPROTO_UDP; - amanda_helper.mask.src.u.udp.port = 0xFFFF; ===== net/ipv4/netfilter/ip_conntrack_tftp.c 1.1 vs edited ===== --- 1.1/net/ipv4/netfilter/ip_conntrack_tftp.c Mon Mar 31 17:08:21 2003 +++ edited/net/ipv4/netfilter/ip_conntrack_tftp.c Sun Jun 29 21:31:10 2003 @@ -21,18 +10,6 @@ tftp[i].tuple.dst.protonum = IPPROTO_UDP; tftp[i].tuple.src.u.udp.port = htons(ports[i]); tftp[i].mask.dst.protonum = 0xFFFF; -===== net/ipv4/netfilter/ip_nat_amanda.c 1.2 vs edited ===== ---- 1.2/net/ipv4/netfilter/ip_nat_amanda.c Wed Jun 25 00:16:00 2003 -+++ edited/net/ipv4/netfilter/ip_nat_amanda.c Sun Jun 29 21:31:40 2003 -@@ -195,8 +195,6 @@ - struct ip_nat_helper *hlpr; - - hlpr = &ip_nat_amanda_helper; -- memset(hlpr, 0, sizeof(struct ip_nat_helper)); -- - hlpr->tuple.dst.protonum = IPPROTO_UDP; - hlpr->tuple.src.u.udp.port = htons(10080); - hlpr->mask.src.u.udp.port = 0xFFFF; ===== net/ipv4/netfilter/ip_nat_tftp.c 1.1 vs edited ===== --- 1.1/net/ipv4/netfilter/ip_nat_tftp.c Mon Mar 31 17:08:21 2003 +++ edited/net/ipv4/netfilter/ip_nat_tftp.c Sun Jun 29 21:31:53 2003 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pending/69_amanda-helpers.patch does not apply to 2.4.22? 2003-10-12 3:25 ` Patrick McHardy @ 2003-10-12 10:52 ` Martin Josefsson 2003-10-13 16:27 ` Patrick McHardy 0 siblings, 1 reply; 6+ messages in thread From: Martin Josefsson @ 2003-10-12 10:52 UTC (permalink / raw) To: Patrick McHardy; +Cc: Henrik Nordstrom, Netfilter-devel On Sun, 2003-10-12 at 05:25, Patrick McHardy wrote: > >Patrick, do you think you could fix it up? > > > > This should do it. Almost, I still have a reject in ip_nat_amanda.c -- /Martin ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pending/69_amanda-helpers.patch does not apply to 2.4.22? 2003-10-12 10:52 ` Martin Josefsson @ 2003-10-13 16:27 ` Patrick McHardy 2003-10-13 17:38 ` Martin Josefsson 0 siblings, 1 reply; 6+ messages in thread From: Patrick McHardy @ 2003-10-13 16:27 UTC (permalink / raw) To: Martin Josefsson; +Cc: Henrik Nordstrom, Netfilter-devel Martin Josefsson wrote: >Almost, I still have a reject in ip_nat_amanda.c > > > It applies cleanly to latest 2.4 -bk. Which one did you test ? Regards, Patrick ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pending/69_amanda-helpers.patch does not apply to 2.4.22? 2003-10-13 16:27 ` Patrick McHardy @ 2003-10-13 17:38 ` Martin Josefsson 0 siblings, 0 replies; 6+ messages in thread From: Martin Josefsson @ 2003-10-13 17:38 UTC (permalink / raw) To: Patrick McHardy; +Cc: Henrik Nordstrom, Netfilter-devel [-- Attachment #1: Type: text/plain, Size: 395 bytes --] On Mon, 2003-10-13 at 18:27, Patrick McHardy wrote: > Martin Josefsson wrote: > > >Almost, I still have a reject in ip_nat_amanda.c > > > > > > > It applies cleanly to latest 2.4 -bk. Which one did you test ? 2.4.22 + submitted and pending I've found the problem, some patches that went into 2.4-bk havn't been added to pom, fixing right now. Sorry about that. -- /Martin [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 189 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2003-10-13 17:38 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2003-10-11 21:22 pending/69_amanda-helpers.patch does not apply to 2.4.22? Henrik Nordstrom 2003-10-11 23:00 ` Martin Josefsson 2003-10-12 3:25 ` Patrick McHardy 2003-10-12 10:52 ` Martin Josefsson 2003-10-13 16:27 ` Patrick McHardy 2003-10-13 17:38 ` Martin Josefsson
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.