From 57fae04b159ac1e01b5a0896b352e5967494ea07 Mon Sep 17 00:00:00 2001
From: basney <basney>
Date: Thu, 10 Jan 2008 16:38:14 +0000
Subject: [PATCH] 4.2 release

---
 openssh/Announcement.txt | 29 +++++++++++++----------------
 openssh/make_gpt_dist    |  2 +-
 openssh/pkg_data_src.gpt |  6 +++---
 openssh/version.h        |  2 +-
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/openssh/Announcement.txt b/openssh/Announcement.txt
index 99d7f72..5607f8e 100644
--- a/openssh/Announcement.txt
+++ b/openssh/Announcement.txt
@@ -1,4 +1,4 @@
-GSI-OpenSSH 4.1, based on OpenSSH 4.7p1, is now available from:
+GSI-OpenSSH 4.2, based on OpenSSH 4.7p1, 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.1 Major changes
+GSI-OpenSSH 4.2 Major changes
 
    New features
 
-      * Upgraded to OpenSSH 4.7p1.
-
-      * Upgraded to HPN12v18 patch from
-        <http://www.psc.edu/networking/projects/hpn-ssh/>.
+      * Added support for new OpenSSL packages in GT 4.2.
 
    Bugs fixed
 
-      * Fixed AIX build failure
-        (http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=5201).
+      * Fixed configure script typo in RPATH ld string
+        (http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=5614).
 
 SHA1 checksums:
-ba69bf26fd16170b7caf8b4b2f74fd80d18d1e50  gsi_openssh-4.1-src.tar.gz
-069b85b183b9f773f288778bdbd4402b425e7d8e  gsi_openssh_bundle-4.1-src.tar.gz
-1c2dc0ca44d20abde3fec5606eda2917adf88c23  gsi_openssh_compat-4.1-src.tar.gz
-8d5bb81e746a9ec757b90f50ca54883f76140125  gsi_openssh_setup-4.1-src.tar.gz
+36cc4a69c0dabd6084be2a589b4a0ad58d782c72  gsi_openssh-4.2-src.tar.gz
+f7f65d9cf402ad5264a002d7a23e46e9c0b45ab9  gsi_openssh_bundle-4.2-src.tar.gz
+e8241d22a9b69e0ee392a98bba9d18b1b8036d5e  gsi_openssh_compat-4.2-src.tar.gz
+1aa8942cecb6b0b9021477599d29d5902777485b  gsi_openssh_setup-4.2-src.tar.gz
 
 MD5 checksums:
-bafb21cc64548dbc5321caa142852aa5  gsi_openssh-4.1-src.tar.gz
-72fe5962f7b55662ce20703d9e89bc51  gsi_openssh_bundle-4.1-src.tar.gz
-1afb13fc5d06dc51b776c93de71879c7  gsi_openssh_compat-4.1-src.tar.gz
-3d23d8ee45732173f24b824684a7e3a1  gsi_openssh_setup-4.1-src.tar.gz
+22c48183022459126866e37041b6aa7e  gsi_openssh-4.2-src.tar.gz
+309399f5f786580111887414d0221429  gsi_openssh_bundle-4.2-src.tar.gz
+fd63b2fa181afc5e31dea3f39ee0c0bf  gsi_openssh_compat-4.2-src.tar.gz
+5f9d67dfc63f6c0c6bf43fbbf07761ba  gsi_openssh_setup-4.2-src.tar.gz
diff --git a/openssh/make_gpt_dist b/openssh/make_gpt_dist
index 2906e04..0d8b5a8 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.1-src";
+$srcdirname = "gsi_openssh-4.2-src";
 $srcpkgname = $srcdirname;
 
 #
diff --git a/openssh/pkg_data_src.gpt b/openssh/pkg_data_src.gpt
index 8c4e2a9..686414c 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="1" Age="0" />
+  <Aging_Version Major="4" Minor="2" Age="0" />
   <Description>GSI-Enabled OpenSSH package</Description>
   <Functional_Group >gsi_openssh</Functional_Group>
   <Version_Stability Release="stable" />
@@ -12,7 +12,7 @@
 
     <With_Flavors build="yes" />
 
-    <Version_Label>GSI-OpenSSH 4.1 / OpenSSH 4.7p1 / HPN12v18</Version_Label>
+    <Version_Label>GSI-OpenSSH 4.2 / OpenSSH 4.7p1 / HPN12v18</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="1" Lower_Major="4" Lower_Minor="1" />
+          <Version_Range Upper_Major="4" Upper_Minor="2" Lower_Major="4" Lower_Minor="2" />
         </Version>
       </Setup_Dependency>
     </Source_Setup_Dependency>
diff --git a/openssh/version.h b/openssh/version.h
index 9d8f3ab..21dbf3e 100644
--- a/openssh/version.h
+++ b/openssh/version.h
@@ -18,7 +18,7 @@
 #define MGLUE_VERSION	""
 #endif
 
-#define NCSA_VERSION	" NCSA_GSSAPI_GPT_4.1"
+#define NCSA_VERSION	" NCSA_GSSAPI_GPT_4.2"
 
 #define SSH_VERSION	"OpenSSH_4.7"
 
-- 
2.45.2