From owner-freebsd-isdn@FreeBSD.ORG Sat Jun 18 08:28:09 2005 Return-Path: X-Original-To: freebsd-isdn@freebsd.org Delivered-To: freebsd-isdn@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BE89216A41C for ; Sat, 18 Jun 2005 08:28:09 +0000 (GMT) (envelope-from Thomas.Wintergerst@nord-com.net) Received: from mail4.ewetel.de (mail4.ewetel.de [212.6.122.28]) by mx1.FreeBSD.org (Postfix) with ESMTP id 478D743D1D for ; Sat, 18 Jun 2005 08:28:08 +0000 (GMT) (envelope-from Thomas.Wintergerst@nord-com.net) Received: from kalak.lemur.nord.de (dialin-80-228-48-093.ewe-ip-backbone.de [80.228.48.93]) by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id j5I8S3uh020706; Sat, 18 Jun 2005 10:28:06 +0200 (MEST) Received: from [192.168.2.4] (lullog.lemur.nord.de [192.168.2.4]) by kalak.lemur.nord.de (8.12.3/8.12.3) with ESMTP id j5I8PKF8023328; Sat, 18 Jun 2005 10:25:29 +0200 (CEST) (envelope-from Thomas.Wintergerst@nord-com.net) Message-ID: <42B3DA70.50100@nord-com.net> Date: Sat, 18 Jun 2005 10:25:20 +0200 From: Thomas Wintergerst User-Agent: Mozilla Thunderbird 0.9 (X11/20041220) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Johannes Ton References: <6610579449.20050617135553@gmx.ch> In-Reply-To: <6610579449.20050617135553@gmx.ch> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-CheckCompat: OK Cc: freebsd-isdn Subject: Re: C4B Patching Problem X-BeenThere: freebsd-isdn@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: twinterg@gmx.de List-Id: Using ISDN with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jun 2005 08:28:09 -0000 Hi Johannes, AFAIK the i4b user tools did not change at least since 5.2 regarding the sources that must be patched for c4b. This is also true for 5.4-RELEASE. So I can only assume you are not running 5.3-RELEASE any more. If you send me "your" version of control.c I will try to change it for you. 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" > -- Gruss, Thomas Wintergerst