From larse@nik.isi.edu  Fri Feb 21 11:23:29 2003
Return-Path: <larse@nik.isi.edu>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2DB3337B401
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Feb 2003 11:23:29 -0800 (PST)
Received: from nik.isi.edu (nik.isi.edu [128.9.168.58])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 84F2443F3F
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Feb 2003 11:23:28 -0800 (PST)
	(envelope-from larse@nik.isi.edu)
Received: from nik.isi.edu (localhost [127.0.0.1])
	by nik.isi.edu (8.12.7/8.12.7) with ESMTP id h1LJNSwS073049
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Feb 2003 11:23:28 -0800 (PST)
	(envelope-from larse@nik.isi.edu)
Received: (from larse@localhost)
	by nik.isi.edu (8.12.7/8.12.7/Submit) id h1LJNSo3073048;
	Fri, 21 Feb 2003 11:23:28 -0800 (PST)
Message-Id: <200302211923.h1LJNSo3073048@nik.isi.edu>
Date: Fri, 21 Feb 2003 11:23:28 -0800 (PST)
From: Lars Eggert <larse@isi.edu>
Reply-To: Lars Eggert <larse@isi.edu>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port: security/ssh2 3.2.2 -> 3.2.3
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         48542
>Category:       ports
>Synopsis:       Update port: security/ssh2 3.2.2 -> 3.2.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 21 11:30:01 PST 2003
>Closed-Date:    Sun Feb 23 14:39:11 PST 2003
>Last-Modified:  Sun Feb 23 14:39:11 PST 2003
>Originator:     Lars Eggert
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
USC/ISI
>Environment:
System: FreeBSD nik.isi.edu 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Mon Feb 10 18:10:13 PST 2003 root@nik.isi.edu:/usr/obj/usr/src/sys/KERNEL-1.15 i386


	
>Description:
	
>How-To-Repeat:
	
>Fix:
diff -u ssh2.orig/Makefile ssh2/Makefile
--- ssh2.orig/Makefile	Fri Feb 21 10:50:58 2003
+++ ssh2/Makefile	Fri Feb 21 11:13:38 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ssh2
-PORTVERSION=	3.2.2
+PORTVERSION=	3.2.3
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.ssh.com/pub/ssh/ \
 		ftp://sunsite.unc.edu/pub/packages/security/ssh/ \
@@ -68,9 +68,9 @@
 .endif
 
 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
+		sshregex.1 ssh-probe2.1 ssh-dummy-shell.1
+MAN5=		ssh2_config.5 sshd-check-conf.5 sshd2_config.5 \
+		sshd2_subconfig.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 \
@@ -80,7 +80,7 @@
 PORTDOCS=	CHANGES FAQ INSTALL LICENSE MANIFEST NEWS README \
 		REGEX-SYNTAX SSH2.QUICKSTART
 
-post-install: install-config-files
+post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
@@ -99,13 +99,5 @@
 		${CHMOD} 751 ${SSH2_RCD}/sshd.sh; \
 	    fi; \
 	fi
-
-install-config-files:
-.for file in ${CONFIG_FILES}
-	${INSTALL_DATA} ${WRKSRC}/apps/ssh/${file} ${SSH2_ETC}/${file}.sample
-.if !exists(${SSH2_ETC}/${file})
-	${INSTALL_DATA} ${WRKSRC}/apps/ssh/${file} ${SSH2_ETC}
-.endif
-.endfor
 
 .include <bsd.port.post.mk>
diff -u ssh2.orig/distinfo ssh2/distinfo
--- ssh2.orig/distinfo	Fri Feb 21 10:50:58 2003
+++ ssh2/distinfo	Fri Feb 21 10:51:44 2003
@@ -1 +1 @@
-MD5 (ssh-3.2.2.tar.gz) = 5ba56fa6f0d533acf0a83f5d2f0fed43
+MD5 (ssh-3.2.3.tar.gz) = d74afd27a5df00ae8fbbe066ec82c88a
Common subdirectories: ssh2.orig/files and ssh2/files
diff -u ssh2.orig/pkg-plist ssh2/pkg-plist
--- ssh2.orig/pkg-plist	Fri Feb 21 10:50:58 2003
+++ ssh2/pkg-plist	Fri Feb 21 11:19:37 2003
@@ -9,12 +9,10 @@
 bin/ssh-probe2
 bin/sftp-server2
 bin/ssh-dummy-shell
-bin/ssh-pubkeymgr
-bin/ssh-chrootmgr
 bin/ssh
 bin/ssh-agent
 bin/ssh-add
-bin/ssh-askpass
+%%WITH_X11:%%bin/ssh-askpass
 bin/ssh-keygen
 bin/scp
 bin/sftp
@@ -22,9 +20,13 @@
 bin/ssh-signer
 bin/ssh-probe
 etc/rc.d/sshd.sh
-etc/ssh2/sshd2_config.sample
-etc/ssh2/ssh2_config.sample
+etc/ssh2/sshd2_config.example
+etc/ssh2/ssh2_config.example
 etc/ssh2/ssh_dummy_shell.out
+etc/ssh2/subconfig/anonymous.example
+etc/ssh2/subconfig/host_ext.example
+etc/ssh2/subconfig/host_int.example
+etc/ssh2/subconfig/user.example
 sbin/sshd2
 sbin/sshd-check-conf
 sbin/sshd
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Sun Feb 23 14:39:06 PST 2003 
State-Changed-Why:  
Commited, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=48542 
>Unformatted:
