o Move to version 2.6.

  o Remove the globus packages from the source bundle.
  o Remove utilities to make a binary bundle.

diff --git a/bundle/gsi_openssh_bundle-bin.xml b/bundle/gsi_openssh_bundle-bin.xml
deleted file mode 100644 (file)
index 8cc9a77..0000000
--- a/bundle/gsi_openssh_bundle-bin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE GPTBundleData SYSTEM "gpt_bundle.dtd">
-<GPTBundleData Name="gsi_openssh" >
-<BundleInfo >
-<Description >EMPTY</Description>
-<ContactInfo ContactEmail="EMPTY" ContactName="EMPTY" />
-<BundleDocs BundleDocsDesc="EMPTY" BundleDocsURL="EMPTY" />
-</BundleInfo>
-<BundleReleaseInfo >
-<BundleStability Release="EMPTY" />
-<BundleVersion Age="EMPTY" Major="EMPTY" Minor="EMPTY" />
-<VersionLabel >EMPTY</VersionLabel>
-<TypeOfBundle ContentsType="gpt" />
-</BundleReleaseInfo>
-<PackageList >
-<IncludedPackages >
-<Package PackageFlavor="gcc32" PackageName="globus_gsi_cert_utils" PackageType="pgm" PackageVersion="0.5" />
-<Package PackageFlavor="gcc32" PackageName="globus_proxy_utils" PackageType="pgm" PackageVersion="0.6" />
-<Package PackageFlavor="noflavor" PackageName="globus_user_env" PackageType="data" PackageVersion="2.2" />
-<Package PackageFlavor="gcc32" PackageName="gsi_openssh" PackageType="pgm" PackageVersion="2.2" />
-</IncludedPackages>
-<ExcludedPackages >
-</ExcludedPackages>
-<PackageFlags >
-</PackageFlags>
-</PackageList>
-</GPTBundleData>

diff --git a/bundle/gsi_openssh_bundle-src.xml b/bundle/gsi_openssh_bundle-src.xml
index 58a03dde7cd8b20e0c64c3a9aa12d6540c3782bb..91c940dab54924180595630798ab5c9ed0cd44b3 100644 (file)
--- a/bundle/gsi_openssh_bundle-src.xml
+++ b/bundle/gsi_openssh_bundle-src.xml
@@ -14,8 +14,6 @@
 </BundleReleaseInfo>
 <PackageList >
 <IncludedPackages >
-<Package PackageFlavor="ANY" PackageName="globus_user_env" PackageType="src" PackageVersion="2.2" />
-<Package PackageFlavor="ANY" PackageName="globus_proxy_utils" PackageType="src" PackageVersion="0.6" />
 <Package PackageFlavor="ANY" PackageName="gsi_openssh" PackageType="src" PackageVersion="2.2" />
 </IncludedPackages>
 <ExcludedPackages >

diff --git a/bundle/make-bin-bundle b/bundle/make-bin-bundle
deleted file mode 100755 (executable)
index ed91f75..0000000
--- a/bundle/make-bin-bundle
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# Usage:
-#
-#   1) Verify that your GLOBUS_LOCATION is set to the installation from which you
-#      wish to create a binary bundle.
-#
-#   2) Run the bin-bundle creation script, passing the platform name to it:
-#
-#        ./make-bin-bundle <platform>
-#
-
-if [ "x$GLOBUS_LOCATION" = "x" ]; then
-    echo "Please set GLOBUS_LOCATION to the location from which you wish to make the binary bundle."
-    exit;
-fi
-
-if [ "x$1" = "x" ]; then
-    echo "Usage: make-bin-bundle <platform>"
-    echo "Example platforms:"
-    echo "  i686-pc-linux-gnu-gcc32"
-    echo "  sparc-sun-solaris2.8-vendorcc32"
-    echo "  ia64-unknown-linux-gnu-gcc64"
-    echo "  mips-sgi-irix6.5-vendorcc32"
-    echo "  powerpc-ibm-aix5.1.0.0-vendorcc32"
-    exit;
-fi
-
-source version.sh
-
-NAME="gsi_openssh_bundle-$VERSION-$1.tar.gz"
-XML="gsi_openssh_bundle-bin.xml"
-
-if [ ! -e output/$NAME ]; then
-    if [ ! -e output/ ]; then
-        mkdir -p output/
-    fi
-
-    if [ ! -e work/ ]; then
-        WORK_SCRIPTCREATED="1"
-        mkdir -p work/
-        cp $XML work/
-    fi
-
-    if [ ! -e work/sources/ ]; then
-        cp -a sources work/sources
-    fi
-
-    cd work/
-    $GPT_LOCATION/sbin/gpt-bundle -output=$NAME -bv=$VERSION -xml=$XML
-    mv $NAME ../output/
-    cd ../
-
-    if [ "x$WORK_SCRIPTCREATED" != "x" ]; then
-        rm -rf work/
-    fi
-else
-    echo "Please remove output/$NAME before running this script."
-    exit;
-fi

diff --git a/bundle/make-src-bundle b/bundle/make-src-bundle
index ef56ebd0b268cbb3ecff64faab2e37688811c79f..c5a993659b35774cbc1760912f88808b5e3ffaf6 100755 (executable)
--- a/bundle/make-src-bundle
+++ b/bundle/make-src-bundle
@@ -28,7 +28,7 @@ if [ ! -e output/$NAME ]; then
     fi
 
     cd work/
-    $GPT_LOCATION/sbin/gpt-bundle -srcdir=sources/ -output=$NAME -bv=$VERSION -xml=$XML
+    $GPT_LOCATION/sbin/gpt-bundle -nodeps -nosetups -srcdir=sources/ -output=$NAME -bv=$VERSION -xml=$XML
     mv $NAME ../output/
     cd ../
 

diff --git a/bundle/sources/globus_common-3.9.tar.gz b/bundle/sources/globus_common-3.9.tar.gz
deleted file mode 100644 (file)
index 903da4b..0000000
Binary files a/bundle/sources/globus_common-3.9.tar.gz and /dev/null differ

diff --git a/bundle/sources/globus_common_setup-2.1.tar.gz b/bundle/sources/globus_common_setup-2.1.tar.gz
deleted file mode 100644 (file)
index a157814..0000000
Binary files a/bundle/sources/globus_common_setup-2.1.tar.gz and /dev/null differ

diff --git a/bundle/sources/globus_gsi_callback-0.6.tar.gz b/bundle/sources/globus_gsi_callback-0.6.tar.gz
deleted file mode 100644 (file)
index 869242f..0000000
Binary files a/bundle/sources/globus_gsi_callback-0.6.tar.gz and /dev/null differ

diff --git a/bundle/sources/globus_gsi_cert_utils-0.8.tar.gz b/bundle/sources/globus_gsi_cert_utils-0.8.tar.gz
deleted file mode 100644 (file)
index 5b6072d..0000000
Binary files a/bundle/sources/globus_gsi_cert_utils-0.8.tar.gz and /dev/null differ

diff --git a/bundle/sources/globus_gsi_credential-0.7.tar.gz b/bundle/sources/globus_gsi_credential-0.7.tar.gz
deleted file mode 100644 (file)
index c449291..0000000
Binary files a/bundle/sources/globus_gsi_credential-0.7.tar.gz and /dev/null differ

diff --git a/bundle/sources/globus_gsi_openssl_error-0.2.tar.gz b/bundle/sources/globus_gsi_openssl_error-0.2.tar.gz
deleted file mode 100644 (file)
index 64a7f5e..0000000
Binary files a/bundle/sources/globus_gsi_openssl_error-0.2.tar.gz and /dev/null differ

diff --git a/bundle/sources/globus_gsi_proxy_core-0.4.tar.gz b/bundle/sources/globus_gsi_proxy_core-0.4.tar.gz
deleted file mode 100644 (file)
index 735024e..0000000
Binary files a/bundle/sources/globus_gsi_proxy_core-0.4.tar.gz and /dev/null differ

diff --git a/bundle/sources/globus_gsi_proxy_ssl-0.1.tar.gz b/bundle/sources/globus_gsi_proxy_ssl-0.1.tar.gz
deleted file mode 100644 (file)
index c3e47db..0000000
Binary files a/bundle/sources/globus_gsi_proxy_ssl-0.1.tar.gz and /dev/null differ

diff --git a/bundle/sources/globus_gsi_sysconfig-0.4.tar.gz b/bundle/sources/globus_gsi_sysconfig-0.4.tar.gz
deleted file mode 100644 (file)
index e29a31d..0000000
Binary files a/bundle/sources/globus_gsi_sysconfig-0.4.tar.gz and /dev/null differ

diff --git a/bundle/sources/globus_gss_assist-3.4.tar.gz b/bundle/sources/globus_gss_assist-3.4.tar.gz
deleted file mode 100644 (file)
index e443c5a..0000000
Binary files a/bundle/sources/globus_gss_assist-3.4.tar.gz and /dev/null differ

diff --git a/bundle/sources/globus_gssapi_gsi-3.9.tar.gz b/bundle/sources/globus_gssapi_gsi-3.9.tar.gz
deleted file mode 100644 (file)
index f4d1a84..0000000
Binary files a/bundle/sources/globus_gssapi_gsi-3.9.tar.gz and /dev/null differ

diff --git a/bundle/sources/globus_openssl-0.14.tar.gz b/bundle/sources/globus_openssl-0.14.tar.gz
deleted file mode 100644 (file)
index b397456..0000000
Binary files a/bundle/sources/globus_openssl-0.14.tar.gz and /dev/null differ

diff --git a/bundle/sources/globus_openssl_module-0.2.tar.gz b/bundle/sources/globus_openssl_module-0.2.tar.gz
deleted file mode 100644 (file)
index e7b3463..0000000
Binary files a/bundle/sources/globus_openssl_module-0.2.tar.gz and /dev/null differ

diff --git a/bundle/sources/globus_proxy_utils-0.6.tar.gz b/bundle/sources/globus_proxy_utils-0.6.tar.gz
deleted file mode 100644 (file)
index d57e004..0000000
Binary files a/bundle/sources/globus_proxy_utils-0.6.tar.gz and /dev/null differ

diff --git a/bundle/sources/globus_trusted_ca_42864e48_setup-0.5.tar.gz b/bundle/sources/globus_trusted_ca_42864e48_setup-0.5.tar.gz
deleted file mode 100644 (file)
index 17ed50a..0000000
Binary files a/bundle/sources/globus_trusted_ca_42864e48_setup-0.5.tar.gz and /dev/null differ

diff --git a/bundle/sources/globus_user_env-2.2.tar.gz b/bundle/sources/globus_user_env-2.2.tar.gz
deleted file mode 100644 (file)
index 39b4804..0000000
Binary files a/bundle/sources/globus_user_env-2.2.tar.gz and /dev/null differ

diff --git a/bundle/sources/gsi_openssh-2.6-src.tar.gz b/bundle/sources/gsi_openssh-2.6-src.tar.gz
index 6b261b5d7589dac24896ce20d3438b56894b5df9..6348b2a21d1fef9086a9e2c42370b3a27c73497b 100644 (file)
Binary files a/bundle/sources/gsi_openssh-2.6-src.tar.gz and b/bundle/sources/gsi_openssh-2.6-src.tar.gz differ

diff --git a/bundle/sources/gsi_openssh_setup-2.6-src.tar.gz b/bundle/sources/gsi_openssh_setup-2.6-src.tar.gz
index db2e6bbc9bc5e067d6f21437e2f0fc8bb835a23a..75ce0be2800fdd9ff49b4f3d79c9c9f845c97238 100644 (file)
Binary files a/bundle/sources/gsi_openssh_setup-2.6-src.tar.gz and b/bundle/sources/gsi_openssh_setup-2.6-src.tar.gz differ

diff --git a/bundle/version.sh b/bundle/version.sh
index 4fb3e768876c32299d8574fda2d380200b543a6c..ff26fbf532ea086c248a18516ad3308696584449 100644 (file)
--- a/bundle/version.sh
+++ b/bundle/version.sh
@@ -1 +1 @@
-VERSION="2.5"
+VERSION="2.6"