version 3.1

[gssapi-openssh.git] / openssh / pkg_data_src.gpt

diff --git a/openssh/pkg_data_src.gpt b/openssh/pkg_data_src.gpt
index e4bd4eb124ca83c2a4fa4ab3f9811e029c50b01d..abf05085b0b383f9339c0a457e81a971ce3daea2 100644 (file)
--- a/openssh/pkg_data_src.gpt
+++ b/openssh/pkg_data_src.gpt
@@ -3,53 +3,68 @@
 
 <gpt_package_metadata Format_Version="0.02" Name="gsi_openssh" >
 
-  <Aging_Version Age="0" Major="0" Minor="3" />
-  <Description>GSI-OpenSSH 3.1p1 package</Description>
+  <Aging_Version Major="3" Minor="1" Age="0" />
+  <Description>GSI-Enabled OpenSSH package</Description>
   <Functional_Group >gsi_openssh</Functional_Group>
-  <Version_Stability Release="beta" />
+  <Version_Stability Release="stable" />
 
   <src_pkg >
 
-    <Build_Environment >
-      <cflags ></cflags>
-      <external_includes ></external_includes>
-      <pkg_libs >-lglobus_gss_assist_$GLOBUS_FLAVOR_NAME -lglobus_gssapi_gsi_$GLOBUS_FLAVOR_NAME -lssl_$GLOBUS_FLAVOR_NAME -lcrypto_$GLOBUS_FLAVOR_NAME</pkg_libs>
-      <external_libs >-lutil -lz -lnsl -lcrypt</external_libs>
-    </Build_Environment>
-
     <With_Flavors build="yes" />
 
-    <Version_Label>3.1p1</Version_Label>
-
-    <Source_Dependencies Type="compile" >
-      <Dependency Name="globus_openssl"><Version><Version_Range Upper_Major="1000" Lower_Major="0" Upper_Minor="1000" Lower_Minor="3" /></Version></Dependency>
-      <Dependency Name="globus_gssapi_gsi"><Version><Simple_Version Major="2"></Simple_Version></Version></Dependency>
-      <Dependency Name="globus_gss_assist"><Version><Simple_Version Major="2"></Simple_Version></Version></Dependency>
-    </Source_Dependencies>
-
-    <Source_Dependencies Type="pgm_link" >
-      <Dependency Name="globus_openssl"><Version><Version_Range Upper_Major="1000" Lower_Major="0" Upper_Minor="1000" Lower_Minor="3" /></Version></Dependency>
-      <Dependency Name="globus_gss_assist"><Version><Simple_Version Major="2"></Simple_Version></Version></Dependency>
+    <Version_Label>GSI-OpenSSH 3.1 / OpenSSH 3.8p1</Version_Label>
+
+    <Source_Dependencies Type="compile">
+      <Dependency Name="globus_openssl">
+        <Version>
+          <Version_Range Lower_Major="0" Lower_Minor="10" Upper_Major="0" Upper_Minor="40" />
+        </Version>
+      </Dependency>
+      <Dependency Name="globus_gss_assist">
+        <Version>
+          <Simple_Version Major="2"></Simple_Version>
+          <Simple_Version Major="3"></Simple_Version>
+        </Version>
+      </Dependency>
     </Source_Dependencies>
 
-    <Source_Dependencies Type="lib_link" >
-      <Dependency Name="globus_gssapi_gsi"><Version><Simple_Version Major="2"></Simple_Version></Version></Dependency>
+    <Source_Dependencies Type="pgm_link">
+      <Dependency Name="globus_openssl">
+        <Version>
+          <Version_Range Lower_Major="0" Lower_Minor="10" Upper_Major="0" Upper_Minor="40" />
+        </Version>
+      </Dependency>
+      <Dependency Name="globus_gss_assist">
+        <Version>
+          <Simple_Version Major="2"></Simple_Version>
+          <Simple_Version Major="3"></Simple_Version>
+        </Version>
+      </Dependency>
     </Source_Dependencies>
 
-    <Source_Setup_Dependencies PkgType="pgm" >
-      <Setup_Dependency Name="gsi_openssh_setup"> <Version > <Simple_Version Major="1" /> </Version> </Setup_Dependency>
-    </Source_Setup_Dependencies>
+    <Source_Setup_Dependency PkgType="pgm">
+      <Setup_Dependency Name="trusted_ca_setup">
+        <Version>
+          <Simple_Version Major="2"></Simple_Version>
+        </Version>
+      </Setup_Dependency>
+      <Setup_Dependency Name="gsi_openssh_setup">
+        <Version>
+          <Version_Range Upper_Major="3" Upper_Minor="1" Lower_Major="3" Lower_Minor="1" />
+        </Version>
+      </Setup_Dependency>
+    </Source_Setup_Dependency>
 
     <Build_Instructions>
 
       <Build_Step>
-        . $GLOBUS_LOCATION/libexec/globus-build-env-FLAVOR_GPTMACRO.sh
+        GSICFG="--prefix=INSTALLDIR_GPTMACRO --with-globus=INSTALLDIR_GPTMACRO --with-globus-flavor=FLAVOR_GPTMACRO"
 
-        if test "STATIC_LINK_GPTMACRO" = "yes"; then
-          static_option=--enable-static-only
+        if test "STATIC_LINK_GPTMACRO" = "yes"; then 
+          GSICFG="$GSICFG --with-globus-static"
         fi
 
-        ./configure --prefix=INSTALLDIR_GPTMACRO --with-globus=INSTALLDIR_GPTMACRO --with-globus-flavor=FLAVOR_GPTMACRO --disable-suid-ssh --without-default-path $static_option OPENSSH_GPTMACRO</Build_Step>
+        CONFIGENV_GPTMACRO ./configure GSI_OPENSSH_GPTMACRO $GSICFG
       </Build_Step>
 
       <Build_Step>