From owner-freebsd-isdn  Tue Mar  7 23:10:39 2000
Delivered-To: freebsd-isdn@freebsd.org
Received: from nets5.rz.rwth-aachen.de (nets5.rz.RWTH-Aachen.DE [137.226.144.13])
	by hub.freebsd.org (Postfix) with ESMTP id DF3B337BE9F
	for <freebsd-isdn@FreeBSD.ORG>; Tue,  7 Mar 2000 23:10:36 -0800 (PST)
	(envelope-from kuku@gilberto.physik.RWTH-Aachen.DE)
Received: from campino.informatik.rwth-aachen.de (campino.Informatik.RWTH-Aachen.DE [137.226.116.240])
	by nets5.rz.rwth-aachen.de (8.9.1a/8.9.1/10) with ESMTP id IAA05047;
	Wed, 8 Mar 2000 08:10:34 +0100 (MET)
Received: from gil.physik.rwth-aachen.de (gilberto.physik.rwth-aachen.de [137.226.30.2])
	by campino.informatik.rwth-aachen.de (8.9.1a/8.9.1/3) with ESMTP id IAA15787;
	Wed, 8 Mar 2000 08:11:21 +0100 (MET)
Received: (from kuku@localhost) by gil.physik.rwth-aachen.de (8.9.3/8.6.9) id IAA89019; Wed, 8 Mar 2000 08:10:36 +0100 (CET)
Date: Wed, 8 Mar 2000 08:10:36 +0100
From: Christoph Kukulies <kuku@gilberto.physik.RWTH-Aachen.DE>
To: Gary Jennejohn <garyj@muc.de>
Cc: freebsd-isdn@FreeBSD.ORG
Subject: Re: sPPP and PPP keepalives
Message-ID: <20000308081036.A88994@gil.physik.rwth-aachen.de>
References: <200003072222.XAA17816@peedub.muc.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Mailer: Mutt 1.0i
In-Reply-To: <200003072222.XAA17816@peedub.muc.de>; from garyj@muc.de on Tue, Mar 07, 2000 at 11:22:09PM +0100
Sender: owner-freebsd-isdn@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

On Tue, Mar 07, 2000 at 11:22:09PM +0100, Gary Jennejohn wrote:
> 
> Just uudecode and apply the patch to a clean 0.90 release tree.

The patch was a bit strange to apply (maybe it's a different structure
in 4.0-current). The diffs seemed top refer files in ./sppp/
that were in /usr/src/sys/net, like:

/usr/src/sys/i4b>  patch -p </home/kuku/sppptimeoutdiff
Hmm...  Looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** ./driver/i4b_isppp.c.orig  Sat Jul 24 15:21:42 1999
|--- ./driver/i4b_isppp.c       Wed Mar  1 09:56:55 2000
--------------------------
Patching file ./driver/i4b_isppp.c using Plan A...
Hunk #1 succeeded at 202 (offset 2 lines).
Hunk #2 succeeded at 558 (offset 2 lines).
Hunk #3 succeeded at 699 (offset 2 lines).
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** ./layer4/i4b_l4.c.orig     Tue Dec  7 10:58:56 1999
|--- ./layer4/i4b_l4.c  Wed Mar  1 10:20:38 2000
--------------------------
Patching file ./layer4/i4b_l4.c using Plan A...
Hunk #1 succeeded at 94 (offset 2 lines).
Hunk #2 succeeded at 767 (offset 2 lines).
Hunk #3 succeeded at 926 (offset 2 lines).
Hunk #4 succeeded at 935 (offset 2 lines).
Hunk #5 succeeded at 978 (offset 2 lines).
Hunk #6 succeeded at 987 (offset 2 lines).
Hunk #7 succeeded at 1017 (offset 2 lines).
Hunk #8 succeeded at 1026 (offset 2 lines).
Hunk #9 succeeded at 1075 (offset 2 lines).
Hunk #10 succeeded at 1084 (offset 2 lines).
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** ./sppp/spppcontrol/spppcontrol.c.orig      Thu Dec  9 20:50:49 1999
|--- ./sppp/spppcontrol/spppcontrol.c   Wed Mar  1 11:14:04 2000
--------------------------
File to patch: /usr/src/sbin/spppcontrol/spppcontrol.c
Patching file /usr/src/sbin/spppcontrol/spppcontrol.c using Plan A...
Hunk #1 succeeded at 189 (offset -31 lines).
Hunk #2 succeeded at 201 (offset -31 lines).
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** ./sppp/if_sppp.h.orig      Sat Oct  2 16:33:18 1999
|--- ./sppp/if_sppp.h   Wed Mar  1 09:22:05 2000
--------------------------
File to patch: /usr/src/sbin/spppcontrol/if_sppp.h
No file found--skip this patch? [n] n
File to patch: /usr/src/sys/net/if_sppp.h
Patching file /usr/src/sys/net/if_sppp.h using Plan A...
Hunk #1 succeeded at 89 (offset -5 lines).
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** ./sppp/if_spppsubr.c.orig  Sun Oct  3 19:43:38 1999
|--- ./sppp/if_spppsubr.c       Wed Mar  1 09:22:14 2000
--------------------------
File to patch: /usr/src/sys/net/if_spppsubr.c
Patching file /usr/src/sys/net/if_spppsubr.c using Plan A...
Hunk #1 succeeded at 604 (offset -61 lines).
Hunk #2 succeeded at 845 (offset -33 lines).
Hunk #3 succeeded at 852 with fuzz 2 (offset -71 lines).
done
/usr/src/sys/i4b>

-- 
Chris Christoph P. U. Kukulies kuku@gil.physik.rwth-aachen.de


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-isdn" in the body of the message