4.4 release

diff --git a/bundle/scripts/version.sh b/bundle/scripts/version.sh
index d90af51e27767a06bf99995daba0e9441bb8bb36..c8195c916cb5991af8e94ff90f1e16397de741fb 100644 (file)
--- a/bundle/scripts/version.sh
+++ b/bundle/scripts/version.sh
@@ -1 +1 @@
-VERSION="4.3"
+VERSION="4.4"

diff --git a/compat/make_gpt_dist b/compat/make_gpt_dist
index 14b029d21660e02284a0bfeda68584b041db49e5..b0c5c6b88d8dc5393cb2886b0f4a87901b7ce29a 100755 (executable)
--- a/compat/make_gpt_dist
+++ b/compat/make_gpt_dist
@@ -15,7 +15,7 @@
 # to the name gpt-bundle gives in its 'packaging_list'.
 #
 
-$srcdirname = "gsi_openssh_compat-4.3-src";
+$srcdirname = "gsi_openssh_compat-4.4-src";
 $srcpkgname = $srcdirname;
 
 #

diff --git a/compat/pkg_data_src.gpt b/compat/pkg_data_src.gpt
index fce070f0512010b96c80c75b6a775c8cd4ad7ae3..eb3f97a45219ee2f2added5070d16decd32e882e 100644 (file)
--- a/compat/pkg_data_src.gpt
+++ b/compat/pkg_data_src.gpt
@@ -3,14 +3,14 @@
 
 <gpt_package_metadata Format_Version="0.02" Name="gsi_openssh_compat" >
 
-  <Aging_Version Major="4" Minor="3" Age="0" />
+  <Aging_Version Major="4" Minor="4" Age="0" />
   <Description>GSI-Enabled OpenSSH compat package</Description>
   <Functional_Group >gsi_openssh</Functional_Group>
   <Version_Stability Release="stable" />
 
   <src_pkg >
 
-    <Version_Label>GSI-OpenSSH 4.3 / OpenSSH 5.0p1 / HPN13v1</Version_Label>
+    <Version_Label>GSI-OpenSSH 4.4 / OpenSSH 5.1p1 / HPN13v5</Version_Label>
 
     <With_Flavors build="no" />
 

diff --git a/setup/make_gpt_dist b/setup/make_gpt_dist
index 22e151dc87e82653de2c912adad4df54ae905f98..597869b290a76da42995159be929877af3cd86e5 100755 (executable)
--- a/setup/make_gpt_dist
+++ b/setup/make_gpt_dist
@@ -15,7 +15,7 @@
 # to the name gpt-bundle gives in its 'packaging_list'.
 #
 
-$srcdirname = "gsi_openssh_setup-4.3-src";
+$srcdirname = "gsi_openssh_setup-4.4-src";
 $srcpkgname = $srcdirname;
 
 #

diff --git a/setup/pkg_data_src.gpt b/setup/pkg_data_src.gpt
index c0df67b346902a8f403acd38504de28e8a077a27..6a69c97e9114cead0e3faf6b43101a4a22856487 100644 (file)
--- a/setup/pkg_data_src.gpt
+++ b/setup/pkg_data_src.gpt
@@ -3,14 +3,14 @@
 
 <gpt_package_metadata Format_Version="0.02" Name="gsi_openssh_setup" >
 
-  <Aging_Version Major="4" Minor="3" Age="0" />
+  <Aging_Version Major="4" Minor="4" Age="0" />
   <Description>GSI-Enabled OpenSSH setup package</Description>
   <Functional_Group >gsi_openssh</Functional_Group>
   <Version_Stability Release="stable" />
 
   <src_pkg >
 
-    <Version_Label>GSI-OpenSSH 4.3 / OpenSSH 5.0p1 / HPN13v1</Version_Label>
+    <Version_Label>GSI-OpenSSH 4.4 / OpenSSH 5.1p1 / HPN13v5</Version_Label>
 
     <With_Flavors build="no" />
 
@@ -36,7 +36,7 @@
     </Post_Install_Message>
 
     <Setup Name="gsi_openssh_setup">
-      <Aging_Version Major="4" Minor="3" Age="0" />
+      <Aging_Version Major="4" Minor="4" Age="0" />
     </Setup>
 
   </src_pkg >

diff --git a/setup/setup-openssh.pl b/setup/setup-openssh.pl
index 69a82b03958fbaa55742d3762f70ed014cabad8f..6a4cdd50db13f254b0dafc77ecf29ea87432baac 100644 (file)
--- a/setup/setup-openssh.pl
+++ b/setup/setup-openssh.pl
@@ -1075,7 +1075,7 @@ sub action
 
     if (($result or $?) and $command !~ m!patch!)
     {
-        exitDie("ERROR: Unable to execute command: $!\n");
+        exitDie("ERROR: Unable to execute $command: $!\n");
     }
 }
 

diff --git a/setup/sshd_config.in b/setup/sshd_config.in
index bd214846b58ef5b9c88d3b5e4f5a442358e61768..badf4af21c7c2c9e8319b5fa09ad3252dac37c71 100644 (file)
--- a/setup/sshd_config.in
+++ b/setup/sshd_config.in
@@ -1,4 +1,4 @@
-#      $OpenBSD: sshd_config,v 1.77 2008/02/08 23:24:07 djm Exp $
+#      $OpenBSD: sshd_config,v 1.80 2008/07/02 02:24:18 djm Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -28,7 +28,7 @@ Protocol 2
 
 # Lifetime and size of ephemeral version 1 server key
 #KeyRegenerationInterval 1h
-#ServerKeyBits 768
+#ServerKeyBits 1024
 
 # Logging
 # obsoletes QuietMode and FascistLogging
@@ -41,6 +41,7 @@ Protocol 2
 #PermitRootLogin yes
 #StrictModes yes
 #MaxAuthTries 6
+#MaxSessions 10
 
 #RSAAuthentication yes
 #PubkeyAuthentication yes
@@ -76,6 +77,7 @@ Protocol 2
 
 # GSSAPI options
 #GSSAPIAuthentication yes
+#GSSAPIDelegateCredentials yes
 #GSSAPICleanupCredentials yes
 #GSSAPIStrictAcceptorCheck yes
 #GSSAPIKeyExchange yes
@@ -91,6 +93,7 @@ Protocol 2
 # and ChallengeResponseAuthentication to 'no'.
 #UsePAM yes
 
+#AllowAgentForwarding yes
 #AllowTcpForwarding yes
 #GatewayPorts no
 X11Forwarding yes
@@ -117,7 +120,6 @@ X11Forwarding yes
 # override default of no subsystems
 Subsystem      sftp    /usr/libexec/sftp-server
 
-
 # the following are HPN related configuration options
 # tcp receive buffer polling. disable in non autotuning kernels
 #TcpRcvBufPoll yes