Oddly, it looks like the changes were made(!?) It might be, having read Tony's reply, that it's because I applied the uk cli patches from Tony and yourself to the stable rather than head branches?
I'll try compiling and let you know..... Cheers for now, Karl > -----Original Message----- > From: [EMAIL PROTECTED] [mailto:asterisk-users- > [EMAIL PROTECTED] On Behalf Of Kevin Walsh > Sent: 28 May 2004 12:07 > To: [EMAIL PROTECTED] > Subject: RE: [Asterisk-Users] Caller ID with BT CD50 > > Karl Dyson [EMAIL PROTECTED] wrote: > > Just checked out asterisk stable and zaptel, patched using Tony's > > patches (which worked, and compiled previously) > > > > Then got this when applying your patch. > > > > bash # cat ../chan_zap.c.diff | patch -p0 > > patching file channels/chan_zap.c > > Hunk #1 succeeded at 4642 (offset -148 lines). > > Hunk #2 FAILED at 4681. > > 1 out of 2 hunks FAILED -- saving rejects to file > > channels/chan_zap.c.rej > > bash # > > > Could you try applying the changes by hand. There are only two lines > to change and it looks as if the first one went through. I'll check > my patch to see if I messed up the original or something silly. > > -- > _/ _/ _/_/_/_/ _/ _/ _/_/_/ _/ _/ > _/_/_/ _/_/ _/ _/ _/ _/_/ _/ K e v i n W a l s h > _/ _/ _/ _/ _/ _/ _/ _/_/ [EMAIL PROTECTED] > _/ _/ _/_/_/_/ _/ _/_/_/ _/ _/ > > _______________________________________________ > Asterisk-Users mailing list > [EMAIL PROTECTED] > http://lists.digium.com/mailman/listinfo/asterisk-users > To UNSUBSCRIBE or update options visit: > http://lists.digium.com/mailman/listinfo/asterisk-users > > ________________________________________________________________________ > This e-mail has been scanned for all viruses by Star Internet. The > service is powered by MessageLabs. For more information on a proactive > anti-virus service working around the clock, around the globe, visit: > http://www.star.net.uk > ________________________________________________________________________ ________________________________________________________________________ This e-mail has been scanned for all viruses by Star Internet. The service is powered by MessageLabs. For more information on a proactive anti-virus service working around the clock, around the globe, visit: http://www.star.net.uk ________________________________________________________________________ _______________________________________________ Asterisk-Users mailing list [EMAIL PROTECTED] http://lists.digium.com/mailman/listinfo/asterisk-users To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-users