From owner-FreeBSD-users-jp@jp.freebsd.org  Thu Jun 19 18:08:42 1997
Received: by jaz.jp.freebsd.org (8.8.5+2.7Wbeta5/8.7.3) id SAA16806
	Thu, 19 Jun 1997 18:08:42 +0900 (JST)
Received: by jaz.jp.freebsd.org (8.8.5+2.7Wbeta5/8.7.3) with ESMTP id SAA16800
	for <FreeBSD-users-jp@jp.freebsd.org>; Thu, 19 Jun 1997 18:08:40 +0900 (JST)
Received: from xl.local.domain (p046041.mirai.or.jp [203.137.46.41]) by he.mirai.or.jp (8.8.5+2.7Wbeta5/3.5W03/21/97) with ESMTP id SAA26009 for <FreeBSD-users-jp@jp.freebsd.org>; Thu, 19 Jun 1997 18:06:26 +0900 (JST)
Received: from sada.rr.iij4u.or.jp (sada.local.domain [192.168.0.13]) by xl.local.domain (8.8.5/3.5Wpl4) with SMTP id SAA29210 for <FreeBSD-users-jp@jp.freebsd.org>; Thu, 19 Jun 1997 18:16:54 +0900 (JST)
Message-Id: <9706190905.AA00153@sada.rr.iij4u.or.jp>
Date: Thu, 19 Jun 1997 18:05:09 +0900
From: SADA Kenji <sada@rr.iij4u.or.jp>
To: FreeBSD-users-jp@jp.freebsd.org
MIME-Version: 1.0
X-Mailer: AL-Mail 1.20
Content-Type: text/plain; charset=iso-2022-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 14521
Subject: [FreeBSD-users-jp 14521] Can't apply NAT-patch
Errors-To: owner-FreeBSD-users-jp@jp.freebsd.org
Sender: owner-FreeBSD-users-jp@jp.freebsd.org

$BL>8E20$N:4ED$G$9!#(J
Q:$B!VE0DlF~Lg!WE:IU$N(J2.2.1-RELEASE$B$r;H$C$F$$$k$N$G$9$,!"(J
junichi$B$5$s$N%Z!<%8(J
 http://www2a.meshnet.or.jp/~junichi
$B$+$iF~<j$7$?(Jiij-ppp$B$N(JNAT$B%Q%C%A$,$&$^$/Ev$?$C$F$/$l$:!"(Jfile$B$N(J
'nat.h'$B$,:n$i$l$^$;$s!#$J$<$G$7$g$&$+!)(J

--
$B<j=g(J:
--

 http://www2a.meshnet.or.jp/~junichi/\
	freebsd/programs/nat-970607.patch
$B$r<!$N(JMakefile$B$H0l=o$K(J./$B$KCV$-!"(Jmake patch$B$H$7$^$7$?!#(J

--
Makefile:
--

src_dir=/usr/src/usr.sbin
dist_dir=/cdrom/2.2.1-RELEASE
patch_file=nat-970607.patch

all: source patch compile install
source:
	(cd ${dist_dir}/src; /bin/sh install.sh usbin)
patch:
	cat ${patch_file} | (cd ${src_dir}; /usr/bin/patch)
compile:
	(cd ${src_dir}/ppp; make)
install:
	(cd ${src_dir}/ppp; make install)

--
$B:n6H2hLL(J:
--

 % make patch
cat nat-970607.patch | (cd /usr/src/usr.sbin; /usr/bin/patch)
Hmm...  Looks like a new-style context diff to me...
 ($BN,(J)
--------------------------
|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
--------------------------
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:
 ($BN,(J)
Patching file ppp/os.h using Plan A...
Hunk #1 succeeded at 34.
done
*** Error code 1

Stop.

--
# $B:n6H2hLL$NA4BN$O(J
#	http://www.big.or.jp/~sada/devil/report-1997-0619.txt
# $B$K$"$j$^$9!#(J
