From owner-FreeBSD-users-jp@jp.freebsd.org  Thu Jun 19 19:05:11 1997
Received: by jaz.jp.freebsd.org (8.8.5+2.7Wbeta5/8.7.3) id TAA22045
	Thu, 19 Jun 1997 19:05:11 +0900 (JST)
Received: by jaz.jp.freebsd.org (8.8.5+2.7Wbeta5/8.7.3) with ESMTP id TAA22039
	for <FreeBSD-users-jp@jp.freebsd.org>; Thu, 19 Jun 1997 19:05:08 +0900 (JST)
Received: from bax.de.mtex.co.jp (bax.mtex.co.jp [192.168.31.133]) by proxyout.mtex.co.jp (8.8.6/3.5Wpl504/01/97) with ESMTP id TAA23068 for <FreeBSD-users-jp@jp.freebsd.org>; Thu, 19 Jun 1997 19:05:06 +0900 (JST)
Received: by bax.de.mtex.co.jp (3.5Wpl5) id TAA12527; Thu, 19 Jun 1997 19:05:05 +0900 (JST)
Received: by purple.de.mtex.co.jp (3.5Wpl5) id TAA11909; Thu, 19 Jun 1997 19:05:04 +0900 (JST)
Message-Id: <199706191005.TAA11909@purple.de.mtex.co.jp>
To: FreeBSD-users-jp@jp.freebsd.org
In-Reply-To: Your message of "Thu, 19 Jun 1997 18:05:09 +0900"
References: <9706190905.AA00153@sada.rr.iij4u.or.jp>
X-Mailer: Mew version 1.69 on Emacs 19.28.1 / Mule 2.3
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Date: Thu, 19 Jun 1997 19:05:04 +0900
From: Masaki KONUMA <konuma@de.mtex.co.jp>
Reply-To: FreeBSD-users-jp@jp.freebsd.org
Precedence: bulk
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=19]
X-Sequence: FreeBSD-users-jp 14524
Subject: [FreeBSD-users-jp 14524] Re: Can't apply NAT-patch
Errors-To: owner-FreeBSD-users-jp@jp.freebsd.org
Sender: owner-FreeBSD-users-jp@jp.freebsd.org

$B$3$L$^$G$9!#(B

From: SADA Kenji <sada@rr.iij4u.or.jp>
Subject: [FreeBSD-users-jp 14521] Can't apply NAT-patch
Date: Thu, 19 Jun 1997 18:05:09 +0900

> Q:$B!VE0DlF~Lg!WE:IU$N(B2.2.1-RELEASE$B$r;H$C$F$$$k$N$G$9$,!"(B
> junichi$B$5$s$N%Z!<%8(B
>  http://www2a.meshnet.or.jp/~junichi
> $B$+$iF~<j$7$?(Biij-ppp$B$N(BNAT$B%Q%C%A$,$&$^$/Ev$?$C$F$/$l$:!"(Bfile$B$N(B
> 'nat.h'$B$,:n$i$l$^$;$s!#$J$<$G$7$g$&$+!)(B
...
> $B$r<!$N(BMakefile$B$H0l=o$K(B./$B$KCV$-!"(Bmake patch$B$H$7$^$7$?!#(B

# $B$3$N(B ./ $B$,$I$3$@$+$o$+$i$J$$$N$G$9$,!"$?$V$sL54X78!#(B

/usr/src/usr.sbin $B$K(B nat.h $B$H(B nat.c $B$,$G$-$F$^$;$s$+!)(B

> # $B:n6H2hLL$NA4BN$O(B
> #	http://www.big.or.jp/~sada/devil/report-1997-0619.txt

$B$r;}$C$F$-$^$7$?!#(B
| Script started on Thu Jun 19 15:22:07 1997
|  % make patch
| cat nat-970607.patch | (cd /usr/src/usr.sbin; /usr/bin/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

/usr/src/usr.sbin/ppp/Makefile $B$,$*$+$7$$$N$G!"(B

> done
> *** Error code 1

$B$N$h$&$G$9$M!#(B

--
$B>.>B2m<y(B <konuma@de.mtex.co.jp>
