Update "ssh" to 1.2.23 on request by mrg.

8 files changed, 253 insertions, 357 deletions

diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 1b5c00f5520..afec5f35fcd 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.18 1998/05/08 10:18:54 hubertf Exp $
+# $NetBSD: Makefile,v 1.19 1998/05/24 18:57:40 tron Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
-DISTNAME=		ssh-1.2.22
+DISTNAME=		ssh-1.2.23
 CATEGORIES=		security net
 MASTER_SITES=		ftp://ftp.cs.hut.fi/pub/ssh/ \
 			ftp://ftp.funet.fi/pub/unix/security/login/ssh/
 
-MAINTAINER=		mrg@eterna.com.au
+MAINTAINER=		tron@netbsd.org
 
 RESTRICTED=		"Crypto; export-controlled"
 MIRROR_DISTFILE=	no
@@ -38,7 +38,7 @@ OPSYS!= uname -s
 SSH_CONF_DIR?=		/etc
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --with-etcdir=${SSH_CONF_DIR} \
-			--disable-suid-ssh --with-libwrap
+			--with-libwrap
 
 #Uncomment if all your users are in their own group and their homedir
 #is writeable by that group.  Beware the security implications!
@@ -79,9 +79,20 @@ CFLAGS+=	 	-I${PREFIX}/include
 CFLAGS+=		-DLIBWRAP_FWD
 .endif
 
-MAN1=			scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 \
-			make-ssh-known-hosts.1
-MAN8=			sshd.8
+MAN1=		scp.1 scp1.1 slogin.1 slogin1.1 ssh-add.1 ssh-add1.1 \
+		ssh-agent.1 ssh-agent1.1 ssh-keygen.1 ssh-keygen1.1 \
+		ssh.1 ssh1.1 make-ssh-known-hosts.1 make-ssh-known-hosts1.1
+MAN8=		sshd.8 sshd1.8
+
+PKGDIR=		${WRKDIR}/pkg
+
+post-extract:
+	@${MKDIR} ${PKGDIR}
+.for FILE in COMMENT DEINSTALL DESCR MESSAGE PLIST
+	@${SED} -e 's#@SSH_CONF_DIR@#${SSH_CONF_DIR}#g' \
+	  -e 's#@PREFIX@#${PREFIX}#g' \
+	  <${.CURDIR}/pkg/${FILE} >${PKGDIR}/${FILE}
+.endfor
 
 pre-patch:
 	@${MV} -f ${WRKSRC}/make-ssh-known-hosts.pl \
@@ -102,17 +113,10 @@ fetch-depends:
 	@${FALSE}
 .endif
 
-pre-install:
-	@${CAT} ${PKGDIR}/PLIST.pre | ${SED} \
-		-e 's;\<\$$SSH_CONF_DIR\>;'${SSH_CONF_DIR}';g' \
-		> ${PKGDIR}/PLIST
-	@${CAT} ${PKGDIR}/MESSAGE.pre | ${SED} \
-		-e 's;\<\$$SSH_CONF_DIR\>;'${SSH_CONF_DIR}';g' \
-		-e 's;\<\$$PREFIX\>;'${PREFIX}';g' \
-		> ${PKGDIR}/MESSAGE
-	@${CAT} ${PKGDIR}/DEINSTALL.pre | ${SED} \
-		-e 's;\<\$$SSH_CONF_DIR\>;'${SSH_CONF_DIR}';g' \
-		> ${PKGDIR}/DEINSTALL
+post-build:
+	@${SED} -e 's#@SSH_CONF_DIR@#${SSH_CONF_DIR}#g' \
+	  -e 's#@PREFIX@#${PREFIX}#g' \
+	  <${FILESDIR}/sshd.sh >${WRKDIR}/sshd.sh
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/examples/ssh
@@ -121,29 +125,15 @@ post-install:
 		${MAKEFILE} install_prefix=${WRKDIR} install-configs)
 	${INSTALL_DATA} ${WRKDIR}${SSH_CONF_DIR}/ssh_config \
 		${WRKDIR}${SSH_CONF_DIR}/sshd_config ${PREFIX}/share/examples/ssh
+	@${RM} -rf ${WRKDIR}${SSH_CONF_DIR}
 	@if [ ! -f ${SSH_CONF_DIR}/ssh_host_key ]; then \
 		${ECHO} "Generating a secret host key..."; \
 		${PREFIX}/bin/ssh-keygen \
 			-f ${SSH_CONF_DIR}/ssh_host_key -N ""; \
 	fi
-	${RM} -f ${PREFIX}/man/man1/slogin.1 ${PREFIX}/man/man1/slogin.1.gz
-.if defined(MANZ)
-	${LN} -sf ssh.1.gz ${PREFIX}/man/man1/slogin.1.gz
-.else
-	${LN} -sf ssh.1 ${PREFIX}/man/man1/slogin.1
-.endif
-#	@if [ ! -f ${PREFIX}/etc/rc.d/sshd.sh ]; then \
-#		${ECHO} "Installing ${PREFIX}/etc/rc.d/sshd.sh startup file."; \
-#		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/sshd.sh; \
-#		${ECHO} "[ -f ${SSH_CONF_DIR}/ssh_host_key ] || ${PREFIX}/bin/ssh-keygen -f ${SSH_CONF_DIR}/ssh_host_key -N ''" >> ${PREFIX}/etc/rc.d/sshd.sh; \
-#		${ECHO} "[ -x ${PREFIX}/sbin/sshd ] && ${PREFIX}/sbin/sshd && ${ECHO} -n ' sshd'" >> ${PREFIX}/etc/rc.d/sshd.sh; \
-#		chmod 755 ${PREFIX}/etc/rc.d/sshd.sh; \
-#	fi
+	${INSTALL_SCRIPT} ${WRKDIR}/sshd.sh ${PREFIX}/etc/rc.d/sshd.sh
 	@${CAT} ${PKGDIR}/MESSAGE
 
-pre-clean:
-	@${RM} -f ${PKGDIR}/PLIST ${PKGDIR}/MESSAGE ${PKGDIR}/DEINSTALL
-
 # Include <bsd.pkg.mk> here.  It is essential to have all the override
 # targets precede inclusion of this.
 
diff --git a/security/ssh/files/md5 b/security/ssh/files/md5
index 7935862b70d..9ff65c0a7f0 100644
--- a/security/ssh/files/md5
+++ b/security/ssh/files/md5
@@ -1 +1 @@
-MD5 (ssh-1.2.22.tar.gz) = 011f2b6d1935c59be0dae299db4ed7fa
+MD5 (ssh-1.2.23.tar.gz) = b8355cba289cf6f4cab91ed8c58b8bc1
diff --git a/security/ssh/files/sshd.sh b/security/ssh/files/sshd.sh
new file mode 100644
index 00000000000..bc940ca7306
--- /dev/null
+++ b/security/ssh/files/sshd.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# $NetBSD: sshd.sh,v 1.1 1998/05/24 18:59:43 tron Exp $
+#
+if [ ! -f @SSH_CONF_DIR@/ssh_host_key ]
+then
+ @PREFIX@/bin/ssh-keygen -f @SSH_CONF_DIR@/ssh_host_key -N ''
+fi
+if [ -x @PREFIX@/sbin/sshd -a -f @SSH_CONF_DIR@/ssh_config ]
+then
+ @PREFIX@/sbin/sshd
+ echo -n ' sshd'
+fi
+exit 0
diff --git a/security/ssh/patches/patch-ac b/security/ssh/patches/patch-ac
index 89fbc02cf49..8d88930ccf8 100644
--- a/security/ssh/patches/patch-ac
+++ b/security/ssh/patches/patch-ac
@@ -1,287 +1,166 @@
-Index: Makefile.in
-*** Makefile.in.orig	Tue Jan 20 05:24:13 1998
---- Makefile.in	Mon Jan 26 19:49:03 1998
-***************
-*** 266,273 ****
-  GMPDEP 		= $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a
-  
-  ZLIBDIR		= zlib-1.0.4
-! ZLIBDEP		= $(ZLIBDIR)/libz.a
-! ZLIBLIBS	= -L$(ZLIBDIR) -lz
-  
-  RSAREFDIR	= rsaref2
-  RSAREFSRCDIR 	= $(RSAREFDIR)/source
---- 266,275 ----
-  GMPDEP 		= $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a
-  
-  ZLIBDIR		= zlib-1.0.4
-! ZLIBINCDIR	= /usr/include
-! ZLIBLIBDIR	= /usr/lib
-! ZLIBDEP		= $(ZLIBINCDIR)/libz.a
-! ZLIBLIBS	= -L$(ZLIBLIBDIR) -lz
-  
-  RSAREFDIR	= rsaref2
-  RSAREFSRCDIR 	= $(RSAREFDIR)/source
-***************
-*** 371,377 ****
-  	$(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) $<
-  
-  sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
-  	-rm -f sshd
---- 373,379 ----
-  	$(CC) -o rfc-pg rfc-pg.o
-  
-  .c.o:
-! 	$(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPDIR) -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
-***************
-*** 419,432 ****
-  $(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 \
---- 421,434 ----
-  $(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 \
-***************
-*** 483,492 ****
-  # (otherwise it can only log in as the user it runs as, and must be
-  # bound to a non-privileged port).  Also, password authentication may
-  # not be available if non-root and using shadow passwords.
-! install: $(PROGRAMS) make-dirs generate-host-key install-configs
-  	-rm -f $(install_prefix)$(bindir)/ssh.old
-  	-mv $(install_prefix)$(bindir)/ssh $(install_prefix)$(bindir)/ssh.old
-! 	-chmod 755 $(install_prefix)$(bindir)/ssh.old
-  	$(INSTALL_PROGRAM) -o root -m $(SSH_INSTALL_MODE) ssh $(install_prefix)$(bindir)/ssh
-  	-if test "`echo ssh | sed '$(transform)'`" '!=' ssh; then \
-  	  rm -f $(install_prefix)$(bindir)/`echo ssh | sed '$(transform)'`; \
---- 485,494 ----
-  # (otherwise it can only log in as the user it runs as, and must be
-  # bound to a non-privileged port).  Also, password authentication may
-  # not be available if non-root and using shadow passwords.
-! install: $(PROGRAMS) make-dirs install-configs
-  	-rm -f $(install_prefix)$(bindir)/ssh.old
-  	-mv $(install_prefix)$(bindir)/ssh $(install_prefix)$(bindir)/ssh.old
-! 	-chmod 555 $(install_prefix)$(bindir)/ssh.old
-  	$(INSTALL_PROGRAM) -o root -m $(SSH_INSTALL_MODE) ssh $(install_prefix)$(bindir)/ssh
-  	-if test "`echo ssh | sed '$(transform)'`" '!=' ssh; then \
-  	  rm -f $(install_prefix)$(bindir)/`echo ssh | sed '$(transform)'`; \
-***************
-*** 501,507 ****
-  	-for p in $(NORMAL_PROGRAMS) $(X_PROGRAMS) $(OTHER_PROGRAMS); do \
-  	  rm -f $(install_prefix)$(bindir)/$$p.old ; \
-  	  mv $(install_prefix)$(bindir)/$$p $(install_prefix)$(bindir)/$$p.old; \
-! 	  $(INSTALL_PROGRAM) -m 0755 $$p $(install_prefix)$(bindir)/$$p; \
-  	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-  	    rm -f $(install_prefix)$(bindir)/`echo $$p | sed '$(transform)'`; \
-  	    $(LN_S) $$p \
---- 503,509 ----
-  	-for p in $(NORMAL_PROGRAMS) $(X_PROGRAMS) $(OTHER_PROGRAMS); do \
-  	  rm -f $(install_prefix)$(bindir)/$$p.old ; \
-  	  mv $(install_prefix)$(bindir)/$$p $(install_prefix)$(bindir)/$$p.old; \
-! 	  $(INSTALL_PROGRAM) $$p $(install_prefix)$(bindir)/$$p; \
-  	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-  	    rm -f $(install_prefix)$(bindir)/`echo $$p | sed '$(transform)'`; \
-  	    $(LN_S) $$p \
-***************
-*** 511,517 ****
-  	  rm -f $(install_prefix)$(bindir)/$$p.old ; \
-  	  mv $(install_prefix)$(bindir)/$$p $(install_prefix)$(bindir)/$$p.old; \
-  	  $(INSTALL_DATA) $$p $(install_prefix)$(bindir)/$$p; \
-! 	  chmod 755 $(install_prefix)$(bindir)/$$p; \
-  	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-  	    rm -f $(install_prefix)$(bindir)/`echo $$p | sed '$(transform)'`; \
-  	    $(LN_S) $$p \
---- 513,519 ----
-  	  rm -f $(install_prefix)$(bindir)/$$p.old ; \
-  	  mv $(install_prefix)$(bindir)/$$p $(install_prefix)$(bindir)/$$p.old; \
-  	  $(INSTALL_DATA) $$p $(install_prefix)$(bindir)/$$p; \
-! 	  chmod 555 $(install_prefix)$(bindir)/$$p; \
-  	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-  	    rm -f $(install_prefix)$(bindir)/`echo $$p | sed '$(transform)'`; \
-  	    $(LN_S) $$p \
-***************
-*** 520,533 ****
-  	-for p in $(SBIN_PROGRAMS); do \
-  	  rm -f $(install_prefix)$(sbindir)/$$p.old ; \
-  	  mv $(install_prefix)$(sbindir)/$$p $(install_prefix)$(sbindir)/$$p.old; \
-! 	  $(INSTALL_PROGRAM) -m 0755 $$p $(install_prefix)$(sbindir)/$$p; \
-  	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-  	    rm -f $(install_prefix)$(sbindir)/`echo $$p | sed '$(transform)'`;\
-  	    $(LN_S) $$p \
-  	      $(install_prefix)$(sbindir)/`echo $$p | sed '$(transform)'`; fi;\
-  	done
-  	-for p in $(MAN1PAGES); do \
-! 	  $(INSTALL_DATA) -m 0644 $(srcdir)/$$p $(install_prefix)$(man1dir)/$$p ; \
-  	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-  	    rm -f $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`;\
-  	    $(LN_S) $$p \
---- 522,535 ----
-  	-for p in $(SBIN_PROGRAMS); do \
-  	  rm -f $(install_prefix)$(sbindir)/$$p.old ; \
-  	  mv $(install_prefix)$(sbindir)/$$p $(install_prefix)$(sbindir)/$$p.old; \
-! 	  $(INSTALL_PROGRAM) $$p $(install_prefix)$(sbindir)/$$p; \
-  	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-  	    rm -f $(install_prefix)$(sbindir)/`echo $$p | sed '$(transform)'`;\
-  	    $(LN_S) $$p \
-  	      $(install_prefix)$(sbindir)/`echo $$p | sed '$(transform)'`; fi;\
-  	done
-  	-for p in $(MAN1PAGES); do \
-! 	  $(INSTALL_DATA) $(srcdir)/$$p $(install_prefix)$(man1dir)/$$p ; \
-  	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-  	    rm -f $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`;\
-  	    $(LN_S) $$p \
-***************
-*** 542,548 ****
-  	    $(install_prefix)$(man1dir)/`echo slogin.1 | sed '$(transform)'`; \
-  	fi
-  	-for p in $(MAN1GENERATED); do \
-! 	  $(INSTALL_DATA) -m 0644 $$p $(install_prefix)$(man1dir)/$$p ; \
-  	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-  	    rm -f $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`;\
-  	    $(LN_S) $$p \
---- 544,550 ----
-  	    $(install_prefix)$(man1dir)/`echo slogin.1 | sed '$(transform)'`; \
-  	fi
-  	-for p in $(MAN1GENERATED); do \
-! 	  $(INSTALL_DATA) $$p $(install_prefix)$(man1dir)/$$p ; \
-  	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-  	    rm -f $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`;\
-  	    $(LN_S) $$p \
-***************
-*** 550,556 ****
-  	  fi; \
-  	done
-  	-for p in $(MAN8GENERATED); do \
-! 	  $(INSTALL_DATA) -m 0644 $$p $(install_prefix)$(man8dir)/$$p; \
-  	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-  	    rm -f $(install_prefix)$(man8dir)/`echo $$p | sed '$(transform)'`;\
-  	    $(LN_S) $$p \
---- 552,558 ----
-  	  fi; \
-  	done
-  	-for p in $(MAN8GENERATED); do \
-! 	  $(INSTALL_DATA) $$p $(install_prefix)$(man8dir)/$$p; \
-  	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-  	    rm -f $(install_prefix)$(man8dir)/`echo $$p | sed '$(transform)'`;\
-  	    $(LN_S) $$p \
-***************
-*** 559,570 ****
-  
-  install-configs:
-  	-if test '!' -f $(install_prefix)$(HOST_CONFIG_FILE); then \
-! 	  $(INSTALL_DATA) -m 0644 $(srcdir)/host_config.sample \
-  	    $(install_prefix)$(HOST_CONFIG_FILE); fi
-  	-if test '!' -f $(install_prefix)$(SERVER_CONFIG_FILE); then \
-  	  cat $(srcdir)/server_config.sample | \
-  	  sed "s#_ETCDIR_#$(etcdir)#g" >/tmp/ssh_inst.$$$$; \
-! 	  $(INSTALL_DATA) -m 0644 /tmp/ssh_inst.$$$$ \
-  	    $(install_prefix)$(SERVER_CONFIG_FILE); \
-  	  rm -f /tmp/ssh_inst.$$$$; fi
-  
---- 561,573 ----
-  
-  install-configs:
-  	-if test '!' -f $(install_prefix)$(HOST_CONFIG_FILE); then \
-! 	  /usr/bin/install -c -o root -g wheel -m 0644 \
-! 	    $(srcdir)/host_config.sample \
-  	    $(install_prefix)$(HOST_CONFIG_FILE); fi
-  	-if test '!' -f $(install_prefix)$(SERVER_CONFIG_FILE); then \
-  	  cat $(srcdir)/server_config.sample | \
-  	  sed "s#_ETCDIR_#$(etcdir)#g" >/tmp/ssh_inst.$$$$; \
-! 	  /usr/bin/install -c -o root -g wheel -m 0644 /tmp/ssh_inst.$$$$ \
-  	    $(install_prefix)$(SERVER_CONFIG_FILE); \
-  	  rm -f /tmp/ssh_inst.$$$$; fi
-  
-***************
-*** 594,606 ****
-  	-rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg
-  	cd $(GMPDIR); $(MAKE) clean
-  #	cd $(RSAREFSRCDIR); rm -f *.o *.a
-! 	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
-  
-  dist: dist-free
-  
---- 597,609 ----
-  	-rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg
-  	cd $(GMPDIR); $(MAKE) clean
-  #	cd $(RSAREFSRCDIR); rm -f *.o *.a
-! #	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
-  
-  dist: dist-free
-  
-***************
-*** 633,640 ****
-  	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
-  
-  #ifdef F_SECURE_COMMERCIAL
-  #
---- 636,643 ----
-  	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
-  
-  #ifdef F_SECURE_COMMERCIAL
-  #
-***************
-*** 662,668 ****
-  	 (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)
-  
-  tags:
-  	-rm -f TAGS
---- 665,671 ----
-  	 (echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed $(srcdir)/version.h >/dev/null
-  
-  depend:
-! 	$(MAKEDEP) -I$(srcdir) -I. $(DEFS) $(SRCS)
-  
-  tags:
-  	-rm -f TAGS
+--- Makefile.in.orig	Tue May 12 00:37:58 1998
++++ Makefile.in	Sun May 24 14:06:29 1998
+@@ -280,8 +280,10 @@
+ GMPDEP 		= $(GMPDIR)/gmp.h $(GMPDIR)/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 +387,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)/$(GMPDIR) -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
+@@ -433,14 +435,14 @@
+ $(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
++#$(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 \
+@@ -497,10 +499,10 @@
+ # (otherwise it can only log in as the user it runs as, and must be
+ # bound to a non-privileged port).  Also, password authentication may
+ # not be available if non-root and using shadow passwords.
+-install: $(PROGRAMS) make-dirs generate-host-key install-configs
++install: $(PROGRAMS) make-dirs install-configs
+ 	-rm -f $(install_prefix)$(bindir)/ssh1.old
+ 	-mv $(install_prefix)$(bindir)/ssh1 $(install_prefix)$(bindir)/ssh1.old
+-	-chmod 755 $(install_prefix)$(bindir)/ssh1.old
++	-chmod 555 $(install_prefix)$(bindir)/ssh1.old
+ 	$(INSTALL_PROGRAM) -o root -m $(SSH_INSTALL_MODE) ssh $(install_prefix)$(bindir)/ssh1
+ 	-if test -f $(install_prefix)$(bindir)/ssh2; then \
+ 	  echo "Ssh version 2 program found, installation doesn't touch ssh link"; \
+@@ -523,7 +525,7 @@
+ 	-for p in $(NORMAL_PROGRAMS) $(X_PROGRAMS) $(OTHER_PROGRAMS); do \
+ 	  rm -f $(install_prefix)$(bindir)/$${p}1.old ; \
+ 	  mv $(install_prefix)$(bindir)/$${p}1 $(install_prefix)$(bindir)/$${p}1.old; \
+-	  $(INSTALL_PROGRAM) -m 0755 $$p $(install_prefix)$(bindir)/$${p}1; \
++	  $(INSTALL_PROGRAM) $$p $(install_prefix)$(bindir)/$${p}1; \
+ 	  if test -f $(install_prefix)$(bindir)/$${p}2; then \
+ 	    echo "Ssh version 2 $$p utility found, installation doesn't touch $$p link"; \
+ 	  else \
+@@ -540,7 +542,7 @@
+ 	  rm -f $(install_prefix)$(bindir)/$${p}1.old ; \
+ 	  mv $(install_prefix)$(bindir)/$${p}1 $(install_prefix)$(bindir)/$${p}1.old; \
+ 	  $(INSTALL_DATA) $$p $(install_prefix)$(bindir)/$${p}1; \
+-	  chmod 755 $(install_prefix)$(bindir)/$${p}1; \
++	  chmod 555 $(install_prefix)$(bindir)/$${p}1; \
+ 	  if test -f $(install_prefix)$(bindir)/$${p}2; then \
+ 	    echo "Ssh version 2 $$p utility found, installation doesn't touch $$p link"; \
+ 	  else \
+@@ -556,7 +558,7 @@
+ 	-for p in $(SBIN_PROGRAMS); do \
+ 	  rm -f $(install_prefix)$(sbindir)/$${p}1.old ; \
+ 	  mv $(install_prefix)$(sbindir)/$${p}1 $(install_prefix)$(sbindir)/$${p}1.old; \
+-	  $(INSTALL_PROGRAM) -m 0755 $$p $(install_prefix)$(sbindir)/$${p}1; \
++	  $(INSTALL_PROGRAM) $$p $(install_prefix)$(sbindir)/$${p}1; \
+ 	  if test -f $(install_prefix)$(sbindir)/$${p}2; then \
+ 	    echo "Ssh version 2 $$p utility found, installation doesn't touch $$p link"; \
+ 	  else \
+@@ -570,7 +572,7 @@
+ 	      $(install_prefix)$(sbindir)/`echo $$p | sed '$(transform)'`; fi;\
+ 	done
+ 	-for p in $(MAN1PAGES); do \
+-	  $(INSTALL_DATA) -m 0644 $(srcdir)/$$p.1 $(install_prefix)$(man1dir)/$${p}1.1 ; \
++	  $(INSTALL_DATA) $(srcdir)/$$p.1 $(install_prefix)$(man1dir)/$${p}1.1 ; \
+ 	  rm -f $(install_prefix)$(man1dir)/$$p.1 ;\
+ 	  $(LN_S) $${p}1.1 $(install_prefix)$(man1dir)/$$p.1 ;\
+ 	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
+@@ -589,7 +591,7 @@
+ 	    $(install_prefix)$(man1dir)/`echo slogin.1 | sed '$(transform)'`; \
+ 	fi
+ 	-for p in $(MAN1GENERATED); do \
+-	  $(INSTALL_DATA) -m 0644 $$p.1 $(install_prefix)$(man1dir)/$${p}1.1 ; \
++	  $(INSTALL_DATA) $$p.1 $(install_prefix)$(man1dir)/$${p}1.1 ; \
+ 	  rm -f $(install_prefix)$(man1dir)/$$p.1 ; \
+ 	  $(LN_S) $${p}1.1 $(install_prefix)$(man1dir)/$$p.1 ; \
+ 	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
+@@ -599,7 +601,7 @@
+ 	  fi; \
+ 	done
+ 	-for p in $(MAN8GENERATED); do \
+-	  $(INSTALL_DATA) -m 0644 $$p.8 $(install_prefix)$(man8dir)/$${p}1.8; \
++	  $(INSTALL_DATA) $$p.8 $(install_prefix)$(man8dir)/$${p}1.8; \
+ 	  rm -f $(install_prefix)$(man8dir)/$$p.8 ; \
+ 	  $(LN_S) $${p}1.8 $(install_prefix)$(man8dir)/$$p.8 ; \
+ 	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
+@@ -610,12 +612,13 @@
+ 
+ install-configs:
+ 	-if test '!' -f $(install_prefix)$(HOST_CONFIG_FILE); then \
+-	  $(INSTALL_DATA) -m 0644 $(srcdir)/host_config.sample \
++	  /usr/bin/install -c -o root -g wheel -m 0644 \
++	    $(srcdir)/host_config.sample \
+ 	    $(install_prefix)$(HOST_CONFIG_FILE); fi
+ 	-if test '!' -f $(install_prefix)$(SERVER_CONFIG_FILE); then \
+ 	  cat $(srcdir)/server_config.sample | \
+ 	  sed "s#_ETCDIR_#$(etcdir)#g" >/tmp/ssh_inst.$$$$; \
+-	  $(INSTALL_DATA) -m 0644 /tmp/ssh_inst.$$$$ \
++	  /usr/bin/install -c -o root -g wheel -m 0644 /tmp/ssh_inst.$$$$ \
+ 	    $(install_prefix)$(SERVER_CONFIG_FILE); \
+ 	  rm -f /tmp/ssh_inst.$$$$; fi
+ 
+@@ -655,13 +658,13 @@
+ 	-rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg
+ 	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 $(ZLIBDIR); $(MAKE) distclean
+ 
+ dist: dist-free
+ 
+@@ -694,8 +697,8 @@
+ 	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 +726,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
diff --git a/security/ssh/pkg/DEINSTALL.pre b/security/ssh/pkg/DEINSTALL
index c1e18ea0d4f..eb3690ff1fd 100644
--- a/security/ssh/pkg/DEINSTALL.pre
+++ b/security/ssh/pkg/DEINSTALL
@@ -5,7 +5,7 @@ case "$2" in
 
 =============================================================
 Note that ssh configuration, key, and random-seed files
-(<$SSH_CONF_DIR>/ssh*) are not removed in the deinstallation
+(@SSH_CONF_DIR@/ssh*) are not removed in the deinstallation
 process.  You should remove those by hand, if you no longer
 need them.
 =============================================================
diff --git a/security/ssh/pkg/MESSAGE.pre b/security/ssh/pkg/MESSAGE
index af07699695d..93a3b55eb55 100644
--- a/security/ssh/pkg/MESSAGE.pre
+++ b/security/ssh/pkg/MESSAGE
@@ -1,11 +1,11 @@
 ==========================================================================
-If "starter" configuration files were installed (in <$SSH_CONF_DIR>)
+If "starter" configuration files were installed (in @SSH_CONF_DIR@)
 when the package was installed, be sure to examine them (and the man pages
 for ssh and sshd) to determine whether you want to make any changes.
 
 Copies of the example configuration files are installed in
-<$PREFIX>/examples/ssh, so those can still be used for reference after
-you have made changes to those installed in <$SSH_CONF_DIR>, or if
+@PREFIX@/examples/ssh, so those can still be used for reference after
+you have made changes to those installed in @SSH_CONF_DIR@, or if
 you had existing configuration files, which would not be overwritten in
 the installation process.
 
@@ -13,7 +13,5 @@ In general, you will want to set up /etc/rc.local to start sshd at boot
 time.  Something like the following should do the job:
 
 # Run sshd if installed and configured
-if [ -f <$PREFIX>/sbin/sshd -a -f <$SSH_CONF_DIR>/sshd_config ]; then
-	echo -n ' sshd';	<$PREFIX>/sbin/sshd
-fi
+@PREFIX@/etc/rc.d/sshd.sh
 ==========================================================================
diff --git a/security/ssh/pkg/PLIST b/security/ssh/pkg/PLIST
new file mode 100644
index 00000000000..c6bb9c1816d
--- /dev/null
+++ b/security/ssh/pkg/PLIST
@@ -0,0 +1,43 @@
+@comment $NetBSD: PLIST,v 1.4 1998/05/24 18:59:44 tron Exp $
+bin/scp
+bin/ssh
+@exec ln -fs %f %B/slogin
+@unexec rm %B/slogin
+bin/ssh-add
+bin/ssh-agent
+bin/ssh-askpass
+bin/ssh-keygen
+bin/ssh1
+bin/ssh-keygen1
+bin/ssh-agent1
+bin/ssh-add1
+bin/scp1
+bin/ssh-askpass1
+bin/make-ssh-known-hosts1
+bin/make-ssh-known-hosts
+etc/rc.d/sshd.sh
+man/man1/make-ssh-known-hosts1.1
+man/man1/make-ssh-known-hosts.1
+man/man1/scp.1
+man/man1/scp1.1
+man/man1/ssh-add.1
+man/man1/ssh-add1.1
+man/man1/ssh-agent.1
+man/man1/ssh-agent1.1
+man/man1/ssh-keygen.1
+man/man1/ssh-keygen1.1
+man/man1/ssh.1
+man/man1/ssh1.1
+man/man1/slogin.1
+man/man1/slogin1.1
+man/man8/sshd.8
+man/man8/sshd1.8
+sbin/sshd
+sbin/sshd1
+share/examples/ssh/ssh_config
+share/examples/ssh/sshd_config
+@exec if [ ! -d @SSH_CONF_DIR@ ]; then echo "Creating directory @SSH_CONF_DIR@ for ssh config files.." ; mkdir -p @SSH_CONF_DIR@; fi
+@exec if [ ! -f @SSH_CONF_DIR@/ssh_config ]; then echo "Installing example ssh_config in @SSH_CONF_DIR@.." ; /usr/bin/install -c -o root -g wheel -m 0644 %D/share/examples/ssh/ssh_config @SSH_CONF_DIR@; fi
+@exec if [ ! -f @SSH_CONF_DIR@/sshd_config ]; then echo "Installing example sshd_config in @SSH_CONF_DIR@.." ; /usr/bin/install -c -o root -g wheel -m 0644 %D/share/examples/ssh/sshd_config @SSH_CONF_DIR@; fi
+@exec if [ ! -f @SSH_CONF_DIR@/ssh_host_key ]; then echo "Generating a secret host key in @SSH_CONF_DIR@.." ; %D/bin/ssh-keygen -N "" -f @SSH_CONF_DIR@/ssh_host_key; fi
+@dirrm share/examples/ssh
diff --git a/security/ssh/pkg/PLIST.pre b/security/ssh/pkg/PLIST.pre
deleted file mode 100644
index 84c160353a2..00000000000
--- a/security/ssh/pkg/PLIST.pre
+++ /dev/null
@@ -1,28 +0,0 @@
-@comment $NetBSD: PLIST.pre,v 1.1 1998/02/12 14:27:49 mrg Exp $
-@comment XXX etc/rc.d/sshd.sh - not yet - hubertf
-bin/scp
-bin/ssh
-@exec ln -fs %f %B/slogin
-@unexec rm %B/slogin
-bin/ssh-add
-bin/ssh-agent
-bin/ssh-askpass
-bin/ssh-keygen
-bin/make-ssh-known-hosts
-man/man1/make-ssh-known-hosts.1.gz
-man/man1/scp.1.gz
-man/man1/ssh-add.1.gz
-man/man1/ssh-agent.1.gz
-man/man1/ssh-keygen.1.gz
-man/man1/ssh.1.gz
-man/man1/slogin.1.gz
-man/man8/sshd.8.gz
-sbin/sshd
-@exec if [ ! -d %D/share/examples/ssh ]; then mkdir -p %D/share/examples/ssh; fi
-share/examples/ssh/ssh_config
-share/examples/ssh/sshd_config
-@exec if [ ! -d <$SSH_CONF_DIR> ]; then echo "Creating directory <$SSH_CONF_DIR> for ssh config files.." ; mkdir -p <$SSH_CONF_DIR>; fi
-@exec if [ ! -f <$SSH_CONF_DIR>/ssh_config ]; then echo "Installing example ssh_config in <$SSH_CONF_DIR>.." ; /usr/bin/install -c -o root -g wheel -m 0644 %D/share/examples/ssh/ssh_config <$SSH_CONF_DIR>; fi
-@exec if [ ! -f <$SSH_CONF_DIR>/sshd_config ]; then echo "Installing example sshd_config in <$SSH_CONF_DIR>.." ; /usr/bin/install -c -o root -g wheel -m 0644 %D/share/examples/ssh/sshd_config <$SSH_CONF_DIR>; fi
-@exec if [ ! -f <$SSH_CONF_DIR>/ssh_host_key ]; then echo "Generating a secret host key in <$SSH_CONF_DIR>.." ; %D/bin/ssh-keygen -N "" -f <$SSH_CONF_DIR>/ssh_host_key; fi
-@dirrm share/examples/ssh