can't patch with patch-o-matic

can't patch with patch-o-matic

[Luis Miguel Cruz Miranda]

Hi all,

I am using patch-o-matic to patch a 2.4.20 kernel but I am having some 
problems here:

For example:

Do you want to apply this patch [N/y/t/f/a/r/b/w/v/q/?] y
Testing patch extra/tcp-window-tracking.patch...
    Placed new Makefile line
Failed to patch copy of /usr/src/linux
TEST FAILED: patch NOT applied.

I want to use that patch but I don't know why I can't.
I have these patches applied:

Already applied: submitted/01_2.4.19
                  submitted/02_2.4.20
                  submitted/ipt_multiport-invfix
                  submitted/ipt_ULOG-mac_len-fix
                  pending/01_ip_conntrack_proto_tcp-lockfix
                  pending/02_newnat-udp-helper
                  pending/03_REJECT-fwspotting-phrack60-fix
                  pending/04_ftp-conntrack-msg-fix
                  pending/05_ECN-tcpchecksum-littleendian-fix
                  base/fuzzy
                  base/iplimit
                  base/ipt_unclean-ubit
                  base/ipv4options
                  base/IPV4OPTSSTRIP
                  base/mport
                  base/NETLINK
                  base/NETMAP
                  base/nth
                  base/pool
                  base/psd
                  base/quota
                  base/random
                  base/realm
                  base/SAME
                  base/time
                  base/TTL
                  extra/condition
                  extra/CONNMARK
                  extra/h323-conntrack-nat
                  extra/ip_tables-proc
                  extra/ipt_TARPIT
                  extra/mms-conntrack-nat
                  extra/pptp-conntrack-nat
                  extra/recent
                  extra/ROUTE
                  extra/rsh
                  extra/string
                  extra/talk-conntrack-nat
                  extra/tftp-conntrack-nat

What is wrong?


Luis Miguel Cruz Miranda.               |       B2B INTEGRAL, S.A.
CCNA - Systems Administrator            |       Pol. Ind. de Asipo
                                         |       C/A - Parcela 86-C
Tel: +34 902 506 605                    |       33.428 - CAYES - LLANERA
Fax:+34 985 980 794                     |       ASTURIAS (ESPAÑA/SPAIN)

Re: can't patch with patch-o-matic

[Raymond Leach]

[-- Attachment #1: Type: text/plain, Size: 2550 bytes --]

You are probably missing the patch program.

Do rpm -qa | grep patch

Ray

On Mon, 2003-02-17 at 18:27, Luis Miguel Cruz Miranda wrote:
> Hi all,
> 
> I am using patch-o-matic to patch a 2.4.20 kernel but I am having some 
> problems here:
> 
> For example:
> 
> Do you want to apply this patch [N/y/t/f/a/r/b/w/v/q/?] y
> Testing patch extra/tcp-window-tracking.patch...
>     Placed new Makefile line
> Failed to patch copy of /usr/src/linux
> TEST FAILED: patch NOT applied.
> 
> I want to use that patch but I don't know why I can't.
> I have these patches applied:
> 
> Already applied: submitted/01_2.4.19
>                   submitted/02_2.4.20
>                   submitted/ipt_multiport-invfix
>                   submitted/ipt_ULOG-mac_len-fix
>                   pending/01_ip_conntrack_proto_tcp-lockfix
>                   pending/02_newnat-udp-helper
>                   pending/03_REJECT-fwspotting-phrack60-fix
>                   pending/04_ftp-conntrack-msg-fix
>                   pending/05_ECN-tcpchecksum-littleendian-fix
>                   base/fuzzy
>                   base/iplimit
>                   base/ipt_unclean-ubit
>                   base/ipv4options
>                   base/IPV4OPTSSTRIP
>                   base/mport
>                   base/NETLINK
>                   base/NETMAP
>                   base/nth
>                   base/pool
>                   base/psd
>                   base/quota
>                   base/random
>                   base/realm
>                   base/SAME
>                   base/time
>                   base/TTL
>                   extra/condition
>                   extra/CONNMARK
>                   extra/h323-conntrack-nat
>                   extra/ip_tables-proc
>                   extra/ipt_TARPIT
>                   extra/mms-conntrack-nat
>                   extra/pptp-conntrack-nat
>                   extra/recent
>                   extra/ROUTE
>                   extra/rsh
>                   extra/string
>                   extra/talk-conntrack-nat
>                   extra/tftp-conntrack-nat
> 
> What is wrong?
> 
> 
> Luis Miguel Cruz Miranda.               |       B2B INTEGRAL, S.A.
> CCNA - Systems Administrator            |       Pol. Ind. de Asipo
>                                          |       C/A - Parcela 86-C
> Tel: +34 902 506 605                    |       33.428 - CAYES - LLANERA
> Fax:+34 985 980 794                     |       ASTURIAS (ESPAÑA/SPAIN)


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: can't patch with patch-o-matic

[Luis Miguel Cruz Miranda]

I have patch command installed, the problem is: why I  can't use 
tcp-window-tracking patch?

At 07:32 18/02/2003 +0200, Raymond Leach wrote:
>You are probably missing the patch program.
>
>Do rpm -qa | grep patch
>
>Ray
>
>On Mon, 2003-02-17 at 18:27, Luis Miguel Cruz Miranda wrote:
> > Hi all,
> >
> > I am using patch-o-matic to patch a 2.4.20 kernel but I am having some
> > problems here:
> >
> > For example:
> >
> > Do you want to apply this patch [N/y/t/f/a/r/b/w/v/q/?] y
> > Testing patch extra/tcp-window-tracking.patch...
> >     Placed new Makefile line
> > Failed to patch copy of /usr/src/linux
> > TEST FAILED: patch NOT applied.
> >
> > I want to use that patch but I don't know why I can't.
> > I have these patches applied:
> >
> > Already applied: submitted/01_2.4.19
> >                   submitted/02_2.4.20
> >                   submitted/ipt_multiport-invfix
> >                   submitted/ipt_ULOG-mac_len-fix
> >                   pending/01_ip_conntrack_proto_tcp-lockfix
> >                   pending/02_newnat-udp-helper
> >                   pending/03_REJECT-fwspotting-phrack60-fix
> >                   pending/04_ftp-conntrack-msg-fix
> >                   pending/05_ECN-tcpchecksum-littleendian-fix
> >                   base/fuzzy
> >                   base/iplimit
> >                   base/ipt_unclean-ubit
> >                   base/ipv4options
> >                   base/IPV4OPTSSTRIP
> >                   base/mport
> >                   base/NETLINK
> >                   base/NETMAP
> >                   base/nth
> >                   base/pool
> >                   base/psd
> >                   base/quota
> >                   base/random
> >                   base/realm
> >                   base/SAME
> >                   base/time
> >                   base/TTL
> >                   extra/condition
> >                   extra/CONNMARK
> >                   extra/h323-conntrack-nat
> >                   extra/ip_tables-proc
> >                   extra/ipt_TARPIT
> >                   extra/mms-conntrack-nat
> >                   extra/pptp-conntrack-nat
> >                   extra/recent
> >                   extra/ROUTE
> >                   extra/rsh
> >                   extra/string
> >                   extra/talk-conntrack-nat
> >                   extra/tftp-conntrack-nat
> >
> > What is wrong?
> >
> >
> > Luis Miguel Cruz Miranda.               |       B2B INTEGRAL, S.A.
> > CCNA - Systems Administrator            |       Pol. Ind. de Asipo
> >                                          |       C/A - Parcela 86-C
> > Tel: +34 902 506 605                    |       33.428 - CAYES - LLANERA
> > Fax:+34 985 980 794                     |       ASTURIAS (ESPAÑA/SPAIN)
>

Luis Miguel Cruz Miranda.               |       B2B INTEGRAL, S.A.
CCNA - Systems Administrator            |       Pol. Ind. de Asipo
                                         |       C/A - Parcela 86-C
Tel: +34 902 506 605                    |       33.428 - CAYES - LLANERA
Fax:+34 985 980 794                     |       ASTURIAS (ESPAÑA/SPAIN)

Re: can't patch with patch-o-matic

[Jozsef Kadlecsik]

On Tue, 18 Feb 2003, Luis Miguel Cruz Miranda wrote:

> I have patch command installed, the problem is: why I  can't use
> tcp-window-tracking patch?

Probably because you use an older release. Check out the cvs and apply the
patch from there.

Regards,
Jozsef
-
E-mail  : kadlec@blackhole.kfki.hu, kadlec@sunserv.kfki.hu
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : KFKI Research Institute for Particle and Nuclear Physics
          H-1525 Budapest 114, POB. 49, Hungary

RE: can't patch with patch-o-matic

[Sneppe Filip]

[-- Attachment #1: Type: text/plain, Size: 2280 bytes --]

Hi Luis,

Luis Miguel Cruz Miranda [mailto:luismi@b2bi.es] wrote:
>
>I have patch command installed, the problem is: why I  can't use 
>tcp-window-tracking patch?
>

Because you have already applied what is commonly referred to
(in technical terms) as "a shitload of other netfilter patches".
:-)
Come on, the window tracking patch is quite "intrusive" and touches
a lot of code. You've already included a lot of other netfilter 
patches. Patches are bound to step on each other that way. 

Patch-o-matic is cool in that it handles a lot of this
stuff without problems, but if you are applying too many patches
on top of each other, you should resolve any conflicts yourself...

>
> Already applied: submitted/01_2.4.19
>                   submitted/02_2.4.20
>                   submitted/ipt_multiport-invfix
>                   submitted/ipt_ULOG-mac_len-fix
>                   pending/01_ip_conntrack_proto_tcp-lockfix
>                   pending/02_newnat-udp-helper
>                   pending/03_REJECT-fwspotting-phrack60-fix
>                   pending/04_ftp-conntrack-msg-fix
>                   pending/05_ECN-tcpchecksum-littleendian-fix
>                   base/fuzzy
>                   base/iplimit
>                   base/ipt_unclean-ubit
>                   base/ipv4options
>                   base/IPV4OPTSSTRIP
>                   base/mport
>                   base/NETLINK
>                   base/NETMAP
>                   base/nth
>                   base/pool
>                   base/psd
>                   base/quota
>                   base/random
>                   base/realm
>                   base/SAME
>                   base/time
>                   base/TTL
>                   extra/condition
>                   extra/CONNMARK
>                   extra/h323-conntrack-nat
>                   extra/ip_tables-proc
>                   extra/ipt_TARPIT
>                   extra/mms-conntrack-nat
>                   extra/pptp-conntrack-nat
>                   extra/recent
>                   extra/ROUTE
>                   extra/rsh
>                   extra/string
>                   extra/talk-conntrack-nat
>                   extra/tftp-conntrack-nat

Regards,
Filip

[-- Attachment #2: Type: text/html, Size: 6510 bytes --]

Re: can't patch with patch-o-matic

[Arnt Karlsen]

On Tue, 18 Feb 2003 13:53:15 +0100, 
"Sneppe Filip" <Filip.Sneppe@cronos.be> wrote in message 
<E131E9F1848D0148813EAF06A846608FD7783B@w2ks-e2k.iconos.be>:

> Hi Luis,
> 
> Luis Miguel Cruz Miranda [mailto:luismi@b2bi.es] wrote:
> >
> >I have patch command installed, the problem is: why I  can't use 
> >tcp-window-tracking patch?
> >
> 
> Because you have already applied what is commonly referred to
> (in technical terms) as "a shitload of other netfilter patches".
> :-)
> Come on, the window tracking patch is quite "intrusive" and touches
> a lot of code. You've already included a lot of other netfilter 
> patches. Patches are bound to step on each other that way. 
> 
> Patch-o-matic is cool in that it handles a lot of this
> stuff without problems, but if you are applying too many patches
> on top of each other, you should resolve any conflicts yourself...

..this attitude is not good enough.  As a minimum, all the base patches
should make it into "my" patched kernel, starting from a _clean_ Linus
tree.  The extras etc, should stop and warn that "this" patch does not
"allow" etc "that" patch, "so, you need to choose which you want".  

..preferably, patch-o-matic should also work as good with Red Hat
kernels, up to and including "base", as Red Hat and its derivatives 
are the entry level distros.  From "extra and up", work from the 
vanilla kernel trees.  

..and, I'd like to have Patch-o-matic log what it does, to a file, 
either as the default, or as a suggestion on how to do it from the 
cli, in a readme, as you see, people come here to learn.

> 
> >
> > Already applied: submitted/01_2.4.19
> >                   submitted/02_2.4.20
> >                   submitted/ipt_multiport-invfix
> >                   submitted/ipt_ULOG-mac_len-fix
> >                   pending/01_ip_conntrack_proto_tcp-lockfix
> >                   pending/02_newnat-udp-helper
> >                   pending/03_REJECT-fwspotting-phrack60-fix
> >                   pending/04_ftp-conntrack-msg-fix
> >                   pending/05_ECN-tcpchecksum-littleendian-fix
> >                   base/fuzzy
> >                   base/iplimit
> >                   base/ipt_unclean-ubit
> >                   base/ipv4options
> >                   base/IPV4OPTSSTRIP
> >                   base/mport
> >                   base/NETLINK
> >                   base/NETMAP
> >                   base/nth
> >                   base/pool
> >                   base/psd
> >                   base/quota
> >                   base/random
> >                   base/realm
> >                   base/SAME
> >                   base/time
> >                   base/TTL
> >                   extra/condition
> >                   extra/CONNMARK
> >                   extra/h323-conntrack-nat
> >                   extra/ip_tables-proc
> >                   extra/ipt_TARPIT
> >                   extra/mms-conntrack-nat
> >                   extra/pptp-conntrack-nat
> >                   extra/recent
> >                   extra/ROUTE
> >                   extra/rsh
> >                   extra/string
> >                   extra/talk-conntrack-nat
> >                   extra/tftp-conntrack-nat
> 
> Regards,
> Filip
> 


-- 
..med vennlig hilsen = with Kind Regards from Arnt... ;-)
...with a number of polar bear hunters in his ancestry...
  Scenarios always come in sets of three: 
  best case, worst case, and just in case.

RE: can't patch with patch-o-matic

[Luis Miguel Cruz Miranda]

Ok,

I deleted /usr/src/linux at all.
I use the original 2.4.19 source code and I still can't apply 
tcp-window-tracking patch :(


At 13:53 18/02/2003 +0100, you wrote:

>Hi Luis,
>
>Luis Miguel Cruz Miranda [<mailto:luismi@b2bi.es>mailto:luismi@b2bi.es] wrote:
> >
> >I have patch command installed, the problem is: why I  can't use
> >tcp-window-tracking patch?
> >
>
>Because you have already applied what is commonly referred to
>(in technical terms) as "a shitload of other netfilter patches".
>:-)
>Come on, the window tracking patch is quite "intrusive" and touches
>a lot of code. You've already included a lot of other netfilter
>patches. Patches are bound to step on each other that way.
>
>Patch-o-matic is cool in that it handles a lot of this
>stuff without problems, but if you are applying too many patches
>on top of each other, you should resolve any conflicts yourself...
>
> >
> > Already applied: submitted/01_2.4.19
> >                   submitted/02_2.4.20
> >                   submitted/ipt_multiport-invfix
> >                   submitted/ipt_ULOG-mac_len-fix
> >                   pending/01_ip_conntrack_proto_tcp-lockfix
> >                   pending/02_newnat-udp-helper
> >                   pending/03_REJECT-fwspotting-phrack60-fix
> >                   pending/04_ftp-conntrack-msg-fix
> >                   pending/05_ECN-tcpchecksum-littleendian-fix
> >                   base/fuzzy
> >                   base/iplimit
> >                   base/ipt_unclean-ubit
> >                   base/ipv4options
> >                   base/IPV4OPTSSTRIP
> >                   base/mport
> >                   base/NETLINK
> >                   base/NETMAP
> >                   base/nth
> >                   base/pool
> >                   base/psd
> >                   base/quota
> >                   base/random
> >                   base/realm
> >                   base/SAME
> >                   base/time
> >                   base/TTL
> >                   extra/condition
> >                   extra/CONNMARK
> >                   extra/h323-conntrack-nat
> >                   extra/ip_tables-proc
> >                   extra/ipt_TARPIT
> >                   extra/mms-conntrack-nat
> >                   extra/pptp-conntrack-nat
> >                   extra/recent
> >                   extra/ROUTE
> >                   extra/rsh
> >                   extra/string
> >                   extra/talk-conntrack-nat
> >                   extra/tftp-conntrack-nat
>
>Regards,
>Filip

Luis Miguel Cruz Miranda.               |       B2B INTEGRAL, S.A.
CCNA - Systems Administrator            |       Pol. Ind. de Asipo
                                         |       C/A - Parcela 86-C
Tel: +34 902 506 605                    |       33.428 - CAYES - LLANERA
Fax:+34 985 980 794                     |       ASTURIAS (ESPAÑA/SPAIN)

Re: can't patch with patch-o-matic

[Martin Josefsson]

On Tue, 2003-02-18 at 15:37, Arnt Karlsen wrote:

> > Patch-o-matic is cool in that it handles a lot of this
> > stuff without problems, but if you are applying too many patches
> > on top of each other, you should resolve any conflicts yourself...
> 
> ..this attitude is not good enough.  As a minimum, all the base patches
> should make it into "my" patched kernel, starting from a _clean_ Linus
> tree.  The extras etc, should stop and warn that "this" patch does not
> "allow" etc "that" patch, "so, you need to choose which you want".  

This attitude is perfectly fine, if you don't like it, start running an
OS you can't modify. You find this attitude _everywhere_ in the Linux
community. If you want to be able to do more advanced stuff you will
have to actually learn how to do parts of it yourself.
I can tell you that patch-o-matic already does a lot of things to help
you apply all these patches. With regular patch files you would have to
fix a lot by hand.

Base patches go in without any problems here, it's some of the extra
stuff that's the problem.

If you want that kind of dependency system you will have to fix it
yourself, I don't think any of the developers are interested in building
it.

> ..preferably, patch-o-matic should also work as good with Red Hat
> kernels, up to and including "base", as Red Hat and its derivatives 
> are the entry level distros.  From "extra and up", work from the 
> vanilla kernel trees.  

This you would definately have to fix yourself. Do you have any idea
what vendor kernels include? They include several hundred patches.

> ..and, I'd like to have Patch-o-matic log what it does, to a file, 
> either as the default, or as a suggestion on how to do it from the 
> cli, in a readme, as you see, people come here to learn.

We live in a do it yourself world, you can't rely on other people
building the stuff you want. If you want to see it built you will
probably have to build it yourself.

If you modify patch-o-matic to do this stuff we will review the changes
and either accept (possibly after some modifications) or reject them.

-- 
/Martin

Never argue with an idiot. They drag you down to their level, then beat you with experience.

RE: can't patch with patch-o-matic

[Jozsef Kadlecsik]

On Tue, 18 Feb 2003, Luis Miguel Cruz Miranda wrote:

> I deleted /usr/src/linux at all.
> I use the original 2.4.19 source code and I still can't apply
> tcp-window-tracking patch :(

The most recent tcp-window-tracking patch from cvs works with 2.4.20.
It requires all the submitted and pending patches.

Regards,
Jozsef
-
E-mail  : kadlec@blackhole.kfki.hu, kadlec@sunserv.kfki.hu
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : KFKI Research Institute for Particle and Nuclear Physics
          H-1525 Budapest 114, POB. 49, Hungary

Re: can't patch with patch-o-matic

[Arnt Karlsen]

On 18 Feb 2003 16:45:35 +0100, Martin Josefsson 
<gandalf@wlug.westbo.se> posted, and _mailed_too_, in 
message: <1045583134.18515.159.camel@tux.rsn.bth.se>:

> On Tue, 2003-02-18 at 15:37, Arnt Karlsen wrote:
> 
> > > Patch-o-matic is cool in that it handles a lot of this
> > > stuff without problems, but if you are applying too many patches
> > > on top of each other, you should resolve any conflicts yourself...
> > 
> > ..this attitude is not good enough.  As a minimum, all the base
> > patches should make it into "my" patched kernel, starting from a
> > _clean_ Linus tree.  The extras etc, should stop and warn that
> > "this" patch does not"allow" etc "that" patch, "so, you need to
> > choose which you want".  
> 
> This attitude is perfectly fine, if you don't like it, start running
> an OS you can't modify. You find this attitude _everywhere_ in the

..we disagree.  Now, note I said "my" etc.  This attitude has the
wee problem it makes patch testing a little harder for the newbies,
because the newbies never learns how they can report back new 
failures, which the attitude guys hasn't been been smart enough to
prevent.  This again has ramifications on development.  Your call.

> Linux community. If you want to be able to do more advanced stuff you
> will have to actually learn how to do parts of it yourself.

..noted.  ;-)

> I can tell you that patch-o-matic already does a lot of things to help
> you apply all these patches. With regular patch files you would have
> to fix a lot by hand.

..this far, I have learned "regular patching" may be slower, but less
trouble.

> Base patches go in without any problems here, it's some of the extra
> stuff that's the problem.

..agreed, I've also seen a few base patches fail on Red Hat trees.
 
> If you want that kind of dependency system you will have to fix it
> yourself, I don't think any of the developers are interested in
> building it.

..I'll consider it next time I have a good slack in my schedule.
 
> > ..preferably, patch-o-matic should also work as good with Red Hat
> > kernels, up to and including "base", as Red Hat and its derivatives 
> > are the entry level distros.  From "extra and up", work from the 
> > vanilla kernel trees.  
> 
> This you would definately have to fix yourself. Do you have any idea
> what vendor kernels include? They include several hundred patches.

..possibly, chk any kernel source srpm. 

> > ..and, I'd like to have Patch-o-matic log what it does, to a file, 
> > either as the default, or as a suggestion on how to do it from the 
> > cli, in a readme, as you see, people come here to learn.
> 
> We live in a do it yourself world, you can't rely on other people
> building the stuff you want. If you want to see it built you will
> probably have to build it yourself.

..agreed.  Meanwhile, the Patch-o-matic readme might be made more 
useful for newbies after including a pointer to these wee '2>&1 >' 
tricks in, say, the abs-guide, unless it hurts someone attitude 
toe or something.  Newbies who use patch-o-matic are smart enough 
to read and be made useful testing stuff for development.

> If you modify patch-o-matic to do this stuff we will review the
> changes and either accept (possibly after some modifications) or
> reject them.
> 

..ok.

-- 
..med vennlig hilsen = with Kind Regards from Arnt... ;-)
...with a number of polar bear hunters in his ancestry...
  Scenarios always come in sets of three: 
  best case, worst case, and just in case.

Re: can't patch with patch-o-matic

[Fabrice MARIE]

Hello,

On Wednesday 19 February 2003 04:01, Arnt Karlsen wrote:
> > [...]
> ..we disagree.  Now, note I said "my" etc.  This attitude has the
> wee problem it makes patch testing a little harder for the newbies,
> because the newbies never learns how they can report back new
> failures, which the attitude guys hasn't been been smart enough to
> prevent.  This again has ramifications on development.  Your call.

Don't get us wrong, but I thought we wrote already _a lot_ of documentation
that help people go through the installation of patches from patch-o-matic.

For instance, you have a README files distributed with patch-o-matic,
you have the excelent iptables tutorial written by Oskar Andreasson and contributors,
you have the netfilter-extensions-HOWTO on netfilter web site in the documentation
part, there are probably other documents, and of course, you have the source code ! :)

We don't mean to discourage newbies at all. hey, everybody started a newbie. I just
wish sometimes they would try harder before complaining. As Martin explained, patch-o-matic
makes it as easy as it can get to apply patches. We can hardly do better.
Finally (but please don't be discouraged nor offensed, that the way to learn), tcp-window-tracking
is not really for newbies as half of the patches in extra/,
you most probably don't need that if you just toy around. Instead, I recommend you to
work with patches in base/ as they are easier to deal with.

> > [...]
> > We live in a do it yourself world, you can't rely on other people
> > building the stuff you want. If you want to see it built you will
> > probably have to build it yourself.
> ..agreed.  Meanwhile, the Patch-o-matic readme might be made more
> useful for newbies after including a pointer to these wee '2>&1 >'
> tricks in, say, the abs-guide, unless it hurts someone attitude
> toe or something.  Newbies who use patch-o-matic are smart enough
> to read and be made useful testing stuff for development.

As I said earlier, I believe there's plenty of docs on p-o-m out there.
But of course, if any of them if not complete enough, patches to the
documentation are welcome :)

Have a nice day,

Fabrice.
--
Fabrice MARIE

"Silly hacker, root is for administrators"
       -Unknown