From owner-FreeBSD-users-jp@jp.freebsd.org  Fri Jun 20 03:46:14 1997
Received: by jaz.jp.freebsd.org (8.8.5+2.7Wbeta5/8.7.3) id DAA09369
	Fri, 20 Jun 1997 03:46:14 +0900 (JST)
Received: by jaz.jp.freebsd.org (8.8.5+2.7Wbeta5/8.7.3) with ESMTP id DAA09364
	for <freebsd-users-jp@jp.freebsd.org>; Fri, 20 Jun 1997 03:46:12 +0900 (JST)
Received: from local.domain (h106.p058.iij4u.or.jp [210.130.58.106]) by m.big.or.jp (8.8.0/3.4W2 ^L^*) with ESMTP id DAA25740 for <freebsd-users-jp@jp.freebsd.org>; Fri, 20 Jun 1997 03:47:39 +0900
Received: from xs.rr.iij4u.or.jp (Xs.local.domain [192.168.0.2]) by local.domain (8.8.5/3.5Wbeta) with SMTP id DAA05407 for <freebsd-users-jp@jp.freebsd.org>; Fri, 20 Jun 1997 03:23:23 +0900 (JST)
Message-Id: <9706191824.AA00172@xs.rr.iij4u.or.jp>
From: SADA Kenji <sada@rr.iij4u.or.jp>
Date: Fri, 20 Jun 1997 03:24:18 +0900
To: freebsd-users-jp@jp.freebsd.org
In-Reply-To: <199706191005.TAA11909@purple.de.mtex.co.jp>
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
Precedence: bulk
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=19]
X-Sequence: FreeBSD-users-jp 14547
Subject: [FreeBSD-users-jp 14547] Re: Can't apply NAT-patch
Errors-To: owner-FreeBSD-users-jp@jp.freebsd.org
Sender: owner-FreeBSD-users-jp@jp.freebsd.org

$B:4ED!wL>8E20$G$9!#$"$j$,$H$&$4$6$$$^$9!#(J

$B>.>B2m<y(J <konuma@de.mtex.co.jp> $B$5$s$O=q$-$^$7$?!'(J

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

$B$G$-$F$$$^$7$?!#85%U%!%$%k$,$J$$$H(J../$B$X;}$C$F$$$/$C$F(J
patch$B$N;EMM$J$s$G$9$+!)(J

# man$B$,1Q8l$@!&!&$C$F6X6g$G$7$?$,(J

$B$=$l$G(J../nat.*$B$r9_$m$7$F$-$F!"(JMakefile$B$K<j$G(J'nat.c'$B$N;XDj$r(J
$B2C$($^$7$?$i!":#EY$O(J

 > make: don't know how to make uucplock.c. Stop

$B$H8@$o$l$F$7$^$$$^$7$?!#(J
$BA4%=!<%9$rE83+$7$F(Jfind -name 'uucplock*'$B$G8+$D$1$F!"(J

 % cd /usr/src; cp sbin/startslip/uucplock.c usr.sbin/ppp

$B$H$7$F(Jmake$B$7$?$i(J

 > cc -O -Wall -DUSE_PERROR -DMSEXT -DPASSWDAUTH   -c main.c
 > In file included from main.c:105:
 > nat.h:77: redefinition of `struct useport'
 > nat.h:90: redefinition of `struct special_udp'
 > nat.h:96: redefinition of `struct icmpaddr'
 > nat.h:103: redefinition of `SPUPORT'
 > nat.h:33: `SPUPORT' previously declared here
 > nat.h:104: redefinition of `UPORT'
 > nat.h:34: `UPORT' previously declared here
 > nat.h:105: redefinition of `ICMPADDR'
 > nat.h:35: `ICMPADDR' previously declared here
 > *** Error code 1
 > 
 > Stop.
 > *** Error code 1

$B$H$$$&$3$H$G$9!#:#F|$O$3$l$G?2$^$9!#(J
$B$A$J$_$K!"8=:_$N(JMakefile$B$O0J2<$NDL$j$G$9!#(J'./'$B$O(J'~/install/ppp/'$B$G$9!#(J

--
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; /bin/sh install.sh sbin)
patch:
	-cat ${patch_file} | (cd ${src_dir}; /usr/bin/patch)
	(cd ${src_dir}/ppp; mv ../nat.* .; cp ../../sbin/startslip/uucplock.c .)
compile:
	(cd ${src_dir}/ppp; make)
install:
	(cd ${src_dir}/ppp; make install)

- --
SADA Kenji <sada@rr.iij4u.or.jp>
FreeBSD$B4XO"5-;v$NDI$C$+$1(J <http://www.big.or.jp/~sada/devil/>
