o Move to version 2.2 and merge in config diffs from 3.6.1p1.

diff --git a/setup/make_gpt_dist b/setup/make_gpt_dist
index 80b9b75598b260c670eec5fcfae9ac74b85ca966..00611c3642a12bf5d4f4bf96d91028814fd243dd 100755 (executable)
--- 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 b515932b5312ea423c30ad04040dbfbcd1e93478..36ba1fd035a3a042b9a4d644aaca43f6d005bdc4 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="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 37069a9a084896f717b59107a8232cca783c7af3..6c8d793f8d7fc0f49d7c6a6c5af3222215a1b495 100644 (file)
--- 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 0061971a3866fbf35ea0b152d6c234f6d032d770..1583c72346c6d8ad8e535a95ab7f6cdbcf43c1ee 100644 (file)
--- 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.