Re: probs applying gre.patch on FreeBSD 3.4

Hi,

    This its the secction of the gre.patch file that applies to options file
in "/usr/src/conf" directory:

Index: conf/options
===================================================================
RCS file: /usr/local/FreeBSD/ncvs/src/sys/conf/options,v
retrieving revision 1.121.2.1
diff -c -r1.121.2.1 options
*** options 1999/02/08 19:05:55 1.121.2.1
--- options 1999/06/07 20:20:42
***************
*** 197,202 ****
--- 197,203 ----
  IPFIREWALL_VERBOSE_LIMIT opt_ipfw.h
  IPFIREWALL_DEFAULT_TO_ACCEPT opt_ipfw.h
  IPFIREWALL_FORWARD opt_ipfw.h
+ GRE opt_gre.h
  IPX opt_ipx.h
  IPXIP opt_ipx.h
  IPTUNNEL opt_ipx.h

The "+" sign means add this line betwen the "IPFIREWALL_FORWARD
opt_ipfw.h" line and the " IPX opt_ipx.h" line.
But the options file in FreeBSD 3.4, doesnt come exacly like this, it has
one more line in it that reads:
IPSTEALTH just where the GRE opt_gre.h line should be.

Just add the "GRE opt_gre.h" line manually to the "options" file, or add
the IPSTEALTH line to the patch and try again, the resulting section of the
"options" file should look like this:
...
...
...
IPFIREWALL_VERBOSE_LIMIT opt_ipfw.h
IPFIREWALL_DEFAULT_TO_ACCEPT opt_ipfw.h
IPFIREWALL_FORWARD opt_ipfw.h
IPSTEALTH
GRE opt_gre.h
IPX opt_ipx.h
IPXIP opt_ipx.h
IPTUNNEL opt_ipx.h
...
...
...

And you are done with the patches, I think also that others sections of the
gre.patch file doesnt really get applyed automatically, you should then
divide the file, and apply one by one of the patches to the corresponding
files, or fix the routes
 in the gre.patch file, to match the real ones.

Have Fun...
Ales

----- Original Message -----
From: "Ahsan Khan" <ahsank@one.net.pk>
To: "Veaceslav Revutchi" <slava@dnt.md>; <squid-users@ircache.net>
Sent: Tuesday, May 02, 2000 11:35 AM
Subject: Re: probs applying gre.patch on FreeBSD 3.4

> I believe Daun Wessel is Running squid on Free Bsd so where is Guru .??
>
>
> With Regards
> Ahsan Khan
> Sr. System Admin
> Internet Division (OneNet)
> Sun Communication Pvt. Ltd.
> Pakistan
> http://www.one.net.pk
>
>
> ----- Original Message -----
> From: "Veaceslav Revutchi" <slava@dnt.md>
> To: <squid-users@ircache.net>
> Sent: Tuesday, May 02, 2000 8:45 PM
> Subject: probs applying gre.patch on FreeBSD 3.4
>
>
> >
> > Hello,
> >
> > has anyone been able to succesfully apply the gre.patch on FreeBSD
> > 3.4RELEASE.
> >
> > It fails patching the /sys/conf/options file:
> >
> > # patch -p0 < gre.patch
> >
> > Hmm... The next patch looks like a new-style context diff to me...
> > The text leading up to this was:
> > --------------------------
> > |Index: conf/options
> > |===================================================================
> > |RCS file: /usr/local/FreeBSD/ncvs/src/sys/conf/options,v
> > |retrieving revision 1.121.2.1
> > |diff -c -r1.121.2.1 options
> > |*** options 1999/02/08 19:05:55 1.121.2.1
> > |--- options 1999/06/07 20:20:42
> > --------------------------
> > File to patch: /usr/src/sys/conf/options
> > Patching file /usr/src/sys/conf/options using Plan A...
> > Hunk #1 failed at 197.
> > 1 out of 1 hunks failed--saving rejects to /usr/src/sys/conf/options.rej
> > _____________________________
> >
> > Any advice appreciated.
> >
> > Veaceslav
> > vr@dnt.md
> >
> >
> >
> >
Received on Mon May 08 2000 - 16:59:08 MDT