From owner-ports-jp@jp.freebsd.org  Sat May 30 12:49:13 1998
Received: (from daemon@localhost)
	by jaz.jp.freebsd.org (8.8.8+3.0Wbeta13/8.7.3) id MAA08743;
	Sat, 30 May 1998 12:49:13 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from coconut.itojun.org (root@coconut.itojun.org [210.160.95.97])
	by jaz.jp.freebsd.org (8.8.8+3.0Wbeta13/8.7.3) with ESMTP id MAA08738
	for <ports-jp@jp.freebsd.org>; Sat, 30 May 1998 12:49:10 +0900 (JST)
	(envelope-from itojun@itojun.org)
Received: from localhost (itojun@localhost.itojun.org [127.0.0.1])
	by coconut.itojun.org (8.8.8+3.0Wbeta12/3.6W) with ESMTP id MAA01537
	for <ports-jp@jp.freebsd.org>; Sat, 30 May 1998 12:49:05 +0900 (JST)
To: ports-jp@jp.freebsd.org
In-reply-to: sanpei's message of Sat, 30 May 1998 12:38:40 JST.
      <199805300338.MAA04628@lavender.rad.cc.keio.ac.jp> 
X-Template-Reply-To: itojun@itojun.org
X-Template-Return-Receipt-To: itojun@itojun.org
X-PGP-Fingerprint: F8 24 B4 2C 8C 98 57 FD  90 5F B4 60 79 54 16 E2
From: Jun-ichiro itojun Itoh <itojun@itojun.org>
Date: Sat, 30 May 1998 12:49:05 +0900
Message-ID: <1533.896500145@coconut.itojun.org>
Reply-To: ports-jp@jp.freebsd.org
Precedence: bulk
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=24]
X-Sequence: ports-jp 3427
Subject: [ports-jp 3427] Re: ssh-1.2.23 port 
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org


>>	maintainer$B$K$OAw$C$?$s$G$9$,!"C/$+%A%'%C%/$7$F$b$i$$$?$$$N$G(B
>>	$B$*$M$,$$$7$^$9!#(B(ssh$B$N$P!<$$!"4V0c$C$F$k$H$H$F$b$$$d$J$N$G(B)
>  $B$&$^$/(B FreeBSD $B$N(B patch $B$,Ev$?$j$^$;$s(B. 
>$B4D6-(B
>	2.2.5-RELEASE $B$G(B /etc/make.conf $B$G(B USA_RESIDENT=yes
>MD5 (ssh-1.2.23.tar.gz) = b8355cba289cf6f4cab91ed8c58b8bc1
>$B$G(B, files/md5 $B$HF1$8CM(B. 
>	ssh-1.2.23/Makefile.in $B$X$N(B patch-ac $B$N<!$NItJ,$,DL$j$^$;$s(B.

	$B$"$l$l!"(Bpatch-ac$B$O@hDxAw$C$?(Bpatch$B$r$"$F$k$H!"(Bunified diff$B$K(B
	$B$J$C$F$k$O$:$J$N$G$9$,(B...

itojun


---$B$\$/$N$F$b$H$N(Bpatch-ac
--- Makefile.in.orig	Tue May 12 07:37:58 1998
+++ Makefile.in	Sat May 30 10:23:51 1998
@@ -276,12 +276,17 @@
 SHELL = /bin/sh
 
 GMPDIR 		= gmp-2.0.2-ssh-2
-GMPLIBS 	= -L$(GMPDIR) -lgmp
-GMPDEP 		= $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a
+# We have the same libgmp in the system, so use it instead
+GMPINCDIR	= /usr/include
+GMPLIBDIR	= /usr/lib
+GMPLIBS 	= -L$(GMPLIBDIR) -lgmp
+GMPDEP 		= $(GMPINCDIR)/gmp.h $(GMPLIBDIR)/libgmp.a
 
 ZLIBDIR		= zlib-1.0.4
-ZLIBDEP		= $(ZLIBDIR)/libz.a
-ZLIBLIBS	= -L$(ZLIBDIR) -lz
+ZLIBINCDIR	= /usr/include
+ZLIBLIBDIR	= /usr/lib
+ZLIBDEP		= $(ZLIBINCDIR)/libz.a
+ZLIBLIBS	= -L$(ZLIBLIBDIR) -lz
 
 RSAREFDIR	= rsaref2
 RSAREFSRCDIR 	= $(RSAREFDIR)/source
@@ -385,7 +390,7 @@
 	$(CC) -o rfc-pg rfc-pg.o
 
 .c.o:
-	$(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPDIR) -I$(srcdir)/$(ZLIBDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
+	$(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPINCDIR) -I$(srcdir)/$(ZLIBINCDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
 
 sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
 	-rm -f sshd
@@ -428,19 +433,19 @@
 	sed "s#&PERL&#$(PERL)#" <$(srcdir)/make-ssh-known-hosts.pl >make-ssh-known-hosts
 	chmod +x make-ssh-known-hosts
 
-GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c mpz_pow_ui.c mpz_add.c mpz_sub.c \
-		mpz_mul.c mpz_cmp.c mpz_sqrtrem.c
-$(GMPDIR)/libgmp.a:
-	cd $(GMPDIR); $(MAKE)
-
-$(ZLIBDEP):
-	-if test '!' -d $(ZLIBDIR); then \
-	  mkdir $(ZLIBDIR); \
-	  cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \
-	fi
-	cd $(ZLIBDIR); $(MAKE) VPATH=$(srcdir)/$(ZLIBDIR):../$(srcdir)/$(ZLIBDIR) \
-	  CC="$(CC)" CFLAGS="$(CFLAGS) -I. -I$(srcdir)/$(ZLIBDIR) \
-	    -I../$(srcdir)/$(GMPDIR)" RANLIB="$(RANLIB)" libz.a
+#GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c mpz_pow_ui.c mpz_add.c mpz_sub.c \
+#		mpz_mul.c mpz_cmp.c mpz_sqrtrem.c
+#$(GMPDIR)/libgmp.a:
+#	cd $(GMPDIR); $(MAKE)
+#
+#$(ZLIBDEP):
+#	-if test '!' -d $(ZLIBDIR); then \
+#	  mkdir $(ZLIBDIR); \
+#	  cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \
+#	fi
+#	cd $(ZLIBDIR); $(MAKE) VPATH=$(srcdir)/$(ZLIBDIR):../$(srcdir)/$(ZLIBDIR) \
+#	  CC="$(CC)" CFLAGS="$(CFLAGS) -I. -I$(srcdir)/$(ZLIBDIR) \
+#	    -I../$(srcdir)/$(GMPDIR)" RANLIB="$(RANLIB)" libz.a
 
 $(RSAREFSRCDIR)/librsaref.a:
 	-if test '!' -d $(RSAREFDIR); then \
@@ -487,7 +492,7 @@
 # This target can be used to install the host key and configuration files on
 # other machines in a networked environment after the binaries have first
 # been installed on one machine into a common binary directory.
-hostinstall: $(PROGRAMS) make-dirs generate-host-key install-configs
+hostinstall: $(PROGRAMS) make-dirs install-configs
 
 # Ssh is preferably installed suid root.  It can also be used non-root,
 # but then it cannot connect from a privileged socket, and rhosts
@@ -653,15 +658,15 @@
 
 clean:
 	-rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg
-	cd $(GMPDIR); $(MAKE) clean
+#	cd $(GMPDIR); $(MAKE) clean
 #	cd $(RSAREFSRCDIR); rm -f *.o *.a
-	cd $(ZLIBDIR); $(MAKE) clean
+#	cd $(ZLIBDIR); $(MAKE) clean
 
 distclean: clean
 	-rm -f Makefile config.status config.cache config.log config.h
 	-rm -f ssh.1 sshd.8 make-ssh-known-hosts.1
-	cd $(GMPDIR); $(MAKE) distclean
-	cd $(ZLIBDIR); $(MAKE) distclean
+#	cd $(GMPDIR); $(MAKE) distclean
+#	cd $(ZLIBDIR); $(MAKE) distclean
 
 dist: dist-free
 
@@ -690,12 +695,12 @@
 	-mkdir $(DISTNAME)
 	cp $(DISTFILES) $(DISTNAME)
 	for i in $(DISTSRCS); do cp $(srcdir)/$$i $(DISTNAME); done
-	(cd $(GMPDIR); make dist)
-	gzip -cd $(GMPDIR)/$(GMPDIR).tar.gz | (cd $(DISTNAME); tar pxf - )
+#	(cd $(GMPDIR); make dist)
+#	gzip -cd $(GMPDIR)/$(GMPDIR).tar.gz | (cd $(DISTNAME); tar pxf - )
 #	tar cf - $(RSAREFDIR) | (cd $(DISTNAME); tar xf -)
 #	cd $(DISTNAME)/$(RSAREFSRCDIR); rm -f *.o *.a
-	(cd  $(srcdir); tar pcf - $(ZLIBDIR) )| (cd $(DISTNAME); tar pxf -)
-	cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a; rm -rf CVS
+#	(cd  $(srcdir); tar pcf - $(ZLIBDIR) )| (cd $(DISTNAME); tar pxf -)
+#	cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a; rm -rf CVS
 
 #ifdef F_SECURE_COMMERCIAL
 #
@@ -723,7 +728,7 @@
 	 (echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed $(srcdir)/version.h >/dev/null
 
 depend:
-	$(MAKEDEP) -I$(srcdir) -I. -I$(GMPDIR) -I$(ZLIBDIR) $(DEFS) $(SRCS)
+	$(MAKEDEP) -I$(srcdir) -I. $(DEFS) $(SRCS)
 
 tags:
 	-rm -f TAGS
