From nobody@FreeBSD.org  Fri Feb  8 15:50:05 2002
Return-Path: <nobody@FreeBSD.org>
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 133B437B421
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  8 Feb 2002 15:50:04 -0800 (PST)
Received: (from nobody@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g18No4U89214;
	Fri, 8 Feb 2002 15:50:04 -0800 (PST)
	(envelope-from nobody)
Message-Id: <200202082350.g18No4U89214@freefall.freebsd.org>
Date: Fri, 8 Feb 2002 15:50:04 -0800 (PST)
From: Lars Eggert <larse@isi.edu>
To: freebsd-gnats-submit@FreeBSD.org
Subject: port update: security/ssh2 2.3.9 -> 3.1.0 [WITH PATCH]
X-Send-Pr-Version: www-1.0

>Number:         34740
>Category:       ports
>Synopsis:       port update: security/ssh2 2.3.9 -> 3.1.0 [WITH PATCH]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 08 16:00:04 PST 2002
>Closed-Date:    Fri Feb 22 11:52:50 JST 2002
>Last-Modified:  Fri Feb 22 11:56:38 JST 2002
>Originator:     Lars Eggert
>Release:        FreeBSD-4.5
>Organization:
>Environment:
FreeBSD  4.5-RELEASE FreeBSD 4.5-RELEASE #0: Thu Jan 31 12:24:36 GMT 2002     root@:/usr/src/sys/compile/TEST  i386

>Description:
The attached patch updates the security/ssh2 port to version 3.1. Note that all patches (files/patch-a[a-l]) must be removed.
>How-To-Repeat:
      
>Fix:
diff -ru /usr/ports/security/ssh2/Makefile ./Makefile
--- /usr/ports/security/ssh2/Makefile   Fri Feb  8 03:21:16 2002
+++ ./Makefile  Fri Feb  8 15:32:49 2002
@@ -6,11 +6,16 @@
 #
 
 PORTNAME=      ssh2
-PORTVERSION=   2.3.0
+PORTVERSION=   3.1.0
 CATEGORIES=    security
 MASTER_SITES=  ftp://ftp.ssh.com/pub/ssh/ \
                ftp://sunsite.unc.edu/pub/packages/security/ssh/ \
-               ftp://ftp.kyoto.wide.ad.jp/pub/security/ssh/
+               ftp://ftp.kyoto.wide.ad.jp/pub/security/ssh/ \
+               ftp://ftp.cis.fed.gov/pub/ssh/ \
+               ftp://ftp.keystealth.org/pub/ssh/ \
+               ftp://mirror.chpc.utah.edu/pub/ssh/ \
+               ftp://metalab.unc.edu/pub/packages/security/ssh/ \
+               ftp://herbie.ucs.indiana.edu/pub/security/ssh/
 DISTNAME=      ssh-${PORTVERSION}
 
 MAINTAINER=    issei@jp.FreeBSD.org
@@ -19,7 +24,7 @@
 
 GNU_CONFIGURE= YES
 
-CONFIGURE_ARGS=        --with-etcdir=${PREFIX}/etc --disable-compiler-optimizat
ions
+CONFIGURE_ARGS=        --with-etcdir=${PREFIX}/etc/ssh2
 #Uncomment if all your users are in their own group and their homedir
 #is writeable by that group.  Beware the security implications!
 #CONFIGURE_ARGS+= --enable-group-writeability
@@ -36,18 +41,20 @@
 LIB_DEPENDS+=  wrap.7:${PORTSDIR}/security/tcp_wrapper
 .endif
 
-MAN1=  scp.1 sftp.1 scp2.1 sftp2.1 sshregex.1 ssh-probe2.1 ssh-dummy-shell.1 \
-       ssh-pubkeymgr.1 ssh2.1 ssh-chrootmgr.1 ssh-agent.1 ssh-keygen.1 \
-       ssh-add.1 ssh-add2.1 ssh-agent2.1 ssh-keygen2.1
-MAN5=  ssh2_config.5 sshd2_config.5
-MAN8=  sshd.8 sshd2.8
+MAN1=           ssh2.1 ssh-keygen2.1 ssh-add2.1 ssh-agent2.1 scp2.1 sftp2.1 \
+                sshregex.1 ssh-probe2.1 ssh-dummy-shell.1 ssh-pubkeymgr.1 \
+                ssh-chrootmgr.1
+MAN5=           ssh2_config.5 sshd-check-conf.5 sshd2_config.5
+MAN8=           sshd2.8
+MLINKS=         ssh2.1 ssh.1 ssh-add2.1 ssh-add.1 ssh-agent2.1 ssh-agent.1 \
+                ssh-keygen2.1 ssh-keygen.1 scp2.1 scp.1 sftp2.1 sftp.1 \
+                ssh-probe2.1 ssh-probe.1 sshd2.8 sshd.8
+MANCOMPRESSED=  no
 
-PORTDOCS=      BUG.REPORT CHANGES FAQ INSTALL LICENSE README \
-               SSH2.QUICKSTART
+PORTDOCS=       BUG.REPORT CHANGES FAQ INSTALL LICENSE MANIFEST NEWS README \
+                REGEX-SYNTAX SSH2.QUICKSTART
 
 post-install:
-       ${RM} ${PREFIX}/man/man1/ssh.1
-       ${RM} ${PREFIX}/man/man1/ssh-probe.1
 .if !defined(NOPORTDOCS)
        -${MKDIR} ${PREFIX}/share/doc/ssh2
 .for i in ${PORTDOCS}
diff -ru /usr/ports/security/ssh2/distinfo ./distinfo
--- /usr/ports/security/ssh2/distinfo   Fri Sep  1 20:56:56 2000
+++ ./distinfo  Fri Feb  8 15:28:12 2002
@@ -1 +1 @@
-MD5 (ssh-2.3.0.tar.gz) = 2296fa2ad3474f117759f65678ce0e7a
+MD5 (ssh-3.1.0.tar.gz) = 0a692bff9c0b2cdb1333c4b5bb8d4a1c
diff -ru /usr/ports/security/ssh2/pkg-plist ./pkg-plist
--- /usr/ports/security/ssh2/pkg-plist  Sat Sep 22 03:15:17 2001
+++ ./pkg-plist Fri Feb  8 15:37:41 2002
@@ -6,6 +6,8 @@
 bin/ssh-add2
 bin/ssh-signer2
 bin/ssh-probe2
+bin/ssh-askpass2
+bin/ssh-pam-client
 bin/sftp-server2
 bin/ssh-dummy-shell
 bin/ssh-pubkeymgr
@@ -21,17 +23,26 @@
 bin/ssh-signer
 bin/ssh-probe
 etc/rc.d/sshd.sh
+etc/ssh2/hostkey
+etc/ssh2/hostkey.pub
 etc/ssh2/sshd2_config
 etc/ssh2/ssh2_config
 etc/ssh2/ssh_dummy_shell.out
 sbin/sshd2
+sbin/sshd-check-conf
 sbin/sshd
 share/doc/ssh2/BUG.REPORT
 share/doc/ssh2/CHANGES
 share/doc/ssh2/FAQ
 share/doc/ssh2/INSTALL
 share/doc/ssh2/LICENSE
+share/doc/ssh2/MANIFEST
+share/doc/ssh2/NEWS
 share/doc/ssh2/README
+share/doc/ssh2/REGEX-SYNTAX
 share/doc/ssh2/SSH2.QUICKSTART
+@dirrm etc/ssh2/knownhosts
+@dirrm etc/ssh2/hostkeys
+@dirrm etc/ssh2
 @dirrm share/doc/ssh2
 @exec if [ ! -f %D/etc/ssh2/hostkey ]; then umask 022; echo "Generating 1024 bi
t host key."; %D/bin/ssh-keygen2 -P -b 1024 -t dsa -c "1024-bit dsa hostkey" -o 
%D/etc/ssh2/hostkey;  fi

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: knu 
State-Changed-When: Fri Feb 22 11:52:50 JST 2002 
State-Changed-Why:  
Committed, thanks!  Now you are the new maintainer. :) 

BTW, the enclosed patch was messed up with whitespace.  Next time please 
include a patch properly (uuencoded if you are not sure). 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=34740 
>Unformatted:
