Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Aug 2000 03:05:35 +0900
From:      issei@jp.FreeBSD.org
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/20869: Update port: security/ssh2
Message-ID:  <20000827030535I.issei@issei.org>

next in thread | raw e-mail | index | archive | help

>Number:         20869
>Category:       ports
>Synopsis:       Update port : security/ssh2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 26 11:20:05 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Issei Suzuki
>Release:        FreeBSD 4.1-RELEASE i386
>Organization:
Individual
>Environment:

	FreeBSD 4.1-RELEASE

>Description:

	Update ssh2 from 2.1.0p2 to 2.3.0.  Today, OpenSSH supports SSH 2
	protocol, but:

	1) It has still problems to comminicate with this SSH Commucations
	   Securiry Corp's ssh2.
	2) ssh2 provides some features that OpenSSH does not, such as
	   sftp.
	
	So I'm sure that we should maintain security/ssh2 port.


	SSH Communicatoins Security Corp change the license of ssh2 from	
	version 2.3.0.

	-- From ssh-2.3.0/LICENSE ----------------------------------------
	To qualify for a Non-Commercial Use License, You must: (1) use the
	Software solely on a system under the Linux, FreeBSD, NetBSD, or
	OpenBSD operating system (whether for commercial or non-commercial
	use), or ...
	------------------------------------------------------------------

	2. COMMERCIAL USE LICENSE
	...
	SSH does not charge license fees for use or
	bundling or distribution of only the respective UNIX versions of the
	Software solely with the following operating systems: Linux, NetBSD,
	FreeBSD and OpenBSD. In order to distribute the Software with the
	above-mentioned operating systems, You must enter into a separate
	agreement with SSH.
	------------------------------------------------------------------

	Users of FreeBSD may use ssh2 without charge, and you may bundle
	ssh2 with FreeBSD distribution, if you want.

>How-To-Repeat:

	

>Fix:


diff -urN ssh2.old/Makefile ssh2/Makefile
--- ssh2.old/Makefile	Sun Aug 27 02:38:54 2000
+++ ssh2/Makefile	Sun Aug 27 02:33:59 2000
@@ -6,16 +6,12 @@
 #
 
 PORTNAME=	ssh2
-PORTVERSION=	2.1.0p2
+PORTVERSION=	2.3.0
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cs.hut.fi/pub/ssh/ \
+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/
-DISTNAME=	ssh-secure-shell-2.1.0-noncommercial
-
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	ssh-2.1.0-patch1
-PATCH_DIST_STRIP=	-p1
+DISTNAME=	ssh-${PORTVERSION}
 
 MAINTAINER=	issei@jp.FreeBSD.org
 
@@ -23,34 +19,16 @@
 
 GNU_CONFIGURE=	YES
 
-CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc --enable-debug
+CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc --disable-compiler-optimizations
 #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
 
 .include <bsd.port.pre.mk>
 
-# Don't support for ssh1 client backward compatibility
-#WITHOUT_SSH1=	yes
 # Include tcp_wrappers support (automaticlly YES if /usr/include/tcpd.h exists)
 #WITH_TCPWRAP=	yes
-# Warning: untested!
-# Include support for the TIS authentication server
-#WITH_TIS=	yes
-# Include support for the SecureID card
-#WITH_SECUREID=	yes
-
-.if ${OSVERSION} < 400016 && !defined(WITHOUT_SSH1)
-BUILD_DEPENDS+=	ssh1:${PORTSDIR}/security/ssh
-RUN_DEPENDS+=	ssh1:${PORTSDIR}/security/ssh
-.endif
 
-.if defined(WITH_SECUREID)
-CONFIGURE_ARGS+= --with-secureid
-.endif
-.if defined(WITH_TIS)
-CONFIGURE_ARGS+= --with-tis
-.endif
 .if exists(/usr/include/tcpd.h) && !defined(WITHOUT_TCPWRAP)
 CONFIGURE_ARGS+= --with-libwrap
 .elif defined(WITH_TCPWRAP)
@@ -58,38 +36,18 @@
 LIB_DEPENDS+=	wrap.7:${PORTSDIR}/security/tcp_wrapper
 .endif
 
-MAN1=	ssh-add2.1 ssh-agent2.1 scp2.1 sftp2.1 sshregex.1 ssh-probe2.1 \
-	ssh-dummy-shell.1 ssh-pubkeymgr.1 ssh2.1 ssh-keygen2.1
-MAN8=	sshd2.8
-
-MLINKS=	scp2.1 scp.1 \
-	sftp2.1 sftp.1 \
-	ssh-add2.1 ssh-add.1 \
-	ssh-agent2.1 ssh-agent.1 \
-	ssh-keygen2.1 ssh-keygen.1 \
-	ssh-probe2.1 ssh-probe.1 \
-	ssh2.1 ssh.1  \
-	sshd2.8 sshd.8
+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
 
-PORTDOCS=	BUG.REPORT CHANGES FAQ INSTALL LICENSING README \
+PORTDOCS=	BUG.REPORT CHANGES FAQ INSTALL LICENSE README \
 		SSH2.QUICKSTART
-.if ${OSVERSION} >= 400016 || defined(WITHOUT_SSH1)
-PLIST=		${PKGDIR}/PLIST.ssh2_only
-.endif
-
-.if exists(/usr/sbin/sshd)
-post-patch:
-	@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/use-base-openssh.diff
-.endif
 
 post-install:
-.if ${OSVERSION} < 400016 && !defined(WITHOUT_SSH1)
-.for i in ssh ssh-keygen ssh-add ssh-agent scp
-	${MV} -f ${PREFIX}/man/man1/${i}.1${MAN_SUFX} ${PREFIX}/man/man1/${i}.old.1${MAN_SUFX}
-.endfor
-	${MV} -f ${PREFIX}/man/man8/sshd.8${MAN_SUFX} ${PREFIX}/man/man8/sshd.old.8${MAN_SUFX}
-.endif
-#
+	${RM} ${PREFIX}/man/man1/ssh.1
+	${RM} ${PREFIX}/man/man1/ssh-prove.1
 .if !defined(NOPORTDOCS)
 	-${MKDIR} ${PREFIX}/share/doc/ssh2
 .for i in ${PORTDOCS}
diff -urN ssh2.old/files/md5 ssh2/files/md5
--- ssh2.old/files/md5	Sun Aug 27 02:38:54 2000
+++ ssh2/files/md5	Sun Aug 27 01:12:34 2000
@@ -1,2 +1 @@
-MD5 (ssh-secure-shell-2.1.0-noncommercial.tar.gz) = adb4e460471a40cb3952a34864300ffc
-MD5 (ssh-2.1.0-patch1) = 5173fde1245c6d1a02d2e63c2250d5e6
+MD5 (ssh-2.3.0.tar.gz) = 2296fa2ad3474f117759f65678ce0e7a
diff -urN ssh2.old/files/use-base-openssh.diff ssh2/files/use-base-openssh.diff
--- ssh2.old/files/use-base-openssh.diff	Sun Aug 27 02:38:54 2000
+++ ssh2/files/use-base-openssh.diff	Thu Jan  1 09:00:00 1970
@@ -1,22 +0,0 @@
---- configure.fbsd	Fri Mar 10 02:26:28 2000
-+++ configure	Fri Mar 10 02:58:22 2000
-@@ -4352,7 +4352,7 @@
- 
- # Check ssh1 compatibility
- # Extract the first word of "ssh1", so it can be a program name with args.
--set dummy ssh1; ac_word=$2
-+set dummy ssh; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:4358: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_SSH1_PATH'+set}'`\" = set"; then
-@@ -4393,8 +4393,8 @@
- #define SSH1_COMPATIBILITY 1
- EOF
- 
--  SSHD1_PATH=`echo $SSH1_PATH | sed 's@/bin/ssh1$@/sbin/sshd1@'`
--  SCP1_PATH=`echo $SSH1_PATH | sed 's@/bin/ssh1$@/bin/scp1@'`
-+  SSHD1_PATH=`echo $SSH1_PATH | sed 's@/usr/bin/ssh$@/usr/sbin/sshd@'`
-+  SCP1_PATH=`echo $SSH1_PATH | sed 's@/usr/bin/ssh$@/usr/bin/scp@'`
-   cat >> confdefs.h <<EOF
- #define SSH1_PATH "$SSH1_PATH"
- EOF
diff -urN ssh2.old/patches/patch-aa ssh2/patches/patch-aa
--- ssh2.old/patches/patch-aa	Sun Aug 27 02:38:54 2000
+++ ssh2/patches/patch-aa	Sun Aug 27 01:13:49 2000
@@ -1,6 +1,6 @@
---- lib/Makefile.in.orig	Thu Mar 30 21:41:49 2000
-+++ lib/Makefile.in	Wed May 17 18:03:14 2000
-@@ -105,7 +105,7 @@
+--- lib/Makefile.in.orig	Thu Aug 24 17:41:39 2000
++++ lib/Makefile.in	Sun Aug 27 01:13:32 2000
+@@ -110,7 +110,7 @@
  
  AUTOMAKE_OPTIONS = 1.0 foreign dist-zip no-dependencies
  
@@ -9,7 +9,7 @@
  
  SUBDIRS_windelta = +win32
  
-@@ -114,7 +114,7 @@
+@@ -119,7 +119,7 @@
  # The `object_SUBLIBRARIES' variables are used on the Windows to
  # expand the original library `object' with the listed sublibraries at
  # the link step.
@@ -18,7 +18,7 @@
  
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../sshconf.h
-@@ -314,11 +314,6 @@
+@@ -319,11 +319,6 @@
  
  local-includes:
  	-if test '!' -d ../include; then mkdir ../include; fi
diff -urN ssh2.old/patches/patch-ab ssh2/patches/patch-ab
--- ssh2.old/patches/patch-ab	Sun Aug 27 02:38:54 2000
+++ ssh2/patches/patch-ab	Sun Aug 27 01:24:10 2000
@@ -1,11 +1,11 @@
---- lib/sshapputil/Makefile.in.orig	Thu Mar 30 21:41:53 2000
-+++ lib/sshapputil/Makefile.in	Wed May 17 18:04:39 2000
-@@ -120,7 +120,7 @@
+--- lib/sshapputil/Makefile.in.orig	Sun Aug 27 01:23:04 2000
++++ lib/sshapputil/Makefile.in	Sun Aug 27 01:23:41 2000
+@@ -128,7 +128,7 @@
  include_HEADERS = sshuserfile.h 		  sshuserfilebuf.h
  
  
--ADD_INCLUDES = -I../.. -I. -I$(srcdir) 	-I$(top_builddir) -I$(top_srcdir) 	-I../sshutil -I$(srcdir)/../sshutil -I../sshmath 	-I$(srcdir)/../sshmath -I../zlib -I$(srcdir)/../zlib
-+ADD_INCLUDES = -I../.. -I. -I$(srcdir) 	-I$(top_builddir) -I$(top_srcdir) 	-I../sshutil -I$(srcdir)/../sshutil -I../sshmath 	-I$(srcdir)/../sshmath
+-INCLUDES = $(ADD_INCLUDES)  -I$(srcdir) -I.  -I$(top_builddir) -I$(top_srcdir)  -I$(top_srcdir)/lib/sshutil -I$(top_srcdir)/lib/sshutil/sshcore -I$(top_srcdir)/lib/sshutil/sshadt -I$(top_srcdir)/lib/sshutil/ssholdadt -I$(top_srcdir)/lib/sshutil/sshstrutil -I$(top_srcdir)/lib/sshutil/ssheloop -I$(top_srcdir)/lib/sshutil/sshstream -I$(top_srcdir)/lib/sshutil/sshfsm -I$(top_srcdir)/lib/sshutil/sshsysutil -I$(top_srcdir)/lib/sshutil/sshnet -I$(top_srcdir)/lib/sshutil/sshmisc -I$(top_srcdir)/lib/sshutil/sshpacketstream -I$(top_srcdir)/lib/sshutil/sshtestutil -I$(top_srcdir)/lib/zlib -I$(top_srcdir)/lib/sshmath -I$(top_srcdir)/lib/sshreadline -I$(top_srcdir)/lib/sshapputil -I$(top_srcdir)/lib/sshcrypt -I$(top_srcdir)/lib/sshproto -I$(top_srcdir)/lib/sshagent -I$(top_srcdir)/lib/sshsession -I$(top_srcdir)/lib/sshhttp -I$(top_srcdir)/lib/sshscrlock -I$(top_srcdir)/lib/sshsmtp -I$(top_srcdir)/lib/sshscm -I$(top_srcdir)/lib/sshpgp -I$(top_srcdir)/lib/sshipsecappapi -I$(top_srcdir)/lib/sshhs -I$(top_srcdir)/lib/sshexternalkey -I$(top_srcdir)/lib/sshfilexfer 
++INCLUDES = $(ADD_INCLUDES)  -I$(srcdir) -I.  -I$(top_builddir) -I$(top_srcdir)  -I$(top_srcdir)/lib/sshutil -I$(top_srcdir)/lib/sshutil/sshcore -I$(top_srcdir)/lib/sshutil/sshadt -I$(top_srcdir)/lib/sshutil/ssholdadt -I$(top_srcdir)/lib/sshutil/sshstrutil -I$(top_srcdir)/lib/sshutil/ssheloop -I$(top_srcdir)/lib/sshutil/sshstream -I$(top_srcdir)/lib/sshutil/sshfsm -I$(top_srcdir)/lib/sshutil/sshsysutil -I$(top_srcdir)/lib/sshutil/sshnet -I$(top_srcdir)/lib/sshutil/sshmisc -I$(top_srcdir)/lib/sshutil/sshpacketstream -I$(top_srcdir)/lib/sshutil/sshtestutil -I$(top_srcdir)/lib/sshmath -I$(top_srcdir)/lib/sshreadline -I$(top_srcdir)/lib/sshapputil -I$(top_srcdir)/lib/sshcrypt -I$(top_srcdir)/lib/sshproto -I$(top_srcdir)/lib/sshagent -I$(top_srcdir)/lib/sshsession -I$(top_srcdir)/lib/sshhttp -I$(top_srcdir)/lib/sshscrlock -I$(top_srcdir)/lib/sshsmtp -I$(top_srcdir)/lib/sshscm -I$(top_srcdir)/lib/sshpgp -I$(top_srcdir)/lib/sshipsecappapi -I$(top_srcdir)/lib/sshhs -I$(top_srcdir)/lib/sshexternalkey -I$(top_srcdir)/lib/sshfilexfer 
  
- 
- INCLUDES = $(ADD_INCLUDES) -I$(srcdir) -I. -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/lib/sshutil
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../sshconf.h
diff -urN ssh2.old/patches/patch-ac ssh2/patches/patch-ac
--- ssh2.old/patches/patch-ac	Sun Aug 27 02:38:54 2000
+++ ssh2/patches/patch-ac	Sun Aug 27 01:15:12 2000
@@ -1,11 +1,11 @@
---- lib/sshcrypt/Makefile.in.orig	Thu Mar 30 21:41:53 2000
-+++ lib/sshcrypt/Makefile.in	Wed May 17 18:05:36 2000
-@@ -140,7 +140,7 @@
+--- lib/sshcrypt/Makefile.in.orig	Thu Aug 24 17:41:49 2000
++++ lib/sshcrypt/Makefile.in	Sun Aug 27 01:15:02 2000
+@@ -149,7 +149,7 @@
  LDADD = libsshcrypt.a 	../sshutil/libsshutil.a ../sshmath/libsshmath.a
  
  
--ADD_INCLUDES = -I../.. -I. -I$(srcdir) 	-I$(top_builddir) -I$(top_srcdir) 	-I../sshutil -I$(srcdir)/../sshutil 	-I../sshmath -I$(srcdir)/../sshmath 	-I../zlib -I$(srcdir)/../zlib 	-I../sshscard -I$(srcdir)/../sshscard 	-I../sshexternalkey -I$(srcdir)/../sshexternalkey 	-I../trq -I$(srcdir)/../trq
-+ADD_INCLUDES = -I../.. -I. -I$(srcdir) 	-I$(top_builddir) -I$(top_srcdir) 	-I../sshutil -I$(srcdir)/../sshutil 	-I../sshmath -I$(srcdir)/../sshmath 	-I../sshscard -I$(srcdir)/../sshscard 	-I../sshexternalkey -I$(srcdir)/../sshexternalkey 	-I../trq -I$(srcdir)/../trq
+-INCLUDES = $(ADD_INCLUDES)  -I$(srcdir) -I.  -I$(top_builddir) -I$(top_srcdir)  -I$(top_srcdir)/lib/sshutil -I$(top_srcdir)/lib/sshutil/sshcore -I$(top_srcdir)/lib/sshutil/sshadt -I$(top_srcdir)/lib/sshutil/ssholdadt -I$(top_srcdir)/lib/sshutil/sshstrutil -I$(top_srcdir)/lib/sshutil/ssheloop -I$(top_srcdir)/lib/sshutil/sshstream -I$(top_srcdir)/lib/sshutil/sshfsm -I$(top_srcdir)/lib/sshutil/sshsysutil -I$(top_srcdir)/lib/sshutil/sshnet -I$(top_srcdir)/lib/sshutil/sshmisc -I$(top_srcdir)/lib/sshutil/sshpacketstream -I$(top_srcdir)/lib/sshutil/sshtestutil -I$(top_srcdir)/lib/zlib -I$(top_srcdir)/lib/sshmath -I$(top_srcdir)/lib/sshreadline -I$(top_srcdir)/lib/sshapputil -I$(top_srcdir)/lib/sshcrypt -I$(top_srcdir)/lib/sshproto -I$(top_srcdir)/lib/sshagent -I$(top_srcdir)/lib/sshsession -I$(top_srcdir)/lib/sshhttp -I$(top_srcdir)/lib/sshscrlock -I$(top_srcdir)/lib/sshsmtp -I$(top_srcdir)/lib/sshscm -I$(top_srcdir)/lib/sshpgp -I$(top_srcdir)/lib/sshipsecappapi -I$(top_srcdir)/lib/sshhs -I$(top_srcdir)/lib/sshexternalkey -I$(top_srcdir)/lib/sshfilexfer 
++INCLUDES = $(ADD_INCLUDES)  -I$(srcdir) -I.  -I$(top_builddir) -I$(top_srcdir)  -I$(top_srcdir)/lib/sshutil -I$(top_srcdir)/lib/sshutil/sshcore -I$(top_srcdir)/lib/sshutil/sshadt -I$(top_srcdir)/lib/sshutil/ssholdadt -I$(top_srcdir)/lib/sshutil/sshstrutil -I$(top_srcdir)/lib/sshutil/ssheloop -I$(top_srcdir)/lib/sshutil/sshstream -I$(top_srcdir)/lib/sshutil/sshfsm -I$(top_srcdir)/lib/sshutil/sshsysutil -I$(top_srcdir)/lib/sshutil/sshnet -I$(top_srcdir)/lib/sshutil/sshmisc -I$(top_srcdir)/lib/sshutil/sshpacketstream -I$(top_srcdir)/lib/sshutil/sshtestutil -I$(top_srcdir)/lib/sshmath -I$(top_srcdir)/lib/sshreadline -I$(top_srcdir)/lib/sshapputil -I$(top_srcdir)/lib/sshcrypt -I$(top_srcdir)/lib/sshproto -I$(top_srcdir)/lib/sshagent -I$(top_srcdir)/lib/sshsession -I$(top_srcdir)/lib/sshhttp -I$(top_srcdir)/lib/sshscrlock -I$(top_srcdir)/lib/sshsmtp -I$(top_srcdir)/lib/sshscm -I$(top_srcdir)/lib/sshpgp -I$(top_srcdir)/lib/sshipsecappapi -I$(top_srcdir)/lib/sshhs -I$(top_srcdir)/lib/sshexternalkey -I$(top_srcdir)/lib/sshfilexfer 
  
- 
- INCLUDES = $(ADD_INCLUDES) -I$(srcdir) -I. -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/lib/sshutil
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../sshconf.h
diff -urN ssh2.old/patches/patch-ad ssh2/patches/patch-ad
--- ssh2.old/patches/patch-ad	Sun Aug 27 02:38:54 2000
+++ ssh2/patches/patch-ad	Sun Aug 27 01:15:41 2000
@@ -1,11 +1,11 @@
---- lib/sshreadline/Makefile.in.orig	Thu Mar 30 21:41:55 2000
-+++ lib/sshreadline/Makefile.in	Wed May 17 18:06:26 2000
-@@ -120,7 +120,7 @@
- include_HEADERS = sshreadline.h
- # noinst_HEADERS =
+--- lib/sshreadline/Makefile.in.orig	Thu Aug 24 17:41:51 2000
++++ lib/sshreadline/Makefile.in	Sun Aug 27 01:15:31 2000
+@@ -127,7 +127,7 @@
  
--ADD_INCLUDES = -I$(srcdir) -I. -I../.. 	-I$(top_builddir) -I$(top_srcdir) 	-I../sshmath -I$(srcdir)/../sshmath 	-I../zlib -I$(srcdir)/../zlib 	-I../sshutil -I$(srcdir)/../sshutil
-+ADD_INCLUDES = -I$(srcdir) -I. -I../.. 	-I$(top_builddir) -I$(top_srcdir) 	-I../sshmath -I$(srcdir)/../sshmath 	-I../sshutil -I$(srcdir)/../sshutil
+ include_HEADERS = sshreadline.h
  
+-INCLUDES = $(ADD_INCLUDES)  -I$(srcdir) -I.  -I$(top_builddir) -I$(top_srcdir)  -I$(top_srcdir)/lib/sshutil -I$(top_srcdir)/lib/sshutil/sshcore -I$(top_srcdir)/lib/sshutil/sshadt -I$(top_srcdir)/lib/sshutil/ssholdadt -I$(top_srcdir)/lib/sshutil/sshstrutil -I$(top_srcdir)/lib/sshutil/ssheloop -I$(top_srcdir)/lib/sshutil/sshstream -I$(top_srcdir)/lib/sshutil/sshfsm -I$(top_srcdir)/lib/sshutil/sshsysutil -I$(top_srcdir)/lib/sshutil/sshnet -I$(top_srcdir)/lib/sshutil/sshmisc -I$(top_srcdir)/lib/sshutil/sshpacketstream -I$(top_srcdir)/lib/sshutil/sshtestutil -I$(top_srcdir)/lib/zlib -I$(top_srcdir)/lib/sshmath -I$(top_srcdir)/lib/sshreadline -I$(top_srcdir)/lib/sshapputil -I$(top_srcdir)/lib/sshcrypt -I$(top_srcdir)/lib/sshproto -I$(top_srcdir)/lib/sshagent -I$(top_srcdir)/lib/sshsession -I$(top_srcdir)/lib/sshhttp -I$(top_srcdir)/lib/sshscrlock -I$(top_srcdir)/lib/sshsmtp -I$(top_srcdir)/lib/sshscm -I$(top_srcdir)/lib/sshpgp -I$(top_srcdir)/lib/sshipsecappapi -I$(top_srcdir)/lib/sshhs -I$(top_srcdir)/lib/sshexternalkey -I$(top_srcdir)/lib/sshfilexfer 
++INCLUDES = $(ADD_INCLUDES)  -I$(srcdir) -I.  -I$(top_builddir) -I$(top_srcdir)  -I$(top_srcdir)/lib/sshutil -I$(top_srcdir)/lib/sshutil/sshcore -I$(top_srcdir)/lib/sshutil/sshadt -I$(top_srcdir)/lib/sshutil/ssholdadt -I$(top_srcdir)/lib/sshutil/sshstrutil -I$(top_srcdir)/lib/sshutil/ssheloop -I$(top_srcdir)/lib/sshutil/sshstream -I$(top_srcdir)/lib/sshutil/sshfsm -I$(top_srcdir)/lib/sshutil/sshsysutil -I$(top_srcdir)/lib/sshutil/sshnet -I$(top_srcdir)/lib/sshutil/sshmisc -I$(top_srcdir)/lib/sshutil/sshpacketstream -I$(top_srcdir)/lib/sshutil/sshtestutil -I$(top_srcdir)/lib/sshmath -I$(top_srcdir)/lib/sshreadline -I$(top_srcdir)/lib/sshapputil -I$(top_srcdir)/lib/sshcrypt -I$(top_srcdir)/lib/sshproto -I$(top_srcdir)/lib/sshagent -I$(top_srcdir)/lib/sshsession -I$(top_srcdir)/lib/sshhttp -I$(top_srcdir)/lib/sshscrlock -I$(top_srcdir)/lib/sshsmtp -I$(top_srcdir)/lib/sshscm -I$(top_srcdir)/lib/sshpgp -I$(top_srcdir)/lib/sshipsecappapi -I$(top_srcdir)/lib/sshhs -I$(top_srcdir)/lib/sshexternalkey -I$(top_srcdir)/lib/sshfilexfer 
  
- INCLUDES = $(ADD_INCLUDES) -I$(srcdir) -I. -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/lib/sshutil
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../sshconf.h
diff -urN ssh2.old/patches/patch-af ssh2/patches/patch-af
--- ssh2.old/patches/patch-af	Sun Aug 27 02:38:54 2000
+++ ssh2/patches/patch-af	Sun Aug 27 01:16:12 2000
@@ -1,6 +1,6 @@
---- apps/ssh/Makefile.in.orig	Thu Mar 30 21:41:56 2000
-+++ apps/ssh/Makefile.in	Wed May 17 18:09:57 2000
-@@ -134,7 +134,7 @@
+--- apps/ssh/Makefile.in.orig	Thu Aug 24 17:41:55 2000
++++ apps/ssh/Makefile.in	Sun Aug 27 01:16:01 2000
+@@ -143,7 +143,7 @@
  INCLUDES = -I. -I$(srcdir) -I../.. -I$(srcdir) 	   -I$(top_builddir) -I$(top_srcdir) 	   -I../../include -I$(srcdir)/../../include
  
  
@@ -8,4 +8,4 @@
 +LDADD = @ssh2_ldadd_options@ -lz
  DEPENDENCIES = ./libssh2.a ../../lib/libssh.a
  
- libssh2_a_SOURCES =  	agentclient.c 	sshchagent.c 	sshserver.c 	agentpath.c 	sshchsession.c 	sshstdiofilter.c 	authc-passwd.c 	sshchssh1agent.c 	sshunixconfig.c 	authc-pubkey.c 	sshchtcpfwd.c 	sshunixuserfiles.c 	auths-passwd.c 	sshchx11.c 	sshuserfiles.c 	auths-pubkey.c 	sshclient.c 	sshcommon.c 	readpass.c 	sshconfig.c 	sshauthmethodc.c 	sshauthmethods.c 	sshglob.c 	auths-common.c 	sshttyflags.c 	auths-hostbased.c 	authc-hostbased.c 	auths-hostbased-rhosts.c 	ssh2pgppub.c 	ssh2pgpsec.c 	ssh2pgputil.c 	sshappcommon.c 	sshfilecopy.c 	sshgetcwd.c 	sshfc_conn.c 	sshfc_glob.c 	sshfc_transfer.c 	sshfc_recurse.c 	sshserverprobe.c 	ssh1encode.c 	ssh1keydecode.c
+ libssh2_a_SOURCES =  	agentclient.c 	sshchagent.c 	sshserver.c 	agentpath.c 	sshchsession.c 	sshstdiofilter.c 	authc-passwd.c 	sshchssh1agent.c 	sshunixconfig.c 	authc-pubkey.c 	sshchtcpfwd.c 	sshunixuserfiles.c 	auths-passwd.c 	sshchx11.c 	sshuserfiles.c 	auths-pubkey.c 	auths-kerberos.c 	authc-kerberos.c 	auths-kerberos-tgt.c 	authc-kerberos-tgt.c 	sshclient.c 	sshcommon.c 	readpass.c 	sshconfig.c 	sshauthmethodc.c 	sshauthmethods.c 	sshglob.c 	auths-common.c 	sshttyflags.c 	auths-hostbased.c 	authc-hostbased.c 	auths-hostbased-rhosts.c 	ssh2pgppub.c 	ssh2pgpsec.c 	ssh2pgputil.c 	sshappcommon.c 	sshfilecopy.c 	sshgetcwd.c 	sshfc_conn.c 	sshfc_glob.c 	sshfc_transfer.c 	sshfc_recurse.c 	sshserverprobe.c 	ssh1encode.c 	ssh1keydecode.c
diff -urN ssh2.old/patches/patch-ag ssh2/patches/patch-ag
--- ssh2.old/patches/patch-ag	Sun Aug 27 02:38:54 2000
+++ ssh2/patches/patch-ag	Sun Aug 27 01:16:33 2000
@@ -1,6 +1,6 @@
---- configure.orig	Wed May 17 18:01:34 2000
-+++ configure	Wed May 17 18:10:35 2000
-@@ -5373,7 +5373,7 @@
+--- configure.orig	Thu Aug 24 17:41:37 2000
++++ configure	Sun Aug 27 01:16:15 2000
+@@ -6021,7 +6021,7 @@
  char tgetent();
  
  int main() {
@@ -8,8 +8,8 @@
 +XXXtgetent()
  ; return 0; }
  EOF
- if { (eval echo configure:5380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -5497,7 +5497,7 @@
+ if { (eval echo configure:6028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -6145,7 +6145,7 @@
    echo "$ac_t""no" 1>&6
  fi
  
diff -urN ssh2.old/patches/patch-ah ssh2/patches/patch-ah
--- ssh2.old/patches/patch-ah	Sun Aug 27 02:38:54 2000
+++ ssh2/patches/patch-ah	Sun Aug 27 01:17:21 2000
@@ -1,6 +1,6 @@
---- apps/ssh/sshchsession.c.orig	Wed May 17 18:01:34 2000
-+++ apps/ssh/sshchsession.c	Wed May 17 18:11:14 2000
-@@ -77,6 +77,11 @@
+--- apps/ssh/sshchsession.c.orig	Thu Aug 24 17:40:41 2000
++++ apps/ssh/sshchsession.c	Sun Aug 27 01:16:55 2000
+@@ -83,6 +83,11 @@
  #include <ulimit.h>
  #endif /* ULIMIT_H */
  
@@ -12,7 +12,7 @@
  #define SSH_DEBUG_MODULE "Ssh2ChannelSession"
  
  #define SSH_SESSION_INTERACTIVE_WINDOW                 10000
-@@ -483,6 +488,67 @@
+@@ -489,6 +494,67 @@
    if (getenv("TZ"))
      ssh_child_set_env(envp, envsizep, "TZ", getenv("TZ"));
  
@@ -80,9 +80,9 @@
    /* Set SSH_CLIENT. */
    snprintf(buf, sizeof(buf), "%s %s %s %s",
             session->common->remote_ip, session->common->remote_port,
-@@ -710,12 +776,20 @@
+@@ -729,12 +795,20 @@
    char buff[100], *time_string;
-   
+ 
    /* Check /etc/nologin. */
 +#ifdef __FreeBSD__
 +  f = fopen("/var/run/nologin", "r");
@@ -101,7 +101,7 @@
        while (fgets(buf, sizeof(buf), f))
          fputs(buf, stderr);
        fclose(f);
-@@ -878,7 +952,11 @@
+@@ -918,7 +992,11 @@
                    {
                      struct stat mailbuf;
                      if (stat(mailbox, &mailbuf) == -1 || mailbuf.st_size == 0)
diff -urN ssh2.old/patches/patch-ai ssh2/patches/patch-ai
--- ssh2.old/patches/patch-ai	Sun Aug 27 02:38:54 2000
+++ ssh2/patches/patch-ai	Sun Aug 27 01:22:18 2000
@@ -1,6 +1,6 @@
---- lib/sshsession/sshunixuser.c.orig	Thu Mar 30 21:41:05 2000
-+++ lib/sshsession/sshunixuser.c	Wed May 17 18:15:10 2000
-@@ -55,6 +55,10 @@
+--- lib/sshsession/sshunixuser.c.orig	Thu Aug 24 17:40:39 2000
++++ lib/sshsession/sshunixuser.c	Sun Aug 27 01:21:57 2000
+@@ -86,6 +86,10 @@
  
  #define SSH_DEBUG_MODULE "SshUnixUser"
  
@@ -11,7 +11,7 @@
  extern char *crypt(const char *key, const char *salt);
  
  /* Data type to hold machine-specific user data. */
-@@ -736,6 +740,24 @@
+@@ -1224,6 +1228,24 @@
    /* Set uid, gid, and groups. */
    if (getuid() == UID_ROOT || geteuid() == UID_ROOT)
      { 
@@ -36,11 +36,11 @@
        if (setgid(ssh_user_gid(uc)) < 0)
          {
            SSH_DEBUG(2, ("ssh_user_become: setgid: %s", strerror(errno)));
-@@ -773,6 +795,7 @@
-                         (int)ssh_user_uid(uc)));
-           return FALSE;
+@@ -1280,6 +1302,7 @@
          }
+ #endif /* HAVE_SIA */
+ #endif /* SSHDIST_SESSION_SIA */
 +#endif /* HAVE_LOGIN_CAP_H */
      }
    
-   /* We are now running with the user's privileges. */
+ #ifdef KERBEROS
diff -urN ssh2.old/patches/patch-aj ssh2/patches/patch-aj
--- ssh2.old/patches/patch-aj	Sun Aug 27 02:38:54 2000
+++ ssh2/patches/patch-aj	Sun Aug 27 01:22:42 2000
@@ -1,6 +1,6 @@
---- lib/sshutil/sshincludes.h.old	Wed May 17 18:39:44 2000
-+++ lib/sshutil/sshincludes.h	Wed May 17 18:40:19 2000
-@@ -166,7 +166,7 @@
+--- lib/sshutil/sshincludes.h.orig	Thu Aug 24 17:43:30 2000
++++ lib/sshutil/sshincludes.h	Sun Aug 27 01:22:27 2000
+@@ -213,7 +213,7 @@
  #define SSH_UID_ROOT 0
  #endif /* SSH_UID_ROOT */
  
@@ -9,7 +9,7 @@
  /* Define zlib to have ssh prefix, so we will not care if there is another zlib
     in the kernel */
  #define deflateInit_            ssh_z_deflateInit_
-@@ -202,6 +202,6 @@
+@@ -249,6 +249,6 @@
  #define uLongf                  ssh_z_uLongf
  #define voidpf                  ssh_z_voidpf
  #define voidp                   ssh_z_voidp
diff -urN ssh2.old/patches/patch-ak ssh2/patches/patch-ak
--- ssh2.old/patches/patch-ak	Thu Jan  1 09:00:00 1970
+++ ssh2/patches/patch-ak	Sun Aug 27 02:31:26 2000
@@ -0,0 +1,13 @@
+--- apps/ssh/sshd2_config.orig	Sun Aug 27 02:30:53 2000
++++ apps/ssh/sshd2_config	Sun Aug 27 02:31:08 2000
+@@ -90,8 +90,8 @@
+ 
+ ## SSH1 compatibility
+ 
+-#	Ssh1Compatibility		<set by	configure by default>
+-#	Sshd1Path			<set by	configure by default>
++	Ssh1Compatibility		yes
++	Sshd1Path			/usr/sbin/sshd
+ 
+ 
+ ## Chrooted environment settings
diff -urN ssh2.old/patches/patch-al ssh2/patches/patch-al
--- ssh2.old/patches/patch-al	Thu Jan  1 09:00:00 1970
+++ ssh2/patches/patch-al	Sun Aug 27 02:31:29 2000
@@ -0,0 +1,10 @@
+--- apps/ssh/ssh2_config.orig	Sun Aug 27 02:30:11 2000
++++ apps/ssh/ssh2_config	Sun Aug 27 02:30:48 2000
+@@ -43,6 +43,7 @@
+ ## SSH1 Compatibility
+ 
+         Ssh1Compatibility               yes
++	Ssh1Path			/usr/bin/ssh
+ 	Ssh1AgentCompatibility		none
+ #	Ssh1AgentCompatibility		traditional
+ #	Ssh1AgentCompatibility		ssh2
diff -urN ssh2.old/pkg/DESCR ssh2/pkg/DESCR
--- ssh2.old/pkg/DESCR	Sun Aug 27 02:38:54 2000
+++ ssh2/pkg/DESCR	Sun Aug 27 02:26:57 2000
@@ -20,4 +20,4 @@
 o Secure file transfer.
 o Tunneling and encryption of arbitrary connections.
 
-WWW: http://www.ssh.fi/
+WWW: http://www.ssh.com/
diff -urN ssh2.old/pkg/PLIST ssh2/pkg/PLIST
--- ssh2.old/pkg/PLIST	Sun Aug 27 02:38:54 2000
+++ ssh2/pkg/PLIST	Sun Aug 27 01:47:43 2000
@@ -1,60 +1,37 @@
 bin/ssh2
-@exec mv %D/bin/ssh %D/bin/ssh.old
-bin/ssh
-@unexec mv -f %B/%f.old %B/%f
 bin/scp2
-@exec mv %D/bin/scp %D/bin/scp.old
-bin/scp
-@unexec mv -f %B/%f.old %B/%f
 bin/sftp2
-bin/sftp
-bin/sftp-server2
-bin/sftp-server
 bin/ssh-agent2
-@exec mv %D/bin/ssh-agent %D/bin/ssh-agent.old
-bin/ssh-agent
-@unexec mv -f %B/%f.old %B/%f
 bin/ssh-keygen2
-@exec mv %D/bin/ssh-keygen %D/bin/ssh-keygen.old
-bin/ssh-keygen
-@unexec mv -f %B/%f.old %B/%f
 bin/ssh-add2
-@exec mv %D/bin/ssh-add %D/bin/ssh-add.old
-bin/ssh-add
-@unexec mv -f %B/%f.old %B/%f
+bin/ssh-signer2
+bin/ssh-probe2
 bin/ssh-askpass2
-@exec mv %D/bin/ssh-askpass %D/bin/ssh-askpass.old
-bin/ssh-askpass
-@unexec mv -f %B/%f.old %B/%f
+bin/sftp-server2
 bin/ssh-dummy-shell
-bin/ssh-probe2
-bin/ssh-probe
-bin/ssh-signer2
+bin/ssh-pubkeymgr
+bin/ssh-chrootmgr
+bin/ssh
+bin/ssh-agent
+bin/ssh-add
+bin/ssh-askpass
+bin/ssh-keygen
+bin/scp
+bin/sftp
+bin/sftp-server
 bin/ssh-signer
+bin/ssh-probe
+etc/rc.d/sshd.sh
+etc/ssh2/sshd2_config
 etc/ssh2/ssh2_config
 etc/ssh2/ssh_dummy_shell.out
-etc/ssh2/sshd2_config
-@exec mv %D/man/man1/ssh.1.gz %D/man/man1/ssh.old.1.gz
-@unexec mv -f %B/ssh.old.1.gz %B/%f
-@exec mv %D/man/man1/ssh-add.1.gz %D/man/man1/ssh-add.old.1.gz
-@unexec mv -f %B/ssh-add.old.1.gz %B/%f
-@exec mv %D/man/man1/ssh-agent.1.gz %D/man/man1/ssh-agent.old.1.gz
-@unexec mv -f %B/ssh-agent.old.1.gz %B/%f
-@exec mv %D/man/man1/ssh-keygen.1.gz %D/man/man1/ssh-keygen.old.1.gz
-@unexec mv -f %B/ssh-keygen.old.1.gz %B/%f
-@exec mv %D/man/man1/scp.1.gz %D/man/man1/scp.old.1.gz
-@unexec mv -f %B/scp.old.1.gz %B/%f
-@exec mv %D/man/man8/sshd.8.gz %D/man/man8/sshd.old.8.gz
-@unexec mv -f %B/sshd.old.8.gz %B/%f
 sbin/sshd2
-@exec mv %D/sbin/sshd %D/sbin/sshd.old
 sbin/sshd
-@unexec mv -f %B/%f.old %B/%f
 share/doc/ssh2/BUG.REPORT
 share/doc/ssh2/CHANGES
 share/doc/ssh2/FAQ
 share/doc/ssh2/INSTALL
-share/doc/ssh2/LICENSING
+share/doc/ssh2/LICENSE
 share/doc/ssh2/README
 share/doc/ssh2/SSH2.QUICKSTART
 @dirrm share/doc/ssh2
diff -urN ssh2.old/pkg/PLIST.ssh2_only ssh2/pkg/PLIST.ssh2_only
--- ssh2.old/pkg/PLIST.ssh2_only	Sun Aug 27 02:38:54 2000
+++ ssh2/pkg/PLIST.ssh2_only	Thu Jan  1 09:00:00 1970
@@ -1,35 +0,0 @@
-bin/scp
-bin/scp2
-bin/sftp
-bin/sftp-server
-bin/sftp-server2
-bin/sftp2
-bin/ssh
-bin/ssh-add
-bin/ssh-add2
-bin/ssh-agent
-bin/ssh-agent2
-bin/ssh-askpass
-bin/ssh-askpass2
-bin/ssh-dummy-shell
-bin/ssh-keygen
-bin/ssh-keygen2
-bin/ssh-probe
-bin/ssh-probe2
-bin/ssh-signer
-bin/ssh-signer2
-bin/ssh2
-etc/rc.d/sshd.sh
-etc/ssh2/ssh2_config
-etc/ssh2/ssh_dummy_shell.out
-etc/ssh2/sshd2_config
-sbin/sshd2
-sbin/sshd
-share/doc/ssh2/BUG.REPORT
-share/doc/ssh2/CHANGES
-share/doc/ssh2/FAQ
-share/doc/ssh2/INSTALL
-share/doc/ssh2/LICENSING
-share/doc/ssh2/README
-share/doc/ssh2/SSH2.QUICKSTART
-@exec if [ ! -f %D/etc/ssh2/hostkey ]; then umask 022; echo "Generating 1024 bit 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:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000827030535I.issei>