From owner-FreeBSD-users-jp@jp.freebsd.org  Sat Jul 26 23:08:48 1997
Received: by jaz.jp.freebsd.org (8.8.6+2.7Wbeta5/8.7.3) id XAA23257
	Sat, 26 Jul 1997 23:08:48 +0900 (JST)
Received: by jaz.jp.freebsd.org (8.8.6+2.7Wbeta5/8.7.3) with ESMTP id XAA23252
	for <FreeBSD-users-jp@jp.freebsd.org>; Sat, 26 Jul 1997 23:08:44 +0900 (JST)
Received: from metro.f1.mynet.jp (localhost.f1.mynet.jp [127.0.0.1])
	by metro.f1.mynet.jp (8.8.5/8.8.5) with ESMTP id XAA00225
	for <FreeBSD-users-jp@jp.freebsd.org>; Sat, 26 Jul 1997 23:10:05 +0900 (JST)
Message-Id: <199707261410.XAA00225@metro.f1.mynet.jp>
To: FreeBSD-users-jp@jp.freebsd.org
Date: Sat, 26 Jul 1997 23:10:02 +0900
From: Charlie & <root@metro.f1.mynet.jp>
Reply-To: FreeBSD-users-jp@jp.freebsd.org
Precedence: bulk
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=20]
X-Sequence: FreeBSD-users-jp 16404
Subject: [FreeBSD-users-jp 16404] ppp+nat patch
Errors-To: owner-FreeBSD-users-jp@jp.freebsd.org
Sender: owner-FreeBSD-users-jp@jp.freebsd.org

$B$O$8$a$^$7$F!"LpEg!w%j%`%M%C%H$H?=$7$^$9!#(B
FreeBSD$B$H$D$-9g$$$@$7$F$+$i#4%+7n$"$^$j7P$C$F$$$k$K$b4X$o$i$:!"(B
$BMM!9$J5!G=$r;H$$$3$J$;$kA0$K%P!<%8%g%s%"%C%W$r7+$jJV$7$F$$$k$?$a(B
$BL$$@$K=i?4<T>uBV$G$9$,!"2?$H$+$b$N$K$7$F$$$-$?$$$H9M$($F$*$j$^$9(B
$B$N$G$h$m$7$/$*4j$$CW$7$^$9!#(B

$B$5$FAaB.$G$9$,!"(Bppp+NAT$B$N%Q%C%A$rEv$F$k:n6H$,$&$^$/9T$+$:!":$$C$F$*$j$^$9!#(B
FreeBSD$BE0DlF~Lg$KImB0$N(BCD-ROM$B$+$i%$%s%9%H!<%k$7$?(BFreeBSD2.2.1-RELEASE
$B$N(Bppp$B%=!<%9%U%!%$%k$r(B /usr/local/ppp+nat/ppp $B$K%3%T!<$7!"$=$3$K:4F#(Bjunichi$B;a(B
$B$N(B2.2.1$BMQ%Q%C%A%U%!%$%k(B nat-970607.patch $B$r0J2<$N$h$&$KEv$F$h$&$H$7$^$7$?(B
$B$,!"$$$/$D$+$N%U%!%$%k$G!V(Blooks like new-style context diff to me ...$B!W$H(B
$B$$$&%a%C%;!<%8$H!V(Bfailed $B%(%i!<!W%a%C%;!<%8$r3NG'$7!"L@$i$+$K%Q%C%A$rEv$F$k(B
$B$3$H$K<:GT$7$F$$$kMM;R$G$9!#(B

# cd /usr/local/src/ppp+nat/ppp
# patch -p1 < ../nat-970607.patch
Hmm...  Looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|diff -c -N -r ppp-221R.org/Makefile ppp/Makefile
|*** ppp-221R.org/Makefile       Sun Feb 23 02:59:04 1997
|--- ppp/Makefile        Sat Mar 29 01:44:00 1997
--------------------------
Patching file Makefile using Plan A...
Hunk #1 failed at 5.
1 out of 1 hunks failed--saving rejects to Makefile.rej
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|diff -c -N -r ppp-221R.org/command.c ppp/command.c
|*** ppp-221R.org/command.c      Mon Feb  3 04:14:08 1997
|--- ppp/command.c       Sat Mar 29 01:44:00 1997
--------------------------
Patching file command.c using Plan A...
Hunk #1 succeeded at 847.
Hunk #2 failed at 1061.
1 out of 2 hunks failed--saving rejects to command.c.rej
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|diff -c -N -r ppp-221R.org/filter.c ppp/filter.c
|*** ppp-221R.org/filter.c       Thu Jan 11 06:27:43 1996
|--- ppp/filter.c        Sat Mar 29 23:14:50 1997
--------------------------
Patching file filter.c using Plan A...
Hunk #1 succeeded at 206.
Hunk #2 succeeded at 232.
Hunk #3 succeeded at 363.
Hunk #4 failed at 454.
1 out of 4 hunks failed--saving rejects to filter.c.rej
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|diff -c -N -r ppp-221R.org/filter.h ppp/filter.h
|*** ppp-221R.org/filter.h       Fri Jan 12 02:48:43 1996
|--- ppp/filter.h        Sat Mar 29 01:53:43 1997
--------------------------
Patching file filter.h using Plan A...
Hunk #1 succeeded at 65.
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|diff -c -N -r ppp-221R.org/ip.c ppp/ip.c
|*** ppp-221R.org/ip.c   Tue Dec 24 03:13:32 1996
|--- ppp/ip.c    Sun Apr  6 20:48:07 1997
--------------------------
Patching file ip.c using Plan A...
Hunk #1 succeeded at 38.
Hunk #2 succeeded at 124.
Hunk #3 succeeded at 132.
Hunk #4 failed at 153.
Hunk #5 succeeded at 176 with fuzz 2.
Hunk #6 failed at 192.
Hunk #7 succeeded at 330.
Hunk #8 succeeded at 341.
2 out of 8 hunks failed--saving rejects to ip.c.rej
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|diff -c -N -r ppp-221R.org/ipcp.c ppp/ipcp.c
|*** ppp-221R.org/ipcp.c Mon Jan 13 06:52:47 1997
|--- ppp/ipcp.c  Sat Mar 29 01:44:00 1997
--------------------------
Patching file ipcp.c using Plan A...
Hunk #1 succeeded at 43.
Hunk #2 succeeded at 155 with fuzz 1.
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|diff -c -N -r ppp-221R.org/ipcp.h ppp/ipcp.h
|*** ppp-221R.org/ipcp.h Sun Oct  6 22:32:29 1996
|--- ppp/ipcp.h  Sat Mar 29 01:44:01 1997
--------------------------
Patching file ipcp.h using Plan A...
Hunk #1 succeeded at 68.
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|diff -c -N -r ppp-221R.org/main.c ppp/main.c
|*** ppp-221R.org/main.c Sat Mar 15 19:44:22 1997
|--- ppp/main.c  Sat Jun  7 23:17:06 1997
--------------------------
Patching file main.c using Plan A...
Hunk #1 succeeded at 23 with fuzz 2.
Hunk #2 succeeded at 86.
Hunk #3 succeeded at 102
Hunk #4 succeeded at 121.
Hunk #5 succeeded at 135.
Hunk #6 failed at 355.
Hunk #7 succeeded at 767.
Hunk #8 failed at 1086.
Hunk #9 succeeded at 1122.
Hunk #10 failed at 1246.
Hunk #11 failed at 1271.
4 out of 11 hunks failed--saving rejects to main.c.rej
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|diff -c -N -r ppp-221R.org/nat.c ppp/nat.c
|*** ppp-221R.org/nat.c  Thu Jan  1 09:00:00 1970
|--- ppp/nat.c   Sat Jun  7 22:34:01 1997
--------------------------
(Creating file nat.c...)
Patching file nat.c using Plan A...
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|diff -c -N -r ppp-221R.org/nat.h ppp/nat.h
|*** ppp-221R.org/nat.h  Thu Jan  1 09:00:00 1970
|--- ppp/nat.h   Sat Jun  7 17:44:39 1997
--------------------------
(Creating file nat.h...)
Patching file nat.h using Plan A...
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|diff -c -N -r ppp-221R.org/os.c ppp/os.c
|*** ppp-221R.org/os.c   Mon Jan 13 06:52:50 1997
|--- ppp/os.c    Wed Apr  9 23:26:07 1997
--------------------------
Patching file os.c using Plan A...
Hunk #1 succeeded at 43.
Hunk #2 succeeded at 55.
Hunk #3 succeeded at 146.
Hunk #4 succeeded at 207.
Hunk #5 succeeded at 405.
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|diff -c -N -r ppp-221R.org/os.h ppp/os.h
|*** ppp-221R.org/os.h   Thu Jan 11 06:27:57 1996
|--- ppp/os.h    Sat Mar 29 01:44:02 1997
--------------------------
Patching file os.h using Plan A...
Hunk #1 succeeded at 34.
done


2.2.1R$BMQ$N%Q%C%A$H$7$F$$$/$D$+$NF|IU$N$b$N$,$"$k$h$&$G$9$,!"(B
$B!J(Bnat-970330.patch $B!A(B nat-970607.patch$B!K(B
ppp$B$N%=!<%9$K$b$$$/$D$+$N%P!<%8%g%s$,B8:_$9$k$N$G$7$g$&$+!#(B
$B$b$7!"$=$&$@$H$7$?$i!V(BFreeBSD$BE0DlF~Lg!W$KIUB0$9$k(BCD-ROM$B$N(B2.2.1R$B$K$O(B
$B$I$N%Q%C%A%U%!%$%k$rEv$F$k$Y$-$J$N$G$7$g$&$+!#(B

$BE*$O$:$l$J<ALd$r$7$F$$$k$+$b$7$l$^$;$s$,!"$I$J$?$+%"%I%P%$%9$$$?$@$1$l$P(B
$B9,$$$G$9!#(B


_/_/_/_/_/_/_/_/_/_/_/_/_/_/
$BLpEg!w%j%`%M%C%H(B
E-mail:kyajima@yk.rim.or.jp
_/_/_/_/_/_/_/_/_/_/_/_/_/_/


