From 667996af0aac75f309e9e7a48abf7cb1a8117e07 Mon Sep 17 00:00:00 2001
From: basney <basney>
Date: Wed, 6 May 2009 19:12:47 +0000
Subject: [PATCH] 4.6 release

---
 openssh/Announcement.txt | 29 +++++++++++++----------------
 openssh/make_gpt_dist    |  2 +-
 openssh/pkg_data_src.gpt |  6 +++---
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/openssh/Announcement.txt b/openssh/Announcement.txt
index fc30b25..8220097 100644
--- a/openssh/Announcement.txt
+++ b/openssh/Announcement.txt
@@ -1,4 +1,4 @@
-GSI-OpenSSH 4.5, based on OpenSSH 5.2p1, is now available from:
+GSI-OpenSSH 4.6, based on OpenSSH 5.2p1, is now available from:
 
 http://grid.ncsa.uiuc.edu/ssh/download.html
 
@@ -11,28 +11,25 @@ Please use Bugzilla to report GSI-OpenSSH bugs:
 
 http://bugzilla.globus.org/globus/enter_bug.cgi?product=GSI-OpenSSH
 
-GSI-OpenSSH 4.5 Major changes
+GSI-OpenSSH 4.6 Major changes
 
    New features
 
-      * Updated to OpenSSH 5.2p1.
-
-      * Improved error handling in SXXsshd script:
-        http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6664
+      * None
 
    Bugs fixed
 
-      * Fixed GPT package to stop on build failures:
-        http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6544
+      * Fix bug in authmethods table, introduced in GSI-OpenSSH 4.5,
+        that disabled the gssapi-keyex, external-keyx, and gssapi
+        methods on the client-side (including those methods that
+        determine the server-side username automatically based on the
+        GSI context).
+
+      * Accept empty identity_buffer from
+        globus_gss_assist_map_and_authorize() to support external
+        gridmap callouts that don't set it:
+        http://bugzilla.globus.org/globus/show_bug.cgi?id=6687
 
 SHA1 checksums:
-8286f997a54ccba81ebb00cf2212fbf34a09aff1  gsi_openssh-4.5-src.tar.gz
-74b85021aac1d2fddbd7ec40a3a2d3b3e12f5d97  gsi_openssh_bundle-4.5-src.tar.gz
-4df5b5309a60b6687dee22b5a98fa6eb9754a043  gsi_openssh_compat-4.5-src.tar.gz
-1836fab465db4705f8b7992b928ef4ee91211f4e  gsi_openssh_setup-4.5-src.tar.gz
 
 MD5 checksums:
-7e4a097667d3f1f2ca725b7c0cb90c94  gsi_openssh-4.5-src.tar.gz
-31ae8778b61d54cc8f0a9502978cf2bb  gsi_openssh_bundle-4.5-src.tar.gz
-74bf5efd014e209ce84d8e27cec2fc66  gsi_openssh_compat-4.5-src.tar.gz
-7b2d89e1337062f1409d807072d4b8eb  gsi_openssh_setup-4.5-src.tar.gz
diff --git a/openssh/make_gpt_dist b/openssh/make_gpt_dist
index 7b296ef..f0019f9 100755
--- a/openssh/make_gpt_dist
+++ b/openssh/make_gpt_dist
@@ -15,7 +15,7 @@
 # to the name gpt-bundle gives in its 'packaging_list'.
 #
 
-$srcdirname = "gsi_openssh-4.5-src";
+$srcdirname = "gsi_openssh-4.6-src";
 $srcpkgname = $srcdirname;
 
 #
diff --git a/openssh/pkg_data_src.gpt b/openssh/pkg_data_src.gpt
index d6964e1..561823f 100644
--- a/openssh/pkg_data_src.gpt
+++ b/openssh/pkg_data_src.gpt
@@ -3,7 +3,7 @@
 
 <gpt_package_metadata Format_Version="0.02" Name="gsi_openssh" >
 
-  <Aging_Version Major="4" Minor="5" Age="0" />
+  <Aging_Version Major="4" Minor="6" Age="0" />
   <Description>GSI-Enabled OpenSSH</Description>
   <Functional_Group >gsi_openssh</Functional_Group>
   <Version_Stability Release="stable" />
@@ -12,7 +12,7 @@
 
     <With_Flavors build="yes" />
 
-    <Version_Label>GSI-OpenSSH 4.5 / OpenSSH 5.2p1 / HPN13v5</Version_Label>
+    <Version_Label>GSI-OpenSSH 4.6 / OpenSSH 5.2p1 / HPN13v5</Version_Label>
 
     <Source_Dependencies Type="compile">
       <Dependency Name="globus_openssl">
@@ -52,7 +52,7 @@
       </Setup_Dependency>
       <Setup_Dependency Name="gsi_openssh_setup">
         <Version>
-          <Version_Range Upper_Major="4" Upper_Minor="5" Lower_Major="4" Lower_Minor="5" />
+          <Version_Range Upper_Major="4" Upper_Minor="6" Lower_Major="4" Lower_Minor="6" />
         </Version>
       </Setup_Dependency>
     </Source_Setup_Dependency>
-- 
2.45.2