From owner-FreeBSD-users-jp@jp.freebsd.org  Mon Dec 30 06:07:07 1996
Received: by jaz.jp.freebsd.org (8.8.4+2.7Wbeta4/8.7.3) id GAA29314
	Mon, 30 Dec 1996 06:07:07 +0900 (JST)
Received: by jaz.jp.freebsd.org (8.8.4+2.7Wbeta4/8.7.3) with ESMTP id GAA29300
	for <FreeBSD-users-jp@jp.freebsd.org>; Mon, 30 Dec 1996 06:07:05 +0900 (JST)
Received: from pc-ikeda-y.tky0.attnet.or.jp by tky0.attnet.or.jp (8.7.5+Spin/3.4W4-PP-R4(12/25/96)) id GAA14749; Mon, 30 Dec 1996 06:07:03 +0900 (JST)
Message-Id: <9612292106.AA00186@pc-ikeda-y.tky0.attnet.or.jp>
From: Yuuichi Ikeda <yuichi@tky0.attnet.or.jp>
Date: Mon, 30 Dec 1996 06:06:39 +0900
To: FreeBSD-users-jp@jp.freebsd.org
MIME-Version: 1.0
X-Mailer: AL-Mail 1.32
Content-Type: text/plain; charset=iso-2022-jp
Reply-To: FreeBSD-users-jp@jp.freebsd.org
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=19]
X-Sequence: FreeBSD-users-jp 7828
Subject: [FreeBSD-users-jp 7828] PPP-NAT Patch Failed!!
Errors-To: owner-FreeBSD-users-jp@jp.freebsd.org
Sender: owner-FreeBSD-users-jp@jp.freebsd.org

$B$$$D$b(JROM$B$P$+$j$G$9$_$^$;$s!"CSED(J@AT&T$B$G$9!#(J

iij-ppp$B$K%*%s%G%^%s%I(J-PPP$B$H(JNAT$B$N%Q%C%A$rEv$F$h$&$H;W$$$^$7$F!"(J
$B<B9T$7$F$_$?$N$G$9$,!"$&$^$/9T$-$^$;$s!#(J

iij-ppp$B$N%=!<%9$O(JFree-BSD2.1.5R$B$N(JCD-ROM$B$+$i<h$C$F$-$?$b$N$G$9!#(J
OS$B$O(JFree-BSD 2.1.5R$B$G$9(J($BF|K\8lHG$N%$%s%9%H!<%i;HMQ(J)$B!#(J

iij-ppp$B$O%Q%C%A$rEv$F$kA0$O2?$iLdBj$J$/@5>o$KF0$$$F$$$^$9!#(J

$B$=$7$F!"%*%s%G%^%s%I(J-PPP$B$N%Q%C%A$rEv$F$h$&$H$7$?=j!"(J

magi# cd /usr/src/usr.sbin/ppp
magi# patch -p1 < ppp.ondemand.diff
Hmm...  Looks like a context diff to me...
The text leading up to this was:
--------------------------
|diff -c ppp-freebsd-2.1.5R/filter.c ppp/filter.c
|*** ppp-freebsd-2.1.5R/filter.c	Tue Feb  6 02:02:56 1996
|--- ppp/filter.c	Thu Aug 29 14:36:36 1996
--------------------------
Patching file filter.c using Plan A...
(Fascinating--this is really a new-style context diff but without
the telltale extra asterisks on the *** line that usually indicate
the new style...)
Hunk #1 failed at 238.
Hunk #2 failed at 369.
Hunk #3 failed at 460.
3 out of 3 hunks failed--saving rejects to filter.c.rej
Hmm...  The next patch looks like a context diff to me...
The text leading up to this was:
--------------------------
|diff -c ppp-freebsd-2.1.5R/filter.h ppp/filter.h
|*** ppp-freebsd-2.1.5R/filter.h	Tue Feb  6 02:02:57 1996
|--- ppp/filter.h	Thu Aug 29 14:36:45 1996
--------------------------
Patching file filter.h using Plan A...
(Fascinating--this is really a new-style context diff but without
the telltale extra asterisks on the *** line that usually indicate
the new style...)
Hunk #1 failed at 65.
1 out of 1 hunks failed--saving rejects to filter.h.rej
Hmm...  The next patch looks like a context diff to me...
The text leading up to this was:
--------------------------
|diff -c ppp-freebsd-2.1.5R/ip.c ppp/ip.c
|*** ppp-freebsd-2.1.5R/ip.c	Tue Feb  6 02:03:02 1996
|--- ppp/ip.c	Fri Aug 30 13:10:12 1996
--------------------------
Patching file ip.c using Plan A...
Hunk #1 failed at 120.
Hunk #2 failed at 128.
(Fascinating--this is really a new-style context diff but without
the telltale extra asterisks on the *** line that usually indicate
the new style...)
Hunk #3 failed at 149.
Hunk #4 failed at 172.
Hunk #5 failed at 188.
5 out of 5 hunks failed--saving rejects to ip.c.rej
Hmm...  The next patch looks like a context diff to me...
The text leading up to this was:
--------------------------
|diff -c ppp-freebsd-2.1.5R/main.c ppp/main.c
|*** ppp-freebsd-2.1.5R/main.c	Tue Feb  6 02:03:09 1996
|--- ppp/main.c	Thu Sep  5 00:52:04 1996
--------------------------
Patching file main.c using Plan A...
(Fascinating--this is really a new-style context diff but without
the telltale extra asterisks on the *** line that usually indicate
the new style...)
Hunk #1 failed at 34.
Hunk #2 failed at 607.
Hunk #3 failed at 802.
Hunk #4 failed at 836.
Hunk #5 failed at 958.
Hunk #6 failed at 983.
6 out of 6 hunks failed--saving rejects to main.c.rej
Hmm...  The next patch looks like a context diff to me...
The text leading up to this was:
--------------------------
|diff -c ppp-freebsd-2.1.5R/os.c ppp/os.c
|*** ppp-freebsd-2.1.5R/os.c	Tue Jun  4 06:39:23 1996
|--- ppp/os.c	Mon Aug 26 00:16:29 1996
--------------------------
Patching file os.c using Plan A...
Hunk #1 failed at 42.
(Fascinating--this is really a new-style context diff but without
the telltale extra asterisks on the *** line that usually indicate
the new style...)
Hunk #2 failed at 137.
Hunk #3 failed at 201.
Hunk #4 succeeded at 349 with fuzz 2.
3 out of 4 hunks failed--saving rejects to os.c.rej
Hmm...  The next patch looks like a context diff to me...
The text leading up to this was:
--------------------------
|diff -c ppp-freebsd-2.1.5R/os.h ppp/os.h
|*** ppp-freebsd-2.1.5R/os.h	Tue Feb  6 02:03:15 1996
|--- ppp/os.h	Sat Aug 24 13:56:56 1996
--------------------------
Patching file os.h using Plan A...
(Fascinating--this is really a new-style context diff but without
the telltale extra asterisks on the *** line that usually indicate
the new style...)
Hunk #1 succeeded at 34 with fuzz 2.
done

$B$H8@$&$h$&$K!"%Q%C%AEv$F$,<:GT!V$i$7$-!W%a%C%;!<%8$,N.$l$^$7$?$,!"(J
$B:#$O$H$j$"$($:5$$K$;$:!"(JNAT$B$N%Q%C%A$rEv$F$h$&$H;W$$!"(J
$B<B9T!#(J

magi# patch -p < nat-961102-1.patch
Hmm...  Looks like a context diff to me...
The text leading up to this was:
--------------------------
|diff -r -N -c ppp-ondemand-0918/Makefile ppp/Makefile
|*** ppp-ondemand-0918/Makefile	Tue Feb  6 02:02:37 1996
|--- ppp/Makefile	Thu Oct 31 23:35:37 1996
--------------------------

$B$3$3$G$$$-$J$j%U%!%$%kL>$rJ9$$$F$/$k$N$G!"$=$N$^$^%U%!%$%kL>$rF~NO!#(J
$B$3$N%U%!%$%kF~NO$O$=$N8e(J4$B!A(J5$B2sB3$-$^$7$?!#(J

File to patch: Makefile
Patching file Makefile using Plan A...
Hunk #1 failed at 4.
1 out of 1 hunks failed--saving rejects to Makefile.rej
Hmm...  The next patch looks like a context diff to me...
The text leading up to this was:
--------------------------
|diff -r -N -c ppp-ondemand-0918/command.c ppp/command.c
|*** ppp-ondemand-0918/command.c	Mon Jun 10 18:41:49 1996
|--- ppp/command.c	Sat Sep 21 13:59:33 1996
--------------------------
File to patch: command.c
Patching file command.c using Plan A...
(Fascinating--this is really a new-style context diff but without
the telltale extra asterisks on the *** line that usually indicate
the new style...)
Hunk #1 failed at 803.
Hunk #2 failed at 915.
2 out of 2 hunks failed--saving rejects to command.c.rej
Hmm...  The next patch looks like a context diff to me...
The text leading up to this was:
--------------------------
|diff -r -N -c ppp-ondemand-0918/ip.c ppp/ip.c
|*** ppp-ondemand-0918/ip.c	Wed Sep 18 22:22:43 1996
|--- ppp/ip.c	Fri Oct 18 21:54:10 1996
--------------------------
File to patch: ip.c
Patching file ip.c using Plan A...
(Fascinating--this is really a new-style context diff but without
the telltale extra asterisks on the *** line that usually indicate
the new style...)
Hunk #1 failed at 37.
Hunk #2 failed at 328.
Hunk #3 failed at 343.
3 out of 3 hunks failed--saving rejects to ip.c.rej
Hmm...  The next patch looks like a context diff to me...
The text leading up to this was:
--------------------------
|diff -r -N -c ppp-ondemand-0918/ipcp.c ppp/ipcp.c
|*** ppp-ondemand-0918/ipcp.c	Tue Feb  6 02:03:04 1996
|--- ppp/ipcp.c	Sat Sep 21 13:53:31 1996
--------------------------
File to patch: ipcp.c
Patching file ipcp.c using Plan A...
Hunk #1 failed at 41.
(Fascinating--this is really a new-style context diff but without
the telltale extra asterisks on the *** line that usually indicate
the new style...)
Hunk #2 failed at 149.
2 out of 2 hunks failed--saving rejects to ipcp.c.rej
Hmm...  The next patch looks like a context diff to me...
The text leading up to this was:
--------------------------
|diff -r -N -c ppp-ondemand-0918/ipcp.h ppp/ipcp.h
|*** ppp-ondemand-0918/ipcp.h	Sat Aug 26 21:11:43 1995
|--- ppp/ipcp.h	Sat Sep 21 12:09:49 1996
--------------------------
File to patch: ipcp.h
Patching file ipcp.h using Plan A...
(Fascinating--this is really a new-style context diff but without
the telltale extra asterisks on the *** line that usually indicate
the new style...)
Hunk #1 failed at 57.
1 out of 1 hunks failed--saving rejects to ipcp.h.rej
Hmm...  The next patch looks like a context diff to me...
The text leading up to this was:
--------------------------
|diff -r -N -c ppp-ondemand-0918/main.c ppp/main.c
|*** ppp-ondemand-0918/main.c	Wed Sep 18 22:22:43 1996
|--- ppp/main.c	Sat Nov  2 01:01:55 1996
--------------------------
File to patch: main.c
Patching file main.c using Plan A...
(Fascinating--this is really a new-style context diff but without
the telltale extra asterisks on the *** line that usually indicate
the new style...)
Hunk #1 failed at 23.
Hunk #2 failed at 61.
Hunk #3 failed at 74.
Hunk #4 failed at 91.
Hunk #5 failed at 103.
Hunk #6 failed at 291.
Hunk #7 failed at 648.
Hunk #8 failed at 678.
Hunk #9 failed at 714.
Hunk #10 failed at 727.
Hunk #11 failed at 771.
Hunk #12 failed at 847.
Hunk #13 failed at 1092.
13 out of 13 hunks failed--saving rejects to main.c.rej
Hmm...  The next patch looks like a context diff to me...
The text leading up to this was:
--------------------------
|diff -r -N -c ppp-ondemand-0918/nat.c ppp/nat.c
|*** ppp-ondemand-0918/nat.c	Thu Jan  1 09:00:00 1970
|--- ppp/nat.c	Sat Nov  2 01:02:30 1996
--------------------------
(Creating file ppp/nat.c...)
patch: **** can't find ppp/nat.c
magi# 

$B$H8@$&$h$&$K:G8e$O(Jnat.c$B$,8+$D$+$i$J$$$H8@$&%a%C%;!<%8$r;D$7!"(J
$B=*N;$7$^$9!#(J

$B$A$J$_$K!"%*%s%G%^%s%I(JPPP$B$N%Q%C%A$N$_$rEv$F$?>uBV$G!"(Jmake$B!"(J
make install$B$7$?=j!"$I$&$d$i@5>o$KF0$$$F$$$kMM$G$9!#(J

$B$I$&$9$l$P$A$c$s$H%Q%C%A$,Ev$F$i$l$k$N$G$7$g$&$+(J?

$B$h$m$7$/$*4j$$$$$?$7$^$9!#(J

-----------------------------------------------------------------------
$B%"%J%m%0(J3$B<o<u83=`HwCf(J
$BCSED!J(JE-MAIL:yuichi@tky0.attnet.or.jp$B!K(J
 
