did the following: after navigating to: http://openbsd.org/anoncvs.html#starting
applied: # *cd /usr; cvs checkout -P -rOPENBSD_4_7 src* using *[email protected]:/cvs* Then downloaded: ftp://ftp.openbsd.org/pub/OpenBSD/patches/4.7.tar.gz and applied: cd /usr/src patch -p0 < 001_kerberos.patch as referred in: ftp://ftp.openbsd.org/pub/OpenBSD/patches/4.7/common/001_kerberos.patch Thanks Tony On Sat, Jun 19, 2010 at 6:40 AM, Nick Holland <[email protected]>wrote: > On 06/18/10 09:42, Tony Berth wrote: > > when trying to patch a new i386 installation with the first patch I get > the > > following: > ... > > Patching file kerberosV/src/lib/krb5/crypto.c using Plan A... > > Hunk #1 succeeded at 3463 (offset 12 lines). > > Hunk #2 failed at 3543. > > Hunk #3 succeeded at 3607 (offset 7 lines). > > 1 out of 3 hunks failed--saving rejects to > > kerberosV/src/lib/krb5/crypto.c.rej > > done > > you did something wrong. > You didn't tell us what you did, so that's the most I can^Wwill say. > For giggles, I just tested it against the 4.7 source, and (surprise!) > it worked just fine. > > So, start with faq5, starting at the top, and work your way through at > least to 5.4 (10.15 would be a good read after 5.1-5.4) and see if you > can find what variation from the proper process that you felt was > harmless or what command you typed in blindly without understanding > what it meant and how it interacted with other things. > > (and yes, I have a pretty good idea what you did, and understanding > faq5.html will set you straight. Assuming you can pick and chose > which parts you read is how you got in trouble. It is a dense read, > but pretty important to understanding what you were trying to do here. > It is worth the time to understand...) > > Nick. > > /nfs1/test $ patch -p0 <001_kerberos.patch > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Apply by doing: > | cd /usr/src > | patch -p0 < 001_kerberos.patch > | > |Rebuild and install the Kerberos 5 library: > | cd lib/libkrb5 > | make obj > | make depend > | make > | make install > | > |And then rebuild and install the Kerberos 5 KDC: > | cd ../../kerberosV/libexec/kdc > | make obj > | make depend > | make > | make install > | > | > |Index: kerberosV/src/lib/krb5/crypto.c > |=================================================================== > |RCS file: /cvs/src/kerberosV/src/lib/krb5/crypto.c,v > |retrieving revision 1.10 > |diff -p -u -p -u -r1.10 crypto.c > |--- kerberosV/src/lib/krb5/crypto.c 6 Oct 2006 07:09:10 -0000 > 1.10 > |+++ kerberosV/src/lib/krb5/crypto.c 30 Mar 2010 17:17:43 -0000 > -------------------------- > Patching file kerberosV/src/lib/krb5/crypto.c using Plan A... > Hunk #1 succeeded at 3451. > Hunk #2 succeeded at 3531. > Hunk #3 succeeded at 3600. > done
