5 files changed, 34 insertions, 35 deletions

diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 2c2157a80621..9b9a22dc06b2 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	openssh
-PORTVERSION=	3.5
-PORTREVISION=	1
+PORTVERSION=	3.6
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/ \
 		ftp://ftp.usa.openbsd.org/pub/OpenBSD/OpenSSH/ \
diff --git a/security/openssh/distinfo b/security/openssh/distinfo
index 0b7ec7e4bcfe..349ec866c582 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -1,2 +1,2 @@
-MD5 (openssh-3.5.tgz) = 79fc225dbe0fe71ebb6910f449101d23
-MD5 (openbsd28_3.5.patch) = 0447cd23214b7ef54aa957da790bddb7
+MD5 (openssh-3.6.tgz) = 758822b888c5c3f83a98045aef904254
+MD5 (openbsd28_3.6.patch) = bcd0e1e4603cfd4e1f2f457830d7842a
diff --git a/security/openssh/files/patch-monitor.c b/security/openssh/files/patch-monitor.c
index fc0f1911ddda..570262e42606 100644
--- a/security/openssh/files/patch-monitor.c
+++ b/security/openssh/files/patch-monitor.c
@@ -1,5 +1,5 @@
---- monitor.c.orig	Fri Jun 21 07:50:51 2002
-+++ monitor.c	Mon Jun 24 20:39:42 2002
+--- monitor.c.orig	Sun Mar 23 20:02:00 2003
++++ monitor.c	Mon Mar 31 16:15:24 2003
 @@ -30,7 +30,7 @@
  #include <openssl/dh.h>
  
@@ -9,21 +9,21 @@
  #endif
  
  #include "ssh.h"
-@@ -656,11 +656,11 @@
+@@ -670,11 +670,11 @@
  int
  mm_answer_skeyquery(int socket, Buffer *m)
  {
 -	struct skey skey;
-+	struct opie opie;
++ 	struct opie opie;
  	char challenge[1024];
- 	int res;
+ 	u_int success;
  
--	res = skeychallenge(&skey, authctxt->user, challenge);
-+	res = opiechallenge(&opie, authctxt->user, challenge);
+-	success = skeychallenge(&skey, authctxt->user, challenge) < 0 ? 0 : 1;
++	success = opiechallenge(&opie, authctxt->user, challenge) < 0 ? 0 : 1;
  
  	buffer_clear(m);
- 	buffer_put_int(m, res);
-@@ -683,8 +683,8 @@
+ 	buffer_put_int(m, success);
+@@ -697,8 +697,8 @@
  
  	authok = (options.challenge_response_authentication &&
  	    authctxt->valid &&
diff --git a/security/openssh/files/patch-session.c b/security/openssh/files/patch-session.c
index 9ec94df2fc1c..0c2331485304 100644
--- a/security/openssh/files/patch-session.c
+++ b/security/openssh/files/patch-session.c
@@ -1,5 +1,5 @@
---- session.c.orig	Thu Oct 17 05:36:12 2002
-+++ session.c	Thu Oct 17 05:46:14 2002
+--- session.c.orig	Mon Mar 31 16:16:15 2003
++++ session.c	Mon Mar 31 16:18:09 2003
 @@ -58,6 +58,13 @@
  #include "session.h"
  #include "monitor_wrap.h"
@@ -14,7 +14,7 @@
  /* func */
  
  Session *session_new(void);
-@@ -419,6 +426,9 @@
+@@ -421,6 +428,9 @@
  do_exec_no_pty(Session *s, const char *command)
  {
  	pid_t pid;
@@ -24,7 +24,7 @@
  
  #ifdef USE_PIPES
  	int pin[2], pout[2], perr[2];
-@@ -437,6 +447,20 @@
+@@ -439,6 +449,20 @@
  	if (s == NULL)
  		fatal("do_exec_no_pty: no session");
  
@@ -45,7 +45,7 @@
  	session_proctitle(s);
  
  	/* Fork the child. */
-@@ -447,6 +471,13 @@
+@@ -449,6 +473,13 @@
  		log_init(__progname, options.log_level, options.log_facility, log_stderr);
  
  		/*
@@ -59,7 +59,7 @@
  		 * Create a new session and process group since the 4.4BSD
  		 * setlogin() affects the entire process group.
  		 */
-@@ -641,6 +672,18 @@
+@@ -643,6 +674,18 @@
  	struct sockaddr_storage from;
  	struct passwd * pw = s->pw;
  	pid_t pid = getpid();
@@ -78,7 +78,7 @@
  
  	/*
  	 * Get IP address of client. If the connection is not a socket, let
-@@ -663,10 +706,97 @@
+@@ -665,10 +708,97 @@
  		    options.verify_reverse_mapping),
  		    (struct sockaddr *)&from, fromlen);
  
@@ -177,7 +177,7 @@
  		time_string = ctime(&s->last_login_time);
  		if (strchr(time_string, '\n'))
  			*strchr(time_string, '\n') = 0;
-@@ -677,7 +807,30 @@
+@@ -679,7 +809,30 @@
  			    s->hostname);
  	}
  
@@ -209,7 +209,7 @@
  }
  
  /*
-@@ -693,9 +846,9 @@
+@@ -695,9 +848,9 @@
  #ifdef HAVE_LOGIN_CAP
  		f = fopen(login_getcapstr(lc, "welcome", "/etc/motd",
  		    "/etc/motd"), "r");
@@ -221,7 +221,7 @@
  		if (f) {
  			while (fgets(buf, sizeof(buf), f))
  				fputs(buf, stdout);
-@@ -722,10 +875,10 @@
+@@ -724,10 +877,10 @@
  #ifdef HAVE_LOGIN_CAP
  	if (login_getcapbool(lc, "hushlogin", 0) || stat(buf, &st) >= 0)
  		return 1;
@@ -234,7 +234,7 @@
  	return 0;
  }
  
-@@ -816,12 +969,39 @@
+@@ -818,12 +971,39 @@
  	fclose(f);
  }
  
@@ -266,7 +266,7 @@
  {
  	char buf[256];
  	u_int i, envsize;
- 	char **env;
+ 	char **env, *laddr;
 +#ifdef HAVE_LOGIN_CAP
 +	extern char **environ;
 +	char **senv, **var;
@@ -274,7 +274,7 @@
  	struct passwd *pw = s->pw;
  
  	/* Initialize the environment. */
-@@ -829,6 +1009,11 @@
+@@ -831,6 +1011,11 @@
  	env = xmalloc(envsize * sizeof(char *));
  	env[0] = NULL;
  
@@ -286,7 +286,7 @@
  	if (!options.use_login) {
  		/* Set basic environment. */
  		child_set_env(&env, &envsize, "USER", pw->pw_name);
-@@ -849,9 +1034,21 @@
+@@ -851,9 +1036,21 @@
  
  		/* Normal systems set SHELL by default. */
  		child_set_env(&env, &envsize, "SHELL", shell);
@@ -310,7 +310,7 @@
  
  	/* Set custom environment options from RSA authentication. */
  	if (!options.use_login) {
-@@ -900,6 +1097,10 @@
+@@ -903,6 +1100,10 @@
  		child_set_env(&env, &envsize, "KRB5CCNAME",
  		    s->authctxt->krb5_ticket_file);
  #endif
@@ -321,7 +321,7 @@
  	if (auth_sock_name != NULL)
  		child_set_env(&env, &envsize, SSH_AUTHSOCKET_ENV_NAME,
  		    auth_sock_name);
-@@ -1018,7 +1219,7 @@
+@@ -1025,7 +1226,7 @@
  	if (getuid() == 0 || geteuid() == 0) {
  #ifdef HAVE_LOGIN_CAP
  		if (setusercontext(lc, pw, pw->pw_uid,
@@ -330,7 +330,7 @@
  			perror("unable to set user context");
  			exit(1);
  		}
-@@ -1058,6 +1259,36 @@
+@@ -1065,6 +1266,36 @@
  	exit(1);
  }
  
@@ -367,7 +367,7 @@
  /*
   * Performs common processing for the child, such as setting up the
   * environment, closing extra file descriptors, setting the user and group
-@@ -1136,7 +1367,7 @@
+@@ -1148,7 +1379,7 @@
  	 * initgroups, because at least on Solaris 2.3 it leaves file
  	 * descriptors open.
  	 */
@@ -376,7 +376,7 @@
  		close(i);
  
  	/*
-@@ -1166,6 +1397,31 @@
+@@ -1178,6 +1409,31 @@
  			exit(1);
  #endif
  	}
diff --git a/security/openssh/files/patch-sftp-Makefile b/security/openssh/files/patch-sftp-Makefile
index 9f2a47b0df01..ffd777ca7bea 100644
--- a/security/openssh/files/patch-sftp-Makefile
+++ b/security/openssh/files/patch-sftp-Makefile
@@ -1,5 +1,5 @@
---- sftp/Makefile.orig	Fri May  4 01:09:57 2001
-+++ sftp/Makefile	Wed Oct  3 13:10:32 2001
+--- sftp/Makefile.orig	Sun Jan 12 17:59:14 2003
++++ sftp/Makefile	Mon Mar 31 16:19:55 2003
 @@ -7,13 +7,13 @@
  
  BINMODE?=555
@@ -9,7 +9,7 @@
 +BINDIR=	/bin
 +MAN1=	sftp.1
  
- SRCS=	sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c misc.c
+ SRCS=	sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c
  
  .include <bsd.prog.mk>