Regenerated some of the patches.

10 files changed, 71 insertions, 71 deletions

diff --git a/security/openssh/distinfo b/security/openssh/distinfo
index fb3bfc335fe..7562a927dec 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.74 2010/02/18 16:27:58 taca Exp $
+$NetBSD: distinfo,v 1.75 2010/02/19 10:17:33 martti Exp $
 
 SHA1 (openssh-5.3.1-20100218/openssh-5.3p1-hpn13v7.diff.gz) = 724aa137c8c42e89af454ce904845a3a2d9e8ed9
 RMD160 (openssh-5.3.1-20100218/openssh-5.3p1-hpn13v7.diff.gz) = a57c038d6b57a2869295e3000abd50658ebb5b93
@@ -6,24 +6,24 @@ Size (openssh-5.3.1-20100218/openssh-5.3p1-hpn13v7.diff.gz) = 22734 bytes
 SHA1 (openssh-5.3.1-20100218/openssh-5.3p1.tar.gz) = d411fde2584ef6022187f565360b2c63a05602b5
 RMD160 (openssh-5.3.1-20100218/openssh-5.3p1.tar.gz) = f8c98b4b91b7e0e02b33837ef6978e8b7570cf9e
 Size (openssh-5.3.1-20100218/openssh-5.3p1.tar.gz) = 1027130 bytes
-SHA1 (patch-aa) = 38546f8fd8bf6021d43cdf076ab723ad39a5f78e
-SHA1 (patch-ab) = 00e7e50a35e8b3bcfa53b239b520a12498c8dca0
-SHA1 (patch-ac) = ba97b23c6527311256b335c58175da9e9a3616e4
+SHA1 (patch-aa) = 94b4427cd6ed2cc4c15728c6721f98b678eafb5d
+SHA1 (patch-ab) = ddb47d597893895314b03bdd13d7e2cb9c4c3b6b
+SHA1 (patch-ac) = 5c63cb47ffb556a15f685011bc3291d2219613dc
 SHA1 (patch-ad) = 254e11c5f56a72bf0b30bb8860e45156b3a0adf2
-SHA1 (patch-ae) = 9585221f9e49b4ebea31c374066d70e11aa804a1
+SHA1 (patch-ae) = 4ec1007b03d4bf28ddd1dcfdf2ec7c5295a69df5
 SHA1 (patch-af) = ca3224af0b648803404776a8c12ed678db4f8ff6
-SHA1 (patch-ag) = b5cb0400d3cda9cb6d60dc729e54b1ffc34ec9e2
-SHA1 (patch-ah) = 6ddd934be038c9177df6856dbcb6e44feab05146
+SHA1 (patch-ag) = b91f89ede11f5ed7ba99cfea883ede969796c0ac
+SHA1 (patch-ah) = 0deb24fae95f0a696048d486b11463b380899cb3
 SHA1 (patch-ai) = becad6262e5daeef2a6db14097a8971c40088403
 SHA1 (patch-aj) = 5c89b4a7da59f05c50c16083aa6dd6e465cd0305
 SHA1 (patch-ak) = 550eae0b47dc220dac2439f57b39b7e4319057c5
 SHA1 (patch-al) = ffd15b2ef3cb6b57419c0f6f1f4f795e497382d7
 SHA1 (patch-am) = 4893a8a059d611d35c1fb9ff03b598c590e0355e
 SHA1 (patch-an) = 5b41d9493028dd4dce4a73ea78e43f3a073108e5
-SHA1 (patch-ao) = 1343faeb45f8e1fe8126a1c76b41439b275efa9b
-SHA1 (patch-ap) = 041059e25d2331aace0eaa5a6c3032afb3d565b4
+SHA1 (patch-ao) = a02f861855403e4a77323460a2611707d64b2e6b
+SHA1 (patch-ap) = 5c0ae4dbcdcd50312d1db037867cbaed7c80931d
 SHA1 (patch-aq) = 1a7d8a4c5e70a0c6211247ba583534ed8ce317d0
 SHA1 (patch-ar) = a1099e0175a2b14f3b19db04261891179b1e3299
 SHA1 (patch-au) = 6cfdfc531e2267017a15e66ea48c7ecfa2a3926f
-SHA1 (patch-av) = 06126d8f83398aa9df8a56792ad55bc769dd2550
+SHA1 (patch-av) = ef1274ad93846c7af2a6bdeb20ae59044fac0f1b
 SHA1 (patch-aw) = 532f2aebcb93cae5e0dd26a5faa1593a7d3a3c51
diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa
index 2efc262c042..8bf1e657323 100644
--- a/security/openssh/patches/patch-aa
+++ b/security/openssh/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.44 2009/05/21 03:22:29 taca Exp $
+$NetBSD: patch-aa,v 1.45 2010/02/19 10:17:33 martti Exp $
 
---- configure.orig	2009-02-23 09:18:14.000000000 +0900
-+++ configure
-@@ -5666,6 +5666,9 @@ if test "${with_rpath+set}" = set; then
+--- configure.orig	2009-09-26 09:31:15.000000000 +0300
++++ configure	2010-02-19 12:06:28.000000000 +0200
+@@ -5997,6 +5997,9 @@
  fi
  
  
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.44 2009/05/21 03:22:29 taca Exp $
  # Allow user to specify flags
  
  # Check whether --with-cflags was given.
-@@ -5812,6 +5815,7 @@ for ac_header in \
+@@ -6142,6 +6145,7 @@
  	maillock.h \
  	ndir.h \
  	net/if_tun.h \
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.44 2009/05/21 03:22:29 taca Exp $
  	netdb.h \
  	netgroup.h \
  	pam/pam_appl.h \
-@@ -7521,6 +7525,36 @@ _ACEOF
+@@ -7965,6 +7969,36 @@
  		;;
  	esac
  	;;
@@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.44 2009/05/21 03:22:29 taca Exp $
  *-*-irix5*)
  	PATH="$PATH:/usr/etc"
  
-@@ -8082,7 +8116,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -8537,7 +8571,7 @@
  _ACEOF
  
  	;;
@@ -66,7 +66,7 @@ $NetBSD: patch-aa,v 1.44 2009/05/21 03:22:29 taca Exp $
  	check_for_libcrypt_later=1
  
  cat >>confdefs.h <<\_ACEOF
-@@ -29187,14 +29221,21 @@ fi
+@@ -30831,14 +30865,21 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  if test -z "$conf_utmpx_location"; then
  	if test x"$system_utmpx_path" = x"no" ; then
@@ -92,7 +92,7 @@ $NetBSD: patch-aa,v 1.44 2009/05/21 03:22:29 taca Exp $
  #define CONF_UTMPX_FILE "$conf_utmpx_location"
  _ACEOF
  
-@@ -29258,14 +29299,20 @@ fi
+@@ -30903,14 +30944,20 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  if test -z "$conf_wtmpx_location"; then
  	if test x"$system_wtmpx_path" = x"no" ; then
@@ -118,7 +118,7 @@ $NetBSD: patch-aa,v 1.44 2009/05/21 03:22:29 taca Exp $
  #define CONF_WTMPX_FILE "$conf_wtmpx_location"
  _ACEOF
  
-@@ -30518,7 +30565,7 @@ echo "OpenSSH has been configured with t
+@@ -32200,7 +32247,7 @@
  echo "                     User binaries: $B"
  echo "                   System binaries: $C"
  echo "               Configuration files: $D"
diff --git a/security/openssh/patches/patch-ab b/security/openssh/patches/patch-ab
index 45f6cd22c7d..5b27d68ab4f 100644
--- a/security/openssh/patches/patch-ab
+++ b/security/openssh/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.26 2009/05/21 03:22:29 taca Exp $
+$NetBSD: patch-ab,v 1.27 2010/02/19 10:17:33 martti Exp $
 
---- configure.ac.orig	2009-02-16 13:37:03.000000000 +0900
-+++ configure.ac
-@@ -191,6 +191,9 @@ AC_ARG_WITH(rpath,
+--- configure.ac.orig	2009-09-11 07:56:08.000000000 +0300
++++ configure.ac	2010-02-19 12:13:02.000000000 +0200
+@@ -191,6 +191,9 @@
  	]
  )
  
@@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.26 2009/05/21 03:22:29 taca Exp $
  # Allow user to specify flags
  AC_ARG_WITH(cflags,
  	[  --with-cflags           Specify additional flags to pass to compiler],
-@@ -258,6 +261,7 @@ AC_CHECK_HEADERS( \
+@@ -258,6 +261,7 @@
  	maillock.h \
  	ndir.h \
  	net/if_tun.h \
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.26 2009/05/21 03:22:29 taca Exp $
  	netdb.h \
  	netgroup.h \
  	pam/pam_appl.h \
-@@ -531,6 +535,15 @@ main() { if (NSVersionOfRunTimeLibrary("
+@@ -535,6 +539,15 @@
  		;;
  	esac
  	;;
@@ -36,7 +36,7 @@ $NetBSD: patch-ab,v 1.26 2009/05/21 03:22:29 taca Exp $
  *-*-irix5*)
  	PATH="$PATH:/usr/etc"
  	AC_DEFINE(BROKEN_INET_NTOA, 1,
-@@ -4063,9 +4076,17 @@ AC_TRY_COMPILE([
+@@ -4129,9 +4142,17 @@
  )
  if test -z "$conf_utmpx_location"; then
  	if test x"$system_utmpx_path" = x"no" ; then
@@ -56,7 +56,7 @@ $NetBSD: patch-ab,v 1.26 2009/05/21 03:22:29 taca Exp $
  	AC_DEFINE_UNQUOTED(CONF_UTMPX_FILE, "$conf_utmpx_location",
  		[Define if you want to specify the path to your utmpx file])
  fi
-@@ -4089,9 +4110,17 @@ AC_TRY_COMPILE([
+@@ -4155,9 +4176,17 @@
  )
  if test -z "$conf_wtmpx_location"; then
  	if test x"$system_wtmpx_path" = x"no" ; then
@@ -76,7 +76,7 @@ $NetBSD: patch-ab,v 1.26 2009/05/21 03:22:29 taca Exp $
  	AC_DEFINE_UNQUOTED(CONF_WTMPX_FILE, "$conf_wtmpx_location",
  		[Define if you want to specify the path to your wtmpx file])
  fi
-@@ -4138,7 +4167,7 @@ echo "OpenSSH has been configured with t
+@@ -4204,7 +4233,7 @@
  echo "                     User binaries: $B"
  echo "                   System binaries: $C"
  echo "               Configuration files: $D"
diff --git a/security/openssh/patches/patch-ac b/security/openssh/patches/patch-ac
index e68b350f72c..7079ba0fe99 100644
--- a/security/openssh/patches/patch-ac
+++ b/security/openssh/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.17 2008/09/16 12:53:08 taca Exp $
+$NetBSD: patch-ac,v 1.18 2010/02/19 10:17:33 martti Exp $
 
---- defines.h.orig	2008-07-04 22:10:49.000000000 +0900
-+++ defines.h
+--- defines.h.orig	2009-08-28 04:21:07.000000000 +0300
++++ defines.h	2010-02-19 12:07:15.000000000 +0200
 @@ -30,6 +30,15 @@
  
  /* Constants */
@@ -18,7 +18,7 @@ $NetBSD: patch-ac,v 1.17 2008/09/16 12:53:08 taca Exp $
  #if defined(HAVE_DECL_SHUT_RD) && HAVE_DECL_SHUT_RD == 0
  enum
  {
-@@ -645,6 +654,24 @@ struct winsize {
+@@ -652,6 +661,24 @@
  #    endif
  #  endif
  #endif
diff --git a/security/openssh/patches/patch-ae b/security/openssh/patches/patch-ae
index a4541a50b6e..99bd65966d3 100644
--- a/security/openssh/patches/patch-ae
+++ b/security/openssh/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.12 2006/10/31 03:31:20 taca Exp $
+$NetBSD: patch-ae,v 1.13 2010/02/19 10:17:33 martti Exp $
 
---- includes.h.orig	2006-09-01 19:29:11.000000000 +0900
-+++ includes.h
-@@ -123,6 +123,10 @@
+--- includes.h.orig	2009-08-20 09:16:01.000000000 +0300
++++ includes.h	2010-02-19 12:07:37.000000000 +0200
+@@ -124,6 +124,10 @@
  #ifdef HAVE_READPASSPHRASE_H
  # include <readpassphrase.h>
  #endif
diff --git a/security/openssh/patches/patch-ag b/security/openssh/patches/patch-ag
index 63f28b8fe7d..88bd15b7f07 100644
--- a/security/openssh/patches/patch-ag
+++ b/security/openssh/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.11 2009/05/21 03:22:29 taca Exp $
+$NetBSD: patch-ag,v 1.12 2010/02/19 10:17:33 martti Exp $
 
---- config.h.in.orig	2009-02-23 09:18:12.000000000 +0900
-+++ config.h.in
-@@ -509,6 +509,9 @@
+--- config.h.in.orig	2009-09-26 09:31:14.000000000 +0300
++++ config.h.in	2010-02-19 12:08:03.000000000 +0200
+@@ -518,6 +518,9 @@
  /* define if you have int64_t data type */
  #undef HAVE_INT64_T
  
@@ -12,7 +12,7 @@ $NetBSD: patch-ag,v 1.11 2009/05/21 03:22:29 taca Exp $
  /* Define to 1 if you have the <inttypes.h> header file. */
  #undef HAVE_INTTYPES_H
  
-@@ -626,6 +629,9 @@
+@@ -638,6 +641,9 @@
  /* Define to 1 if you have the <net/if_tun.h> header file. */
  #undef HAVE_NET_IF_TUN_H
  
diff --git a/security/openssh/patches/patch-ah b/security/openssh/patches/patch-ah
index 7f2b7f02544..80635cd7bf4 100644
--- a/security/openssh/patches/patch-ah
+++ b/security/openssh/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.26 2010/02/18 08:04:35 martti Exp $
+$NetBSD: patch-ah,v 1.27 2010/02/19 10:17:33 martti Exp $
 
---- Makefile.in.orig	2008-11-05 14:20:46.000000000 +0900
-+++ Makefile.in
-@@ -22,7 +22,7 @@ top_srcdir=@top_srcdir@
+--- Makefile.in.orig	2009-08-28 03:47:38.000000000 +0300
++++ Makefile.in	2010-02-19 12:08:24.000000000 +0200
+@@ -22,7 +22,7 @@
  DESTDIR=
  VPATH=@srcdir@
  SSH_PROGRAM=@bindir@/ssh
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.26 2010/02/18 08:04:35 martti Exp $
  SFTP_SERVER=$(libexecdir)/sftp-server
  SSH_KEYSIGN=$(libexecdir)/ssh-keysign
  RAND_HELPER=$(libexecdir)/ssh-rand-helper
-@@ -233,7 +233,7 @@ distprep: catman-do
+@@ -235,7 +235,7 @@
  	(cd scard && $(MAKE) -f Makefile.in distprep)
  
  install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
@@ -20,7 +20,7 @@ $NetBSD: patch-ah,v 1.26 2010/02/18 08:04:35 martti Exp $
  install-nosysconf: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files
  
  check-config:
-@@ -244,7 +244,7 @@ check-config:
+@@ -244,7 +244,7 @@
  scard-install:
  	(cd scard && env DESTDIR=$(DESTDIR) $(MAKE) DESTDIR=$(DESTDIR) install)
  
diff --git a/security/openssh/patches/patch-ao b/security/openssh/patches/patch-ao
index 895258c75d3..01ea164d96e 100644
--- a/security/openssh/patches/patch-ao
+++ b/security/openssh/patches/patch-ao
@@ -1,12 +1,12 @@
-$NetBSD: patch-ao,v 1.14 2010/02/18 08:04:35 martti Exp $
+$NetBSD: patch-ao,v 1.15 2010/02/19 10:17:34 martti Exp $
 
 One more replacing 0 with ROOTUID is handled by using SUBST framework
 because patch can't handle it when hpn-patch option is enabled.
 So, don't simply update this file with mkpatch command.
 
---- session.c.orig	2009-01-28 14:29:49.000000000 +0900
-+++ session.c
-@@ -1068,7 +1068,7 @@ read_etc_default_login(char ***env, u_in
+--- session.c.orig	2009-08-20 09:20:50.000000000 +0300
++++ session.c	2010-02-19 12:09:09.000000000 +0200
+@@ -1066,7 +1066,7 @@
  	if (tmpenv == NULL)
  		return;
  
@@ -15,7 +15,7 @@ So, don't simply update this file with mkpatch command.
  		var = child_get_env(tmpenv, "SUPATH");
  	else
  		var = child_get_env(tmpenv, "PATH");
-@@ -1177,7 +1177,7 @@ do_setup_env(Session *s, const char *she
+@@ -1175,7 +1175,7 @@
  #  endif /* HAVE_ETC_DEFAULT_LOGIN */
  		if (path == NULL || *path == '\0') {
  			child_set_env(&env, &envsize, "PATH",
@@ -24,7 +24,7 @@ So, don't simply update this file with mkpatch command.
  				SUPERUSER_PATH : _PATH_STDPATH);
  		}
  # endif /* HAVE_CYGWIN */
-@@ -1291,6 +1291,18 @@ do_setup_env(Session *s, const char *she
+@@ -1289,6 +1289,18 @@
  		    strcmp(pw->pw_dir, "/") ? pw->pw_dir : "");
  		read_environment_file(&env, &envsize, buf);
  	}
@@ -43,7 +43,7 @@ So, don't simply update this file with mkpatch command.
  	if (debug_flag) {
  		/* dump the environment */
  		fprintf(stderr, "Environment:\n");
-@@ -1462,9 +1474,9 @@ do_setusercontext(struct passwd *pw)
+@@ -1462,9 +1474,9 @@
  	(void)ssh_selinux_enabled();
  #endif
  
@@ -55,7 +55,7 @@ So, don't simply update this file with mkpatch command.
  	{
  #ifdef HAVE_LOGIN_CAP
  # ifdef __bsdi__
-@@ -1500,11 +1512,13 @@ do_setusercontext(struct passwd *pw)
+@@ -1493,11 +1505,13 @@
  			perror("setgid");
  			exit(1);
  		}
@@ -69,7 +69,7 @@ So, don't simply update this file with mkpatch command.
  		endgrent();
  # ifdef USE_PAM
  		/*
-@@ -2328,7 +2342,7 @@ session_pty_cleanup2(Session *s)
+@@ -2322,7 +2336,7 @@
  		record_logout(s->pid, s->tty, s->pw->pw_name);
  
  	/* Release the pseudo-tty. */
diff --git a/security/openssh/patches/patch-ap b/security/openssh/patches/patch-ap
index 70377e9c4a1..228939fbbcf 100644
--- a/security/openssh/patches/patch-ap
+++ b/security/openssh/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.10 2009/05/21 03:22:29 taca Exp $
+$NetBSD: patch-ap,v 1.11 2010/02/19 10:17:34 martti Exp $
 
---- ssh.c.orig	2009-02-14 14:28:21.000000000 +0900
-+++ ssh.c
-@@ -702,7 +702,7 @@ main(int ac, char **av)
+--- ssh.c.orig	2009-07-06 00:16:56.000000000 +0300
++++ ssh.c	2010-02-19 12:09:35.000000000 +0200
+@@ -705,7 +705,7 @@
  	if (ssh_connect(host, &hostaddr, options.port,
  	    options.address_family, options.connection_attempts, &timeout_ms,
  	    options.tcp_keep_alive, 
diff --git a/security/openssh/patches/patch-av b/security/openssh/patches/patch-av
index 3e06c1b1ccd..e89bdca5ef1 100644
--- a/security/openssh/patches/patch-av
+++ b/security/openssh/patches/patch-av
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.7 2009/05/21 03:22:29 taca Exp $
+$NetBSD: patch-av,v 1.8 2010/02/19 10:17:34 martti Exp $
 
---- sshd.c.orig	2009-01-28 14:31:23.000000000 +0900
-+++ sshd.c
-@@ -234,7 +234,11 @@ int *startup_pipes = NULL;
+--- sshd.c.orig	2009-06-21 13:26:17.000000000 +0300
++++ sshd.c	2010-02-19 12:10:07.000000000 +0200
+@@ -235,7 +235,11 @@
  int startup_pipe;		/* in child */
  
  /* variables used for privilege separation */
@@ -14,7 +14,7 @@ $NetBSD: patch-av,v 1.7 2009/05/21 03:22:29 taca Exp $
  struct monitor *pmonitor = NULL;
  
  /* global authentication context */
-@@ -604,10 +608,15 @@ privsep_preauth_child(void)
+@@ -605,10 +609,15 @@
  	/* XXX not ready, too heavy after chroot */
  	do_setusercontext(privsep_pw);
  #else
@@ -30,7 +30,7 @@ $NetBSD: patch-av,v 1.7 2009/05/21 03:22:29 taca Exp $
  #endif
  }
  
-@@ -647,7 +656,7 @@ privsep_preauth(Authctxt *authctxt)
+@@ -648,7 +657,7 @@
  		close(pmonitor->m_sendfd);
  
  		/* Demote the child */
@@ -39,7 +39,7 @@ $NetBSD: patch-av,v 1.7 2009/05/21 03:22:29 taca Exp $
  			privsep_preauth_child();
  		setproctitle("%s", "[net]");
  	}
-@@ -662,7 +671,7 @@ privsep_postauth(Authctxt *authctxt)
+@@ -663,7 +672,7 @@
  #ifdef DISABLE_FD_PASSING
  	if (1) {
  #else
@@ -48,7 +48,7 @@ $NetBSD: patch-av,v 1.7 2009/05/21 03:22:29 taca Exp $
  #endif
  		/* File descriptor passing is broken or root login */
  		use_privsep = 0;
-@@ -1272,8 +1281,10 @@ main(int ac, char **av)
+@@ -1273,8 +1282,10 @@
  	av = saved_argv;
  #endif
  
@@ -60,7 +60,7 @@ $NetBSD: patch-av,v 1.7 2009/05/21 03:22:29 taca Exp $
  
  	/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
  	sanitise_stdfd();
-@@ -1577,7 +1588,7 @@ main(int ac, char **av)
+@@ -1578,7 +1589,7 @@
  		    (st.st_uid != getuid () ||
  		    (st.st_mode & (S_IWGRP|S_IWOTH)) != 0))
  #else
@@ -69,7 +69,7 @@ $NetBSD: patch-av,v 1.7 2009/05/21 03:22:29 taca Exp $
  #endif
  			fatal("%s must be owned by root and not group or "
  			    "world-writable.", _PATH_PRIVSEP_CHROOT_DIR);
-@@ -1601,8 +1612,10 @@ main(int ac, char **av)
+@@ -1602,8 +1613,10 @@
  	 * to create a file, and we can't control the code in every
  	 * module which might be used).
  	 */