From: Herbert Poetzl (herbert_at_13thfloor.at)
Date: Sun 22 Dec 2002 - 07:58:56 GMT
On Sun, Dec 22, 2002 at 06:02:01PM +1100, edward_at_DigitalAngel.com.au wrote:
> You can tell patch to ignore whitespace only ( empty lines etc.. ) changes
> with an '-l' switch:
yeah, but that does not help with leading/trailing
empty lines ...
best,
Herbert
> e.g.
>
> # patch -lp1 <patchctx16
>
>
> hth
> Ed
>
>
> On Sunday, 22 December 2002 at 7:22, Herbert Poetzl wrote:
> > On Sat, Dec 21, 2002 at 11:02:40PM -0500, tedsuo wrote:
> > >
> > > After the 2.4.19ctx15 patch i apply your patch
> > >
> > > deb:/usr/src/linux-2.4.19# patch -p1 <patchctx16
> > > patching file Makefile
> > > patching file include/net/route.h
> > > Hunk #1 FAILED at 164.
> > > 1 out of 1 hunk FAILED -- saving rejects to file include/net/route.h.rej
> > >
> > > is this normal ??
> >
> > no, this is not normal, this shows that either
> > your mailer broke my patch, or, what I assume
> > that you broke my patch, by adding empty lines
> > at the end (or something similar ...)
> >
> > *sigh* get the complete patch for 2.4.19 from
> > http://www.13thfloor.at/VServer/patch-2.4.19-ctx16.diff.bz2
> >
> > best,
> > Herbert
> >
> > > >
> > > > > >
> > > > > > any way to get ctx16 patch for linux 2.4.19 kernel??
> > > > >
> > > > > here is your patch ... (everithing except whitespace)
> > > > > apply it after the 2.4.19ctx15 patch ...
> > > > >
> > > > > best,
> > > > > Herbert
> > > > >
> > > > > --- cut here ---
> > > > > diff -NurbP --minimal linux-2.4.20-ctx15/Makefile
> > > > linux-2.4.20-ctx16/Makefile
> > > > > --- linux-2.4.20-ctx15/Makefile Mon Dec 16 19:54:35 2002
> > > > > +++ linux-2.4.20-ctx16/Makefile Mon Dec 16 19:52:25 2002
> > > > > @@ -1,7 +1,7 @@
> > > > > VERSION = 2
> > > > > PATCHLEVEL = 4
> > > > > SUBLEVEL = 19
> > > > > -EXTRAVERSION =ctx-15
> > > > > +EXTRAVERSION =ctx-16
> > > > >
> > > > > KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
> > > > >
> > > > > diff -NurbP --minimal linux-2.4.20-ctx15/include/net/route.h
> > > > linux-2.4.20-ctx16/include/net/route.h
> > > > > --- linux-2.4.20-ctx15/include/net/route.h Mon Dec 16 19:54:36 2002
> > > > > +++ linux-2.4.20-ctx16/include/net/route.h Mon Dec 16 19:52:25 2002
> > > > > @@ -164,14 +164,20 @@
> > > > > static inline int ip_route_connect(struct rtable **rp, u32 dst, u32
> > > src,
> > > > u32 tos, int oif)
> > > > > {
> > > > > int err;
> > > > > - if (current->ip_info != NULL){
> > > > > - __u32 ipv4root = current->ip_info->ipv4[0];
> > > > > + struct iproot_info *ip_info = current->ip_info;
> > > > > + if (ip_info != NULL){
> > > > > + __u32 ipv4root = ip_info->ipv4[0];
> > > > > if (ipv4root != 0){
> > > > > if (src == 0){
> > > > > src = dst == 0x0100007f
> > > > > ? 0x0100007f: ipv4root;
> > > > > - }else if (ipv4root != src){
> > > > > - return -EPERM;
> > > > > + }else{
> > > > > + int n=ip_info->nbipv4;
> > > > > + int i;
> > > > > + for (i=0; i<n; i++){
> > > > > + if (ip_info->ipv4[i] == src) break;
> > > > > + }
> > > > > + if (i==n) return -EPERM;
> > > > > }
> > > > > if (dst == 0x0100007f && current->s_context != 0){
> > > > > dst = ipv4root;
> > > > >
> > > >
> >
>