Date: Fri, 17 Jun 2005 17:19:09 +0100 From: Cian Hughes <cianlists@cian.ws> To: Johannes Ton <punky@gmx.ch>, freebsd-isdn@freebsd.org Subject: Re: C4B Patching Problem Message-ID: <A9B18A12-427C-496C-B6EA-58817FA87DA5@cian.ws> In-Reply-To: <6610579449.20050617135553@gmx.ch> References: <6610579449.20050617135553@gmx.ch>
next in thread | previous in thread | raw e-mail | index | archive | help
C4B is a bit wierd at the moment as far a patching is concerned, are you sure you are patching 5.3-Release src and have never run cvsup, you could also try patching 5.4-Release, which definitely works, I'm trying to patch FreeBSD-Current at the moment, i'll let you know how that goes. Cian Hughes cianlists@cian.ws On 17 Jun 2005, at 12:55, Johannes Ton wrote: > Hi List, > > I have a strange problem with the patch for controller.c under > usr.sbin/i4b. > > The output of the do-patch script: > > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |--- controller.c.orgig Sat Dec 22 10:38:24 2001 > |+++ controller.c Wed Mar 23 22:51:03 2005 > -------------------------- > Patching file controller.c using Plan A... > Hunk #1 failed at 95. > Hunk #2 failed at 121. > Hunk #3 failed at 218. > 3 out of 3 hunks failed--saving rejects to controller.c.rej > > - C4B V. 1.0 > - FreeBSD 5.3 Release > > I refetched controller.c and the whole c4b package, but the same > problem. > > If I try to patch the file direkt: > > diabolo# patch < patch-usr.sbin-i4b-isdnd > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |--- usr.sbin/i4b/isdnd/controller.c.org.c4b Sat Dec 22 10:38:24 > 2001 > |+++ usr.sbin/i4b/isdnd/controller.c Wed Mar 23 22:51:03 2005 > -------------------------- > File to patch: /usr/src/usr.sbin/i4b/isdnd/controller.c > Patching file /usr/src/usr.sbin/i4b/isdnd/controller.c using Plan A... > Hunk #1 failed at 95. > Hunk #2 failed at 121. > Hunk #3 failed at 218. > 3 out of 3 hunks failed--saving rejects to /usr/src/usr.sbin/i4b/ > isdnd/controller.c.rej > > Any ideas? > Or does the problem sit in front of my pc? > > Thanks in advance, > Johannes > > > > _______________________________________________ > freebsd-isdn@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-isdn > To unsubscribe, send any mail to "freebsd-isdn- > unsubscribe@freebsd.org" >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?A9B18A12-427C-496C-B6EA-58817FA87DA5>