From e716d9feb0bd6a2e3240571ee079d61865c59908 Mon Sep 17 00:00:00 2001
From: cphillip <cphillip>
Date: Thu, 10 Apr 2003 20:20:25 +0000
Subject: [PATCH]   o Move to version 2.2 and merge in config diffs from
 3.6.1p1.

---
 setup/make_gpt_dist    | 4 ++--
 setup/pkg_data_src.gpt | 6 +++---
 setup/ssh_prng_cmds.in | 1 +
 setup/sshd_config.in   | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/setup/make_gpt_dist b/setup/make_gpt_dist
index 80b9b75..00611c3 100755
--- a/setup/make_gpt_dist
+++ b/setup/make_gpt_dist
@@ -15,8 +15,8 @@
 # to the name gpt-bundle gives in its 'packaging_list'.
 #
 
-$srcdirname = "gsi_openssh_setup-2.1-src";
-$srcpkgname = "gsi_openssh_setup-2.1-src";
+$srcdirname = "gsi_openssh_setup-2.2-src";
+$srcpkgname = "gsi_openssh_setup-2.2-src";
 
 #
 # uncomment when we've got a better place to get the current version from
diff --git a/setup/pkg_data_src.gpt b/setup/pkg_data_src.gpt
index b515932..36ba1fd 100644
--- 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="2" Minor="1" Age="1" />
+  <Aging_Version Major="2" Minor="2" Age="0" />
   <Description>GSI-Enabled OpenSSH setup package</Description>
   <Functional_Group >gsi_openssh</Functional_Group>
   <Version_Stability Release="stable" />
 
   <src_pkg >
 
-    <Version_Label>3.5p1</Version_Label>
+    <Version_Label>GSI-OpenSSH 2.2 / OpenSSH 3.6.1p1</Version_Label>
 
     <With_Flavors build="no" />
 
@@ -36,7 +36,7 @@
     </Post_Install_Message>
 
     <Setup Name="gsi_openssh_setup">
-      <Aging_Version Major="2" Minor="1" Age="1" />
+      <Aging_Version Major="2" Minor="2" Age="0" />
     </Setup>
 
   </src_pkg >
diff --git a/setup/ssh_prng_cmds.in b/setup/ssh_prng_cmds.in
index 37069a9..6c8d793 100644
--- a/setup/ssh_prng_cmds.in
+++ b/setup/ssh_prng_cmds.in
@@ -72,3 +72,4 @@
 "tail -200 /var/log/maillog"		@PROG_TAIL@	0.01
 "tail -200 /var/adm/maillog"		@PROG_TAIL@	0.01
 "tail -200 /var/adm/syslog/mail.log"	@PROG_TAIL@	0.01
+
diff --git a/setup/sshd_config.in b/setup/sshd_config.in
index 0061971..1583c72 100644
--- a/setup/sshd_config.in
+++ b/setup/sshd_config.in
@@ -1,4 +1,4 @@
-#     $OpenBSD: sshd_config,v 1.59 2002/09/25 11:17:16 markus Exp $
+#	$OpenBSD: sshd_config,v 1.59 2002/09/25 11:17:16 markus Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
-- 
2.45.1