diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/amdir/pkgdata_Makefile.am gt4.2.1-all-source-installer/gpt/packaging_tools/amdir/pkgdata_Makefile.am --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/amdir/pkgdata_Makefile.am 2006-07-26 21:16:59.000000000 +0200 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/amdir/pkgdata_Makefile.am 2009-03-16 08:47:57.000000000 +0100 @@ -1,6 +1,6 @@ include $(top_srcdir)/globus_automake_pre -flavordir = $(GLOBUS_LOCATION)/etc/$(PACKAGE) +flavordir = $(datadir)/globus/flavors FILELIST_FILES = noflavor_data.filelist \ $(GLOBUS_FLAVOR_NAME)_dev.filelist \ @@ -52,12 +52,12 @@ # kind of metadata file is missing by calling "true" install-pkgDATA: $(pkg_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(mkdir_p) "$(DESTDIR)$(pkgdir)"; + test -z "$(pkgdir)" || $(mkinstalldirs) "$(DESTDIR)$(pkgdir)"; @list='$(pkg_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(pkgDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdir)/$$f'"; \ - $(pkgDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdir)/$$f"; \ + echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pkgdir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdir)/$$f"; \ done || true $(METADATA_FILES): pkg_data_src.gpt diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/configure gt4.2.1-all-source-installer/gpt/packaging_tools/configure --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/configure 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/configure 2009-03-16 08:47:34.000000000 +0100 @@ -273,7 +273,7 @@ PACKAGE_BUGREPORT='' ac_unique_file="Makefile.am" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot PERL POD2MAN TAR GUNZIP GZIP LN_S GPT_LOCATION LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot PERL POD2MAN perlmoduledir TAR GUNZIP GZIP LN_S ENABLE_COMPAT_TRUE ENABLE_COMPAT_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -793,10 +793,18 @@ esac cat <<\_ACEOF +Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-compat disable backward compatibility symlinks + Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-perl= specify path to perl binary + --with-perl=PATH path to perl binary + --with-perlmoduledir=DIR + perl module installation directory + [PREFIX/lib/perl] _ACEOF fi @@ -1269,88 +1277,7 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -# Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} - { (exit 1); exit 1; }; } - -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} - { (exit 1); exit 1; }; } -fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 -build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 -host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -echo "$as_me:$LINENO: checking target system type" >&5 -echo $ECHO_N "checking target system type... $ECHO_C" >&6 -if test "${ac_cv_target+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_target_alias=$target_alias -test "x$ac_cv_target_alias" = "x" && - ac_cv_target_alias=$ac_cv_host_alias -ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -echo "${ECHO_T}$ac_cv_target" >&6 -target=$ac_cv_target -target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -# The aliases save the names the user supplied, while $host etc. -# will get canonicalized. -test -n "$target_alias" && - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- am__api_version="1.7" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -1728,7 +1655,6 @@ -echo $target > ./etc/gpt/gnu_target # Check whether --with-perl or --without-perl was given. @@ -1842,21 +1768,38 @@ -#echo "POD2MAN=$POD2MAN" -# checking for the GPT_LOCATION +# Check whether --with-perlmoduledir was given. +if test "${with_perlmoduledir+set}" = set; then + withval=$with_perlmoduledir; + case $withval in + no) + echo "--with-perlmoduledir requires an argument" >&2 + exit 1 + ;; + yes) + echo "--with-perlmoduledir requires an argument" >&2 + exit 1 + ;; + *) + perlmoduledir=$withval + ;; + esac + +else + + perlmoduledir='${prefix}/lib/perl' -if test "x$GPT_LOCATION" = "x"; then - # checking for the GLOBUS_LOCATION - if test "x$GLOBUS_LOCATION" = "x"; then - echo "ERROR Please specify GLOBUS_LOCATION or GPT_LOCATION" >&2 - exit 1 - else - GPT_LOCATION=$GLOBUS_LOCATION - fi fi + + + + +# checking for the GPT_LOCATION +ac_default_prefix=${GPT_LOCATION:-$ac_default_prefix} + for ac_prog in gtar tar do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -2001,6 +1944,24 @@ fi +# Check whether --enable-compat was given. +if test "${enable_compat+set}" = set; then + enableval=$enable_compat; +else + enable_compat="yes" +fi + +{ echo "$as_me:$LINENO: Enable backward compatibility symlinks: $enable_compat" >&5 +echo "$as_me: Enable backward compatibility symlinks: $enable_compat" >&6;} + + +if test "x$enable_compat" = "xyes"; then + ENABLE_COMPAT_TRUE= + ENABLE_COMPAT_FALSE='#' +else + ENABLE_COMPAT_TRUE='#' + ENABLE_COMPAT_FALSE= +fi ac_config_files="$ac_config_files Makefile perl/scripts/gpt_version perl/GPT/GPTIdentity.pm" @@ -2127,6 +2088,13 @@ LTLIBOBJS=$ac_ltlibobjs +if test -z "${ENABLE_COMPAT_TRUE}" && test -z "${ENABLE_COMPAT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"ENABLE_COMPAT\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"ENABLE_COMPAT\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -2642,18 +2610,6 @@ s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t s,@LIBS@,$LIBS,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t -s,@target@,$target,;t t -s,@target_cpu@,$target_cpu,;t t -s,@target_vendor@,$target_vendor,;t t -s,@target_os@,$target_os,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t @@ -2675,11 +2631,13 @@ s,@am__leading_dot@,$am__leading_dot,;t t s,@PERL@,$PERL,;t t s,@POD2MAN@,$POD2MAN,;t t +s,@perlmoduledir@,$perlmoduledir,;t t s,@TAR@,$TAR,;t t s,@GUNZIP@,$GUNZIP,;t t s,@GZIP@,$GZIP,;t t s,@LN_S@,$LN_S,;t t -s,@GPT_LOCATION@,$GPT_LOCATION,;t t +s,@ENABLE_COMPAT_TRUE@,$ENABLE_COMPAT_TRUE,;t t +s,@ENABLE_COMPAT_FALSE@,$ENABLE_COMPAT_FALSE,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/configure.ac gt4.2.1-all-source-installer/gpt/packaging_tools/configure.ac --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/configure.ac 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/configure.ac 2009-03-16 08:47:34.000000000 +0100 @@ -1,14 +1,12 @@ AC_REVISION($Revision: 1.1.1.1 $) AC_INIT(gpt, 3.2) AC_CONFIG_SRCDIR(Makefile.am) -AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE([ no-installman ]) -echo $target > ./etc/gpt/gnu_target AC_ARG_WITH([perl], -[ --with-perl= specify path to perl binary ], +AC_HELP_STRING([--with-perl=PATH], [path to perl binary]), [ case $withval in no) @@ -21,7 +19,6 @@ ;; *) PERL=$withval - AC_SUBST(PERL) POD2MAN=`echo $PERL | sed 's!bin/perl!bin/pod2man!'` if ! test -f $POD2MAN; then POD2MAN= @@ -35,31 +32,48 @@ ] ) +AC_SUBST(PERL) +AC_SUBST(POD2MAN) -AC_SUBST(POD2MAN) +AC_ARG_WITH([perlmoduledir], -#echo "POD2MAN=$POD2MAN" +AC_HELP_STRING([--with-perlmoduledir=DIR], +[perl module installation directory [[PREFIX/lib/perl]]]), +[ + case $withval in + no) + echo "--with-perlmoduledir requires an argument" >&2 + exit 1 + ;; + yes) + echo "--with-perlmoduledir requires an argument" >&2 + exit 1 + ;; + *) + perlmoduledir=$withval + ;; + esac +], +[ + perlmoduledir='${prefix}/lib/perl' +] +) -# checking for the GPT_LOCATION +AC_SUBST(perlmoduledir) -if test "x$GPT_LOCATION" = "x"; then - # checking for the GLOBUS_LOCATION - if test "x$GLOBUS_LOCATION" = "x"; then - echo "ERROR Please specify GLOBUS_LOCATION or GPT_LOCATION" >&2 - exit 1 - else - GPT_LOCATION=$GLOBUS_LOCATION - fi -fi +# checking for the GPT_LOCATION +ac_default_prefix=${GPT_LOCATION:-$ac_default_prefix} AC_PATH_PROGS(TAR, gtar tar) AC_PATH_PROGS(GUNZIP, gunzip) AC_PATH_PROGS(GZIP, gzip) AC_PROG_LN_S -AC_SUBST(GPT_LOCATION) +AC_ARG_ENABLE(compat, AC_HELP_STRING([--disable-compat], [disable backward compatibility symlinks]),[],enable_compat="yes") +AC_MSG_NOTICE([Enable backward compatibility symlinks: $enable_compat]) +AM_CONDITIONAL([ENABLE_COMPAT],[test "x$enable_compat" = "xyes"]) AC_CONFIG_FILES(Makefile perl/scripts/gpt_version diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/etc/bootstrap.frg gt4.2.1-all-source-installer/gpt/packaging_tools/etc/bootstrap.frg --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/etc/bootstrap.frg 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/etc/bootstrap.frg 2009-03-16 08:46:13.000000000 +0100 @@ -1,17 +1,12 @@ #! /bin/sh -# checking for the GLOBUS_LOCATION - -if test "x$GLOBUS_LOCATION" = "x"; then - echo "ERROR Please specify GLOBUS_LOCATION" >&2 - exit 1 -fi - -if [ ! -f ${GLOBUS_LOCATION}/libexec/globus-bootstrap.sh ]; then - echo "ERROR: Unable to locate \${GLOBUS_LOCATION}/libexec/globus-bootstrap.sh" +if [ -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-bootstrap.sh ]; then + . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-bootstrap.sh +elif [ -f ${GLOBUS_LOCATION:-/usr}/libexec/globus-bootstrap.sh ]; then + . ${GLOBUS_LOCATION:-/usr}/libexec/globus-bootstrap.sh +else + echo "ERROR: Unable to locate globus-bootstrap.sh" echo " Please ensure that you have installed the globus-core package and" echo " that GLOBUS_LOCATION is set to the proper directory" exit fi - -. ${GLOBUS_LOCATION}/libexec/globus-bootstrap.sh diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/etc/globus_package.dtd gt4.2.1-all-source-installer/gpt/packaging_tools/etc/globus_package.dtd --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/etc/globus_package.dtd 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/etc/globus_package.dtd 2009-03-16 08:47:06.000000000 +0100 @@ -3,8 +3,8 @@ Description, Functional_Group, Version_Stability, - VersionLabel, - PackagingTool, + VersionLabel?, + PackagingTool?, (data_pkg | dev_pkg | doc_pkg | @@ -46,41 +46,43 @@ ToolName CDATA #REQUIRED ToolVersion CDATA #REQUIRED > - - + - - - + - - @@ -145,28 +147,22 @@ pgm | rtl) #REQUIRED > - - - - - - - - - + + + + - + &2 - exit 1 + GPT_LOCATION=/usr fi AC_SUBST(GPT_LOCATION) @@ -27,7 +26,7 @@ GPT_LINKTYPE="shared" # We have to figure out if we're linking only static before build_config AC_ARG_ENABLE(static-only, - [ --enable-static-only Don't do any dynamic linking], + AC_HELP_STRING([--enable-static-only], [Don't do any dynamic linking]), [ case $enableval in @@ -73,11 +72,11 @@ . ./gpt_build_temp.sh rm ./gpt_build_temp.sh GPT_CFLAGS="$GPT_CONFIG_CFLAGS" - GPT_INCLUDES="-I$GLOBUS_LOCATION/include/$GLOBUS_FLAVOR_NAME $GPT_CONFIG_INCLUDES" + GPT_INCLUDES="$GPT_CONFIG_INCLUDES" GPT_LIBS="$GPT_CONFIG_PKG_LIBS $GPT_CONFIG_LIBS" - GPT_LDFLAGS="$GPT_CONFIG_STATIC_LINKLINE -L$GLOBUS_LOCATION/lib $GPT_LDFLAGS" + GPT_LDFLAGS="$GPT_CONFIG_STATIC_LINKLINE $GPT_LDFLAGS" GPT_PGM_LINKS="$GPT_CONFIG_PGM_LINKS $GPT_CONFIG_LIBS" - GPT_LIB_LINKS="$GPT_CONFIG_LIB_LINKS $GPT_CONFIG_LIBS" + GPT_LIB_LINKS="-version-info $GPT_MAJOR_VERSION:$GPT_MINOR_VERSION:$GPT_AGE_VERSION $GPT_CONFIG_LIB_LINKS $GPT_CONFIG_LIBS" diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/etc/gpt-bootstrap.sh gt4.2.1-all-source-installer/gpt/packaging_tools/etc/gpt-bootstrap.sh --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/etc/gpt-bootstrap.sh 2008-01-25 21:33:21.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/etc/gpt-bootstrap.sh 2009-03-16 08:47:12.000000000 +0100 @@ -1,3 +1,5 @@ +#!/bin/sh + error() { echo "" @@ -9,7 +11,7 @@ # Removed check for autotools. CAB 01/08 # Always include globus macros -config="$aclocal_includes -I $GLOBUS_LOCATION/share/globus_aclocal" +config="$aclocal_includes -I ${GLOBUS_LOCATION:-/usr}/share/globus/aclocal" # test for local macros if test -d "./config"; then @@ -17,23 +19,17 @@ fi # test to see if GPT macros are in a seperate location -if test ! -f "$GLOBUS_LOCATION/share/globus_aclocal/gpt_autoconf_macros.m4"; then - if test "x$GPT_LOCATION" = "x"; then - echo "ERROR Globus Packaging Tools not found" >&2 - echo "ERROR either set GPT_LOCATION or install them in $GLOBUS_LOCATION" >&2 - exit 1 - else - config="$config -I $GPT_LOCATION/share/gpt/aclocal" - fi +if test ! -f "${GLOBUS_LOCATION:-/usr}/share/globus/aclocal/gpt_autoconf_macros.m4"; then + config="$config -I ${GPT_LOCATION:-/usr}/share/globus/aclocal" fi if test "x$GPT_LOCATION" = "x"; then - GPT_LOCATION=$GLOBUS_LOCATION + GPT_LOCATION=/usr fi if test ! -h pkgdata/Makefile.am ; then echo "installing Makefile.am in the pkgdata directory" - ln -s $GPT_LOCATION/share/gpt/amdir/pkgdata_Makefile.am \ + ln -s $GPT_LOCATION/share/globus/amdir/pkgdata_Makefile.am \ pkgdata/Makefile.am fi diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/etc/gpt_rpm.spec gt4.2.1-all-source-installer/gpt/packaging_tools/etc/gpt_rpm.spec --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/etc/gpt_rpm.spec 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/etc/gpt_rpm.spec 2009-03-16 08:46:08.000000000 +0100 @@ -31,7 +31,7 @@ %build GPT_INSTALL_LOCATION=${RPM_BUILD_ROOT}GPT_PREFIX_GPT; export GPT_INSTALL_LOCATION; $GPT_LOCATION/sbin/gpt-install --force ${RPM_SOURCE_DIR}/GPT_BIN_PKG_NAME_GPT -rm -f ${RPM_BUILD_ROOT}GPT_PREFIX_GPT/etc/gpt/packages/GPT_NAME_GPT/GPT_FLAVOR_GPTGPT_PKGTYPE_GPT.format +rm -f ${RPM_BUILD_ROOT}GPT_PREFIX_GPT/share/globus/packages/GPT_NAME_GPT/GPT_FLAVOR_GPTGPT_PKGTYPE_GPT.format ######################################################################### diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/Makefile.am gt4.2.1-all-source-installer/gpt/packaging_tools/Makefile.am --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/Makefile.am 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/Makefile.am 2009-03-16 08:46:18.000000000 +0100 @@ -1,5 +1,3 @@ -prefix=$(GPT_LOCATION) - sbin_SCRIPTS = \ perl/scripts/gpt-build \ perl/scripts/gpt_build_config \ @@ -31,15 +29,15 @@ perl/scripts/gpt_version -gptdatadir = ${prefix}/etc/gpt +gptdatadir = $(datadir)/globus gptdata_DATA = gpt_scripts_list -gptexecsharedir = ${prefix}/share/gpt +gptexecsharedir = $(datadir)/globus gptexecshare_SCRIPTS = config.guess -gptmodulesdir = ${prefix}/lib/perl/Grid/GPT +gptmodulesdir = $(perlmoduledir)/Grid/GPT gptmodules_DATA = \ perl/GPT/Algorithms.pm \ @@ -128,7 +126,7 @@ perl/GPT/PackageFilelist/xml1/ListInterface.pm -amdirdir = $(datadir)/gpt/amdir +amdirdir = $(datadir)/globus/amdir amdir_DATA = \ amdir/data.am \ @@ -143,9 +141,9 @@ amdir/pkgdata_Makefile.am -pkg_confdir = $(sysconfdir)/gpt -dtddir = $(sysconfdir)/gpt/dtd -aclocaldir = $(datadir)/gpt/aclocal +pkg_confdir = $(datadir)/globus +dtddir = $(datadir)/globus/dtd +aclocaldir = $(datadir)/globus/aclocal pkg_conf_DATA = \ etc/globus_flavor_labels.conf \ @@ -171,21 +169,28 @@ etc/gpt-bootstrap.sh install-man: install-pod2man +if ENABLE_COMPAT install-data-hook: install-localize hack-for-globus-core +else +install-data-hook: install-localize +endif install-localize: @echo "Localizing scripts to $(PERL)" + PERLLIB=$(DESTDIR)$(perlmoduledir) \ $(PERL) $(DESTDIR)$(sbindir)/gpt-config -perl=$(PERL) \ + -location=$(DESTDIR)$(prefix) \ -probe \ -ignore-errors install-pod2man: @if test "X$(POD2MAN)" != "X"; then \ - $(mkinstalldirs) $(DESTDIR)man/man1; \ + $(mkinstalldirs) $(DESTDIR)$(mandir)/man8; \ list='$(sbin_SCRIPTS)'; for p in $$list; do \ + grep -q ^= $$p || continue; \ script=`echo $$p | sed 's!perl/scripts/!!'`; \ - echo "Generating $(DESTDIR)$(prefix)/man/man1/$$script.1"; \ - $(POD2MAN) $$p > $(DESTDIR)$(prefix)/man/man1/$$script.1; \ + echo "Generating $(DESTDIR)$(mandir)/man8/$$script.8"; \ + $(POD2MAN) --section 8 $$p > $(DESTDIR)$(mandir)/man8/$$script.8; \ done \ else \ echo "Skipping Man page installation"; \ @@ -195,13 +200,13 @@ @if test ! -h $(datadir)/globus_aclocal; then \ startdir=`pwd`; \ cd $(datadir); \ - $(LN_S) gpt/aclocal globus_aclocal; \ + $(LN_S) globus/aclocal globus_aclocal; \ cd $$startdir; \ fi; \ if test ! -h $(datadir)/gpt_amdir; then \ startdir=`pwd`; \ cd $(datadir); \ - $(LN_S) gpt/amdir gpt_amdir; \ + $(LN_S) globus/amdir gpt_amdir; \ cd $$startdir; \ fi diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/Makefile.in gt4.2.1-all-source-installer/gpt/packaging_tools/Makefile.in --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/Makefile.in 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/Makefile.in 2009-03-16 08:47:34.000000000 +0100 @@ -35,9 +35,6 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ @@ -49,7 +46,8 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -GPT_LOCATION = @GPT_LOCATION@ +ENABLE_COMPAT_FALSE = @ENABLE_COMPAT_FALSE@ +ENABLE_COMPAT_TRUE = @ENABLE_COMPAT_TRUE@ GUNZIP = @GUNZIP@ GZIP = @GZIP@ INSTALL_DATA = @INSTALL_DATA@ @@ -78,18 +76,10 @@ ac_ct_STRIP = @ac_ct_STRIP@ am__leading_dot = @am__leading_dot@ bindir = @bindir@ -build = @build@ build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ -host = @host@ host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -98,17 +88,13 @@ localstatedir = @localstatedir@ mandir = @mandir@ oldincludedir = @oldincludedir@ -prefix = $(GPT_LOCATION) +perlmoduledir = @perlmoduledir@ +prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ -target = @target@ target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ - sbin_SCRIPTS = \ perl/scripts/gpt-build \ perl/scripts/gpt_build_config \ @@ -140,15 +126,15 @@ perl/scripts/gpt_version -gptdatadir = ${prefix}/etc/gpt +gptdatadir = $(datadir)/globus gptdata_DATA = gpt_scripts_list -gptexecsharedir = ${prefix}/share/gpt +gptexecsharedir = $(datadir)/globus gptexecshare_SCRIPTS = config.guess -gptmodulesdir = ${prefix}/lib/perl/Grid/GPT +gptmodulesdir = $(perlmoduledir)/Grid/GPT gptmodules_DATA = \ perl/GPT/Algorithms.pm \ @@ -240,7 +226,7 @@ perl/GPT/PackageFilelist/xml1/ListInterface.pm -amdirdir = $(datadir)/gpt/amdir +amdirdir = $(datadir)/globus/amdir amdir_DATA = \ amdir/data.am \ @@ -255,9 +241,9 @@ amdir/pkgdata_Makefile.am -pkg_confdir = $(sysconfdir)/gpt -dtddir = $(sysconfdir)/gpt/dtd -aclocaldir = $(datadir)/gpt/aclocal +pkg_confdir = $(datadir)/globus +dtddir = $(datadir)/globus/dtd +aclocaldir = $(datadir)/globus/aclocal pkg_conf_DATA = \ etc/globus_flavor_labels.conf \ @@ -836,21 +822,25 @@ install-man: install-pod2man -install-data-hook: install-localize hack-for-globus-core +@ENABLE_COMPAT_TRUE@install-data-hook: install-localize hack-for-globus-core +@ENABLE_COMPAT_FALSE@install-data-hook: install-localize install-localize: @echo "Localizing scripts to $(PERL)" + PERLLIB=$(DESTDIR)$(perlmoduledir) \ $(PERL) $(DESTDIR)$(sbindir)/gpt-config -perl=$(PERL) \ + -location=$(DESTDIR)$(prefix) \ -probe \ -ignore-errors install-pod2man: @if test "X$(POD2MAN)" != "X"; then \ - $(mkinstalldirs) $(DESTDIR)man/man1; \ + $(mkinstalldirs) $(DESTDIR)$(mandir)/man8; \ list='$(sbin_SCRIPTS)'; for p in $$list; do \ + grep -q ^= $$p || continue; \ script=`echo $$p | sed 's!perl/scripts/!!'`; \ - echo "Generating $(DESTDIR)$(prefix)/man/man1/$$script.1"; \ - $(POD2MAN) $$p > $(DESTDIR)$(prefix)/man/man1/$$script.1; \ + echo "Generating $(DESTDIR)$(mandir)/man8/$$script.8"; \ + $(POD2MAN) --section 8 $$p > $(DESTDIR)$(mandir)/man8/$$script.8; \ done \ else \ echo "Skipping Man page installation"; \ @@ -860,13 +850,13 @@ @if test ! -h $(datadir)/globus_aclocal; then \ startdir=`pwd`; \ cd $(datadir); \ - $(LN_S) gpt/aclocal globus_aclocal; \ + $(LN_S) globus/aclocal globus_aclocal; \ cd $$startdir; \ fi; \ if test ! -h $(datadir)/gpt_amdir; then \ startdir=`pwd`; \ cd $(datadir); \ - $(LN_S) gpt/amdir gpt_amdir; \ + $(LN_S) globus/amdir gpt_amdir; \ cd $$startdir; \ fi diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/Algorithms.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/Algorithms.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/Algorithms.pm 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/Algorithms.pm 2009-03-16 08:46:08.000000000 +0100 @@ -1188,9 +1188,9 @@ return "SRC_2xBUNDLE"; } + return "BIN_PKG" if grep { m!share/globus/packages! } @contents; return "BIN_PKG" if grep { m!etc/gpt/packages! } @contents; return "BIN_PKG" if grep { m!etc/globus_packages! } @contents; -## return "BIN_PKG" if grep { m!etc/gpt/packages! } @contents; return "SRC_PKG" if grep { m!pkgdata! } @contents; return "SRC_PKG" if grep { m!pkg_data_src.gpt! } @contents; diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/BuildLine.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/BuildLine.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/BuildLine.pm 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/BuildLine.pm 2009-03-16 08:46:13.000000000 +0100 @@ -33,7 +33,9 @@ if ($libname =~ m!$flavor! || $libname =~ m!GLOBUS_FLAVOR_NAME!) { - $libname =~ s/\-l/$ENV{GLOBUS_LOCATION}\/lib\/lib/; + my $globus_path = defined $ENV{GLOBUS_LOCATION} ? + $ENV{GLOBUS_LOCATION} : "/usr"; + $libname =~ s/\-l/$globus_path\/lib\/lib/; $libname = $libname.".a"; } $libslist .= $libname; diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/FilelistFunctions.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/FilelistFunctions.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/FilelistFunctions.pm 2007-08-08 01:07:51.000000000 +0200 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/FilelistFunctions.pm 2009-03-16 08:46:08.000000000 +0100 @@ -81,6 +81,7 @@ #check for the existance of packaging data files for my $pkgtype (@Grid::GPT::V1::Definitions::package_types) { my $pkgdatadir = "$me->{'locations'}->{'pkgdir'}/$name"; + my $oldpkgdatadir = "$me->{'locations'}->{'oldpkgdir'}/$name"; my $altpkgdatadir = "$me->{'locations'}->{'altpkgdir'}/$name"; my ($filelistname, $pkgdataname) = ("$ {flavor}_$ {pkgtype}.filelist", @@ -92,12 +93,18 @@ $filelistname = "$pkgdatadir/$filelistname" if -f "$pkgdatadir/$filelistname"; + $filelistname = "$oldpkgdatadir/$filelistname" + if -f "$oldpkgdatadir/$filelistname"; + $filelistname = "$altpkgdatadir/$filelistname" if -f "$altpkgdatadir/$filelistname"; $pkgdataname = "$pkgdatadir/$pkgdataname" if -f "$pkgdatadir/$pkgdataname"; + $pkgdataname = "$oldpkgdatadir/$pkgdataname" + if -f "oldpkgdatadir/$pkgdataname"; + $pkgdataname = "$altpkgdatadir/$pkgdataname" if -f "$altpkgdatadir/$pkgdataname"; @@ -108,12 +115,16 @@ my $pkgdatasubdir = $pkgdatadir; $pkgdatasubdir =~ s!$installdir/!!; + my $oldpkgdatasubdir = $oldpkgdatadir; + $oldpkgdatasubdir =~ s!$installdir/!!; + my $altpkgdatasubdir = $altpkgdatadir; $altpkgdatasubdir =~ s!$installdir/!!; my @notpkgdata; @notpkgdata = grep { ! m!$pkgdatasubdir!} + grep { ! m!$oldpkgdatasubdir!} grep { ! m!$altpkgdatasubdir!} @$list if defined $list; #remove empty packages @@ -671,7 +682,9 @@ for my $f (@$filelist) { my ($dir, $name) = $f =~ m!(.+)/([^/]+)$!; - next if $dir =~ m!/etc/\w+packages!; + next if $dir =~ m!/share/globus/packages!; + next if $dir =~ m!/etc/gpt/packages!; + next if $dir =~ m!/etc/globus_packages!; $dir = "$installdir/$dir"; diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/Filelist.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/Filelist.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/Filelist.pm 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/Filelist.pm 2009-03-16 08:46:48.000000000 +0100 @@ -59,13 +59,11 @@ sub reset { my $self = shift; $self->{'list'} = []; -## @{$self->{'list'}} = grep { $_->{'dir'} !~ m!etc/globus_packages/! } - - @{$self->{'list'}} = grep { $_->{'dir'} !~ m!etc/gpt/packages/! } + @{$self->{'list'}} = grep { $_->{'dir'} !~ m!share/globus/packages/! } + grep { $_->{'dir'} !~ m!etc/gpt/packages/! } grep { $_->{'dir'} !~ m!etc/globus_packages/! } @{$self->{'fulllist'}}; - # need to leave this because of bug that leaves noinst files in the root dir. @{$self->{'list'}} = grep { $_->{'dir'} =~ m!\w+! or $_->{'name'} =~ m!\.xml! @@ -117,7 +115,9 @@ my $list = $self->{'list'}; my @newlist; for (@{$list}) { - if ($_->{'name'} =~ /\.h$/ and $_->{'dir'} =~ m!include/$f!) { + if ($_->{'name'} =~ /\.h$/ + and ($_->{'dir'} =~ m!include/$f! or + $_->{'dir'} =~ m!lib(64)?(/.*)?/include!)) { push @newlist, $_; } } @@ -129,7 +129,9 @@ my $list = $self->{'list'}; my @newlist; for (@{$list}) { - if ($_->{'name'} =~ /\.h$/ and $_->{'dir'} !~ m!include/$f!) { + if ($_->{'name'} =~ /\.h$/ + and ($_->{'dir'} !~ m!include/$f! and + $_->{'dir'} !~ m!lib(64)?(/.*)?/include!)) { push @newlist, $_; } } @@ -153,7 +155,7 @@ my $list = $self->{'list'}; my @newlist; for (@{$list}) { - if ($_->{'dir'} =~ m!^/setup/!) { + if ($_->{'dir'} =~ m!(?:/|^)setup(?:/|$)!) { push @newlist, $_; } } @@ -165,7 +167,11 @@ my $list = $self->{'list'}; my @newlist; for (@{$list}) { - if ($_->{'name'} =~ /\.a$/ and $_->{'dir'} =~ m!lib/*$!) { + if ( ( $_->{'name'} =~ m!\.a$! + or $_->{'name'} =~ m!^[^.]*\.so$! + or $_->{'name'} =~ m!^[^.]*\.sl$! + or $_->{'name'} =~ m!^[^.]*\.dylib$! ) + and $_->{'name'} =~ m!^lib!) { push @newlist, $_; } } @@ -177,9 +183,9 @@ my $list = $self->{'list'}; my @newlist; for (@{$list}) { - if ( ( $_->{'name'} =~ m!\.so! - or $_->{'name'} =~ m!\.sl! - or $_->{'name'} =~ m!\.dylib! ) + if ( ( $_->{'name'} =~ m!(?:\.so\.|\.[^.]+\.so)! + or $_->{'name'} =~ m!(?:\.sl\.|\.[^.]+\.sl)! + or $_->{'name'} =~ m!(?:\.dylib\.|\.[^.]+\.dylib)! ) and $_->{'name'} =~ m!^lib!) { push @newlist, $_; } @@ -216,7 +222,7 @@ my $list = $self->{'list'}; my @newlist; for (@{$list}) { - if ($_->{'dir'} =~ m!(?:/|^)(?:share/doc|man)(?:/|$)!) { + if ($_->{'dir'} =~ m!(?:/|^)(?:share/doc|man|share/man)(?:/|$)!) { push @newlist, $_; } } @@ -228,8 +234,7 @@ my $list = $self->{'list'}; my @newlist; for (@{$list}) { -## if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|s?bin|libexec|include|lib|setup|etc/globus_packages)(?:/|$)!) { - if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|s?bin|libexec|include|lib|setup|etc/gpt/packages)(?:/|$)!) { + if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|share/man|s?bin|libexec|include|lib(64)?|setup|share/globus/packages)(?:/|$)!) { push @newlist, $_; } } diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/FilelistSort.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/FilelistSort.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/FilelistSort.pm 2008-04-07 18:33:10.000000000 +0200 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/FilelistSort.pm 2009-03-16 08:46:48.000000000 +0100 @@ -56,8 +56,8 @@ sub reset { my $self = shift; $self->{'list'} = []; -## @{$self->{'list'}} = grep { $_->{'dir'} !~ m!etc/globus_packages/! } - @{$self->{'list'}} = grep { $_->{'dir'} !~ m!etc/gpt/packages/! } + @{$self->{'list'}} = grep { $_->{'dir'} !~ m!share/globus/packages/! } + grep { $_->{'dir'} !~ m!etc/gpt/packages/! } grep { $_->{'dir'} !~ m!etc/globus_packages/! } @{$self->{'fulllist'}}; @@ -112,7 +112,9 @@ my $list = $self->{'list'}; my @newlist; for (@{$list}) { - if ($_->{'name'} =~ /\.h$/ and $_->{'dir'} =~ m!include/$f!) { + if ($_->{'name'} =~ /\.h$/ + and ($_->{'dir'} =~ m!include/$f! or + $_->{'dir'} =~ m!lib(64)?(/.*)?/include!)) { push @newlist, $_; } } @@ -124,7 +126,9 @@ my $list = $self->{'list'}; my @newlist; for (@{$list}) { - if ($_->{'name'} =~ /\.h$/ and $_->{'dir'} !~ m!include/$f!) { + if ($_->{'name'} =~ /\.h$/ + and ($_->{'dir'} !~ m!include/$f! and + $_->{'dir'} !~ m!lib(64)?(/.*)?/include!)) { push @newlist, $_; } } @@ -148,7 +152,7 @@ my $list = $self->{'list'}; my @newlist; for (@{$list}) { - if ($_->{'dir'} =~ m!^/setup/!) { + if ($_->{'dir'} =~ m!(?:/|^)setup(?:/|$)!) { push @newlist, $_; } } @@ -160,9 +164,11 @@ my $list = $self->{'list'}; my @newlist; for (@{$list}) { - # Changed to allow for lib/subdir/lib.a while still allowing - # lib/lib.a, where apparently the dir is just lib, not lib/ - if ($_->{'name'} =~ /\.a$/ and $_->{'dir'} =~ m!lib$|lib/!) { + if ( ( $_->{'name'} =~ m!\.a$! + or $_->{'name'} =~ m!^[^.]*\.so$! + or $_->{'name'} =~ m!^[^.]*\.sl$! + or $_->{'name'} =~ m!^[^.]*\.dylib$! ) + and $_->{'name'} =~ m!^lib!) { push @newlist, $_; } } @@ -174,9 +180,9 @@ my $list = $self->{'list'}; my @newlist; for (@{$list}) { - if ( ( $_->{'name'} =~ m!\.so! - or $_->{'name'} =~ m!\.sl! - or $_->{'name'} =~ m!\.dylib! ) + if ( ( $_->{'name'} =~ m!(?:\.so\.|\.[^.]+\.so)! + or $_->{'name'} =~ m!(?:\.sl\.|\.[^.]+\.sl)! + or $_->{'name'} =~ m!(?:\.dylib\.|\.[^.]+\.dylib)! ) and $_->{'name'} =~ m!^lib!) { push @newlist, $_; } @@ -213,7 +219,7 @@ my $list = $self->{'list'}; my @newlist; for (@{$list}) { - if ($_->{'dir'} =~ m!(?:/|^)(?:share/doc|man)(?:/|$)!) { + if ($_->{'dir'} =~ m!(?:/|^)(?:share/doc|man|share/man)(?:/|$)!) { push @newlist, $_; } } @@ -225,8 +231,7 @@ my $list = $self->{'list'}; my @newlist; for (@{$list}) { -## if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|s?bin|libexec|include|lib|setup|etc/globus_packages)(?:/|$)!) { - if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|s?bin|libexec|include|lib|setup|etc/gpt/packages)(?:/|$)!) { + if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|share/man|s?bin|libexec|include|lib(64)?|setup|share/globus/packages)(?:/|$)!) { push @newlist, $_; } } diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/Installation.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/Installation.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/Installation.pm 2006-01-11 17:56:48.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/Installation.pm 2009-03-16 08:46:08.000000000 +0100 @@ -74,8 +74,7 @@ # Check to see if version checking is disabled for this location. my $gptdir = $me->{'locations'}->{'pkgdir'}; - $gptdir =~ s!globus_packages!gpt!; -## $gptdir =~ s!gpt/packages!gpt!; + $gptdir =~ s!globus/packages!globus!; $me->{'disable_version_checking'} = 1 if -e "$gptdir/disable_version_checking" diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/LocalEnv.pm.in gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/LocalEnv.pm.in --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/LocalEnv.pm.in 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/LocalEnv.pm.in 2009-03-16 08:47:34.000000000 +0100 @@ -41,7 +41,13 @@ } -sub get_target {return "@target@"} +sub get_target { + my $gpath = $ENV{'GPT_LOCATION'}; + $gpath = '/usr' if ! defined $gpath; + require Grid::GPT::Localize; + return Grid::GPT::Localize::get_target($gpath); +} + sub use_system_tar {return "@systar@"} sub listconfig { diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/Localize.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/Localize.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/Localize.pm 2007-06-24 22:26:36.000000000 +0200 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/Localize.pm 2009-03-16 08:46:08.000000000 +0100 @@ -16,7 +16,7 @@ sub get_target { my $gpath = shift; return $target if defined $target; - $target = `$gpath/share/gpt/config.guess`; + $target = `$gpath/share/globus/config.guess`; chomp($target); return $target; } @@ -49,7 +49,6 @@ sub new { my ($that, %args) = @_; - push @INC, my $class = ref($that) || $that; my $me = { ignore_errors => $args{'ignore_errors'}, @@ -328,14 +327,16 @@ sub localize { my($me) = @_; - my $gpath = $me->{'gpath'}; + my $pmpath; - require Grid::GPT::FilelistFunctions; - Grid::GPT::FilelistFunctions::mkinstalldir("$gpath/var/lib/perl/Grid/GPT/"); + foreach my $dir (@INC) { + next unless ( -e "$dir/Grid/GPT/LocalEnv.pm.in" ); + $pmpath = $dir; + last; + } - open INFILE, "$gpath/lib/perl/Grid/GPT/LocalEnv.pm.in"; - open OUTFILE, ">$gpath/var/lib/perl/Grid/GPT/LocalEnv.pm"; - my $link = ">$gpath/var/lib/perl/Grid/GPT/LocalEnv.pm"; + open INFILE, "$pmpath/Grid/GPT/LocalEnv.pm.in"; + open OUTFILE, ">$pmpath/Grid/GPT/LocalEnv.pm"; for my $l () { while (my ($n,$v) = each(%{$me->{'substitutions'}})) { diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/Locations.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/Locations.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/Locations.pm 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/Locations.pm 2009-03-16 08:46:13.000000000 +0100 @@ -30,6 +30,7 @@ gpt_amdir => undef, gpt_aclocaldir => undef, pkgdir => undef, + oldpkgdir => undef, altpkgdir => undef, bundledir => undef, setupdir => undef, @@ -65,9 +66,10 @@ sub _init_gptdir { my ($me) =@_; my $gptdir = $ENV{'GPT_LOCATION'}; - $me->{'gpt_etcdir'} = "$gptdir/etc/gpt"; - $me->{'gpt_amdir'} = "$gptdir/share/gpt/amdir"; - $me->{'gpt_aclocaldir'} = "$gptdir/share/gpt/aclocal"; + $gptdir = "/usr" if ( !defined $gptdir ); + $me->{'gpt_etcdir'} = "$gptdir/share/globus"; + $me->{'gpt_amdir'} = "$gptdir/share/globus/amdir"; + $me->{'gpt_aclocaldir'} = "$gptdir/share/globus/aclocal"; } sub _init_tmpdir { @@ -87,10 +89,22 @@ if ($args{'mode'} eq 'install' ) { Grid::GPT::FilelistFunctions::mkinstalldir($me->{'bundledir'}); Grid::GPT::FilelistFunctions::mkinstalldir($me->{'setupdir'}); - my $startdir = cwd(); - chdir "$me->{'installdir'}/etc"; - my $result = `ln -s gpt/packages globus_packages` - if ! -d "globus_packages"; + my $amdir = $me->{'gpt_amdir'}; + $amdir =~ s!globus/amdir!gpt_amdir!; + if (-d "$amdir") { + Grid::GPT::FilelistFunctions::mkinstalldir("$me->{'installdir'}/etc/gpt"); + Grid::GPT::FilelistFunctions::mkinstalldir("$me->{'installdir'}/share/globus/aclocal"); + Grid::GPT::FilelistFunctions::mkinstalldir("$me->{'installdir'}/share/globus/flavors"); + my $result; + $result = `ln -s ../../share/globus/packages $me->{'oldpkgdir'}` + if ! -d "$me->{'oldpkgdir'}"; + $result = `ln -s ../share/globus/packages $me->{'altpkgdir'}` + if ! -d "$me->{'altpkgdir'}"; + $result = `ln -s globus/aclocal $me->{'installdir'}/share/globus_aclocal` + if ! -d "$me->{'installdir'}/share/globus_aclocal"; + $result = `ln -s ../share/globus/flavors $me->{'installdir'}/etc/globus_core` + if ! -d "$me->{'installdir'}/etc/globus_core"; + } return } if ($args{'mode'} eq 'build' ) { @@ -121,7 +135,7 @@ my ($me) =@_; my $gpath = $ENV{GPT_INSTALL_LOCATION} ? $ENV{GPT_INSTALL_LOCATION} - : $ENV{GLOBUS_LOCATION}; + : $ENV{GLOBUS_LOCATION} ? $ENV{GLOBUS_LOCATION} : "/usr"; $me->{'installdir'} = defined $me->{'installdir'} ? @@ -133,16 +147,13 @@ # Determine what kind of package directory we have - my ($altpkgdir, $pkgdir) = ("etc/globus_packages", "etc/gpt/packages"); + my ($pkgdir, $oldpkgdir, $altpkgdir) = ("share/globus/packages", + "etc/gpt/packages", + "etc/globus_packages"); - if (-d "$me->{'installdir'}/etc/globus_packages" and - ! -d "$me->{'installdir'}/etc/gpt/packages") { - $pkgdir = "etc/globus_packages"; - $altpkgdir = "etc/gpt/packages"; - } - - $me->{'bundledir'} = "$me->{'installdir'}/etc/gpt/bundles"; + $me->{'bundledir'} = "$me->{'installdir'}/share/globus/bundles"; $me->{'pkgdir'} = "$me->{'installdir'}/$pkgdir"; + $me->{'oldpkgdir'} = "$me->{'installdir'}/$oldpkgdir"; $me->{'altpkgdir'} = "$me->{'installdir'}/$altpkgdir"; $me->{'setupdir'} = "$me->{'installdir'}/$pkgdir/setup"; } diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/MyFilelists.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/MyFilelists.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/MyFilelists.pm 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/MyFilelists.pm 2009-03-16 08:47:18.000000000 +0100 @@ -68,6 +68,12 @@ push @$result, @$list; $me->{'filelist'}->reset(); + $me->{'filelist'}->flavored_files() if defined $me->{'mangling'}; + $me->{'filelist'}->extract_libtool_libs(); + $list = $me->{'filelist'}->get_list(); + push @$result, @$list; + $me->{'filelist'}->reset(); + $me->{'filelist'}->extract_perl_modules(); $list = $me->{'filelist'}->get_list(); push @$result, @$list; @@ -85,13 +91,7 @@ push @$result, @$list; $me->{'filelist'}->reset(); - $me->{'filelist'}->flavored_files() if defined $me->{'mangling'}; - $me->{'filelist'}->extract_libtool_libs(); - $list = $me->{'filelist'}->get_list(); - push @$result, @$list; - $me->{'filelist'}->reset(); - - $me->{'filelist'}->flavored_headers() if defined $me->{'mangling'}; + $me->{'filelist'}->flavored_headers(); $me->{'filelist'}->add_package_metadata_files('dev'); $list = $me->{'filelist'}->get_list(); push @$result, @$list; diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/PackageFilelist/flat1.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/PackageFilelist/flat1.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/PackageFilelist/flat1.pm 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/PackageFilelist/flat1.pm 2009-03-16 08:46:13.000000000 +0100 @@ -69,7 +69,9 @@ # handle arguments # - my %args = (installdir => $ENV{'GLOBUS_LOCATION'}, @_); + my $globus_path = defined $ENV{'GLOBUS_LOCATION'} ? + $ENV{'GLOBUS_LOCATION'} : "/usr"; + my %args = (installdir => $globus_path, @_); my $installdir = $args{'installdir'}; my $packageList = $args{'packageList'}; @@ -116,7 +118,7 @@ $flavor = $pkginfo->flavor(); $pkgtype = $pkginfo->pkgtype(); - my $tmpPath = "etc/globus_packages/" . $name . "/" . $flavor . "_" . $pkgtype . ".filelist"; + my $tmpPath = "share/globus/packages/" . $name . "/" . $flavor . "_" . $pkgtype . ".filelist"; $self->setFilelist( read => $tmpPath ); } diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/PackageFilelist/xml1.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/PackageFilelist/xml1.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/PackageFilelist/xml1.pm 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/PackageFilelist/xml1.pm 2009-03-16 08:46:13.000000000 +0100 @@ -69,7 +69,9 @@ # handle arguments # - my %args = (installdir => $ENV{'GLOBUS_LOCATION'}, @_); + my $globus_path = defined $ENV{'GLOBUS_LOCATION'} ? + $ENV{'GLOBUS_LOCATION'} : "/usr"; + my %args = (installdir => $globus_path, @_); my $installdir = $args{'installdir'}; my $packageList = $args{'packageList'}; @@ -116,7 +118,7 @@ $flavor = $pkginfo->flavor(); $pkgtype = $pkginfo->pkgtype(); - my $tmpPath = "etc/globus_packages/" . $name . "/" . $flavor . "_" . $pkgtype . "_filelist.xml"; + my $tmpPath = "share/globus/packages/" . $name . "/" . $flavor . "_" . $pkgtype . "_filelist.xml"; $self->setFilelist( read => $tmpPath, write => $tmpPath ); } diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/PackageFilelist.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/PackageFilelist.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/PackageFilelist.pm 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/PackageFilelist.pm 2009-03-16 08:46:08.000000000 +0100 @@ -435,8 +435,7 @@ return undef; } - my $str = "etc/globus_packages/" -## my $str = "etc/gpt/packages/" + my $str = "share/globus/packages/" . $self->getPkgInfo()->pkgname() . "/pkg_data_" . $self->getPkgInfo()->flavor() diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/PkgDist.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/PkgDist.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/PkgDist.pm 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/PkgDist.pm 2009-03-16 08:46:08.000000000 +0100 @@ -162,6 +162,7 @@ return undef; } + return $f if $f =~ m!share/globus/packages!; return $f if $f =~ m!etc/gpt/packages!; return $f if $f =~ m!etc/globus_packages!; return undef; diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/PkgFileName.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/PkgFileName.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/PkgFileName.pm 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/PkgFileName.pm 2009-03-16 08:46:08.000000000 +0100 @@ -32,7 +32,8 @@ my $coreflavors = new Grid::GPT::V1::BuildFlavors(core =>1); push @{$me->{'flavors'}}, @{$coreflavors->{'flavors'}}; - if (-d "$me->{'locations'}->{'installdir'}/etc/globus_core") { + if (-d "$me->{'locations'}->{'installdir'}/share/globus/flavors" or + -d "$me->{'locations'}->{'installdir'}/etc/globus_core") { my $installedflavors = new Grid::GPT::V1::BuildFlavors(installed => 1, locations => $me->{'locations'}); diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/PkgMngmt/Archive.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/PkgMngmt/Archive.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/PkgMngmt/Archive.pm 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/PkgMngmt/Archive.pm 2009-03-16 08:46:08.000000000 +0100 @@ -75,21 +75,6 @@ return if defined $gtar; - my $gpath = $ENV{GPT_LOCATION}; - - if (!defined($gpath)) - { - $gpath = $ENV{GLOBUS_LOCATION}; - } - - if (!defined($gpath)) - { - die "GPT_LOCATION or needs to be set before running this script"; - } - - # Add path to LocalEnv module to @INC - push @INC,"$gpath/var/lib/perl"; - die "ERROR: GPT is not configured. Use gpt-config\n" if ! defined eval ("require Grid::GPT::LocalEnv;"); @@ -110,24 +95,6 @@ sub new { my ($class, %arg) = @_; - - - - my $gpath = $ENV{GPT_LOCATION}; - - if (!defined($gpath)) - { - $gpath = $ENV{GLOBUS_LOCATION}; - } - - if (!defined($gpath)) - { - die "GPT_LOCATION or needs to be set before running this script"; - } - - # Add path to LocalEnv module to @INC - push @INC,"$gpath/var/lib/perl"; - die "ERROR: GPT is not configured. Use gpt-config\n" if ! defined eval ("require Grid::GPT::LocalEnv;"); @@ -343,7 +310,8 @@ for my $f (@$rawfilelist) { $f =~ s!^/+!!; - $f =~ s!etc/globus_packages/!etc/gpt/packages/!; + $f =~ s!etc/gpt/packages/!share/globus/packages/!; + $f =~ s!etc/globus_packages/!share/globus/packages/!; push @filelist, $f; } @@ -413,7 +381,8 @@ my $rawfilelist = $filelist; $filelist = []; for my $f (@$rawfilelist) { - $f =~ s!etc/globus_packages/!etc/gpt/packages/!; + $f =~ s!etc/gpt/packages/!share/globus/packages/!; + $f =~ s!etc/globus_packages/!share/globus/packages/!; push @$filelist, $f; } diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/PkgMngmt/BuildMacros.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/PkgMngmt/BuildMacros.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/PkgMngmt/BuildMacros.pm 2006-03-16 19:27:23.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/PkgMngmt/BuildMacros.pm 2009-03-16 08:46:03.000000000 +0100 @@ -21,21 +21,6 @@ # Preloaded methods go here. sub find_make { - my $gpath = $ENV{GPT_LOCATION}; - - if (!defined($gpath)) - { - $gpath = $ENV{GLOBUS_LOCATION}; - } - - if (!defined($gpath)) - { - die "GPT_LOCATION or needs to be set before running this script"; - } - - # Add path to LocalEnv module to @INC - push @INC,"$gpath/var/lib/perl"; - die "ERROR: GPT is not configured. Use gpt-config\n" if ! defined eval ("require Grid::GPT::LocalEnv;"); diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/PkgMngmt/ExpandSource.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/PkgMngmt/ExpandSource.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/PkgMngmt/ExpandSource.pm 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/PkgMngmt/ExpandSource.pm 2009-03-16 08:46:03.000000000 +0100 @@ -61,21 +61,6 @@ return if defined $gtar; - my $gpath = $ENV{GPT_LOCATION}; - - if (!defined($gpath)) - { - $gpath = $ENV{GLOBUS_LOCATION}; - } - - if (!defined($gpath)) - { - die "GPT_LOCATION or needs to be set before running this script"; - } - - # Add path to LocalEnv module to @INC - push @INC,"$gpath/var/lib/perl"; - die "ERROR: GPT is not configured. Use gpt-config\n" if ! defined eval ("require Grid::GPT::LocalEnv;"); diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/PkgMngmt/SetupBuildFlavors.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/PkgMngmt/SetupBuildFlavors.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/PkgMngmt/SetupBuildFlavors.pm 2006-01-11 17:56:49.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/PkgMngmt/SetupBuildFlavors.pm 2009-03-16 08:46:13.000000000 +0100 @@ -24,15 +24,14 @@ if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; - + $gpath = "/usr"; } if (!defined($gpath)) { die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script" } - $environment{'core_src'} = "$gpath/etc/gpt"; + $environment{'core_src'} = "$gpath/share/globus"; $environment{'core_src'} .= "/globus_core-src.tar.gz"; diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/PkgMngmt.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/PkgMngmt.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/PkgMngmt.pm 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/PkgMngmt.pm 2009-03-16 08:46:03.000000000 +0100 @@ -23,21 +23,6 @@ return $rpm if defined $rpm; - my $gpath = $ENV{GPT_LOCATION}; - - if (!defined($gpath)) - { - $gpath = $ENV{GLOBUS_LOCATION}; - } - - if (!defined($gpath)) - { - die "GPT_LOCATION or needs to be set before running this script"; - } - - # Add path to LocalEnv module to @INC - push @INC,"$gpath/var/lib/perl"; - die "ERROR: GPT is not configured. Use gpt-config\n" if ! defined eval ("require Grid::GPT::LocalEnv;"); @@ -86,21 +71,6 @@ return if defined $gtar; - my $gpath = $ENV{GPT_LOCATION}; - - if (!defined($gpath)) - { - $gpath = $ENV{GLOBUS_LOCATION}; - } - - if (!defined($gpath)) - { - die "GPT_LOCATION or needs to be set before running this script"; - } - - # Add path to LocalEnv module to @INC - push @INC,"$gpath/var/lib/perl"; - die "ERROR: GPT is not configured. Use gpt-config\n" if ! defined eval ("require Grid::GPT::LocalEnv;"); diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/Setup.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/Setup.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/Setup.pm 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/Setup.pm 2009-03-16 08:46:13.000000000 +0100 @@ -11,6 +11,7 @@ use Config; # @INC fiddling my $gpt_path = $ENV{GPT_LOCATION}; +$gpt_path = "/usr" if ( !defined $gpt_path ); @INC = ("$gpt_path/lib/perl", "$gpt_path/lib/perl/$Config{'archname'}", @INC); require Grid::GPT::Installation; @@ -135,7 +136,7 @@ =item finish Writes metatdata into -$GLOBUS_LOCATION/etc/globus_packages/setup/ to +$GLOBUS_LOCATION/share/globus/packages/setup/ to indicate that the setup is complete. =head1 AUTHOR diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/V1/BuildFlavors.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/V1/BuildFlavors.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/V1/BuildFlavors.pm 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/V1/BuildFlavors.pm 2009-03-16 08:46:13.000000000 +0100 @@ -30,9 +30,9 @@ if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; + $gpath = "/usr"; } - my $confdir = "$gpath/etc/gpt"; + my $confdir = "$gpath/share/globus"; if (defined $args{'core'}) { @@ -63,7 +63,22 @@ $me->{'flavors'} = []; - if (-d "$gpath/etc/globus_core") { + if (-d "$gpath/share/globus/flavors") { + opendir(CONFDIR, "$gpath/share/globus/flavors") + || die "ERROR:BuildFlavors: $gpath/share/globus/flavors cannot be accessed\n"; + + my @flavorfiles = grep {m!flavor_\w+.gpt!} readdir(CONFDIR); + + closedir(CONFDIR); + for my $ff (@flavorfiles) { + my $obj = + new Grid::GPT::V1::FlavorDefinition(xmlfile => + "$gpath/share/globus/flavors/$ff"); + $me->{$obj->{'name'}} = $obj; + push @{$me->{'flavors'}}, $obj->{'name'}; + } + } + elsif (-d "$gpath/etc/globus_core") { opendir(CONFDIR, "$gpath/etc/globus_core") || die "ERROR:BuildFlavors: $gpath/etc/globus_core cannot be accessed\n"; @@ -79,7 +94,7 @@ } } } -##print Dumper $me; + return $me; } diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/V1/Bundle.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/V1/Bundle.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/V1/Bundle.pm 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/V1/Bundle.pm 2009-03-16 08:46:08.000000000 +0100 @@ -849,7 +849,7 @@ my $self = shift; my $globusdir = shift; - my $bndlDir = "$globusdir/etc/gpt/bundles/$self->{'Name'}"; + my $bndlDir = "$globusdir/share/globus/bundles/$self->{'Name'}"; if (!(-e "$bndlDir")) { @@ -879,7 +879,7 @@ my $globusdir = $args{'globusdir'}; my $file = $args{'file'}; - my $bndlDir = "$globusdir/etc/gpt/bundles/$file"; + my $bndlDir = "$globusdir/share/globus/bundles/$file"; opendir(DIR, $bndlDir) || die "can't opendir $bndlDir: $!"; my @dots = grep { /$file\.gpt-bundle\.xml/ } readdir(DIR); @@ -893,7 +893,7 @@ my $self = shift; my $globusdir = shift; - my $bndlDir = "$globusdir/etc/gpt/bundles/$self->{'Name'}"; + my $bndlDir = "$globusdir/share/globus/bundles/$self->{'Name'}"; if( !defined($self->{'BundleFile'}) ) { diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/V1/Package.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/V1/Package.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/V1/Package.pm 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/V1/Package.pm 2009-03-16 08:47:24.000000000 +0100 @@ -84,7 +84,8 @@ { my ($self, $name, $f, $t)=@_; my $globus=$ENV{GLOBUS_LOCATION}; - my $path="$globus/etc/globus_packages/$name/pkg_data_".$f."_$t.gpt"; + $globus="/usr" if (!defined $globus); + my $path="$globus/share/globus/packages/$name/pkg_data_".$f."_$t.gpt"; $self->read_metadata_file($path); } @@ -426,7 +427,7 @@ $converted->{$n} = $self->{$n}; next if ! defined $converted->{$n}; - if ($n eq 'pkg_libs') { + if ($n eq 'pkg_libs' and $self->{'ColocateLibraries'} ne 'no') { $converted->{$n} =~ s!(-l\w+)\s+!$ {1}_$flavor !g; $converted->{$n} =~ s!(-l\w+)$!$ {1}_$flavor!; } diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/V1/XML.pm gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/V1/XML.pm --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/GPT/V1/XML.pm 2006-01-11 17:10:11.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/GPT/V1/XML.pm 2009-03-16 08:47:39.000000000 +0100 @@ -275,10 +275,10 @@ my ($self, $tag) = @_; local *FILE = *{$self->{'FILE'}}; - print FILE "<$tag->{'name'} "; + print FILE "<$tag->{'name'}"; for my $a (sort keys %{$tag->{attributes}}) { - print FILE "$a=\"$tag->{attributes}->{$a}\" "; + print FILE " $a=\"$tag->{attributes}->{$a}\""; } if (@{$tag->{'contents'}} == 0) { diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-build gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-build --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-build 2006-01-11 17:56:50.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-build 2009-03-16 08:46:18.000000000 +0100 @@ -11,10 +11,6 @@ # programs. # -my $gp = $ENV{GPT_LOCATION}; -my @p = $ENV{PATH}; -my $pi = $ENV{PATH}; - if ( ! ( defined eval "require 5.005" ) ) { die "GPT requires at least Perl version 5.005"; @@ -24,7 +20,7 @@ if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; + $gpath = "/usr"; } if (!defined($gpath)) @@ -227,8 +223,8 @@ } if (defined $disable_version_checking) { - Grid::GPT::FilelistFunctions::mkinstalldir("$installdir/etc/gpt"); - my $result = system("touch $installdir/etc/gpt/disable_version_checking") + Grid::GPT::FilelistFunctions::mkinstalldir("$installdir/share/globus"); + my $result = system("touch $installdir/share/globus/disable_version_checking") } # Scan source objects for globus_core @@ -624,7 +620,7 @@ pkg_data_src.gpt. If no instructions are found the script uses the default instructions described in I. -Multiple packages can be built by passing in multiple i<-srcdir> +Multiple packages can be built by passing in multiple I<-srcdir> arguments or multiple source packages and or bundles. For now these have to be passed in in dependent order ie. if package foo needs package fee's headers to build then fee should come first. @@ -638,7 +634,7 @@ Build flavors are character string labels that represent a set of compiler and linker options defined during the building of the globus_core package. Predefined flavors can be listed by using the -B script. Packages can be built with any +B script. Packages can be built with any installed flavor. globus_core can only be built with pre-defined flavors. globus_core needs to be built by hand (i.e. ./configure|make|make install) to install a custom build flavor. @@ -718,7 +714,7 @@ =item B<-coresrc> Use this version of globus_core source rather than the one found in -$GLOBUS_LOCATION/etc/gpt/globus_core-src.tar.gz. +$GPT_LOCATION/share/globus/globus_core-src.tar.gz. =item B<-disable-version-checking> @@ -729,13 +725,13 @@ used, the version checking is disabled B for the installation pointed to by $GLOBUS_LOCATION. This condition can only be removed by deleting the file -$GLOBUS_LOCATION/etc/gpt/disable_version_checking. +$GLOBUS_LOCATION/share/globus/disable_version_checking. =item B<-flavor-cfg=FILE> Use the flavor configurations found in FILE. The default configuration file is -$GLOBUS_LOCATION/etc/gpt/globus_flavor_labels.conf +$GPT_LOCATION/share/globus/globus_flavor_labels.conf =item B<-logdir=DIRECTORY> @@ -774,7 +770,7 @@ =head1 SEE ALSO -gpt-pkg(1) gpt-bundle(1) gpt-install(1) BuildMacros(3) +gpt-pkg(8) gpt-bundle(8) gpt-install(8) BuildMacros(3) =head1 AUTHOR diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt_build_config gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt_build_config --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt_build_config 2006-01-11 17:56:50.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt_build_config 2009-03-16 08:46:18.000000000 +0100 @@ -19,8 +19,7 @@ if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; - + $gpath = "/usr"; } if (!defined($gpath)) @@ -178,15 +177,15 @@ =head1 NAME -B - Returns a minimized list of ldflags from a list of globus packages and external libraries. +B - Returns a minimized list of ldflags from a list of globus packages and external libraries. =head1 SYNOPSIS -globus_build_config -src CB-f -link [static|shared] +gpt_build_config -src -f -link [static|shared] =head1 DESCRIPTION -B creates a file in it's current directory named +B creates a file in it's current directory named gpt_build_temp.sh that contains a list of necessary flags assembled from the build environment metadata of the packages on which the source metadata depends. @@ -195,7 +194,7 @@ =head1 LINK ORDER -The flag list returned by B is assembled in +The flag list returned by B is assembled in dependent order. A dependency between two libraries occurs when one library needs the symbols of another library in order to link correctly. For most linkers the library providing the symbols has to @@ -204,7 +203,7 @@ -L/opt/Xpm/lib -lXpm -L/usr/lib/X11 -lXm -lX -B assumes that the library Xpm is dependent on Xm which in turn is dependent on X. In addition, B assumes that Xpm is located in /opt/Xpm/lib and Xm and X are both located in /usr/lib/X11. +B assumes that the library Xpm is dependent on Xm which in turn is dependent on X. In addition, B assumes that Xpm is located in /opt/Xpm/lib and Xm and X are both located in /usr/lib/X11. =head1 BUGS diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-bundle gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-bundle --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-bundle 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-bundle 2009-03-16 08:46:18.000000000 +0100 @@ -17,7 +17,7 @@ if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; + $gpath = "/usr"; } if (!defined($gpath)) @@ -811,9 +811,6 @@ if (! defined $arch) { - # Add path to LocalEnv module to @INC - push @INC,"$gpath/var/lib/perl"; - die "ERROR: GPT is not configured. Use gpt-config\n" if ! defined eval ("require Grid::GPT::LocalEnv;"); @@ -925,7 +922,7 @@ collection of source packages. These bundles can then distributed be installed using I or I. A bundle consists of a collection of packages and a XML formatted description file. The DTD -for this file is found in I<$GPT_LOCATION/etc/gpt_bundle.dtd>. +for this file is found in I<$GPT_LOCATION/share/dtd/gpt_bundle.dtd>. The script accepts a list of packages from the command line or from an inputed bundle description file. It expands this list to include all @@ -1109,7 +1106,7 @@ =head1 SEE ALSO -gpt-build(1) gpt-install(1) gpt-pkg(1) +gpt-build(8) gpt-install(8) gpt-pkg(8) =head1 AUTHOR diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-config gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-config --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-config 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-config 2009-03-16 08:46:13.000000000 +0100 @@ -48,7 +48,7 @@ if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; + $gpath = "/usr"; } if (!defined($gpath)) @@ -82,11 +82,6 @@ exit 0; } -# Add path to LocalEnv module to @INC - -push @INC,"$gpath/var/lib/perl"; - - if (defined $list) { die "ERROR: GPT has not been configured\n" if ! defined eval "require Grid::GPT::LocalEnv;"; @@ -158,7 +153,7 @@ sub modify_gpt_scripts { - open LIST, "$gpath/etc/gpt/gpt_scripts_list"; + open LIST, "$gpath/share/globus/gpt_scripts_list"; my $list = ; diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-convert-bundle-old2new gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-convert-bundle-old2new --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-convert-bundle-old2new 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-convert-bundle-old2new 2009-03-16 08:46:18.000000000 +0100 @@ -20,7 +20,7 @@ if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; + $gpath = "/usr"; } if (!defined($gpath)) @@ -165,7 +165,7 @@ =head1 SEE ALSO -globus-build(1) globus-install(1) +globus-build(8) globus-install(8) =head1 AUTHOR diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt_convert_xml gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt_convert_xml --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt_convert_xml 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt_convert_xml 2009-03-16 08:46:13.000000000 +0100 @@ -58,7 +58,7 @@ if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; + $gpath = "/usr"; } if (!defined($gpath)) diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt_create_automake_rules gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt_create_automake_rules --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt_create_automake_rules 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt_create_automake_rules 2009-03-16 08:46:13.000000000 +0100 @@ -20,8 +20,7 @@ my $gpath = $ENV{GPT_LOCATION}; if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; - + $gpath = "/usr"; } if (!defined($gpath)) { @@ -61,7 +60,7 @@ # target types defined by automake my @target_types = ("PROGRAMS", "LTLIBRARIES", "LIBRARIES","SCRIPTS", "HEADERS","DATA", "MANS"); -my $amdir = "$gpath/share/gpt_amdir"; +my $amdir = "$gpath/share/globus/amdir"; my %excluded_dirs; for my $p (@excludes) { diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-deps gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-deps --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-deps 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-deps 2009-03-16 08:46:18.000000000 +0100 @@ -18,6 +18,16 @@ my $gpt_path = $ENV{GPT_LOCATION}; my $globus_path = $ENV{GLOBUS_LOCATION}; +if ( !defined($gpt_path) ) +{ + $gpt_path = "/usr"; +} + +if ( !defined($globus_path) ) +{ + $globus_path = "/usr"; +} + if ( !defined($gpt_path) && !defined($globus_path) ) { die("GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"); @@ -40,9 +50,9 @@ die("$gpath does not appear to hold a valid GPT installation\n"); } -if ( ! -d "$globus_path/etc/globus_packages" ) +if ( ! -d "$globus_path/share/globus/packages" ) { - die("Can't find a globus_packages directory to work on in your GLOBUS_LOCATION!\n"); + die("Can't find a globus/packages directory to work on in your GLOBUS_LOCATION!\n"); } # @@ -85,7 +95,7 @@ my $installation = new Grid::GPT::Installation( - pkgdir => "$globus_path/etc/globus_packages", + pkgdir => "$globus_path/share/globus/packages", ); Pod::Usage::pod2usage(-verbose => 0, @@ -172,7 +182,7 @@ =head1 SEE ALSO -gpt-install(1) gpt-verify(1) gpt-query(1) gpt-postinstall(1) +gpt-install(8) gpt-verify(8) gpt-query(8) gpt-postinstall(8) =head1 AUTHOR diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt_extract_data gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt_extract_data --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt_extract_data 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt_extract_data 2009-03-16 08:47:29.000000000 +0100 @@ -18,8 +18,7 @@ my $gpath = $ENV{GPT_LOCATION}; if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; - + $gpath = "/usr"; } if (!defined($gpath)) { @@ -65,7 +64,8 @@ print "GPT_NAME='$pkg->{'Name'}'\n" if defined $name; print "GPT_MAJOR_VERSION='$pkg->{'Version'}->{'major'}' -GPT_MINOR_VERSION='$pkg->{'Version'}->{'minor'}'\n" if defined $version; +GPT_MINOR_VERSION='$pkg->{'Version'}->{'minor'}' +GPT_AGE_VERSION='$pkg->{'Version'}->{'age'}'\n" if defined $version; print "GPT_CFLAGS='$pkg->{'cflags'}' GPT_INCLUDES='$pkg->{'external_includes'}' @@ -96,8 +96,8 @@ =item version -Print out version numbers as GPT_MAJOR_VERSION and GPT_MINOR_VERSION -variables. +Print out version numbers as GPT_MAJOR_VERSION, GPT_MINOR_VERSION and +GPT_AGE_VERSION variables. =item build_env diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-filelist-convert gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-filelist-convert --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-filelist-convert 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-filelist-convert 2009-03-16 08:46:13.000000000 +0100 @@ -19,6 +19,16 @@ my $globus_path = $ENV{GLOBUS_LOCATION}; my $gpath; +if ( !defined($gpt_path) ) +{ + $gpt_path = "/usr"; +} + +if ( !defined($globus_path) ) +{ + $globus_path = "/usr"; +} + if ( !defined($gpt_path) && !defined($globus_path) ) { die("GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"); @@ -34,9 +44,9 @@ $gpath = $globus_path; } -if ( ! -d "$globus_path/etc/globus_packages" ) +if ( ! -d "$globus_path/share/globus/packages" ) { - die("Can't find a globus_packages directory to work on in your GLOBUS_LOCATION!\n"); + die("Can't find a globus/packages directory to work on in your GLOBUS_LOCATION!\n"); } # @@ -75,7 +85,7 @@ # my $installation = new Grid::GPT::Installation( - pkgdir => "$globus_path/etc/globus_packages", + pkgdir => "$globus_path/share/globus/packages", with_filelists => 0, ); @@ -103,7 +113,7 @@ { my $fl = new Grid::GPT::PackageFilelist( context => "installdir", - contextData => { dir => $ENV{'GLOBUS_LOCATION'}, }, + contextData => { dir => $globus_path, }, pkgnode => $pkg, convert => 1, ); diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-filelist-copy gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-filelist-copy --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-filelist-copy 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-filelist-copy 2009-03-16 08:46:13.000000000 +0100 @@ -19,6 +19,16 @@ my $globus_path = $ENV{GLOBUS_LOCATION}; my $gpath; +if ( !defined($gpt_path) ) +{ + $gpt_path = "/usr"; +} + +if ( !defined($globus_path) ) +{ + $globus_path = "/usr"; +} + if ( !defined($gpt_path) && !defined($globus_path) ) { die("GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"); @@ -34,9 +44,9 @@ $gpath = $globus_path; } -if ( ! -d "$globus_path/etc/globus_packages" ) +if ( ! -d "$globus_path/share/globus/packages" ) { - die("Can't find a globus_packages directory to work on in your GLOBUS_LOCATION!\n"); + die("Can't find a globus/packages directory to work on in your GLOBUS_LOCATION!\n"); } # @@ -79,7 +89,7 @@ # my $installation = new Grid::GPT::Installation( - pkgdir => "$globus_path/etc/globus_packages", + pkgdir => "$globus_path/share/globus/packages", with_filelists => 0, ); @@ -109,7 +119,7 @@ { my $fl = new Grid::GPT::PackageFilelist( context => "installdir", - contextData => { dir => $ENV{'GLOBUS_LOCATION'}, }, + contextData => { dir => $globus_path, }, pkgnode => $pkg, convert => 0, ); diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-file-remove gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-file-remove --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-file-remove 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-file-remove 2009-03-16 08:46:13.000000000 +0100 @@ -19,6 +19,16 @@ my $globus_path = $ENV{GLOBUS_LOCATION}; my $gpath; +if ( !defined($gpt_path) ) +{ + $gpt_path = "/usr"; +} + +if ( !defined($globus_path) ) +{ + $globus_path = "/usr"; +} + if ( !defined($gpt_path) && !defined($globus_path) ) { die("GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"); @@ -34,9 +44,9 @@ $gpath = $globus_path; } -if ( ! -d "$globus_path/etc/globus_packages" ) +if ( ! -d "$globus_path/share/globus/packages" ) { - die("Can't find a globus_packages directory to work on in your GLOBUS_LOCATION!\n"); + die("Can't find a globus/packages directory to work on in your GLOBUS_LOCATION!\n"); } # @@ -92,7 +102,7 @@ if ( ($action eq "both") or ($action eq "filelist") ) { my $installation = new Grid::GPT::Installation( - pkgdir => "$globus_path/etc/globus_packages", + pkgdir => "$globus_path/share/globus/packages", with_filelists => 1, ); diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-flavor-configuration gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-flavor-configuration --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-flavor-configuration 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-flavor-configuration 2009-03-16 08:46:13.000000000 +0100 @@ -19,8 +19,7 @@ if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; - + $gpath = "/usr"; } if (!defined($gpath)) @@ -117,10 +116,9 @@ default is a list of installed flavors. If the B<-standard> or B<-all> flags are used then the script permutes the flavor choices listed in the flavor configuration file. The file -$GPT_LOCATION/etc/globus_package_management/globus_flavor_labels.conf +$GPT_LOCATION/share/globus/globus_flavor_labels.conf is the default. The possible fields for a flavor are described in the -file -$GPT_LOCATION/etc/globus_package_management/globus_flavors.dtd +file $GPT_LOCATION/share/globus/dtd/globus_flavors.dtd =head1 OPTIONS diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt_generate_bin_pkg_data gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt_generate_bin_pkg_data --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt_generate_bin_pkg_data 2006-01-11 17:56:50.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt_generate_bin_pkg_data 2009-03-16 08:46:18.000000000 +0100 @@ -18,8 +18,7 @@ my $gpath = $ENV{GPT_LOCATION}; if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; - + $gpath = "/usr"; } if (!defined($gpath)) { @@ -80,65 +79,3 @@ } __END__ - -=head1 NAME - -B - Returns a minimized list of ldflags from a list of globus packages and external libraries. - -=head1 SYNOPSIS - -globus_build_config.pl [--ldflags=""] --flavor= - -=head1 DESCRIPTION - -B returns a list of ldflags. It builds this -list from the ld flags passed in as well as from scanning the -build_dependencies file of each package passed in as a dependency. -This scanning is done recursively to cover the entire dependency tree. -This script is based on the shell script gnome_config. - -=head1 LINK ORDER - -The flag list returned by B is assembled in -dependent order. A dependency between two libraries occurs when one -library needs the symbols of another library in order to link -correctly. For most linkers the library providing the symbols has to -be linked after the library that needs the symbols. For -example, from the line: - - -L/opt/Xpm/lib -lXpm -L/usr/lib/X11 -lXm -lX - -B assumes that the library Xpm is dependent on Xm which in turn is dependent on X. In addition, B assumes that Xpm is located in /opt/Xpm/lib and Xm and X are both located in /usr/lib/X11. - -=head1 MINIMIZATION - -B makes sure that every library is listed only once. The purpose of this is to reduce the size of the linking command and make the linking behavior more predictable. Here is an example of minimization: - - Before: -lm -L/home/mystuff/lib -lXm -L$(GLOBUS_INSTALL_PATH)/lib \ --lfum_$(GLOBUS_FLAVOR_NAME) -lm -L/opt/dum/lib -ldee \ --L$(GLOBUS_INSTALL_PATH)/lib -lfoo_$(GLOBUS_FLAVOR_NAME) -lm -L/usr/local/lib \ --lX -L$(GLOBUS_INSTALL_PATH)/lib -lfee_$(GLOBUS_FLAVOR_NAME) -lm -L/opt/dum/lib \ --ldum - - After: -L/home/mystuff/lib -lXm -L$(GLOBUS_INSTALL_PATH)/lib \ --lfum_$(GLOBUS_FLAVOR_NAME) -L/opt/dum/lib -ldee -L$(GLOBUS_INSTALL_PATH)/lib \ --lfoo_$(GLOBUS_FLAVOR_NAME) -L/usr/local/lib -lX -L$(GLOBUS_INSTALL_PATH)/lib \ --lfee_$(GLOBUS_FLAVOR_NAME) -lm -L/opt/dum/lib -ldum - -Notice that in the After, -lm is listed only once near the end of the list. - -=head1 BUGS - -Circular dependencies between libraries are not supported. These -dependencies are usually resolved by listing one of the libraries -before and after its co-dependent library (ie. -lfoo -lfee -lfoo). -B will eliminate the first -lfoo because of -minimization. - - -=head1 AUTHOR - -Michael Bletzinger Embletzin.ncsa.uiuc.eduE and Eric Blau -Eeblau.ncsa.uiuc.eduE - -=cut diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-install gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-install --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-install 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-install 2009-03-16 08:46:13.000000000 +0100 @@ -21,8 +21,7 @@ if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; - + $gpath = "/usr"; } if (!defined($gpath)) diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-link gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-link --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-link 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-link 2009-03-16 08:46:13.000000000 +0100 @@ -20,8 +20,7 @@ if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; - + $gpath = "/usr"; } if (!defined($gpath)) diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-md5 gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-md5 --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-md5 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-md5 2009-03-16 08:46:13.000000000 +0100 @@ -18,7 +18,7 @@ if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; + $gpath = "/usr"; } if (!defined($gpath)) diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-pkg gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-pkg --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-pkg 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-pkg 2009-03-16 08:46:18.000000000 +0100 @@ -20,8 +20,7 @@ if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; - + $gpath = "/usr"; } if (!defined($gpath)) @@ -238,7 +237,7 @@ =head1 SEE ALSO -gpt-bundle(1) gpt-install(1) gpt-build(1) +gpt-bundle(8) gpt-install(8) gpt-build(8) =head1 AUTHOR diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-postinstall gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-postinstall --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-postinstall 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-postinstall 2009-03-16 08:46:13.000000000 +0100 @@ -26,6 +26,16 @@ my $globus_path = $ENV{GLOBUS_LOCATION}; my $verbose; +if ( !defined($gpt_path) ) +{ + $gpt_path = "/usr"; +} + +if ( !defined($globus_path) ) +{ + $globus_path = "/usr"; +} + if ( !defined($gpt_path) && !defined($globus_path) ) { die("GPT_LOCATION and GLOBUS_LOCATION needs to be set before running this script"); @@ -41,9 +51,9 @@ $gpath = $globus_path; } -if ( ! -d "$globus_path/etc/globus_packages" ) +if ( ! -d "$globus_path/share/globus/packages" ) { - die("Can't find a globus_packages directory to work on in your GLOBUS_LOCATION!\n"); + die("Can't find a globus/packages directory to work on in your GLOBUS_LOCATION!\n"); } @INC = ("$gpath/lib/perl", "$gpath/lib/perl/$Config{'archname'}", @INC); diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-query gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-query --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-query 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-query 2009-03-16 08:46:18.000000000 +0100 @@ -25,6 +25,16 @@ my $gpt_path = $ENV{GPT_LOCATION}; my $globus_path = $ENV{GLOBUS_LOCATION}; +if ( !defined($gpt_path) ) +{ + $gpt_path = "/usr"; +} + +if ( !defined($globus_path) ) +{ + $globus_path = "/usr"; +} + if ( !defined($gpt_path) && !defined($globus_path) ) { die("GPT_LOCATION needs to be set before running this script"); @@ -451,7 +461,7 @@ =head1 SEE ALSO -gpt-install(1) gpt-uninstall(1) gpt-verify(1) gpt-postinstall(1) +gpt-install(8) gpt-uninstall(8) gpt-verify(8) gpt-postinstall(8) =head1 AUTHOR diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt_save_flavor gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt_save_flavor --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt_save_flavor 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt_save_flavor 2009-03-16 08:46:18.000000000 +0100 @@ -18,8 +18,7 @@ my $gpath = $ENV{GPT_LOCATION}; if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; - + $gpath = "/usr"; } if (!defined($gpath)) { @@ -76,65 +75,3 @@ __END__ - -=head1 NAME - -B - Returns a minimized list of ldflags from a list of globus packages and external libraries. - -=head1 SYNOPSIS - -globus_build_config.pl [--ldflags=""] --flavor= - -=head1 DESCRIPTION - -B returns a list of ldflags. It builds this -list from the ld flags passed in as well as from scanning the -build_dependencies file of each package passed in as a dependency. -This scanning is done recursively to cover the entire dependency tree. -This script is based on the shell script gnome_config. - -=head1 LINK ORDER - -The flag list returned by B is assembled in -dependent order. A dependency between two libraries occurs when one -library needs the symbols of another library in order to link -correctly. For most linkers the library providing the symbols has to -be linked after the library that needs the symbols. For -example, from the line: - - -L/opt/Xpm/lib -lXpm -L/usr/lib/X11 -lXm -lX - -B assumes that the library Xpm is dependent on Xm which in turn is dependent on X. In addition, B assumes that Xpm is located in /opt/Xpm/lib and Xm and X are both located in /usr/lib/X11. - -=head1 MINIMIZATION - -B makes sure that every library is listed only once. The purpose of this is to reduce the size of the linking command and make the linking behavior more predictable. Here is an example of minimization: - - Before: -lm -L/home/mystuff/lib -lXm -L$(GLOBUS_INSTALL_PATH)/lib \ --lfum_$(GLOBUS_FLAVOR_NAME) -lm -L/opt/dum/lib -ldee \ --L$(GLOBUS_INSTALL_PATH)/lib -lfoo_$(GLOBUS_FLAVOR_NAME) -lm -L/usr/local/lib \ --lX -L$(GLOBUS_INSTALL_PATH)/lib -lfee_$(GLOBUS_FLAVOR_NAME) -lm -L/opt/dum/lib \ --ldum - - After: -L/home/mystuff/lib -lXm -L$(GLOBUS_INSTALL_PATH)/lib \ --lfum_$(GLOBUS_FLAVOR_NAME) -L/opt/dum/lib -ldee -L$(GLOBUS_INSTALL_PATH)/lib \ --lfoo_$(GLOBUS_FLAVOR_NAME) -L/usr/local/lib -lX -L$(GLOBUS_INSTALL_PATH)/lib \ --lfee_$(GLOBUS_FLAVOR_NAME) -lm -L/opt/dum/lib -ldum - -Notice that in the After, -lm is listed only once near the end of the list. - -=head1 BUGS - -Circular dependencies between libraries are not supported. These -dependencies are usually resolved by listing one of the libraries -before and after its co-dependent library (ie. -lfoo -lfee -lfoo). -B will eliminate the first -lfoo because of -minimization. - - -=head1 AUTHOR - -Michael Bletzinger Embletzin.ncsa.uiuc.eduE and Eric Blau -Eeblau.ncsa.uiuc.eduE - -=cut diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-setup gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-setup --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-setup 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-setup 2009-03-16 08:46:18.000000000 +0100 @@ -14,8 +14,7 @@ my $gpath = $ENV{GPT_LOCATION}; if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; - + $gpath = "/usr"; } if (!defined($gpath)) { @@ -43,7 +42,7 @@ # sub pod2usage { # my $ex = shift; -# print "gpt_setup -name= -version= [-nocomments -verbose -help -v ] source_dir build_dir\n"; +# print "gpt-setup -name= -version= [-nocomments -verbose -help -v ] source_dir build_dir\n"; # exit $ex; # } @@ -72,7 +71,7 @@ my $packagedizedir = $gpath; -$packagedizedir .= '/share/globus_aclocal'; +$packagedizedir .= '/share/globus/aclocal'; # establish stuff to be ignored by packagedize for (@{ ['CVS', 'RCS', 'pkgdata', 'doxygen'] }) { @@ -606,16 +605,16 @@ =head1 NAME -B - Create automake and autoconf files to convert +B - Create automake and autoconf files to convert software into a package =head1 SYNOPSIS -gpt_setup name version [directory_containing_source_code] [build_directory] +gpt-setup name version [directory_containing_source_code] [build_directory] =head1 DESCRIPTION -B creates Makefile.am files and a configure.in file as well +B creates Makefile.am files and a configure.in file as well as other stuff that is used to convert a software distribution into a globus package. I is the name of the package. I is the version of the package. I is the @@ -624,15 +623,15 @@ the resulting binaries (default is the source directory). The resulting build depends on other files from the globus packaging tools (GPT) as well as the globus_core package. B that the files that -gpt_setup creates need to be edited by hand in order for the packaging -to be complete. The idea behind gpt_setup is simple; "It is easier to +gpt-setup creates need to be edited by hand in order for the packaging +to be complete. The idea behind gpt-setup is simple; "It is easier to edit than to create.". -=head1 Description of the Files that B Creates +=head1 Description of the Files that B Creates =over 4 -=item B. B creates a Makefile.am in the top +=item B. B creates a Makefile.am in the top level directory and every subdirectory except for those called CVS or RCS. The Makefile.am files contain a list of sources, subdirectories, libraries, programs, and scripts. All libraries will be built as @@ -643,21 +642,21 @@ directives to include files from globus_core that contain standard make targets and rules. -=item B B creates a top level configure.in +=item B B creates a top level configure.in containing the standard GLOBUS_* macros from globus_core. The script detects the occurance of *.in files and headers and adds them to AM_CONFIG_HEADER and AC_OUTPUT. -=item B B creates a top level bootstrap script +=item B B creates a top level bootstrap script which is used to invoke aclocal, automake, autoheader, and autoconf in the correct order. -=item B B creates a pkgdata directory that contains the following: +=item B B creates a pkgdata directory that contains the following: =over 4 =item B is a file that contains the packaging -metadata for the newly created package. B inserts the name +metadata for the newly created package. B inserts the name and version of the package as well as a list of all of the libraries that the package provides. @@ -673,10 +672,10 @@ =back -=head1 Post gpt_setup Tasks (What is Left to the Developer) +=head1 Post gpt-setup Tasks (What is Left to the Developer) -B does not do everything that is needed to compile a +B does not do everything that is needed to compile a package. Some tasks need a developer's touch. Here is a checklist of tasks that may need to be done by hand: @@ -684,7 +683,7 @@ =item Dependencies need to be added to pkgdata/pkg_data_src.gpt.in -You can use the GUI tool B or edit the file by hand. The +You can use the GUI tool B or edit the file by hand. The format is explained in B, B, and B. @@ -699,7 +698,7 @@ =item Source needs to be assigned to programs and libraries in the Makefile.am's. -B automatically assigns all source found in a directory to +B automatically assigns all source found in a directory to all of the targets found in a directory. For example: Sources = \ @@ -720,7 +719,7 @@ =item Autoconf defines need to be tested for -Use B to identify all of the preprocesser macros that +Use B to identify all of the preprocesser macros that are used in the source code which are not defined internally. This list will highlight the autoconf tests that need to be added to the configure.in script. @@ -729,7 +728,7 @@ =head1 SEE ALSO -gpt_edit(1) gpt_undefines(1) automake(1) autoconf(1) Package(3) Version(3) SourceDependency(3) +gpt-edit(8) gpt-undefines(8) automake(1) autoconf(1) Package(3) Version(3) SourceDependency(3) =head1 AUTHOR diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt_sort_filelist gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt_sort_filelist --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt_sort_filelist 2006-01-12 00:05:17.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt_sort_filelist 2009-03-16 08:46:13.000000000 +0100 @@ -21,6 +21,16 @@ my $globus_path = $ENV{GLOBUS_LOCATION}; my $verbose = 0; +if ( !defined($gpt_path) ) +{ + $gpt_path = "/usr"; +} + +if ( !defined($globus_path) ) +{ + $globus_path = "/usr"; +} + if ( !defined($gpt_path) && !defined($globus_path) ) { die("GPT_LOCATION needs to be set before running this script"); @@ -116,6 +126,8 @@ # the filelists later. my $pkgdatasubdir = "$locations->{'pkgdir'}"; $pkgdatasubdir =~ s!$prefix/!!; +my $oldpkgdatasubdir = "$locations->{'oldpkgdir'}"; +$oldpkgdatasubdir =~ s!$prefix/!!; my $altpkgdatasubdir = "$locations->{'altpkgdir'}"; $altpkgdatasubdir =~ s!$prefix/!!; @@ -158,6 +170,7 @@ # If this filelist only has package metadata, don't write it! my @notpkgdata; @notpkgdata = grep { ! m!$pkgdatasubdir!} + grep { ! m!$oldpkgdatasubdir!} grep { ! m!$altpkgdatasubdir!} @$outlines; next if (! @notpkgdata ); diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-undefines gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-undefines --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-undefines 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-undefines 2009-03-16 08:46:18.000000000 +0100 @@ -20,8 +20,7 @@ my $gpath = $ENV{GPT_LOCATION}; if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; - + $gpath = "/usr"; } if (!defined($gpath)) { @@ -45,7 +44,7 @@ # sub pod2usage { # my $ex = shift; -# print "gpt_undefines [-srcdir=PATH -config -disable-undefs -verbose -help] headers containing defines\n"; +# print "gpt-undefines [-srcdir=PATH -config -disable-undefs -verbose -help] headers containing defines\n"; # exit $ex; # } @@ -208,17 +207,17 @@ =head1 NAME -B - Generate a list of preprocessor macros that are not defined. +B - Generate a list of preprocessor macros that are not defined. =head1 SYNOPSIS -gpt_undefines [-srcdir=PATH -config -disable-undefs -verbose -help] headers containing defines +gpt-undefines [-srcdir=PATH -config -disable-undefs -verbose -help] headers containing defines =head1 DESCRIPTION -B Generates a list of preprocessor macros that are not +B Generates a list of preprocessor macros that are not defined internally in the source code. Macros that are defined in the -header files listed during B's invocation will also be +header files listed during B's invocation will also be excluded. =head1 OPTIONS @@ -229,7 +228,7 @@ Use PATH as the directory containing the source code. Source code in the entire directory tree will be scanned. Default PATH is the -directory B was invoked in. +directory B was invoked in. =item -config diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-uninstall gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-uninstall --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-uninstall 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-uninstall 2009-03-16 08:46:18.000000000 +0100 @@ -24,7 +24,7 @@ # my $gpath = defined $ENV{GPT_LOCATION} ? $ENV{GPT_LOCATION} - : $ENV{GLOBUS_LOCATION}; + : "/usr"; if ( !defined($gpath)) { die("GPT_LOCATION needs to be set before running this script"); @@ -228,7 +228,7 @@ =head1 SEE ALSO -gpt-install(1) gpt-query(1) gpt-verify(1) gpt-postinstall(1) +gpt-install(8) gpt-query(8) gpt-verify(8) gpt-postinstall(8) =head1 AUTHOR diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-update gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-update --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-update 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-update 2009-03-16 08:47:43.000000000 +0100 @@ -5,26 +5,23 @@ die "GPT requires at least Perl version 5.005"; } -system("./gpt_version") == 0 - or die "GPT died due to Version mismatch. Check PATH and GPT_LOCATION\n" ; - - my $gpath = $ENV{GPT_LOCATION}; -my $globus_path = $ENV{GLOBUS_LOCATION}; if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; - + $gpath = "/usr"; } if (!defined($gpath)) { - error_out("GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"); + error_out("GPT_LOCATION needs to be set before running this script"); } @INC = ("$gpath/lib/perl", "$gpath/lib/perl/$Config{'archname'}", @INC); +system("$gpath/sbin/gpt_version") == 0 + or die "GPT died due to Version mismatch. Check PATH and GPT_LOCATION\n" ; + if ( ! ( defined eval "require Grid::GPT::GPTObject" ) ) { die("$gpath does not appear to hold a valid GPT installation\n"); diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-verify gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-verify --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-verify 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-verify 2009-03-16 08:46:18.000000000 +0100 @@ -27,6 +27,16 @@ my $globus_path = $ENV{GLOBUS_LOCATION}; my $verbose; +if ( !defined($gpt_path) ) +{ + $gpt_path = "/usr"; +} + +if ( !defined($globus_path) ) +{ + $globus_path = "/usr"; +} + if ( !defined($gpt_path) && !defined($globus_path) ) { die("GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"); @@ -42,9 +52,9 @@ $gpath = $globus_path; } -if ( ! -d "$globus_path/etc/globus_packages" ) +if ( ! -d "$globus_path/share/globus/packages" ) { - die("Can't find a globus_packages directory to work on in your GLOBUS_LOCATION!\n"); + die("Can't find a globus/packages directory to work on in your GLOBUS_LOCATION!\n"); } @INC = ("$gpath/lib/perl", "$gpath/lib/perl/$Config{'archname'}", @INC); @@ -251,7 +261,7 @@ =head1 SEE ALSO -gpt-install(1) gpt-uninstall(1) gpt-query(1) gpt-postinstall(1) +gpt-install(8) gpt-uninstall(8) gpt-query(8) gpt-postinstall(8) =head1 AUTHOR diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt_version.in gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt_version.in --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt_version.in 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt_version.in 2009-03-16 08:46:13.000000000 +0100 @@ -23,7 +23,7 @@ if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; + $gpath = "/usr"; } if (!defined($gpath)) diff -Nur gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-virtual-pkg gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-virtual-pkg --- gt4.2.1-all-source-installer.orig/gpt/packaging_tools/perl/scripts/gpt-virtual-pkg 2006-01-11 17:10:12.000000000 +0100 +++ gt4.2.1-all-source-installer/gpt/packaging_tools/perl/scripts/gpt-virtual-pkg 2009-03-16 08:46:13.000000000 +0100 @@ -20,8 +20,7 @@ if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; - + $gpath = "/usr"; } if (!defined($gpath)) diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/setup/configure.in gt4.2.1-all-source-installer/source-trees/common/setup/configure.in --- gt4.2.1-all-source-installer.orig/source-trees/common/setup/configure.in 2002-01-10 03:26:32.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/common/setup/configure.in 2009-03-16 08:54:29.000000000 +0100 @@ -9,10 +9,31 @@ dnl Initialize the automake rules the last argument AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION) +AC_ARG_WITH(tmpdir, + AC_HELP_STRING([--with-tmpdir=DIR], + [directory for temporary files [[/tmp]]]), + [tmpdir="$withval"], + [tmpdir=/tmp]) +AC_SUBST(tmpdir) +AC_ARG_WITH(local-tmpdir, + AC_HELP_STRING([--with-local-tmpdir=DIR], + [local directory for temporary files [[TMPDIR]]]), + [local_tmpdir="$withval"], + [local_tmpdir='${tmpdir}']) +AC_SUBST(local_tmpdir) + +AC_ARG_WITH(secure-tmpdir, + AC_HELP_STRING([--with-secure-tmpdir=DIR], + [secure directory for temporary files [[PREFIX/tmp]]]), + [secure_tmpdir="$withval"], + [secure_tmpdir='${prefix}/tmp']) +AC_SUBST(secure_tmpdir) AC_OUTPUT( Makefile + globus-script-initializer + Paths.pm:Paths.in pkgdata/Makefile pkgdata/pkg_data_src.gpt ) diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/setup/findshelltools.in gt4.2.1-all-source-installer/source-trees/common/setup/findshelltools.in --- gt4.2.1-all-source-installer.orig/source-trees/common/setup/findshelltools.in 2004-09-29 14:52:55.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/common/setup/findshelltools.in 2009-03-16 08:54:29.000000000 +0100 @@ -1,16 +1,6 @@ AC_REVISION($Revision: 1.2 $) AC_INIT(globus-sh-tools-vars.sh.in) -# checking for the GLOBUS_LOCATION - -if test "x$GLOBUS_LOCATION" = "x"; then - echo "ERROR Please specify GLOBUS_LOCATION" >&2 - exit 1 -fi - -prefix='$(GLOBUS_LOCATION)' -exec_prefix='$(GLOBUS_LOCATION)' - if test "x$PERL" = "x"; then AC_PATH_PROG(PERL,perl) fi diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/setup/globus-script-initializer.in gt4.2.1-all-source-installer/source-trees/common/setup/globus-script-initializer.in --- gt4.2.1-all-source-installer.orig/source-trees/common/setup/globus-script-initializer.in 2005-11-29 21:08:58.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/common/setup/globus-script-initializer.in 2009-03-16 08:54:29.000000000 +0100 @@ -1,49 +1,53 @@ - - -exec_prefix=${GLOBUS_LOCATION} -prefix=$GLOBUS_LOCATION -sbindir=${exec_prefix}/sbin -bindir=${exec_prefix}/bin -libdir=${exec_prefix}/lib -libexecdir=${exec_prefix}/libexec -includedir=${exec_prefix}/include -datadir=${prefix}/share -sysconfdir=${prefix}/etc -sharedstatedir=${prefix}/com -localstatedir=${prefix}/var +prefix=${GLOBUS_LOCATION:-/usr} +exec_prefix=${GLOBUS_LOCATION:-/usr} +bindir=@bindir@ +sbindir=@sbindir@ +libdir=@libdir@ +includedir=@includedir@ +flavorincludedir=@flavorincludedir@ +datadir=@datadir@ +libexecdir=@libexecdir@ +sysconfdir=@sysconfdir@ +sharedstatedir=@sharedstatedir@ +localstatedir=@localstatedir@ +setupdir=@setupdir@ +testdir=@testdir@ +perlmoduledir=@perlmoduledir@ tmpdir=@tmpdir@ local_tmpdir=@local_tmpdir@ secure_tmpdir=@secure_tmpdir@ +if [ x$prefix != "x/usr" ]; then + DELIM= if [ -n "${LD_LIBRARY_PATH}" ]; then DELIM=: fi -LD_LIBRARY_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARY_PATH}" +LD_LIBRARY_PATH="${libdir}${DELIM}${LD_LIBRARY_PATH}" DELIM= if [ -n "${DYLD_LIBRARY_PATH}" ]; then DELIM=: fi -DYLD_LIBRARY_PATH="${GLOBUS_LOCATION}/lib${DELIM}${DYLD_LIBRARY_PATH}" +DYLD_LIBRARY_PATH="${libdir}${DELIM}${DYLD_LIBRARY_PATH}" if [ -z "${LIBPATH}" ]; then LIBPATH="/usr/lib:/lib" fi -LIBPATH="${GLOBUS_LOCATION}/lib:${LIBPATH}" +LIBPATH="${libdir}:${LIBPATH}" DELIM= if [ -n "${SHLIB_PATH}" ]; then DELIM=: fi -SHLIB_PATH="${GLOBUS_LOCATION}/lib${DELIM}${SHLIB_PATH}" +SHLIB_PATH="${libdir}${DELIM}${SHLIB_PATH}" -if [ -d $GLOBUS_LOCATION/lib/sasl ]; then +if [ -d ${libdir}/sasl ]; then DELIM= if [ -n "${SASL_PATH}" ]; then DELIM=: fi - SASL_PATH="${GLOBUS_LOCATION}/lib/sasl${DELIM}${SASL_PATH}" + SASL_PATH="${libdir}/sasl${DELIM}${SASL_PATH}" fi export LD_LIBRARY_PATH DYLD_LIBRARY_PATH LIBPATH SHLIB_PATH SASL_PATH @@ -53,7 +57,7 @@ if [ "X${LD_LIBRARYN32_PATH}" != "X" ]; then DELIM=: fi - LD_LIBRARYN32_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARYN32_PATH}" + LD_LIBRARYN32_PATH="${libdir}${DELIM}${LD_LIBRARYN32_PATH}" export LD_LIBRARYN32_PATH fi @@ -62,10 +66,19 @@ if [ "X${LD_LIBRARY64_PATH}" != "X" ]; then DELIM=: fi - LD_LIBRARY64_PATH="${GLOBUS_LOCATION}/lib${DELIM}${LD_LIBRARY64_PATH}" + LD_LIBRARY64_PATH="${libdir}${DELIM}${LD_LIBRARY64_PATH}" export LD_LIBRARY64_PATH fi +DELIM= +if [ -n "${PERLLIB}" ]; then + DELIM=: +fi +PERLLIB="${perlmoduledir}${DELIM}${PERLLIB}" +export PERLLIB + +fi + globus_source () { # Check if file exists and source it diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/setup/Makefile.am gt4.2.1-all-source-installer/source-trees/common/setup/Makefile.am --- gt4.2.1-all-source-installer.orig/source-trees/common/setup/Makefile.am 2002-09-24 23:33:53.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/common/setup/Makefile.am 2009-03-16 08:54:29.000000000 +0100 @@ -3,25 +3,26 @@ setup_SCRIPTS = \ findshelltools \ - setup-tmpdirs \ setup-globus-common \ setup-globus-common.pl setup_DATA = \ - globus-script-initializer.in \ - globus-sh-tools-vars.sh.in \ - Paths.in + globus-sh-tools-vars.sh.in + +libexec_SCRIPTS = globus-script-initializer + +globusperldir = $(perlmoduledir)/Globus/Core +globusperl_DATA = Paths.pm + +findshelltools: findshelltools.in + autoconf -o findshelltools findshelltools.in SUBDIRS = pkgdata EXTRA_DIST = \ findshelltools \ findshelltools.in \ - setup-tmpdirs \ - setup-tmpdirs.in \ - globus-script-initializer.in \ - globus-sh-tools-vars.sh.in \ - Paths.in \ + globus-sh-tools-vars.sh.in \ setup-globus-common \ setup-globus-common.pl diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/setup/Paths.in gt4.2.1-all-source-installer/source-trees/common/setup/Paths.in --- gt4.2.1-all-source-installer.orig/source-trees/common/setup/Paths.in 2002-09-24 23:33:53.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/common/setup/Paths.in 2009-03-16 08:54:29.000000000 +0100 @@ -4,26 +4,38 @@ @ISA = qw(Exporter); -@EXPORT = qw($exec_prefix $prefix - $sbindir $bindir - $libdir $libexecdir $includedir - $datadir $sysconfdir $sharedstatedir +@EXPORT = qw($prefix $exec_prefix + $bindir $sbindir $libdir + $includedir $flavorincludedir + $datadir $libexecdir + $sysconfdir $sharedstatedir $localstatedir + $setupdir $testdir + $perlmoduledir $tmpdir $local_tmpdir $secure_tmpdir); -$exec_prefix=$ENV{GLOBUS_LOCATION}; +my $PACKAGE = "\$PACKAGE"; +my $GLOBUS_FLAVOR_NAME = "\$GLOBUS_FLAVOR_NAME"; + $prefix=$ENV{GLOBUS_LOCATION}; -$sbindir="${exec_prefix}/sbin"; -$bindir="${exec_prefix}/bin"; -$libdir="${exec_prefix}/lib"; -$libexecdir="${exec_prefix}/libexec"; -$includedir="${exec_prefix}/include"; -$datadir="${prefix}/share"; -$sysconfdir="${prefix}/etc"; -$sharedstatedir="${prefix}/com"; -$localstatedir="${prefix}/var"; +$prefix="/usr" if (!defined $prefix); +$exec_prefix=$ENV{GLOBUS_LOCATION}; +$exec_prefix="/usr" if (!defined $exec_prefix); +$bindir="@bindir@"; +$sbindir="@sbindir@"; +$libdir="@libdir@"; +$includedir="@includedir@"; +$flavorincludedir="@flavorincludedir@"; +$datadir="@datadir@"; +$libexecdir="@libexecdir@"; +$sysconfdir="@sysconfdir@"; +$sharedstatedir="@sharedstatedir@"; +$localstatedir="@localstatedir@"; +$setupdir="@setupdir@"; +$testdir="@testdir@"; +$perlmoduledir="@perlmoduledir@"; $tmpdir="@tmpdir@"; $local_tmpdir="@local_tmpdir@"; $secure_tmpdir="@secure_tmpdir@"; diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/setup/setup-globus-common gt4.2.1-all-source-installer/source-trees/common/setup/setup-globus-common --- gt4.2.1-all-source-installer.orig/source-trees/common/setup/setup-globus-common 2001-06-21 00:24:26.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/common/setup/setup-globus-common 2009-03-16 08:54:29.000000000 +0100 @@ -1,3 +1,8 @@ #! /bin/sh -perl $GLOBUS_LOCATION/setup/globus/setup-globus-common.pl +if test -f "${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer" ; then + . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer +else + . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer +fi +perl ${setupdir}/setup-globus-common.pl diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/setup/setup-globus-common.pl gt4.2.1-all-source-installer/source-trees/common/setup/setup-globus-common.pl --- gt4.2.1-all-source-installer.orig/source-trees/common/setup/setup-globus-common.pl 2006-01-19 06:54:11.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/common/setup/setup-globus-common.pl 2009-03-16 08:54:29.000000000 +0100 @@ -19,13 +19,7 @@ if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; - -} - -if (!defined($gpath)) -{ - die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script" + $gpath = "/usr"; } @INC = (@INC, "$gpath/lib/perl"); @@ -34,37 +28,25 @@ my $metadata = new Grid::GPT::Setup(package_name => "globus_common_setup"); -my $globusdir = $ENV{GLOBUS_LOCATION}; - -if((!defined($globusdir))) -{ - die "GLOBUS_LOCATION needs to be set before running this script" -} - -my $setupdir = "$globusdir/setup/globus/"; +require Globus::Core::Paths; +my $setupdir = $Globus::Core::Paths::setupdir; +my $libexecdir = $Globus::Core::Paths::libexecdir; +my $bindir = $Globus::Core::Paths::bindir; print "creating globus-sh-tools-vars.sh\n"; my $result = `$setupdir/findshelltools`; -print "creating globus-script-initializer\n"; -print "creating Globus::Core::Paths\n"; - -$result = `$setupdir/setup-tmpdirs`; - -for my $setupfile ('globus-script-initializer', 'globus-sh-tools-vars.sh') +for my $setupfile ('globus-sh-tools-vars.sh') { - $result = system("cp $setupdir/$setupfile $globusdir/libexec"); - $result = system("chmod 0755 $globusdir/libexec/$setupfile"); - + $result = system("cp $setupdir/$setupfile $libexecdir/$setupfile"); + $result = system("chmod 0644 $libexecdir/$setupfile"); } -system("mkdir -p $globusdir/lib/perl/Globus/Core"); -system("cp $setupdir/Paths.pm $globusdir/lib/perl/Globus/Core/"); -system("chmod 0644 $globusdir/lib/perl/Globus/Core/Paths.pm"); +system("rm -f config.log config.status"); print "checking globus-hostname\n"; -my $hostname = `$globusdir/bin/globus-hostname`; +my $hostname = `$bindir/globus-hostname`; $hostname =~ s/\w//g; #strip whitespace diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/source/configure.in gt4.2.1-all-source-installer/source-trees/common/source/configure.in --- gt4.2.1-all-source-installer.orig/source-trees/common/source/configure.in 2007-12-12 00:29:27.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/common/source/configure.in 2009-03-16 08:54:19.000000000 +0100 @@ -24,6 +24,11 @@ GPT_SET_LIBS(["$EXTERNAL_LIBS"]) +save_LIBS=$LIBS +LIBS="$LIBS $GPT_LIBS" +AC_CHECK_FUNCS([lt_dlmutex_register]) +LIBS=$save_LIBS + AC_SUBST(GLOBUS_THREADS) if test x"$GLOBUS_VERSIONNAME" = "x" ; then diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/source/library/globus_callback.h gt4.2.1-all-source-installer/source-trees/common/source/library/globus_callback.h --- gt4.2.1-all-source-installer.orig/source-trees/common/source/library/globus_callback.h 2006-01-19 06:54:13.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/common/source/library/globus_callback.h 2009-03-16 08:54:07.000000000 +0100 @@ -19,10 +19,10 @@ /** * @file globus_callback.h Globus Callback API * - * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_callback.h,v $
- * $Date: 2006/01/19 05:54:13 $
- * $Revision: 1.12 $
- * $Author: mlink $
+ * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_callback.h,v $ + * $Date: 2006/01/19 05:54:13 $ + * $Revision: 1.12 $ + * $Author: mlink $ */ /** diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/source/library/globus_common.h.in gt4.2.1-all-source-installer/source-trees/common/source/library/globus_common.h.in --- gt4.2.1-all-source-installer.orig/source-trees/common/source/library/globus_common.h.in 2006-01-19 06:54:14.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/common/source/library/globus_common.h.in 2009-03-16 08:54:07.000000000 +0100 @@ -44,14 +44,6 @@ EXTERN_C_BEGIN -/* TODO remove this if we ever doxyegenate common fully */ -/** - * @mainpage - * - * @note More globus_common API documentation is available here. - * - */ - /****************************************************************************** Type definitions ******************************************************************************/ diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/source/library/globus_extension.c gt4.2.1-all-source-installer/source-trees/common/source/library/globus_extension.c --- gt4.2.1-all-source-installer.orig/source-trees/common/source/library/globus_extension.c 2008-03-12 20:01:05.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/common/source/library/globus_extension.c 2009-03-16 08:54:19.000000000 +0100 @@ -14,6 +14,7 @@ * limitations under the License. */ +#include "config.h" #include "globus_extension.h" #include "globus_debug.h" #include GLOBUS_THREAD_INCLUDE @@ -169,6 +170,7 @@ { goto error_dlinit; } +# ifdef HAVE_LT_DLMUTEX_REGISTER if(lt_dlmutex_register( globus_l_libtool_mutex_lock, globus_l_libtool_mutex_unlock, @@ -177,6 +179,7 @@ { goto error_dlmutex; } +# endif /* HAVE_LT_DLMUTEX_REGISTER */ # endif /* !BUILD_STATIC_ONLY */ globus_hashtable_init( @@ -385,11 +388,24 @@ dlhandle = lt_dlopenext(library); if(!dlhandle) { + snprintf(library, 1024, "lib%s", name); + library[1023] = 0; + dlhandle = lt_dlopenext(library); + } + if(!dlhandle) + { /* older libtools dont search the extensions correctly */ snprintf(library, 1024, "lib%s_%s" MY_LIB_EXT, name, build_flavor); library[1023] = 0; dlhandle = lt_dlopenext(library); } + if(!dlhandle) + { + /* older libtools dont search the extensions correctly */ + snprintf(library, 1024, "lib%s" MY_LIB_EXT, name); + library[1023] = 0; + dlhandle = lt_dlopenext(library); + } if(!dlhandle) { diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/source/library/globus_thread_common.h gt4.2.1-all-source-installer/source-trees/common/source/library/globus_thread_common.h --- gt4.2.1-all-source-installer.orig/source-trees/common/source/library/globus_thread_common.h 2006-01-19 06:54:14.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/common/source/library/globus_thread_common.h 2009-03-16 08:54:07.000000000 +0100 @@ -17,10 +17,10 @@ /** * @file globus_thread_common.h Common Thread Interface * - * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_thread_common.h,v $
- * $Date: 2006/01/19 05:54:14 $
- * $Revision: 1.6 $
- * $Author: mlink $
+ * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_thread_common.h,v $ + * $Date: 2006/01/19 05:54:14 $ + * $Revision: 1.6 $ + * $Author: mlink $ */ /****************************************************************************** diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/source/library/globus_thread_pthreads.h gt4.2.1-all-source-installer/source-trees/common/source/library/globus_thread_pthreads.h --- gt4.2.1-all-source-installer.orig/source-trees/common/source/library/globus_thread_pthreads.h 2006-01-19 06:54:14.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/common/source/library/globus_thread_pthreads.h 2009-03-16 08:53:24.000000000 +0100 @@ -62,7 +62,13 @@ #include EXTERN_C_END #else /* TARGET_ARCH_AIX */ +#if defined __GNUC__ && defined __EXCEPTIONS +#undef __EXCEPTIONS #include +#define __EXCEPTIONS +#else +#include +#endif #endif /* TARGET_ARCH_AIX */ EXTERN_C_BEGIN diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/source/library/globus_url.h gt4.2.1-all-source-installer/source-trees/common/source/library/globus_url.h --- gt4.2.1-all-source-installer.orig/source-trees/common/source/library/globus_url.h 2008-01-23 18:26:04.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/common/source/library/globus_url.h 2009-03-16 08:54:07.000000000 +0100 @@ -67,7 +67,7 @@ GLOBUS_URL_SCHEME_X_NEXUS, /** GASS Cache Entry */ GLOBUS_URL_SCHEME_X_GASS_CACHE, - /** Any other URL of the form ://:// */ GLOBUS_URL_SCHEME_UNKNOWN, GLOBUS_URL_SCHEME_SSHFTP, /** Total number of URL schemes supported */ diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/source/library/Makefile.am gt4.2.1-all-source-installer/source-trees/common/source/library/Makefile.am --- gt4.2.1-all-source-installer.orig/source-trees/common/source/library/Makefile.am 2006-01-13 22:24:29.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/common/source/library/Makefile.am 2009-03-16 08:54:02.000000000 +0100 @@ -143,7 +143,7 @@ libglobus_common___GLOBUS_FLAVOR_NAME__la_LIBADD = @GPT_LIB_LINKS@ libglobus_common___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources) -libglobus_common___GLOBUS_FLAVOR_NAME__la_LDFLAS = @GPT_LDFLAGS@ +libglobus_common___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@ EXTRA_DIST = \ globus_callback_nothreads.c \ @@ -157,7 +157,6 @@ globus_thread_sproc.c \ globus_thread_sproc.h -EXTRA_HEADERS = \ - globus_netos_dir.h +EXTRA_HEADERS = include $(top_srcdir)/globus_automake_post diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/source/Makefile.am gt4.2.1-all-source-installer/source-trees/common/source/Makefile.am --- gt4.2.1-all-source-installer.orig/source-trees/common/source/Makefile.am 2004-10-11 14:53:32.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/common/source/Makefile.am 2009-03-16 08:53:18.000000000 +0100 @@ -9,7 +9,7 @@ config \ doxygen -sbin_SCRIPTS= \ +libexec_SCRIPTS= \ config.guess EXTRA_DIST = \ diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/source/pkgdata/pkg_data_src.gpt.in gt4.2.1-all-source-installer/source-trees/common/source/pkgdata/pkg_data_src.gpt.in --- gt4.2.1-all-source-installer.orig/source-trees/common/source/pkgdata/pkg_data_src.gpt.in 2008-09-29 23:20:49.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/common/source/pkgdata/pkg_data_src.gpt.in 2009-03-16 08:54:11.000000000 +0100 @@ -3,7 +3,7 @@ - + Common Library Common @@ -51,14 +51,6 @@ -lglobus_common - - - - - - - - diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/source/programs/globus-sh-exec.in gt4.2.1-all-source-installer/source-trees/common/source/programs/globus-sh-exec.in --- gt4.2.1-all-source-installer.orig/source-trees/common/source/programs/globus-sh-exec.in 2006-01-19 06:54:19.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/common/source/programs/globus-sh-exec.in 2009-03-16 08:53:18.000000000 +0100 @@ -17,7 +17,11 @@ # -. ${GLOBUS_LOCATION}/libexec/globus-script-initializer +if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then +. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer +else +. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer +fi globus_source ${libexecdir}/globus-sh-tools.sh # This was done by the script initializer before V2.0 diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/source/programs/globus-version.in gt4.2.1-all-source-installer/source-trees/common/source/programs/globus-version.in --- gt4.2.1-all-source-installer.orig/source-trees/common/source/programs/globus-version.in 2008-09-29 23:20:05.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/common/source/programs/globus-version.in 2009-03-16 08:53:18.000000000 +0100 @@ -43,7 +43,11 @@ usage() { - . ${GLOBUS_LOCATION}/libexec/globus-script-initializer + if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then + . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer + else + . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer + fi globus_source ${libexecdir}/globus-sh-tools.sh ${GLOBUS_SH_CAT-cat} 1>&2 <&2 - exit 1 +if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then +. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer +else +. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer fi -. ${GLOBUS_LOCATION}/libexec/globus-script-initializer - PROGRAM_NAME=`echo $0 | ${GLOBUS_SH_SED-sed} -e 's|.*/||g'` PROGRAM_VERSION=`echo '$Revision: 1.3 $' | ${GLOBUS_SH_CUT-cut} -d' ' -f2` @@ -67,7 +66,7 @@ EOF } -. ${GLOBUS_LOCATION}/libexec/globus-args-parser-header +. ${libexecdir}/globus-args-parser-header if [ -n "$1" ]; then globus_args_unrecognized_option "$1" @@ -79,8 +78,8 @@ if [ -z "${GLOBUS_HOSTNAME}" ] ; then # Set the _fullname based upon Globus's hostname command - if [ -x "${libexecdir}/globus-libc-hostname" ]; then - _fullname="`${libexecdir}/globus-libc-hostname`" + if [ -x "${sbindir}/globus-libc-hostname" ]; then + _fullname="`${sbindir}/globus-libc-hostname`" fi # if failed to set, use the system's hostname command diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/source/scripts/globus-makefile-header gt4.2.1-all-source-installer/source-trees/common/source/scripts/globus-makefile-header --- gt4.2.1-all-source-installer.orig/source-trees/common/source/scripts/globus-makefile-header 2008-02-20 17:03:35.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/common/source/scripts/globus-makefile-header 2009-03-16 08:53:18.000000000 +0100 @@ -25,29 +25,15 @@ my $gpt_path = $ENV{GPT_LOCATION}; my $globus_path = $ENV{GLOBUS_LOCATION}; -my $gpath; -if ( !defined($gpt_path) && !defined($globus_path) ) +if ( !defined($gpt_path) ) { - die("ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"); + $gpt_path = "/usr"; } -if ( defined($gpt_path) ) +if ( !defined($globus_path) ) { - $gpath = $gpt_path; - if ( ! -d $gpath ) - { - die("ERROR: $gpath doesn't exist!\n"); - } -} - -if ( !defined($gpath) && defined($globus_path) ) -{ - $gpath = $globus_path; - if ( ! -d $gpath ) - { - die("ERROR: $gpath doesn't exist!\n"); - } + $globus_path = "/usr"; } @@ -60,7 +46,7 @@ # my($environment); -@INC = ("$gpath/lib/perl", "$gpath/lib/perl/$Config{'archname'}", @INC); +@INC = ("$gpt_path/lib/perl", "$gpt_path/lib/perl/$Config{'archname'}", @INC); if ( defined eval "require Grid::GPT::V1::Package" ) { @@ -240,7 +226,9 @@ # point our installation object at our globus location # - $installation = new Grid::GPT::Installation(pkgdir => "$globus_path/etc/globus_packages"); + $installation = -d "$globus_path/share/globus/packages" ? + new Grid::GPT::Installation(pkgdir => "$globus_path/share/globus/packages") : + new Grid::GPT::Installation(pkgdir => "$globus_path/etc/globus_packages"); $installation->set_depenv('Build'); # @@ -313,10 +301,17 @@ # push all of our entries onto our header array # + @INC = ("$globus_path/lib/perl", @INC); + + require Globus::Core::Paths; + my $includedir = $Globus::Core::Paths::includedir; + my $flavorincludedir = $Globus::Core::Paths::flavorincludedir; + my $libdir = $Globus::Core::Paths::libdir; + push(@$header, "GLOBUS_CFLAGS=\"$cflagslist\""); - push(@$header, "GLOBUS_INCLUDES=\"-I${globus_path}/include/$flavor $includeslist\""); + push(@$header, "GLOBUS_INCLUDES=\"-I${includedir} -I${flavorincludedir} $includeslist\""); push(@$header, "GLOBUS_LIBS=\"$libslist\""); - push(@$header, "GLOBUS_LDFLAGS=\"-L${globus_path}/lib\""); + push(@$header, "GLOBUS_LDFLAGS=\"-L${libdir}\""); push(@$header, "GLOBUS_PKG_LIBS=\"$pkglibslist $extlibslist\""); push(@$header, "GLOBUS_LIBTOOL=\"$globus_path/sbin/libtool-$flavor\""); } @@ -332,7 +327,9 @@ my($header) = @_; my($copy); - open(IN, "$globus_path/libexec/globus-build-env-$flavor.sh") || die "ERROR: Cannot open $globus_path/libexec/globus-build-env-$flavor.sh!\n$common_error\n"; + open(IN, "$globus_path/share/globus/globus-build-env-$flavor.sh") || + open(IN, "$globus_path/libexec/globus-build-env-$flavor.sh") || + die "ERROR: Cannot open globus-build-env-$flavor.sh!\n$common_error\n"; while () { @@ -370,7 +367,9 @@ my($header) = @_; my($copy); - open(IN, "$globus_path/libexec/globus-sh-tools-vars.sh") || die "ERROR: Cannot open $globus_path/libexec/globus-sh-tools-vars.sh!\n$common_error\n"; + open(IN, "$globus_path/share/globus/globus-sh-tools-vars.sh") || + open(IN, "$globus_path/libexec/globus-sh-tools-vars.sh") || + die "ERROR: Cannot open globus-sh-tools-vars.sh!\n$common_error\n"; while () { diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/source/scripts/globus-makefile-header.gpt1 gt4.2.1-all-source-installer/source-trees/common/source/scripts/globus-makefile-header.gpt1 --- gt4.2.1-all-source-installer.orig/source-trees/common/source/scripts/globus-makefile-header.gpt1 2003-02-05 03:48:31.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/common/source/scripts/globus-makefile-header.gpt1 2009-03-16 08:53:18.000000000 +0100 @@ -15,18 +15,13 @@ my $flavor; my $link="static"; -my $gpt=$ENV{GPT_LOCATION}; + my $gpath = $ENV{GPT_LOCATION}; if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; - - } - if (!defined($gpath)) - { - die "ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script" - } - + $gpath = "/usr"; +} + @INC = (@INC, "$gpath/lib/perl"); require Grid::GPT::Dependencies; @@ -40,20 +35,10 @@ my $pgm_linkslist; my $lib_linkslist; -if(!defined($gpt)) -{ - $gpt=$ENV{GLOBUS_LOCATION}; -} -if(!defined($gpt)) -{ - die "ERROR: GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script\n"; -} - my $globus=$ENV{GLOBUS_LOCATION}; - if(!defined($globus)) { - die "ERROR: GLOBUS_LOCATION needs to be set before running this script\n"; + $globus = "/usr"; } my %hash; @@ -102,14 +87,23 @@ assemble_link_lines($fakepkg, $flavor, $link); +@INC = ("$globus/lib/perl", @INC); + +require Globus::Core::Paths; +my $includedir = $Globus::Core::Paths::includedir; +my $flavorincludedir = $Globus::Core::Paths::flavorincludedir; +my $libdir = $Globus::Core::Paths::libdir; + push @temp_header, "GLOBUS_CFLAGS=\"$cflagslist\"\n"; -push @temp_header, "GLOBUS_INCLUDES=\" -I$ENV{GLOBUS_LOCATION}/include/$flavor $includeslist\"\n"; +push @temp_header, "GLOBUS_INCLUDES=\"-I$includedir -I$flavorincludedir $includeslist\"\n"; push @temp_header, "GLOBUS_LIBS=\"$libslist\"\n"; -push @temp_header, "GLOBUS_LDFLAGS=\" -L$ENV{GLOBUS_LOCATION}/lib\n"; +push @temp_header, "GLOBUS_LDFLAGS=\"-L$libdir\"\n"; push @temp_header, "GLOBUS_PKG_LIBS=\"$pkglibslist\"\n"; push @temp_header, "GLOBUS_LIBTOOL=$globus/sbin/libtool-$flavor\n"; -open(IN, "$globus/libexec/globus-build-env-$flavor.sh") || die "ERROR: Cannot open GLOBUS_LOCATION/libexec/globus-build-env-$flavor.sh\n"; +open(IN, "$globus/share/globus/globus-build-env-$flavor.sh") || + open(IN, "$globus/libexec/globus-build-env-$flavor.sh") || + die "ERROR: Cannot open globus-build-env-$flavor.sh\n"; while() { @@ -130,7 +124,9 @@ #END of Section one: prepending GLOBUS_ close (IN); -open(IN, "$globus/libexec/globus-sh-tools-vars.sh") || die "ERROR: Cannot open GLOBUS_LOCATION/libexec/globus-sh-tools-vars.sh\n"; +open(IN, "$globus/share/globus/globus-sh-tools-vars.sh") || + open(IN, "$globus/libexec/globus-sh-tools-vars.sh") || + die "ERROR: Cannot open globus-sh-tools-vars.sh\n"; while() { if(m!\S!) diff -Nur gt4.2.1-all-source-installer.orig/source-trees/common/source/scripts/globus-sh-tools.sh gt4.2.1-all-source-installer/source-trees/common/source/scripts/globus-sh-tools.sh --- gt4.2.1-all-source-installer.orig/source-trees/common/source/scripts/globus-sh-tools.sh 2006-01-19 06:54:22.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/common/source/scripts/globus-sh-tools.sh 2009-03-16 08:53:18.000000000 +0100 @@ -18,7 +18,11 @@ if test -z "$GLOBUS_SH_VARIABLES_SET" ; then - . ${GLOBUS_LOCATION}/libexec/globus-sh-tools-vars.sh + if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-sh-tools-vars.sh ; then + . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-sh-tools-vars.sh + else + . ${GLOBUS_LOCATION:-/usr}/libexec/globus-sh-tools-vars.sh + fi # export all commands: diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/aclocal/acdoxygen.m4 gt4.2.1-all-source-installer/source-trees/core/source/aclocal/acdoxygen.m4 --- gt4.2.1-all-source-installer.orig/source-trees/core/source/aclocal/acdoxygen.m4 2004-08-24 17:37:02.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/core/source/aclocal/acdoxygen.m4 2009-03-16 08:52:12.000000000 +0100 @@ -39,7 +39,8 @@ lac_tag="${lac_tag_base}.tag" lac_doxygen_tagfiles="$lac_doxygen_tagfiles $x" lac_doxygen_internal_tagfiles="$lac_doxygen_internal_tagfiles ${x}i" - lac_doxygen_installdox="$lac_doxygen_installdox -l${lac_tag}@../../${lac_tag_base}/html" + lac_html_dir=`echo ${x} | sed -e 's|.*/\(.*/html\)/.*|../../\1|'` + lac_doxygen_installdox="$lac_doxygen_installdox -l${lac_tag}@${lac_html_dir}" fi done AC_SUBST(lac_doxygen_tagfiles) @@ -65,9 +66,7 @@ AC_DEFUN([LAC_DOXYGEN],dnl [ AC_ARG_ENABLE(doxygen, - changequote(<<, >>)dnl -<< --enable-doxygen[=PATH] use Doxygen to generate documentation>>, - changequote([, ])dnl + AC_HELP_STRING([--enable-doxygen[[=PATH]]], [use Doxygen to generate documentation]), [ if test "$enableval" = "yes"; then AC_PATH_PROG(DOXYGEN, @@ -87,8 +86,7 @@ AC_ARG_ENABLE(internal-doc, - [ --enable-internal-doc Generate Doxygen documentation for - internal functions. Requires --enable-doxygen], + AC_HELP_STRING([--enable-internal-doc], [Generate Doxygen documentation for internal functions. Requires --enable-doxygen]), [ DOXYFILE="Doxyfile-internal" AC_SUBST(DOXYFILE) @@ -123,7 +121,7 @@ LAC_DOXYGEN_PROJECT($GPT_NAME) LAC_DOXYGEN_OUTPUT_TAGFILE($GPT_NAME) - lac_dep_check="$GLOBUS_LOCATION/sbin/globus-build-doxygen-dependencies" + lac_dep_check="${GLOBUS_LOCATION:-/usr}/sbin/globus-build-doxygen-dependencies" if test ! -x $lac_dep_check ; then diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/aclocal/automake_rules gt4.2.1-all-source-installer/source-trees/core/source/aclocal/automake_rules --- gt4.2.1-all-source-installer.orig/source-trees/core/source/aclocal/automake_rules 2001-06-04 21:46:01.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/core/source/aclocal/automake_rules 2009-03-16 08:49:05.000000000 +0100 @@ -4,15 +4,15 @@ filelist-am: -link: link-recursive link-libLTLIBRARIES link-libLIBRARIES link-libexecPROGRAMS link-libexecSCRIPTS link-etcDATA link-binPROGRAMS link-binSCRIPTS link-sbinPROGRAMS link-sbinSCRIPTS link-includeHEADERS link-shareDATA link-setupDATA link-setupPROGRAMS link-setupSCRIPTS link-testDATA link-testPROGRAMS link-testSCRIPTS link-scriptsysconfPROGRAMS link-scriptsysconfSCRIPTS link-flavorincludeHEADERS link-pkgDATA link-aclocalDATA link-doxygenDATA link-docDATA +link: link-recursive link-libLTLIBRARIES link-libLIBRARIES link-libexecPROGRAMS link-libexecSCRIPTS link-etcDATA link-binPROGRAMS link-binSCRIPTS link-sbinPROGRAMS link-sbinSCRIPTS link-includeHEADERS link-shareDATA link-setupDATA link-setupPROGRAMS link-setupSCRIPTS link-testDATA link-testPROGRAMS link-testSCRIPTS link-scriptsysconfPROGRAMS link-scriptsysconfSCRIPTS link-flavorincludeHEADERS link-pkgDATA link-aclocalDATA link-perlmoduleDATA link-doxygenDATA link-docDATA : -unlink: unlink-recursive unlink-libLTLIBRARIES unlink-libLIBRARIES unlink-libexecPROGRAMS unlink-libexecSCRIPTS unlink-etcDATA unlink-binPROGRAMS unlink-binSCRIPTS unlink-sbinPROGRAMS unlink-sbinSCRIPTS unlink-includeHEADERS unlink-shareDATA unlink-setupDATA unlink-setupPROGRAMS unlink-setupSCRIPTS unlink-testDATA unlink-testPROGRAMS unlink-testSCRIPTS unlink-scriptsysconfPROGRAMS unlink-scriptsysconfSCRIPTS unlink-flavorincludeHEADERS unlink-pkgDATA unlink-aclocalDATA unlink-doxygenDATA unlink-docDATA +unlink: unlink-recursive unlink-libLTLIBRARIES unlink-libLIBRARIES unlink-libexecPROGRAMS unlink-libexecSCRIPTS unlink-etcDATA unlink-binPROGRAMS unlink-binSCRIPTS unlink-sbinPROGRAMS unlink-sbinSCRIPTS unlink-includeHEADERS unlink-shareDATA unlink-setupDATA unlink-setupPROGRAMS unlink-setupSCRIPTS unlink-testDATA unlink-testPROGRAMS unlink-testSCRIPTS unlink-scriptsysconfPROGRAMS unlink-scriptsysconfSCRIPTS unlink-flavorincludeHEADERS unlink-pkgDATA unlink-aclocalDATA unlink-perlmoduleDATA unlink-doxygenDATA unlink-docDATA : -.PHONY: link unlink link-recursive unlink-recursive link-am unlink-am filelist-amlink-libLTLIBRARIES unlink-libLTLIBRARIES filelist-libLTLIBRARIES link-libLIBRARIES unlink-libLIBRARIES filelist-libLIBRARIES link-libexecPROGRAMS unlink-libexecPROGRAMS filelist-libexecPROGRAMS link-libexecSCRIPTS unlink-libexecSCRIPTS filelist-libexecSCRIPTS link-etcDATA unlink-etcDATA filelist-etcDATA link-binPROGRAMS unlink-binPROGRAMS filelist-binPROGRAMS link-binSCRIPTS unlink-binSCRIPTS filelist-binSCRIPTS link-sbinPROGRAMS unlink-sbinPROGRAMS filelist-sbinPROGRAMS link-sbinSCRIPTS unlink-sbinSCRIPTS filelist-sbinSCRIPTS link-includeHEADERS unlink-includeHEADERS filelist-includeHEADERS link-shareDATA unlink-shareDATA filelist-shareDATA link-setupDATA unlink-setupDATA filelist-setupDATA link-setupPROGRAMS unlink-setupPROGRAMS filelist-setupPROGRAMS link-setupSCRIPTS unlink-setupSCRIPTS filelist-setupSCRIPTS link-testDATA unlink-testDATA filelist-testDATA link-testPROGRAMS unlink-testPROGRAMS filelist-testPROGRAMS link-testSCRIPTS unlink-testSCRIPTS filelist-testSCRIPTS link-scriptsysconfPROGRAMS unlink-scriptsysconfPROGRAMS filelist-scriptsysconfPROGRAMS link-scriptsysconfSCRIPTS unlink-scriptsysconfSCRIPTS filelist-scriptsysconfSCRIPTS link-flavorincludeHEADERS unlink-flavorincludeHEADERS filelist-flavorincludeHEADERS link-pkgDATA unlink-pkgDATA filelist-pkgDATA link-aclocalDATA unlink-aclocalDATA filelist-aclocalDATA link-doxygenDATA unlink-doxygenDATA filelist-doxygenDATA link-docDATA unlink-docDATA filelist-docDATA +.PHONY: link unlink link-recursive unlink-recursive link-am unlink-am filelist-amlink-libLTLIBRARIES unlink-libLTLIBRARIES filelist-libLTLIBRARIES link-libLIBRARIES unlink-libLIBRARIES filelist-libLIBRARIES link-libexecPROGRAMS unlink-libexecPROGRAMS filelist-libexecPROGRAMS link-libexecSCRIPTS unlink-libexecSCRIPTS filelist-libexecSCRIPTS link-etcDATA unlink-etcDATA filelist-etcDATA link-binPROGRAMS unlink-binPROGRAMS filelist-binPROGRAMS link-binSCRIPTS unlink-binSCRIPTS filelist-binSCRIPTS link-sbinPROGRAMS unlink-sbinPROGRAMS filelist-sbinPROGRAMS link-sbinSCRIPTS unlink-sbinSCRIPTS filelist-sbinSCRIPTS link-includeHEADERS unlink-includeHEADERS filelist-includeHEADERS link-shareDATA unlink-shareDATA filelist-shareDATA link-setupDATA unlink-setupDATA filelist-setupDATA link-setupPROGRAMS unlink-setupPROGRAMS filelist-setupPROGRAMS link-setupSCRIPTS unlink-setupSCRIPTS filelist-setupSCRIPTS link-testDATA unlink-testDATA filelist-testDATA link-testPROGRAMS unlink-testPROGRAMS filelist-testPROGRAMS link-testSCRIPTS unlink-testSCRIPTS filelist-testSCRIPTS link-scriptsysconfPROGRAMS unlink-scriptsysconfPROGRAMS filelist-scriptsysconfPROGRAMS link-scriptsysconfSCRIPTS unlink-scriptsysconfSCRIPTS filelist-scriptsysconfSCRIPTS link-flavorincludeHEADERS unlink-flavorincludeHEADERS filelist-flavorincludeHEADERS link-pkgDATA unlink-pkgDATA filelist-pkgDATA link-aclocalDATA unlink-aclocalDATA filelist-aclocalDATA link-perlmoduleDATA unlink-perlmoduleDATA filelist-perlmoduleDATA link-doxygenDATA unlink-doxygenDATA filelist-doxygenDATA link-docDATA unlink-docDATA filelist-docDATA -filelist: filelist-recursive filelist-libLTLIBRARIES filelist-libLIBRARIES filelist-libexecPROGRAMS filelist-libexecSCRIPTS filelist-etcDATA filelist-binPROGRAMS filelist-binSCRIPTS filelist-sbinPROGRAMS filelist-sbinSCRIPTS filelist-includeHEADERS filelist-shareDATA filelist-setupDATA filelist-setupPROGRAMS filelist-setupSCRIPTS filelist-testDATA filelist-testPROGRAMS filelist-testSCRIPTS filelist-scriptsysconfPROGRAMS filelist-scriptsysconfSCRIPTS filelist-flavorincludeHEADERS filelist-pkgDATA filelist-aclocalDATA filelist-doxygenDATA filelist-docDATA +filelist: filelist-recursive filelist-libLTLIBRARIES filelist-libLIBRARIES filelist-libexecPROGRAMS filelist-libexecSCRIPTS filelist-etcDATA filelist-binPROGRAMS filelist-binSCRIPTS filelist-sbinPROGRAMS filelist-sbinSCRIPTS filelist-includeHEADERS filelist-shareDATA filelist-setupDATA filelist-setupPROGRAMS filelist-setupSCRIPTS filelist-testDATA filelist-testPROGRAMS filelist-testSCRIPTS filelist-scriptsysconfPROGRAMS filelist-scriptsysconfSCRIPTS filelist-flavorincludeHEADERS filelist-pkgDATA filelist-aclocalDATA filelist-perlmoduleDATA filelist-doxygenDATA filelist-docDATA : @@ -1097,6 +1097,59 @@ +link-perlmoduleDATA: $(perlmodule_DATA) + @$(NORMAL_INSTALL) + @$(mkinstalldirs) $(DESTDIR)$(perlmoduledir) + @list='$(perlmodule_DATA)'; for p in $$list; do \ + mydir=`pwd`; \ + target_p=$(DESTDIR)$(perlmoduledir)/$$p; \ + if test -f $(srcdir)/$$p; then \ + cd $(srcdir); \ + fullsrcdir=`pwd`; \ + cd $$mydir; \ + if test -f $$target_p -a ! -h $$target_p; then \ + echo "mv $$target_p $$target_p.$(LINK_BAK)"; \ + mv $$target_p $$target_p.$(LINK_BAK); \ + fi; \ + if test ! -h $$target_p; then \ + echo "ln -s $$fullsrcdir/$$p $$target_p"; \ + ln -s $$fullsrcdir/$$p $$target_p; \ + fi; \ + else if test -f $$p; then \ + if test -f $$target_p -a ! -h $$target_p; then \ + echo "mv $$target_p $$target_p.$(LINK_BAK)"; \ + mv $$target_p $$target_p.$(LINK_BAK); \ + fi; \ + if test ! -h $$target_p; then \ + echo "ln -s $$mydir/$$p $$target_p"; \ + ln -s $$mydir/$$p $$target_p; \ + fi; \ + fi; fi; \ + done + +unlink-perlmoduleDATA: + @$(NORMAL_UNINSTALL) + @list='$(perlmodule_DATA)'; for p in $$list; do \ + target_p=$(DESTDIR)$(perlmoduledir)/$$p; \ + if test -h $$target_p; then \ + echo "rm $$target_p"; \ + rm $$target_p; \ + fi; \ + if test -f $$target_p.$(LINK_BAK); then \ + echo "mv $$target_p.$(LINK_BAK) $$target_p"; \ + mv $$target_p.$(LINK_BAK) $$target_p; \ + fi; \ + done + +filelist-perlmoduleDATA: + @list='$(perlmodule_DATA)'; for p in $$list; do \ + echo "$(DESTDIR)$(perlmoduledir)/$$p" >> $(FILELIST_FILE); \ + done + + + + + link-doxygenDATA: $(doxygen_DATA) @$(NORMAL_INSTALL) @$(mkinstalldirs) $(DESTDIR)$(doxygendir) diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/aclocal/automake_targets gt4.2.1-all-source-installer/source-trees/core/source/aclocal/automake_targets --- gt4.2.1-all-source-installer.orig/source-trees/core/source/aclocal/automake_targets 2002-07-03 21:19:28.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/core/source/aclocal/automake_targets 2009-03-16 08:49:05.000000000 +0100 @@ -1,30 +1,30 @@ ## Special globus installation directories -setupdir = $(GLOBUS_LOCATION)/setup/globus +setupdir = @setupdir@ ## setup = [ DATA,PROGRAMS,SCRIPTS ] -testdir = $(GLOBUS_LOCATION)/test/$(PACKAGE) +testdir = @testdir@ ## test = [ DATA,PROGRAMS,SCRIPTS ] -scriptsysconfdir = $(GLOBUS_LOCATION)/etc +scriptsysconfdir = ${sysconfdir} ## scriptsysconf = [ PROGRAMS,SCRIPTS ] -flavorincludedir = $(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOR_NAME) +flavorincludedir = @flavorincludedir@ ## flavorinclude = [ HEADERS ] -pkgdir = $(GLOBUS_LOCATION)/etc/globus_packages/$(PACKAGE) +pkgdir = @pkgdir@ ## pkg = [ DATA ] -aclocaldir = $(GLOBUS_LOCATION)/share/globus_aclocal +aclocaldir = @aclocaldir@ ## aclocal = [ DATA ] -amdirdir = $(GLOBUS_LOCATION)/share/globus_amdir -## amdir = [ DATA ] +perlmoduledir = @perlmoduledir@ +## perlmodule = [ DATA ] -doxygendir = $(GLOBUS_LOCATION)/share/doxygen +doxygendir = @doxygendir@ ## doxygen = [ DATA ] -docdir = $(GLOBUS_LOCATION)/share/doc +docdir = ${datadir}/doc ## doc = [ DATA ] LINK_BAK = orig diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/aclocal/Doxyfile.in gt4.2.1-all-source-installer/source-trees/core/source/aclocal/Doxyfile.in --- gt4.2.1-all-source-installer.orig/source-trees/core/source/aclocal/Doxyfile.in 2004-03-14 07:29:13.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/core/source/aclocal/Doxyfile.in 2009-03-16 08:52:30.000000000 +0100 @@ -13,7 +13,7 @@ # Include the standard part of the doxygen configuration: # -@INCLUDE_PATH = @prefix@/share/doxygen +@INCLUDE_PATH = @doxygendir@ @INCLUDE = Doxyfile.include @@ -64,27 +64,27 @@ # each generated HTML page. If it is left blank doxygen will generate a # standard header. -HTML_HEADER = @prefix@/share/doxygen/globus_head.html +HTML_HEADER = @doxygendir@/globus_head.html # The HTML_FOOTER tag can be used to specify a personal HTML footer for # each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = @prefix@/share/doxygen/globus_foot.html +HTML_FOOTER = @doxygendir@/globus_foot.html # The HTML_STYLESHEET tag can be used to specify a user defined cascading # style sheet that is used by each HTML page. It can be used to # fine-tune the look of the HTML output. If the tag is left blank doxygen # will generate a default style sheet -HTML_STYLESHEET = @prefix@/share/doxygen/globus.css +HTML_STYLESHEET = # The LATEX_HEADER tag can be used to specify a personal LaTeX header for # the generated latex document. The header should contain everything until # the first chapter. If it is left blank doxygen will generate a # standard header. Notice: only use this tag if you know what you are doing! -LATEX_HEADER = @prefix@/share/doxygen/globus_head.tex +LATEX_HEADER = # The PREDEFINED tag can be used to specify one or more macro names that # are defined before the preprocessor is started (similar to the -D option of diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/aclocal/Doxyfile-internal.in gt4.2.1-all-source-installer/source-trees/core/source/aclocal/Doxyfile-internal.in --- gt4.2.1-all-source-installer.orig/source-trees/core/source/aclocal/Doxyfile-internal.in 2004-03-14 07:29:13.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/core/source/aclocal/Doxyfile-internal.in 2009-03-16 08:52:30.000000000 +0100 @@ -13,7 +13,7 @@ # Include the standard part of the doxygen configuration: # -@INCLUDE_PATH = @prefix@/share/doxygen +@INCLUDE_PATH = @doxygendir@ @INCLUDE = Doxyfile-internal.include @@ -65,27 +65,27 @@ # each generated HTML page. If it is left blank doxygen will generate a # standard header. -HTML_HEADER = @prefix@/share/doxygen/globus_head.html +HTML_HEADER = @doxygendir@/globus_head.html # The HTML_FOOTER tag can be used to specify a personal HTML footer for # each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = @prefix@/share/doxygen/globus_foot.html +HTML_FOOTER = @doxygendir@/globus_foot.html # The HTML_STYLESHEET tag can be used to specify a user defined cascading # style sheet that is used by each HTML page. It can be used to # fine-tune the look of the HTML output. If the tag is left blank doxygen # will generate a default style sheet -HTML_STYLESHEET = @prefix@/share/doxygen/globus.css +HTML_STYLESHEET = # The LATEX_HEADER tag can be used to specify a personal LaTeX header for # the generated latex document. The header should contain everything until # the first chapter. If it is left blank doxygen will generate a # standard header. Notice: only use this tag if you know what you are doing! -LATEX_HEADER = @prefix@/share/doxygen/globus_head.tex +LATEX_HEADER = # The PREDEFINED tag can be used to specify one or more macro names that # are defined before the preprocessor is started (similar to the -D option of diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/aclocal/doxygen_Makefile.am gt4.2.1-all-source-installer/source-trees/core/source/aclocal/doxygen_Makefile.am --- gt4.2.1-all-source-installer.orig/source-trees/core/source/aclocal/doxygen_Makefile.am 2002-01-04 17:41:38.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/core/source/aclocal/doxygen_Makefile.am 2009-03-16 08:52:30.000000000 +0100 @@ -12,28 +12,35 @@ $(PERL) ./doc/html/installdox $(doxygen_installdox) ./doc/html/*;\ fi ; \ fi ; \ + if test -d doc/latex; then \ + (cd doc/latex ; for f in *.tex ; do sed 's/\\doxyref{/{\\bf /g' < $$f > $$f.new ; mv $$f.new $$f ; done ; make) ; \ + fi \ fi install-data-local: @if test ! -z "@DOXYGEN@"; then \ - for dir in `find ./doc/* -type d -print|sed "s,./doc/,,"`; do \ + for dir in `find ./doc/{html,man} -type d -print|sed "s,./doc/,,"`; do \ if test -z "`echo $${dir}|sed -n '/^man/ p'`"; then \ $(INSTALL) -d -m 755 \ $(DESTDIR)$(docdir)/@PACKAGE@/$${dir}; \ else \ $(INSTALL) -d -m 755 \ - $(DESTDIR)$(prefix)/$${dir}; \ + $(DESTDIR)$(mandir)/../$${dir}; \ fi \ done; \ - for file in `find ./doc -type f -print|sed "s,./doc/,,"`; do \ + for file in `find ./doc/{html,man} -type f -print|sed "s,./doc/,,"`; do \ if test -z "`echo $${file}|sed -n '/^man/ p'`"; then \ $(INSTALL) -m 644 ./doc/$${file} \ $(DESTDIR)$(docdir)/@PACKAGE@/$${file}; \ else \ $(INSTALL) -m 644 ./doc/$${file} \ - $(DESTDIR)$(prefix)/$${file};\ + $(DESTDIR)$(mandir)/../$${file};\ fi \ - done \ + done; \ + if test -f doc/latex/refman.pdf; then \ + $(INSTALL) -m 644 doc/latex/refman.pdf \ + $(DESTDIR)$(docdir)/@PACKAGE@; \ + fi \ fi clean-data-local: @@ -43,10 +50,13 @@ filelist: @if test ! -z "@DOXYGEN@"; then \ - find ./doc -type f -print| \ - sed "s,./doc/man,$(prefix)/man,"| \ + find ./doc/{man,html} -type f -print| \ + sed "s,./doc/man,$(mandir),"| \ sed "s,./doc,$(docdir)/@PACKAGE@," \ >> $(FILELIST_FILE); \ + if test -f doc/latex/refman.pdf; then \ + echo $(docdir)/@PACKAGE@/refman.pdf >> $(FILELIST_FILE); \ + fi \ fi dist-hook: all-local diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/aclocal/globus_package.m4 gt4.2.1-all-source-installer/source-trees/core/source/aclocal/globus_package.m4 --- gt4.2.1-all-source-installer.orig/source-trees/core/source/aclocal/globus_package.m4 2005-11-02 23:25:24.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/core/source/aclocal/globus_package.m4 2009-03-16 08:52:12.000000000 +0100 @@ -2,15 +2,8 @@ AM_MAINTAINER_MODE -# checking for the GLOBUS_LOCATION - -if test "x$GLOBUS_LOCATION" = "x"; then - echo "ERROR Please specify GLOBUS_LOCATION" >&2 - exit 1 -fi if test "x$GPT_LOCATION" = "x"; then - GPT_LOCATION=$GLOBUS_LOCATION - export GPT_LOCATION + GPT_LOCATION=/usr fi #extract whether the package is built with flavors from the src metadata @@ -24,7 +17,8 @@ fi AC_ARG_WITH(flavor, - [ --with-flavor= Specify the globus build flavor or without-flavor for a flavor independent ], + AC_HELP_STRING([--with-flavor=FLAVOR], + [Specify the globus build flavor or --without-flavor for a flavor independent package]), [ case $withval in @@ -41,7 +35,8 @@ echo "Warning: $withval ignored" >&2 else GLOBUS_FLAVOR_NAME=$withval - if test ! -f "$GLOBUS_LOCATION/etc/globus_core/flavor_$GLOBUS_FLAVOR_NAME.gpt"; then + if test ! -f "${GLOBUS_LOCATION:-/usr}/share/globus/flavors/flavor_$GLOBUS_FLAVOR_NAME.gpt" \ + -a ! -f "${GLOBUS_LOCATION:-/usr}/etc/globus_core/flavor_$GLOBUS_FLAVOR_NAME.gpt"; then echo "ERROR: Flavor $GLOBUS_FLAVOR_NAME has not been installed" >&2 exit 1 fi @@ -70,12 +65,23 @@ # get the environment scripts -if test "x$GLOBUS_FLAVOR_NAME" != "xnoflavor" ; then - . $GLOBUS_LOCATION/libexec/globus-build-env-$GLOBUS_FLAVOR_NAME.sh +if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-build-env-$GLOBUS_FLAVOR_NAME.sh ; then + . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-build-env-$GLOBUS_FLAVOR_NAME.sh +else + . ${GLOBUS_LOCATION:-/usr}/libexec/globus-build-env-$GLOBUS_FLAVOR_NAME.sh fi -prefix='$(GLOBUS_LOCATION)' -exec_prefix='$(GLOBUS_LOCATION)' +ac_default_prefix=${GLOBUS_LOCATION:-$ac_default_prefix} + +# doxygendir must have absolute path... +saveprefix=$prefix +if test x$prefix = "xNONE" ; then + prefix=$ac_default_prefix +fi +while echo "$doxygendir" | grep -q '\$' ; do + eval doxygendir=$doxygendir +done +prefix=$saveprefix AC_SUBST(CC) AC_SUBST(CPP) @@ -102,10 +108,17 @@ AC_SUBST(OBJEXT) AC_SUBST(EXEEXT) AC_SUBST(OBJECT_MODE) +AC_SUBST(setupdir) +AC_SUBST(testdir) +AC_SUBST(flavorincludedir) +AC_SUBST(pkgdir) +AC_SUBST(aclocaldir) +AC_SUBST(perlmoduledir) +AC_SUBST(doxygendir) define([AM_PROG_LIBTOOL],[ - LIBTOOL='$(SHELL) $(GLOBUS_LOCATION)/sbin/libtool-$(GLOBUS_FLAVOR_NAME)' + LIBTOOL='$(SHELL) ${sbindir}/libtool-$(GLOBUS_FLAVOR_NAME)' AC_SUBST(LIBTOOL) AC_SUBST(LN_S) ]) @@ -127,12 +140,13 @@ dnl GPT_MAJOR_VERSION and GPT_MINOR_VERSION provided by GPT_INIT AC_SUBST(GPT_MAJOR_VERSION) AC_SUBST(GPT_MINOR_VERSION) +AC_SUBST(GPT_AGE_VERSION) AC_SUBST(DIRT_TIMESTAMP) AC_SUBST(DIRT_BRANCH_ID) AC_ARG_ENABLE([programs], -[ --disable-programs Don't compile/link programs], + AC_HELP_STRING([--disable-programs], [Don't compile/link programs]), [case "${enableval}" in yes) ENABLE_PROGRAMS=true @@ -157,9 +171,7 @@ lac_INSURE=$INSURE AC_ARG_ENABLE(insure, - changequote(<<, >>)dnl - <<--disable-insure disable Insure++ >>, - changequote([, ])dnl + AC_HELP_STRING([--disable-insure], [disable Insure++]), [ if test "$enableval" = "yes"; then lac_INSURE="${INSURE-insure}" diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/bootstrap gt4.2.1-all-source-installer/source-trees/core/source/bootstrap --- gt4.2.1-all-source-installer.orig/source-trees/core/source/bootstrap 2004-08-24 17:36:59.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/core/source/bootstrap 2009-03-16 08:51:35.000000000 +0100 @@ -1,12 +1,5 @@ #! /bin/sh -# checking for the GLOBUS_LOCATION - -if test "x$GLOBUS_LOCATION" = "x"; then - echo "ERROR Please specify GLOBUS_LOCATION" >&2 - exit 1 -fi - error() { echo "" @@ -34,20 +27,23 @@ fi # test to see if GPT macros are in a seperate location -if test ! -f "$GLOBUS_LOCATION/share/globus_aclocal/gpt_autoconf_macros.m4"; then - if test "x$GPT_LOCATION" = "x"; then - echo "ERROR Globus Packaging Tools not found" >&2 - echo "ERROR either set GPT_LOCATION or install them in $GLOBUS_LOCATION" >&2 - exit 1 +if test ! -f "${GLOBUS_LOCATION:-/usr}/share/globus/aclocal/gpt_autoconf_macros.m4" \ + -a ! -f "${GLOBUS_LOCATION:-/usr}/share/globus_aclocal/gpt_autoconf_macros.m4"; then + if test -d "${GPT_LOCATION:-/usr}/share/globus/aclocal"; then + config="$config -I ${GPT_LOCATION:-/usr}/share/globus/aclocal" else - config="$config -I $GPT_LOCATION/share/globus_aclocal" + config="$config -I ${GPT_LOCATION:-/usr}/share/globus_aclocal" fi else - config="$config -I $GLOBUS_LOCATION/share/globus_aclocal" + if test -d "${GLOBUS_LOCATION:-/usr}/share/globus/aclocal"; then + config="$config -I ${GLOBUS_LOCATION:-/usr}/share/globus/aclocal" + else + config="$config -I ${GLOBUS_LOCATION:-/usr}/share/globus_aclocal" + fi fi if test "x$GPT_LOCATION" = "x"; then - GPT_LOCATION=$GLOBUS_LOCATION + GPT_LOCATION=/usr fi echo "running aclocal $config" diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/config/accompiler.m4 gt4.2.1-all-source-installer/source-trees/core/source/config/accompiler.m4 --- gt4.2.1-all-source-installer.orig/source-trees/core/source/config/accompiler.m4 2008-03-04 01:39:39.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/core/source/config/accompiler.m4 2009-03-16 08:52:12.000000000 +0100 @@ -69,31 +69,29 @@ AC_DEFUN([LAC_COMPILERS_ARGS], [ AC_ARG_WITH(threads, - [ --with-threads=TYPE build target with threads], + AC_HELP_STRING([--with-threads=TYPE], [build target with threads]), [lac_cv_threads_type="$withval"], [lac_cv_threads_type=${lac_cv_threads_type='no'}]) LAC_THREADS_ARGS AC_ARG_ENABLE(debug, - [ --enable-debug compile in debugging features], + AC_HELP_STRING([--enable-debug], [compile in debugging features]), [lac_cv_debug="$enableval"], [lac_cv_debug=${lac_cv_debug='no'}]) AC_ARG_ENABLE(64bit, - [ --enable-64bit build 64-bit objects (SGI Irix 6.x, HP HPUX 11.x, IA-64 only)], + AC_HELP_STRING([--enable-64bit], [build 64-bit objects (SGI Irix 6.x, HP HPUX 11.x, IA-64 only)]), [lac_cv_build_64bit="$enableval"], [lac_cv_build_64bit=${lac_cv_build_64bit='no'}]) AC_ARG_ENABLE(profiling, - [ --enable-profiling enable profile build (GCC only)], + AC_HELP_STRING([--enable-profiling], [enable profile build (GCC only)]), [lac_cv_build_profile="$enableval"], [lac_cv_build_profile=${lac_cv_build_profile='no'}]) AC_ARG_ENABLE(insure, - changequote(<<, >>)dnl - <<--enable-insure[=PATH] use Insure++ [default=insure]>>, - changequote([, ])dnl + AC_HELP_STRING([--enable-insure[[=PATH]]], [use Insure++ [[default=insure]]]), [ if test "$enableval" = "yes"; then lac_cv_INSURE="insure" @@ -171,10 +169,26 @@ dnl LAC_COMPILERS_SET_ALL_VARS(THREAD-TYPE) AC_DEFUN([LAC_COMPILERS_SET_ALL_VARS], [ +lac_includedir='$includedir' +while echo "$lac_includedir" | grep -q '\$' ; do + eval lac_includedir=$lac_includedir +done +lac_includedir=`echo $lac_includedir | sed s!^NONE!$ac_default_prefix!` +lac_flavorincludedir='$flavorincludedir' +while echo "$lac_flavorincludedir" | grep -q '\$' ; do + eval lac_flavorincludedir=$lac_flavorincludedir +done +lac_flavorincludedir=`echo $lac_flavorincludedir | sed s!^NONE!$ac_default_prefix!` +lac_libdir='$libdir' +while echo "$lac_libdir" | grep -q '\$' ; do + eval lac_libdir=$lac_libdir +done +lac_libdir=`echo $lac_libdir | sed s!^NONE!$ac_default_prefix!` + lac_CFLAGS="$CFLAGS " -lac_CPPFLAGS="$CPPFLAGS -I$GLOBUS_LOCATION/include -I$GLOBUS_LOCATION/include/$globus_cv_flavor" +lac_CPPFLAGS="$CPPFLAGS -I$lac_includedir -I$lac_flavorincludedir" lac_CXXFLAGS="$CXXFLAGS " -lac_LDFLAGS="$LDFLAGS -L$GLOBUS_LOCATION/lib" +lac_LDFLAGS="$LDFLAGS -L$lac_libdir" lac_LIBS="$LIBS " lac_F77FLAGS="$F77FLAGS " lac_F90FLAGS="$F90FLAGS " diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/config/acmp.m4 gt4.2.1-all-source-installer/source-trees/core/source/config/acmp.m4 --- gt4.2.1-all-source-installer.orig/source-trees/core/source/config/acmp.m4 2004-08-24 17:37:05.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/core/source/config/acmp.m4 2009-03-16 08:52:12.000000000 +0100 @@ -31,8 +31,7 @@ AC_DEFUN([LAC_MP_INC_ARGS], [ AC_ARG_WITH(mpi-includes, - [ --with-mpi-includes Specify include flags for MPI - (example --with-mpi-includes=-I/path/to/mpi/headers)], + AC_HELP_STRING([--with-mpi-includes], [Specify include flags for MPI (example --with-mpi-includes=-I/path/to/mpi/headers)]), [if test "$build_arg_mpi" != "yes" ; then AC_MSG_ERROR([you must specify --with-mpi[[=yes]] to use --with-mpi-includes]) exit 1 @@ -46,8 +45,7 @@ ]) AC_ARG_WITH(mpi-libs, - [ --with-mpi-libs Specify libs and LDFLAGS for MPI - (example --with-mpi-libs=\"-L/path/to/mpi/libs -lmpi\")], + AC_HELP_STRING([--with-mpi-libs], [Specify libs and LDFLAGS for MPI (example --with-mpi-libs="-L/path/to/mpi/libs -lmpi")]), [if test "$build_arg_mpi" != "yes" ; then AC_MSG_ERROR([you must specify --with-mpi[[=yes]] to use --with-mpi-libs]) exit 1 @@ -64,7 +62,7 @@ AC_DEFUN([LAC_MP_ARGS], [ AC_ARG_WITH(mpi, - [ --with-mpi include the MPI protocols], + AC_HELP_STRING([--with-mpi], [include the MPI protocols]), [if test "$withval" = "yes" ; then build_arg_mpi='yes' else diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/config/acsystem.m4 gt4.2.1-all-source-installer/source-trees/core/source/config/acsystem.m4 --- gt4.2.1-all-source-installer.orig/source-trees/core/source/config/acsystem.m4 2007-02-20 22:15:34.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/core/source/config/acsystem.m4 2009-03-16 08:51:47.000000000 +0100 @@ -254,6 +254,9 @@ AC_CHECK_FUNCS(geteuid) AC_CHECK_FUNCS(getpwnam) AC_CHECK_FUNCS(getpwuid) +AC_CHECK_FUNCS(vsnprintf) +AC_CHECK_FUNCS(snprintf) +AC_CHECK_FUNCS(strncasecmp) dnl used in RSL AC_FUNC_ALLOCA diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/config/acthreads.m4 gt4.2.1-all-source-installer/source-trees/core/source/config/acthreads.m4 --- gt4.2.1-all-source-installer.orig/source-trees/core/source/config/acthreads.m4 2006-01-17 23:17:49.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/core/source/config/acthreads.m4 2009-03-16 08:52:12.000000000 +0100 @@ -21,11 +21,11 @@ AC_BEFORE([$0], [LAC_THREADS]) AC_ARG_WITH(thread-library, - [ --with-thread-library=PATH path to thread library files], + AC_HELP_STRING([--with-thread-library=PATH], [path to thread library files]), [lac_thread_library_path="$withval"], [lac_thread_library_path=${lac_thread_library_path=''}]) AC_ARG_WITH(thread-includes, - [ --with-thread-includes=PATH path to thread include files], + AC_HELP_STRING([--with-thread-includes=PATH], [path to thread include files]), [lac_thread_include_path="$withval"], [lac_thread_include_path=${lac_thread_include_path=''}]) ]) diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/configure.in gt4.2.1-all-source-installer/source-trees/core/source/configure.in --- gt4.2.1-all-source-installer.orig/source-trees/core/source/configure.in 2005-07-28 21:38:23.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/core/source/configure.in 2009-03-16 08:52:40.000000000 +0100 @@ -2,20 +2,13 @@ AC_INIT(Makefile.am) AC_CONFIG_AUX_DIR(config) -# checking for the GLOBUS_LOCATION - -if test "x$GLOBUS_LOCATION" = "x"; then - echo "ERROR Please specify GLOBUS_LOCATION" >&2 - exit 1 -fi - if test "x$GPT_LOCATION" = "x"; then - GPT_LOCATION=$GLOBUS_LOCATION - export GPT_LOCATION + GPT_LOCATION=/usr fi -prefix='$(GLOBUS_LOCATION)' -exec_prefix='$(GLOBUS_LOCATION)' +ac_default_prefix=${GLOBUS_LOCATION:-$ac_default_prefix} + +AC_GNU_SOURCE # save CC and CFLAGS, so AC_PROG_CC can detect and use a compiler # up to the point where we want to pick a compiler based on the @@ -36,7 +29,7 @@ AC_ARG_WITH( flavor, - [ --with-flavor Globus flavor string], + AC_HELP_STRING([--with-flavor=FLAVOR], [Globus flavor string]), [globus_cv_flavor="$withval"], [globus_cv_flavor="notset"]) @@ -46,6 +39,101 @@ -o "$globus_cv_flavor" = "yes" ; then AC_MSG_ERROR([A flavor description string must be specified!]) fi + +AC_ARG_WITH([setupdir], +AC_HELP_STRING([--with-setupdir=DIR], +[setup installation directory [[PREFIX/setup/globus]]]), +[ + if test x$withval = "xno" -o x$withval = "xyes" ; then + AC_MSG_ERROR([--with-setupdir requires an argument]) + fi + setupdir=$withval +], +[ + setupdir='${prefix}/setup/globus' +]) +AC_SUBST(setupdir) + +AC_ARG_WITH([testdir], +AC_HELP_STRING([--with-testdir=DIR], +[test installation directory [[PREFIX/test/PACKAGE]]]), +[ + if test x$withval = "xno" -o x$withval = "xyes" ; then + AC_MSG_ERROR([--with-testdir requires an argument]) + fi + testdir=$withval +], +[ + testdir='${prefix}/test/${PACKAGE}' +]) +AC_SUBST(testdir) + +AC_ARG_WITH([flavorincludedir], +AC_HELP_STRING([--with-flavorincludedir=DIR], +[flavored header installation directory [[INCLUDEDIR/FLAVOR]]]), +[ + if test x$withval = "xno" -o x$withval = "xyes" ; then + AC_MSG_ERROR([--with-flavorincludedir requires an argument]) + fi + flavorincludedir=$withval +], +[ + flavorincludedir='${includedir}/${GLOBUS_FLAVOR_NAME}' +]) +AC_SUBST(flavorincludedir) + +AC_ARG_WITH([perlmoduledir], +AC_HELP_STRING([--with-perlmoduledir=DIR], +[perl module directory [[PREFIX/lib/perl]]]), +[ + if test x$withval = "xno" -o x$withval = "xyes" ; then + AC_MSG_ERROR([--with-perlmoduledir requires an argument]) + fi + perlmoduledir=$withval +], +[ + perlmoduledir='${prefix}/lib/perl' +]) +AC_SUBST(perlmoduledir) + +AC_ARG_WITH([doxygendir], +AC_HELP_STRING([--with-doxygendir=DIR], +[doxygen installation directory [[DATADIR/doxygen]]]), +[ + if test x$withval = "xno" -o x$withval = "xyes" ; then + AC_MSG_ERROR([--with-doxygendir requires an argument]) + fi + doxygendir=$withval +], +[ + doxygendir='${datadir}/doxygen' +]) +AC_SUBST(doxygendir) + +AC_ARG_WITH([newgpt], +AC_HELP_STRING([--with-newgpt], [Use installation paths from new GPT]), +[ + if test x$withval = "xno" ; then + aclocaldir='${datadir}/globus_aclocal' + pkgdir='${sysconfdir}/globus_packages/${PACKAGE}' + flavordir='${sysconfdir}/globus_core' + else + aclocaldir='${datadir}/globus/aclocal' + pkgdir='${datadir}/globus/packages/${PACKAGE}' + flavordir='${datadir}/globus/flavors' + fi +], +[ + aclocaldir='${datadir}/globus_aclocal' + pkgdir='${sysconfdir}/globus_packages/${PACKAGE}' + flavordir='${sysconfdir}/globus_core' +]) +AC_SUBST(aclocaldir) +AC_SUBST(pkgdir) +AC_SUBST(flavordir) + +GLOBUS_FLAVOR_NAME=$globus_cv_flavor +AC_SUBST(GLOBUS_FLAVOR_NAME) LAC_COMPILERS LAC_TARGET_ARCH @@ -62,9 +150,6 @@ AC_DEFINE(BUILD_STATIC_ONLY) fi -GLOBUS_FLAVOR_NAME=$globus_cv_flavor -AC_SUBST(GLOBUS_FLAVOR_NAME) - dnl define FILELIST_FILE variable FILELIST_FILE=`pwd`; FILELIST_FILE="$FILELIST_FILE/pkgdata/master.filelist" @@ -76,9 +161,9 @@ fi -AC_ARG_ENABLE(internal-doc, -[ --enable-am-depends Enable automake dependency caching. - (Requires gcc, developers only)], +AC_ARG_ENABLE(am-depends, +AC_HELP_STRING([--enable-am-depends], +[Enable automake dependency caching. (Requires gcc, developers only)]), [ if test "X$GCC" = "Xyes"; then AUTOMAKE_OPTS="" @@ -94,7 +179,6 @@ AM_PROG_LIBTOOL -mv ./libtool libtool-$GLOBUS_FLAVOR_NAME dnl dnl Output selected thread package @@ -125,7 +209,8 @@ fi AC_OUTPUT(Makefile - scripts/globus-build-env-$GLOBUS_FLAVOR_NAME.sh:scripts/globus-build-env.sh.in + scripts/globus-build-env-$GLOBUS_FLAVOR_NAME.sh:scripts/globus-build-env.sh.in + scripts/globus-build-env-noflavor.sh scripts/Makefile aclocal/Makefile aclocal/automake_config @@ -136,3 +221,4 @@ pkgdata/build-parameters ) +mv ./libtool libtool-$GLOBUS_FLAVOR_NAME diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/doxygen/Doxyfile.include gt4.2.1-all-source-installer/source-trees/core/source/doxygen/Doxyfile.include --- gt4.2.1-all-source-installer.orig/source-trees/core/source/doxygen/Doxyfile.include 2004-03-14 07:29:15.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/core/source/doxygen/Doxyfile.include 2009-03-16 08:52:30.000000000 +0100 @@ -451,7 +451,7 @@ # by the printer. Possible values are: a4, a4wide, letter, legal and # executive. If left blank a4wide will be used. -PAPER_TYPE = letter +PAPER_TYPE = # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX # packages that should be included in the LaTeX output. @@ -477,7 +477,7 @@ # plain latex in the generated Makefile. Set this option to YES to get a # higher quality PDF documentation. -USE_PDFLATEX = NO +USE_PDFLATEX = YES # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. # command to the generated LaTeX files. This will instruct LaTeX to keep @@ -547,7 +547,7 @@ # only source the real man page, but without them the man command # would be unable to find the correct page. The default is NO. -MAN_LINKS = YES +MAN_LINKS = NO #--------------------------------------------------------------------------- # Configuration options related to the preprocessor diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/doxygen/Doxyfile-internal.include gt4.2.1-all-source-installer/source-trees/core/source/doxygen/Doxyfile-internal.include --- gt4.2.1-all-source-installer.orig/source-trees/core/source/doxygen/Doxyfile-internal.include 2004-03-14 07:29:15.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/core/source/doxygen/Doxyfile-internal.include 2009-03-16 08:52:30.000000000 +0100 @@ -436,7 +436,7 @@ # by the printer. Possible values are: a4, a4wide, letter, legal and # executive. If left blank a4wide will be used. -PAPER_TYPE = letter +PAPER_TYPE = # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX # packages that should be included in the LaTeX output. diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/doxygen/globus-build-doxygen-dependencies gt4.2.1-all-source-installer/source-trees/core/source/doxygen/globus-build-doxygen-dependencies --- gt4.2.1-all-source-installer.orig/source-trees/core/source/doxygen/globus-build-doxygen-dependencies 2006-01-19 06:54:28.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/core/source/doxygen/globus-build-doxygen-dependencies 2009-03-16 08:51:35.000000000 +0100 @@ -32,8 +32,7 @@ if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; - + $gpath = "/usr"; } if (!defined($gpath)) @@ -49,6 +48,12 @@ use Cwd; my $prefix = $ENV{GLOBUS_LOCATION}; + +if (!defined($prefix)) +{ + $prefix = "/usr"; +} + my $srcfile; my $help; my $debug = 0; @@ -105,7 +110,8 @@ { print STDERR "Found dependency $name\n" if $debug; $dependencies{$name} = 1; - $new_pkgfile = + $new_pkgfile = -f "$prefix/share/globus/packages/$name/pkg_data_noflavor_doc.gpt" ? + "$prefix/share/globus/packages/$name/pkg_data_noflavor_doc.gpt" : "$prefix/etc/globus_packages/$name/pkg_data_noflavor_doc.gpt"; foreach(process_package($new_pkgfile, $name)) { diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/doxygen/globus_head.html gt4.2.1-all-source-installer/source-trees/core/source/doxygen/globus_head.html --- gt4.2.1-all-source-installer.orig/source-trees/core/source/doxygen/globus_head.html 2001-04-17 20:51:29.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/core/source/doxygen/globus_head.html 2009-03-16 08:52:30.000000000 +0100 @@ -1,9 +1,11 @@ + Globus Reference Manual - + + diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/doxygen/globus-update-doxygen-index gt4.2.1-all-source-installer/source-trees/core/source/doxygen/globus-update-doxygen-index --- gt4.2.1-all-source-installer.orig/source-trees/core/source/doxygen/globus-update-doxygen-index 2006-09-22 06:48:05.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/core/source/doxygen/globus-update-doxygen-index 2009-03-16 08:51:35.000000000 +0100 @@ -43,11 +43,14 @@ $gpt_path = $ENV{GPT_LOCATION}; if (!defined($gpt_path)) { - $gpt_path = $ENV{GLOBUS_LOCATION}; - + $gpt_path = "/usr"; } $globus_path = $ENV{GLOBUS_LOCATION}; + if (!defined($globus_path)) + { + $globus_path = "/usr"; + } if (!defined($gpt_path) || !defined($globus_path)) { @@ -95,7 +98,7 @@ print "Sorting into functional groups\n"; foreach (keys %pkgs) { my $package_factory = new Grid::GPT::PackageFactory(); - my @package_files = glob("$globus_path/etc/globus_packages/$_/pkg_data*.gpt"); + my @package_files = glob("$globus_path/{share/globus/packages,etc/globus_packages}/$_/pkg_data*.gpt"); my $package_file = $package_files[0]; if ($package_file eq '') { diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/doxygen/Makefile.am gt4.2.1-all-source-installer/source-trees/core/source/doxygen/Makefile.am --- gt4.2.1-all-source-installer.orig/source-trees/core/source/doxygen/Makefile.am 2005-12-07 10:37:42.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/core/source/doxygen/Makefile.am 2009-03-16 08:52:30.000000000 +0100 @@ -2,10 +2,8 @@ doxygen_DATA = Doxyfile-internal.include \ Doxyfile.include \ - globus.css \ globus_foot.html \ - globus_head.html \ - globus_head.tex + globus_head.html sbin_SCRIPTS = \ globus-build-doxygen-dependencies \ diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/globus_config.h.in gt4.2.1-all-source-installer/source-trees/core/source/globus_config.h.in --- gt4.2.1-all-source-installer.orig/source-trees/core/source/globus_config.h.in 2007-02-20 22:15:34.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/core/source/globus_config.h.in 2009-03-16 08:51:54.000000000 +0100 @@ -14,6 +14,10 @@ * limitations under the License. */ +#ifndef _GNU_SOURCE +#undef _GNU_SOURCE +#endif + #undef HAVE_EXTERNALTHREADS #undef HAVE_PTHREAD #undef HAVE_PTHREAD_DRAFT_10 diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/pkgdata/Makefile.am gt4.2.1-all-source-installer/source-trees/core/source/pkgdata/Makefile.am --- gt4.2.1-all-source-installer.orig/source-trees/core/source/pkgdata/Makefile.am 2006-01-12 18:12:52.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/core/source/pkgdata/Makefile.am 2009-03-16 08:52:34.000000000 +0100 @@ -1,6 +1,6 @@ include $(top_srcdir)/aclocal/automake_targets -flavordir = $(GLOBUS_LOCATION)/etc/$(PACKAGE) +flavordir = @flavordir@ FILELIST_FILES = noflavor_data.filelist \ $(GLOBUS_FLAVOR_NAME)_dev.filelist \ @@ -44,12 +44,12 @@ install-pkgDATA: $(pkg_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgdir)" || $(mkdir_p) "$(DESTDIR)$(pkgdir)"; + test -z "$(pkgdir)" || $(mkinstalldirs) "$(DESTDIR)$(pkgdir)"; @list='$(pkg_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(pkgDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdir)/$$f'"; \ - $(pkgDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdir)/$$f"; \ + echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pkgdir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdir)/$$f"; \ done || true diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/scripts/globus-bootstrap.sh gt4.2.1-all-source-installer/source-trees/core/source/scripts/globus-bootstrap.sh --- gt4.2.1-all-source-installer.orig/source-trees/core/source/scripts/globus-bootstrap.sh 2006-01-19 06:54:29.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/core/source/scripts/globus-bootstrap.sh 2009-03-16 08:52:06.000000000 +0100 @@ -1,4 +1,4 @@ - +#!/bin/sh # # Copyright 1999-2006 University of Chicago @@ -27,7 +27,11 @@ rm ${file} fi echo "installing ${file} link" - ln -s $GLOBUS_LOCATION/share/globus_aclocal/${file} ${file} + if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/aclocal/${file} ; then + ln -s ${GLOBUS_LOCATION:-/usr}/share/globus/aclocal/${file} ${file} + else + ln -s ${GLOBUS_LOCATION:-/usr}/share/globus_aclocal/${file} ${file} + fi fi done @@ -38,23 +42,36 @@ do if test ! -h "doxygen/$file" ; then echo "installing doxygen/$file link" - ln -s $GLOBUS_LOCATION/share/globus_aclocal/$file doxygen/$file + if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/aclocal/$file ; then + ln -s ${GLOBUS_LOCATION:-/usr}/share/globus/aclocal/$file doxygen/$file + else + ln -s ${GLOBUS_LOCATION:-/usr}/share/globus_aclocal/$file doxygen/$file + fi fi done if test ! -h doxygen/Makefile.am ; then echo "installing Makefile.am link in doxygen" - ln -s $GLOBUS_LOCATION/share/globus_aclocal/doxygen_Makefile.am \ - doxygen/Makefile.am + if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/aclocal/doxygen_Makefile.am ; then + ln -s ${GLOBUS_LOCATION:-/usr}/share/globus/aclocal/doxygen_Makefile.am \ + doxygen/Makefile.am + else + ln -s ${GLOBUS_LOCATION:-/usr}/share/globus_aclocal/doxygen_Makefile.am \ + doxygen/Makefile.am + fi fi fi if test "x$GPT_LOCATION" = "x"; then - GPT_LOCATION=$GLOBUS_LOCATION + GPT_LOCATION=/usr fi -. ${GPT_LOCATION}/libexec/gpt-bootstrap.sh +if test -f ${GPT_LOCATION}/share/globus/gpt-bootstrap.sh ; then + . ${GPT_LOCATION}/share/globus/gpt-bootstrap.sh +else + . ${GPT_LOCATION}/libexec/gpt-bootstrap.sh +fi # update stamp.h.in diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/scripts/globus-build-env-noflavor.sh.in gt4.2.1-all-source-installer/source-trees/core/source/scripts/globus-build-env-noflavor.sh.in --- gt4.2.1-all-source-installer.orig/source-trees/core/source/scripts/globus-build-env-noflavor.sh.in 1970-01-01 01:00:00.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/core/source/scripts/globus-build-env-noflavor.sh.in 2009-03-16 08:49:05.000000000 +0100 @@ -0,0 +1,9 @@ +libexecdir='@libexecdir@' +setupdir='@setupdir@' +testdir='@testdir@' +includedir='@includedir@' +flavorincludedir='@flavorincludedir@' +pkgdir='@pkgdir@' +aclocaldir='@aclocaldir@' +perlmoduledir='@perlmoduledir@' +doxygendir='@doxygendir@' diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/scripts/globus-build-env.sh.in gt4.2.1-all-source-installer/source-trees/core/source/scripts/globus-build-env.sh.in --- gt4.2.1-all-source-installer.orig/source-trees/core/source/scripts/globus-build-env.sh.in 2006-01-19 06:54:29.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/core/source/scripts/globus-build-env.sh.in 2009-03-16 08:49:05.000000000 +0100 @@ -61,3 +61,13 @@ GLOBUS_THREADS="@GLOBUS_THREADS@" GLOBUS_HOST="@GLOBUS_HOST@" GLOBUS_DEBUG="@GLOBUS_DEBUG@" + +libexecdir='@libexecdir@' +setupdir='@setupdir@' +testdir='@testdir@' +includedir='@includedir@' +flavorincludedir='@flavorincludedir@' +pkgdir='@pkgdir@' +aclocaldir='@aclocaldir@' +perlmoduledir='@perlmoduledir@' +doxygendir='@doxygendir@' diff -Nur gt4.2.1-all-source-installer.orig/source-trees/core/source/scripts/Makefile.am gt4.2.1-all-source-installer/source-trees/core/source/scripts/Makefile.am --- gt4.2.1-all-source-installer.orig/source-trees/core/source/scripts/Makefile.am 2002-09-24 23:34:09.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/core/source/scripts/Makefile.am 2009-03-16 08:49:05.000000000 +0100 @@ -1,8 +1,10 @@ include $(top_srcdir)/aclocal/automake_targets libexec_SCRIPTS = \ globus-build-env-$(GLOBUS_FLAVOR_NAME).sh \ + globus-build-env-noflavor.sh \ globus-bootstrap.sh EXTRA_DIST = \ globus-build-env.sh.in \ + globus-build-env-noflavor.sh.in \ globus-bootstrap.sh diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gass/copy/source/globus_gass_copy.c gt4.2.1-all-source-installer/source-trees/gass/copy/source/globus_gass_copy.c --- gt4.2.1-all-source-installer.orig/source-trees/gass/copy/source/globus_gass_copy.c 2008-03-12 20:01:06.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gass/copy/source/globus_gass_copy.c 2009-03-16 09:06:44.000000000 +0100 @@ -903,7 +903,7 @@ * * @param attr * A globus_gass_copy attribute structure - * @param io_attr + * @param gass_attr * The http/https attributes to be used * * @return diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gass/transfer/source/library/globus_gass_transfer_client.c gt4.2.1-all-source-installer/source-trees/gass/transfer/source/library/globus_gass_transfer_client.c --- gt4.2.1-all-source-installer.orig/source-trees/gass/transfer/source/library/globus_gass_transfer_client.c 2006-01-19 06:54:50.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gass/transfer/source/library/globus_gass_transfer_client.c 2009-03-16 09:06:24.000000000 +0100 @@ -533,11 +533,6 @@ * The length of the data to append to the url, if known. If this * parameter is set to @a GLOBUS_GASS_LENGTH_UNKNOWN, then the append * may fail if the protocol does not support arbitrarily-length files. - * @param callback - * Function to call once the URL has been accepted, referred, or - * denied by the server. - * @param user_arg - * User-supplied argument to the callback function. * * @retval GLOBUS_SUCCESS * The put was successfully initiated. diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gass/transfer/source/library/globus_gass_transfer_proto.c gt4.2.1-all-source-installer/source-trees/gass/transfer/source/library/globus_gass_transfer_proto.c --- gt4.2.1-all-source-installer.orig/source-trees/gass/transfer/source/library/globus_gass_transfer_proto.c 2006-01-19 06:54:50.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gass/transfer/source/library/globus_gass_transfer_proto.c 2009-03-16 09:06:24.000000000 +0100 @@ -151,7 +151,7 @@ * has decided that a new request can be accepted on this particular listener. * It must only be called after the GASS Transfer Library has called the * @link globus_gass_transfer_listener_proto_t::listen listen function @endlink - * in a @link #globus_gass_transfer_listener_proto_t protocol module-specific + * in a #globus_gass_transfer_listener_proto_t protocol module-specific * listener structure. * * @param listener diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gass/transfer/source/library/globus_gass_transfer_request.c gt4.2.1-all-source-installer/source-trees/gass/transfer/source/library/globus_gass_transfer_request.c --- gt4.2.1-all-source-installer.orig/source-trees/gass/transfer/source/library/globus_gass_transfer_request.c 2006-01-19 06:54:50.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gass/transfer/source/library/globus_gass_transfer_request.c 2009-03-16 09:06:24.000000000 +0100 @@ -627,9 +627,9 @@ * * @param request * The request to destroy. - * @param GLOBUS_SUCCESS + * @retval GLOBUS_SUCCESS * The request handle reference was successfully destroyed. - * @param GLOBUS_GASS_TRANSFER_ERROR_INVALID_USE + * @retval GLOBUS_GASS_TRANSFER_ERROR_INVALID_USE * Either an invalid request handle or one which is actively being * used was passed to this function as the @a request parameter. */ diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gass/transfer/source/library/globus_gass_transfer_server.c gt4.2.1-all-source-installer/source-trees/gass/transfer/source/library/globus_gass_transfer_server.c --- gt4.2.1-all-source-installer.orig/source-trees/gass/transfer/source/library/globus_gass_transfer_server.c 2006-01-19 06:54:50.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gass/transfer/source/library/globus_gass_transfer_server.c 2009-03-16 09:06:24.000000000 +0100 @@ -302,6 +302,8 @@ * @param request * A pointer to a new request handle. This request handle will * be initialized when the callback function is invoked. + * @param attr + * Request attributes. * @param listener * The listener handle to register for the new request. * @param callback diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gridftp/client/source/globus_ftp_client_attr.c gt4.2.1-all-source-installer/source-trees/gridftp/client/source/globus_ftp_client_attr.c --- gt4.2.1-all-source-installer.orig/source-trees/gridftp/client/source/globus_ftp_client_attr.c 2008-04-04 03:51:47.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gridftp/client/source/globus_ftp_client_attr.c 2009-03-16 09:05:26.000000000 +0100 @@ -359,7 +359,7 @@ * * @param attr * Attribute to modify - * @param gridftp + * @param gridftp2 * Set to GLOBUS_TRUE to enable GridFTP2 support. * Default of GLOBUS_FALSE specifies that GridFTP is disabled. */ @@ -1841,7 +1841,7 @@ * * @param attr * The attribute set to query or modify. - * @param buffer + * @param tcp_buffer * The value of tcp_buffer attribute. * * @see #globus_gsiftp_control_tcpbuffer_t @@ -1939,7 +1939,7 @@ * * @param attr * The attribute set to query or modify. - * @param buffer + * @param type * The value of type attribute. * * @see #globus_ftp_control_type_t @@ -2035,7 +2035,7 @@ * * @param attr * The attribute set to query or modify. - * @param layout + * @param mode * The value of mode attribute * * @see #globus_ftp_control_mode_t, @@ -2124,7 +2124,9 @@ return globus_error_put(err); } /* globus_ftp_client_operationattr_get_mode() */ +/* @} */ +/* @{ */ /** * Set/Get whether or not list data will use the current data mode * @ingroup globus_ftp_client_operationattr diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gridftp/client/source/globus_ftp_client_data.c gt4.2.1-all-source-installer/source-trees/gridftp/client/source/globus_ftp_client_data.c --- gt4.2.1-all-source-installer.orig/source-trees/gridftp/client/source/globus_ftp_client_data.c 2008-04-04 03:51:47.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gridftp/client/source/globus_ftp_client_data.c 2009-03-16 09:05:26.000000000 +0100 @@ -330,6 +330,7 @@ * mode, the data does not need to be sent in order. In stream * mode (the default), data must be sent in sequential * order. The behavior is undefined if multiple writes overlap. + * @param eof * @param callback * The function to be called once the data has been written. * @param callback_arg diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gridftp/client/source/globus_ftp_client_debug_plugin.c gt4.2.1-all-source-installer/source-trees/gridftp/client/source/globus_ftp_client_debug_plugin.c --- gt4.2.1-all-source-installer.orig/source-trees/gridftp/client/source/globus_ftp_client_debug_plugin.c 2007-06-01 19:23:06.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gridftp/client/source/globus_ftp_client_debug_plugin.c 2009-03-16 09:05:31.000000000 +0100 @@ -1199,6 +1199,8 @@ * A pointer to an uninitialized plugin. The plugin will be * configured as a debugging plugin, with the default of sending * debugging messages to stderr. + * @param stream + * @param text * * @return This function returns an error if * - plugin is null @@ -1329,7 +1331,7 @@ GLOBUS_L_FTP_CLIENT_DEBUG_PLUGIN_RETURN(plugin); result = globus_ftp_client_plugin_get_plugin_specific(plugin, - (void **) &d); + (void **) (void *) &d); if(result != GLOBUS_SUCCESS) { return result; diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gridftp/client/source/globus_ftp_client_perf_plugin.c gt4.2.1-all-source-installer/source-trees/gridftp/client/source/globus_ftp_client_perf_plugin.c --- gt4.2.1-all-source-installer.orig/source-trees/gridftp/client/source/globus_ftp_client_perf_plugin.c 2006-01-19 06:54:53.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gridftp/client/source/globus_ftp_client_perf_plugin.c 2009-03-16 09:05:31.000000000 +0100 @@ -720,7 +720,7 @@ result = globus_ftp_client_plugin_get_plugin_specific( plugin, - (void **) &ps); + (void **) (void *) &ps); if(result != GLOBUS_SUCCESS) { @@ -767,7 +767,7 @@ result = globus_ftp_client_plugin_get_plugin_specific( plugin, - (void **) &ps); + (void **) (void *) &ps); if(result != GLOBUS_SUCCESS) { @@ -827,7 +827,7 @@ result = globus_ftp_client_plugin_get_plugin_specific( plugin, - (void **) &ps); + (void **) (void *) &ps); if(result != GLOBUS_SUCCESS) { diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gridftp/client/source/globus_ftp_client_plugin.c gt4.2.1-all-source-installer/source-trees/gridftp/client/source/globus_ftp_client_plugin.c --- gt4.2.1-all-source-installer.orig/source-trees/gridftp/client/source/globus_ftp_client_plugin.c 2006-10-14 09:21:56.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gridftp/client/source/globus_ftp_client_plugin.c 2009-03-16 09:05:26.000000000 +0100 @@ -81,12 +81,12 @@ * * @param handle * The handle which is associated with the list. - * @param source_url + * @param url * The destination URL of the transfer. This may be different than * the original list's URL, if the plugin decides to redirect to * another FTP server due to performance or reliability * problems with the original URL. - * @param source_attr + * @param attr * The attributes to use for the new transfer. This may be a * modified version of the original list's attribute set. * @param when @@ -143,12 +143,12 @@ * * @param handle * The handle which is associated with the list. - * @param source_url + * @param url * The destination URL of the transfer. This may be different than * the original list's URL, if the plugin decides to redirect to * another FTP server due to performance or reliability * problems with the original URL. - * @param source_attr + * @param attr * The attributes to use for the new transfer. This may be a * modified version of the original list's attribute set. * @param when @@ -206,12 +206,12 @@ * * @param handle * The handle which is associated with the list. - * @param source_url + * @param url * The destination URL of the transfer. This may be different than * the original list's URL, if the plugin decides to redirect to * another FTP server due to performance or reliability * problems with the original URL. - * @param source_attr + * @param attr * The attributes to use for the new transfer. This may be a * modified version of the original list's attribute set. * @param when @@ -268,12 +268,12 @@ * * @param handle * The handle which is associated with the list. - * @param source_url + * @param url * The destination URL of the transfer. This may be different than * the original list's URL, if the plugin decides to redirect to * another FTP server due to performance or reliability * problems with the original URL. - * @param source_attr + * @param attr * The attributes to use for the new transfer. This may be a * modified version of the original list's attribute set. * @param when @@ -330,12 +330,12 @@ * * @param handle * The handle which is associated with the list. - * @param source_url + * @param url * The destination URL of the transfer. This may be different than * the original list's URL, if the plugin decides to redirect to * another FTP server due to performance or reliability * problems with the original URL. - * @param source_attr + * @param attr * The attributes to use for the new transfer. This may be a * modified version of the original list's attribute set. * @param when @@ -537,12 +537,12 @@ * * @param handle * The handle which is associated with the delete. - * @param source_url + * @param url * The destination URL of the transfer. This may be different than * the original delete's URL, if the plugin decides to redirect to * another FTP server due to performance or reliability * problems with the original URL. - * @param source_attr + * @param attr * The attributes to use for the new transfer. This may be a * modified version of the original delete's attribute set. * @param when @@ -599,12 +599,12 @@ * * @param handle * The handle which is associated with the feat. - * @param source_url + * @param url * The destination URL of the transfer. This may be different than * the original feat's URL, if the plugin decides to redirect to * another FTP server due to performance or reliability * problems with the original URL. - * @param source_attr + * @param attr * The attributes to use for the new transfer. This may be a * modified version of the original feat's attribute set. * @param when @@ -661,12 +661,12 @@ * * @param handle * The handle which is associated with the mkdir. - * @param source_url + * @param url * The destination URL of the transfer. This may be different than * the original mkdir's URL, if the plugin decides to redirect to * another FTP server due to performance or reliability * problems with the original URL. - * @param source_attr + * @param attr * The attributes to use for the new transfer. This may be a * modified version of the original mkdir's attribute set. * @param when @@ -723,12 +723,12 @@ * * @param handle * The handle which is associated with the rmdir. - * @param source_url + * @param url * The destination URL of the transfer. This may be different than * the original rmdir's URL, if the plugin decides to redirect to * another FTP server due to performance or reliability * problems with the original URL. - * @param source_attr + * @param attr * The attributes to use for the new transfer. This may be a * modified version of the original rmdir's attribute set. * @param when @@ -1101,12 +1101,12 @@ * * @param handle * The handle which is associated with the operation. - * @param source_url + * @param url * The source URL of the size check. This may be different than * the original operations URL, if the plugin decides to redirect to * another FTP server due to performance or reliability * problems with the original URL. - * @param source_attr + * @param attr * The attributes to use for the new operation. This may be a * modified version of the original operations's attribute set. * @param when @@ -1161,12 +1161,12 @@ * * @param handle * The handle which is associated with the operation. - * @param source_url + * @param url * The source URL of the modification time check. This may be different * than the original operations URL, if the plugin decides to redirect * to another FTP server due to performance or reliability problems with * the original URL. - * @param source_attr + * @param attr * The attributes to use for the new operation. This may be a * modified version of the original operations's attribute set. * @param when diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gridftp/client/source/globus_ftp_client_restart_marker_plugin.c gt4.2.1-all-source-installer/source-trees/gridftp/client/source/globus_ftp_client_restart_marker_plugin.c --- gt4.2.1-all-source-installer.orig/source-trees/gridftp/client/source/globus_ftp_client_restart_marker_plugin.c 2006-01-19 06:54:53.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gridftp/client/source/globus_ftp_client_restart_marker_plugin.c 2009-03-16 09:05:31.000000000 +0100 @@ -722,7 +722,7 @@ result = globus_ftp_client_plugin_get_plugin_specific( plugin, - (void **) &ps); + (void **) (void *) &ps); if(result != GLOBUS_SUCCESS) { diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gridftp/client/source/globus_ftp_client_restart_plugin.c gt4.2.1-all-source-installer/source-trees/gridftp/client/source/globus_ftp_client_restart_plugin.c --- gt4.2.1-all-source-installer.orig/source-trees/gridftp/client/source/globus_ftp_client_restart_plugin.c 2008-09-18 10:52:41.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gridftp/client/source/globus_ftp_client_restart_plugin.c 2009-03-16 09:05:31.000000000 +0100 @@ -396,7 +396,7 @@ goto free_exit; } result = globus_ftp_client_plugin_get_plugin_specific(newguy, - (void **) &newd); + (void **) (void *) &newd); if(result != GLOBUS_SUCCESS) { goto destroy_exit; @@ -1234,7 +1234,7 @@ globus_result_t result; result = globus_ftp_client_plugin_get_plugin_specific( - plugin, (void **) &d); + plugin, (void **) (void *) &d); if(result != GLOBUS_SUCCESS) { return result; @@ -1455,7 +1455,7 @@ GLOBUS_L_FTP_CLIENT_RESTART_PLUGIN_RETURN(plugin); result = globus_ftp_client_plugin_get_plugin_specific(plugin, - (void **) &d); + (void **) (void *) &d); if(result != GLOBUS_SUCCESS) { return result; diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gridftp/client/source/globus_ftp_client_throughput_nl_plugin.c gt4.2.1-all-source-installer/source-trees/gridftp/client/source/globus_ftp_client_throughput_nl_plugin.c --- gt4.2.1-all-source-installer.orig/source-trees/gridftp/client/source/globus_ftp_client_throughput_nl_plugin.c 2006-01-19 06:54:53.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gridftp/client/source/globus_ftp_client_throughput_nl_plugin.c 2009-03-16 09:05:31.000000000 +0100 @@ -339,7 +339,7 @@ { globus_ftp_client_throughput_plugin_get_user_specific( plugin, - (void **) &info); + (void **) (void *) &info); info->destroy_handle = GLOBUS_TRUE; } else @@ -494,7 +494,7 @@ result = globus_ftp_client_throughput_plugin_get_user_specific( plugin, - (void **) &info); + (void **) (void *) &info); if(result != GLOBUS_SUCCESS) { @@ -526,6 +526,8 @@ * provides by using this function to set these callbacks. Note that * the callbacks are defined the same as in the throughput plugin * + * @param plugin + * * @param begin_cb * the callback to be called upon the start of a transfer * @@ -576,7 +578,7 @@ result = globus_ftp_client_throughput_plugin_get_user_specific( plugin, - (void **) &info); + (void **) (void *) &info); if(result != GLOBUS_SUCCESS) { diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gridftp/client/source/globus_ftp_client_throughput_plugin.c gt4.2.1-all-source-installer/source-trees/gridftp/client/source/globus_ftp_client_throughput_plugin.c --- gt4.2.1-all-source-installer.orig/source-trees/gridftp/client/source/globus_ftp_client_throughput_plugin.c 2006-01-19 06:54:53.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gridftp/client/source/globus_ftp_client_throughput_plugin.c 2009-03-16 09:05:31.000000000 +0100 @@ -635,7 +635,7 @@ result = globus_ftp_client_perf_plugin_get_user_specific( plugin, - (void **) &info); + (void **) (void *) &info); if(result != GLOBUS_SUCCESS) { @@ -682,7 +682,7 @@ result = globus_ftp_client_perf_plugin_get_user_specific( plugin, - (void **) &info); + (void **) (void *) &info); if(result != GLOBUS_SUCCESS) { @@ -749,7 +749,7 @@ result = globus_ftp_client_perf_plugin_get_user_specific( plugin, - (void **) &info); + (void **) (void *) &info); if(result != GLOBUS_SUCCESS) { diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gridftp/client/source/globus_ftp_client_transfer.c gt4.2.1-all-source-installer/source-trees/gridftp/client/source/globus_ftp_client_transfer.c --- gt4.2.1-all-source-installer.orig/source-trees/gridftp/client/source/globus_ftp_client_transfer.c 2008-10-02 05:46:48.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gridftp/client/source/globus_ftp_client_transfer.c 2009-03-16 09:05:26.000000000 +0100 @@ -2089,7 +2089,7 @@ * aborted, the complete_callback will be invoked with the final * status of the get. * - * @param u_handle + * @param handle * An FTP Client handle to use for the get operation. * @param url * The URL to download. The URL may be an ftp or gsiftp URL. @@ -2799,6 +2799,7 @@ * Attributes for this file transfer. * @param restart * Pointer to a restart marker. + * @param esto_alg_str * @param complete_callback * Callback to be invoked once the "put" is completed. * @param callback_arg @@ -3346,11 +3347,13 @@ * The URL to transfer. The URL may be an ftp or gsiftp URL. * @param source_attr * Attributes for the souce URL. + * @param eret_alg_str * @param dest_url * The destination URL for the transfer. The URL may be an ftp * or gsiftp URL. * @param dest_attr * Attributes for the destination URL. + * @param esto_alg_str * @param restart * Pointer to a restart marker. * @param complete_callback diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gridftp/control/source/globus_ftp_control_client.c gt4.2.1-all-source-installer/source-trees/gridftp/control/source/globus_ftp_control_client.c --- gt4.2.1-all-source-installer.orig/source-trees/gridftp/control/source/globus_ftp_control_client.c 2008-10-02 05:46:49.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gridftp/control/source/globus_ftp_control_client.c 2009-03-16 09:04:59.000000000 +0100 @@ -1799,7 +1799,7 @@ rc=globus_i_ftp_control_encode_command(&(handle->cc_handle), buf, - (char **) &encode_buf); + (char **) (void *) &encode_buf); globus_libc_free(buf); @@ -4678,7 +4678,7 @@ result=globus_i_ftp_control_encode_command( &handle->cc_handle, write_buf, - (char **) &element->write_buf); + (char **) (void *) &element->write_buf); } else { diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gridftp/control/source/globus_ftp_control_data.c gt4.2.1-all-source-installer/source-trees/gridftp/control/source/globus_ftp_control_data.c --- gt4.2.1-all-source-installer.orig/source-trees/gridftp/control/source/globus_ftp_control_data.c 2008-10-02 05:46:49.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gridftp/control/source/globus_ftp_control_data.c 2009-03-16 09:04:56.000000000 +0100 @@ -1000,6 +1000,13 @@ * @param handle * A pointer to a FTP control handle which is configured to * create an incoming data connection. + * + * @param callback + * This callback is called when the connection occurs. This + * parameter may be NULL. + * + * @param user_arg + * The user argument passed to the connect callback. */ globus_result_t globus_ftp_control_data_connect_read( @@ -1108,7 +1115,7 @@ * @param handle * A pointer to a FTP control handle which is configured to * create an outgoing data connection. - * @param interface + * @param interface_addr * */ globus_result_t @@ -1192,13 +1199,6 @@ * * @param user_arg * The user argument passed to the connect callback. - * - * @param enqueue_func - * The function used to break up data over the stripes. This - * parameter is ignored when in stream mode. - * - * @param enqueue_arg - * The user argument passed to the enqueue function. */ globus_result_t globus_ftp_control_data_connect_write( @@ -1804,7 +1804,7 @@ * store information about any channels added by this function. * @param num_channels * The number of additional channels to add. - * @param stripe + * @param stripe_ndx * A integer identifying the stripe to add channels too. In the * case of non-striped transfer this parameter will be ignored. */ @@ -1880,6 +1880,7 @@ * * @param array_size * The number of elements in count[]. + * @param eof_message * @param cb * The function to be called when the eof message has been called. * @param user_arg @@ -2143,7 +2144,7 @@ * update information about any channels removed by this function. * @param num_channels * The number of channels to remove. - * @param stripe + * @param stripe_ndx * A integer identifying the stripe to remove channels from. In the * case of non-striped transfer this parameter will be ignored. */ @@ -2253,7 +2254,7 @@ * determine the host corresponding to "stripe" and number of * channels corresponding to that host. * @param num_channels - * @param stripe + * @param stripe_ndx * A integer identifying the stripe for which to return the * number of channels. In the case of non-striped transfer this * parameter should be zero. @@ -2340,7 +2341,7 @@ * channels corresponding to that host. * @param num_channels * - * @param stripe + * @param stripe_ndx * A integer identifying the stripe for which to return the * number of channels. In the case of non-striped transfer this * parameter should be zero. @@ -3436,13 +3437,13 @@ /** - * Update the FTP control handle with the given socket buffer size + * Update the FTP control handle with the given socket buffer * information. * * @param handle * A pointer to the FTP control handle to be updated - * @param buffer_size - * Specifies the size of the socket buffer in bytes. + * @param tcp_buffer + * A pointer to the socket buffer. * */ globus_result_t @@ -3633,7 +3634,8 @@ * @param dcau * A parameter specifying the data channel authentication * mode. Possible values are No Authentication, Self - * Authentication and Subject-name authentication. */ + * Authentication and Subject-name authentication. + * @param delegated_credential_handle */ globus_result_t globus_ftp_control_local_dcau( globus_ftp_control_handle_t * handle, @@ -5414,6 +5416,8 @@ * user calls globus_ftp_control_release_data_info(). The callback * is passed all of the arguments passed to this function with the * exception of data_info. + * @param callback_arg + * User supplied argument to the callback function */ globus_result_t globus_ftp_control_create_data_info( @@ -5605,11 +5609,10 @@ * @param stripe_ndx * The index of the stripe on which the data will be sent. The index * of each stripe is determined by the call to local_spas or local_spor. - * @param data_info - * In order to use this function the user must have a valid pointer - * to a globus_ftp_control_data_write_info_t structure. The user should - * call globus_ftp_control_create_data_info() to populate a valid - * data_info structure. + * @param callback + * The function to be called once the data has been sent + * @param callback_arg + * User supplied argument to the callback function */ globus_result_t globus_ftp_control_data_write_stripe( diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gridftp/control/source/globus_ftp_control_server.c gt4.2.1-all-source-installer/source-trees/gridftp/control/source/globus_ftp_control_server.c --- gt4.2.1-all-source-installer.orig/source-trees/gridftp/control/source/globus_ftp_control_server.c 2008-10-02 05:46:49.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gridftp/control/source/globus_ftp_control_server.c 2009-03-16 09:04:59.000000000 +0100 @@ -792,7 +792,7 @@ * @param callback * The user callback that will be called when the server * structure is no longer listening. - * @param callback + * @param callback_arg * The user argument that is passed into callback. */ @@ -2681,7 +2681,7 @@ if(handle->cc_handle.auth_info.authenticated == GLOBUS_TRUE) { - rc=globus_i_ftp_control_encode_reply(buf,(char **) &encoded_buf, + rc=globus_i_ftp_control_encode_reply(buf,(char **) (void *) &encoded_buf, &(handle->cc_handle.auth_info)); globus_libc_free(buf); diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gridftp/control/source/globus_gridftp_protocol_extensions.doc gt4.2.1-all-source-installer/source-trees/gridftp/control/source/globus_gridftp_protocol_extensions.doc --- gt4.2.1-all-source-installer.orig/source-trees/gridftp/control/source/globus_gridftp_protocol_extensions.doc 2002-04-15 09:02:09.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gridftp/control/source/globus_gridftp_protocol_extensions.doc 2009-03-16 09:04:56.000000000 +0100 @@ -2,7 +2,7 @@ @anchor page_extensions @page extensions GridFTP: Protocol Extensions to FTP for the Grid -@subsection extensions_intro Introduction +@section extensions_intro Introduction

This section defines extensions to the FTP specification STD 9, RFC @@ -48,7 +48,7 @@

-@subsection term Terminology +@section term Terminology @par Parallel transfer From a single data server, splitting file data for transfer over multiple @@ -71,7 +71,7 @@ The protocol interpreter. The user and server sides of the protocol have distinct roles implemented in a user-PI and a server-PI. -@subsection Existing FTP Standards Used +@section Existing FTP Standards Used - RFC 959, @ref rfc959 "FILE TRANSFER PROTOCOL (FTP)", J. Postel, R. Reynolds (October 1985) @@ -135,7 +135,7 @@ - Restart of a stream mode transfer @anchor sec_SPAS -@subsection SPAS Striped Passive (SPAS) +@section SPAS Striped Passive (SPAS) This extension is used to establish a vector of data socket listeners for for a server with one or more stripes. This command MUST be used in conjunction with @@ -177,7 +177,7 @@ OPTS command defined. @anchor sec_SPOR -@subsection SPOR Striped Data Port (SPOR) +@section SPOR Striped Data Port (SPOR) This extension is to be used as a complement to the SPAS command to implement striped third-party transfers. This command MUST always be used in @@ -211,7 +211,7 @@ OPTS command defined. @anchor sec_ERET -@subsection ERET Extended Retrieve (ERET) +@section ERET Extended Retrieve (ERET) The extended retrieve extension is used to request that a retrieve be done with some additional processing on the server. This command an @@ -254,7 +254,7 @@

@anchor sec_ESTO -@subsection ESTO Extended Store (ESTO) +@section ESTO Extended Store (ESTO) The extended store extension is used to request that a store be done with some additional processing on the server. Arbitrary data processing algorithms may @@ -290,7 +290,7 @@

@anchor sec_SBUF -@subsection SBUF Set Buffer Size (SBUF) +@section SBUF Set Buffer Size (SBUF) This extension adds the capability of a client to set the TCP buffer size for subsequent data connections to a value. This replaces the @@ -323,7 +323,7 @@

@anchor sec_DCAU -@subsection DCAU Data Channel Authentication (DCAU) +@section DCAU Data Channel Authentication (DCAU) This extension provides a method for specifying the type of authentication to be performed on FTP data channels. This extension @@ -366,7 +366,7 @@ If the security handshake fails, the server should return the error response 432 (Data channel authentication failed). -@subsection mode_e Extended Block Mode +@section mode_e Extended Block Mode The striped and parallel data transfer methods described above require an extended transfer mode to support out-of-sequence data delivery, and partial data transmission per data connection. The extended block @@ -587,7 +587,7 @@ at the given timestamp. The meaning of the facts are - Timestamp - The time at which the server computed the performance - information. This is in seconds since the epoch ((00:00:00 UTC, January 1, + information. This is in seconds since the epoch (00:00:00 UTC, January 1, 1970). - Stripe Index - the index (0-number of stripes on the STOR side of the transfer) which this marker pertains to. @@ -605,7 +605,7 @@ 'Stripe Bytes Transferred' set to the total transfer size for that stripe. @anchor sec_OPTS -@subsection opts Options to RETR +@section opts Options to RETR The options described in this section provide a means to convey striping and transfer parallelism information to the server-DTP. For @@ -666,7 +666,7 @@ increase the number of parallel connections to per destination data node to at most this value. -@subsection refs References +@section refs References @anchor rfc959 [1] Postel, J. and Reynolds, J., " FTP Extensions", IETF Draft, May 2001. -@subsection appendix_i Appendix I: Implementation under GSI +@section appendix_i Appendix I: Implementation under GSI

There are several security components in this document which are extensions diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gridftp/control/source/pkgdata/pkg_data_src.gpt.in gt4.2.1-all-source-installer/source-trees/gridftp/control/source/pkgdata/pkg_data_src.gpt.in --- gt4.2.1-all-source-installer.orig/source-trees/gridftp/control/source/pkgdata/pkg_data_src.gpt.in 2008-09-18 21:46:09.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gridftp/control/source/pkgdata/pkg_data_src.gpt.in 2009-03-16 09:04:51.000000000 +0100 @@ -4,7 +4,7 @@ - GridFTP Client Library + GridFTP Client Control Library FileAccess diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/callback/source/library/Makefile.am gt4.2.1-all-source-installer/source-trees/gsi/callback/source/library/Makefile.am --- gt4.2.1-all-source-installer.orig/source-trees/gsi/callback/source/library/Makefile.am 2004-08-24 17:38:29.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gsi/callback/source/library/Makefile.am 2009-03-16 08:58:00.000000000 +0100 @@ -21,8 +21,7 @@ libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources) -libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LIBADD = @GPT_LIB_LINKS@ -lglobus_oldgaa_$(GLOBUS_FLAVOR_NAME) - -libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@ -L./oldgaa/ +libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LIBADD = ./oldgaa/libglobus_oldgaa_$(GLOBUS_FLAVOR_NAME).la @GPT_LIB_LINKS@ +libglobus_gsi_callback___GLOBUS_FLAVOR_NAME__la_LDFLAGS = @GPT_LDFLAGS@ include $(top_srcdir)/globus_automake_post diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/cert_utils/source/programs/grid-cert-info.in gt4.2.1-all-source-installer/source-trees/gsi/cert_utils/source/programs/grid-cert-info.in --- gt4.2.1-all-source-installer.orig/source-trees/gsi/cert_utils/source/programs/grid-cert-info.in 2007-12-03 18:13:04.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gsi/cert_utils/source/programs/grid-cert-info.in 2009-03-16 08:57:16.000000000 +0100 @@ -22,16 +22,16 @@ # Easily extract information from a user's cert. # -if test -z "${GLOBUS_LOCATION}"; then - echo "" - echo "ERROR: Please set GLOBUS_LOCATION to the Globus installation directory before" - echo "running this script" - echo "" +if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer; then + . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer +elif test -f ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer; then + . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer +else + echo "ERROR: Please set GLOBUS_LOCATION to the Globus installation directory before" 1>&2 + echo "running this script" 1>&2 exit 1 fi - -. ${GLOBUS_LOCATION}/libexec/globus-script-initializer -globus_source ${GLOBUS_LOCATION}/libexec/globus-sh-tools.sh +globus_source ${libexecdir}/globus-sh-tools.sh PROGRAM_NAME=`echo $0 | ${GLOBUS_SH_SED-sed} 's|.*/||g'` @@ -98,9 +98,16 @@ #SSL related needs -PATH=${GLOBUS_LOCATION}/bin:${PATH} -SSL_EXEC="${GLOBUS_LOCATION}/bin/openssl" - +if test -n "${GLOBUS_LOCATION}" -a -x ${bindir}/openssl; then + SSL_EXEC=${bindir}/openssl +else + SSL_EXEC="openssl" +fi + +if ! ${SSL_EXEC} version > /dev/null 2> /dev/null; then + echo "Unable to locate openssl binary in $bindir or PATH" 1>&2 + exit 1 +fi # DEFault Generated Files cert_format=x509 diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/cert_utils/source/programs/grid-cert-request.in gt4.2.1-all-source-installer/source-trees/gsi/cert_utils/source/programs/grid-cert-request.in --- gt4.2.1-all-source-installer.orig/source-trees/gsi/cert_utils/source/programs/grid-cert-request.in 2008-09-18 22:23:21.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gsi/cert_utils/source/programs/grid-cert-request.in 2009-03-16 08:57:16.000000000 +0100 @@ -39,16 +39,16 @@ -if test -z "${GLOBUS_LOCATION}"; then - echo "" - echo "ERROR: Please set GLOBUS_LOCATION to the Globus installation directory before" - echo "running this script" - echo "" +if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer; then + . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer +elif test -f ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer; then + . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer +else + echo "ERROR: Please set GLOBUS_LOCATION to the Globus installation directory before" 1>&2 + echo "running this script" 1>&2 exit 1 fi - -. ${GLOBUS_LOCATION}/libexec/globus-script-initializer -globus_source ${GLOBUS_LOCATION}/libexec/globus-sh-tools.sh +globus_source ${libexecdir}/globus-sh-tools.sh if [ ! -z "${GRID_SECURITY_DIR}" ] ; then if [ -r "${GRID_SECURITY_DIR}/globus-user-ssl.conf" ] && @@ -57,10 +57,13 @@ if test ! -z "${X509_CERT_DIR}" ; then trusted_certs_dir="${X509_CERT_DIR}" elif test "X`echo ${GRID_SECURITY_DIR}|sed 's/etc$//'|sed 's/\/$//'`" \ - = "X`echo ${GLOBUS_LOCATION}|sed 's/\/$//'`" ; then - trusted_certs_dir="${GLOBUS_LOCATION}/share/certificates" - else + = "X`echo ${GLOBUS_LOCATION:-/usr}|sed 's/\/$//'`" ; then + trusted_certs_dir="${GLOBUS_LOCATION:-/usr}/share/certificates" + elif test -d "${secconfdir}/certificates"; then trusted_certs_dir="${secconfdir}/certificates" + else + echo "ERROR: Cannot determine trusted certificate directory. Please set X509_CERT_DIR" 1>&2 + exit 1 fi fi elif [ -r "/etc/grid-security/globus-user-ssl.conf" ] && @@ -77,7 +80,7 @@ if test ! -z "${X509_CERT_DIR}" ; then trusted_certs_dir="${X509_CERT_DIR}" else - trusted_certs_dir="${GLOBUS_LOCATION}/share/certificates" + trusted_certs_dir="${GLOBUS_LOCATION:-/usr}/share/certificates" fi fi @@ -189,9 +192,9 @@ for cert in ${trusted_certs_dir}/*.0; do if test -r "${cert}" ; then eval "CA${index}=${cert}" - TEMP_SUBJECT=`openssl x509 -in ${cert} -noout -subject` + TEMP_SUBJECT=`${SSL_EXEC} x509 -in ${cert} -noout -subject` eval "CA_SUBJECT${index}=\"`echo ${TEMP_SUBJECT} | ${GLOBUS_SH_SED-sed} -e \"s|subject= ||\"`\"" - eval "CA_HASH${index}=`openssl x509 -in ${cert} -noout -hash`" + eval "CA_HASH${index}=`${SSL_EXEC} x509 -in ${cert} -noout -hash`" eval "echo \"$index) \${CA_HASH${index}} - \${CA_SUBJECT${index}}\"" index=`expr $index + 1` fi @@ -218,7 +221,7 @@ echo exit 1 fi - TEMP_SUBJECT=`openssl x509 -in ${trusted_certs_dir}/${CA_HASH}.0 -noout -subject` + TEMP_SUBJECT=`${SSL_EXEC} x509 -in ${trusted_certs_dir}/${CA_HASH}.0 -noout -subject` eval "CA_SUBJECT=\"`echo ${TEMP_SUBJECT} | ${GLOBUS_SH_SED-sed} -e \"s|subject= ||\"`\"" fi @@ -813,8 +816,17 @@ #SSL related variables -PATH=${GLOBUS_LOCATION}/bin:${PATH} -SSL_EXEC="${GLOBUS_LOCATION}/bin/openssl" +if test -n "${GLOBUS_LOCATION}" -a -x ${bindir}/openssl; then + SSL_EXEC=${bindir}/openssl +else + SSL_EXEC="openssl" +fi + +if ! ${SSL_EXEC} version > /dev/null 2> /dev/null; then + echo "Unable to locate openssl binary in $bindir or PATH" 1>&2 + exit 1 +fi + SSL_CONFIG="${secconfdir}/globus-user-ssl.conf" SSL_USER_CONFIG="${secconfdir}/globus-user-ssl.conf" SSL_HOST_CONFIG="${secconfdir}/globus-host-ssl.conf" diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/cert_utils/source/programs/grid-change-pass-phrase.in gt4.2.1-all-source-installer/source-trees/gsi/cert_utils/source/programs/grid-change-pass-phrase.in --- gt4.2.1-all-source-installer.orig/source-trees/gsi/cert_utils/source/programs/grid-change-pass-phrase.in 2006-01-19 06:55:37.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gsi/cert_utils/source/programs/grid-change-pass-phrase.in 2009-03-16 08:57:16.000000000 +0100 @@ -20,16 +20,16 @@ # Change the pass phrase on a user's private key # -if test -z "${GLOBUS_LOCATION}"; then - echo "" - echo "ERROR: Please set GLOBUS_LOCATION to the Globus installation directory before" - echo "running this script" - echo "" +if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer; then + . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer +elif test -f ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer; then + . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer +else + echo "ERROR: Please set GLOBUS_LOCATION to the Globus installation directory before" 1>&2 + echo "running this script" 1>&2 exit 1 fi - -. ${GLOBUS_LOCATION}/libexec/globus-script-initializer -globus_source ${GLOBUS_LOCATION}/libexec/globus-sh-tools.sh +globus_source ${libexecdir}/globus-sh-tools.sh PROGRAM_NAME=`echo $0 | ${GLOBUS_SH_SED-sed} -e 's|.*/||g'` @@ -69,12 +69,16 @@ globus_source $libexecdir/globus-args-parser-header $@ # SSL related need -PATH="${GLOBUS_LOCATION}/bin:${PATH}" -SSLEAY=${GLOBUS_LOCATION}/bin/ssleay -if [ -r ${GLOBUS_LOCATION}/bin/openssl ]; then - SSLEAY="${GLOBUS_LOCATION}/bin/openssl" +if test -n "${GLOBUS_LOCATION}" -a -x ${bindir}/openssl; then + SSLEAY=${bindir}/openssl; +else + SSLEAY="openssl" fi +if ! ${SSLEAY} version > /dev/null 2> /dev/null; then + echo "Unable to locate openssl binary in $bindir or PATH" 1>&2 + exit 1 +fi # DEFault Generated Files DEF_GLOBUS_DIR="${HOME}/.globus" diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/cert_utils/source/programs/grid-default-ca.in gt4.2.1-all-source-installer/source-trees/gsi/cert_utils/source/programs/grid-default-ca.in --- gt4.2.1-all-source-installer.orig/source-trees/gsi/cert_utils/source/programs/grid-default-ca.in 2007-08-07 16:08:16.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gsi/cert_utils/source/programs/grid-default-ca.in 2009-03-16 08:57:16.000000000 +0100 @@ -92,7 +92,7 @@ for x in "$@"; do if test -f "${x}/$DEFAULTCAHASH.0"; then - DEFAULT_SUBJECT=`openssl x509 -in ${x}/$DEFAULTCAHASH.0 -noout -subject | ${GLOBUS_SH_SED-sed} -e "s|subject= ||"` + DEFAULT_SUBJECT=`${SSL_EXEC} x509 -in ${x}/$DEFAULTCAHASH.0 -noout -subject | ${GLOBUS_SH_SED-sed} -e "s|subject= ||"` echo echo "The default CA is: $DEFAULT_SUBJECT" echo " Location: ${x}/$DEFAULTCAHASH.0" @@ -120,7 +120,7 @@ for cert in ${cert_hashes}; do if test -r "${cert}" ; then eval "CA${index}=${cert}" - TEMP_SUBJECT=`openssl x509 -in ${cert} -noout -subject` + TEMP_SUBJECT=`${SSL_EXEC} x509 -in ${cert} -noout -subject` eval "CA_SUBJECT${index}=\"`echo ${TEMP_SUBJECT} | ${GLOBUS_SH_SED-sed} -e \"s|subject= ||\"`\"" TEMP_HASH=`echo ${cert} | ${GLOBUS_SH_SED-sed} -e "s|.*/\([^/]*\)\.0|\1|"` eval "CA_HASH${index}=$TEMP_HASH" @@ -236,15 +236,16 @@ ############################################################ # main code section ############################################################ -if test -z "${GLOBUS_LOCATION}"; then - echo - echo "ERROR: Please set the GLOBUS_LOCATION to the Globus" - echo "installation directory before running this script." - echo + +if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer; then + . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer +elif test -f ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer; then + . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer +else + echo "ERROR: Please set GLOBUS_LOCATION to the Globus installation directory before" 1>&2 + echo "running this script" 1>&2 exit 1 fi - -. ${GLOBUS_LOCATION}/libexec/globus-script-initializer globus_source ${libexecdir}/globus-sh-tools.sh PROGRAM_NAME=`echo $0 | ${GLOBUS_SH_SED-sed} 's|.*/||g'` @@ -262,6 +263,17 @@ . $libexecdir/globus-args-parser-header +if test -n "${GLOBUS_LOCATION}" -a -x ${bindir}/openssl; then + SSL_EXEC=${bindir}/openssl +else + SSL_EXEC="openssl" +fi + +if ! ${SSL_EXEC} version > /dev/null 2> /dev/null; then + echo "Unable to locate openssl binary in $bindir or PATH" 1>&2 + exit 1 +fi + readCommandLine "$@" # reset positional parameters @@ -280,8 +292,8 @@ if test -d "/etc/grid-security/certificates/." ; then set -- "$@" "/etc/grid-security/certificates" fi -if test -d "${GLOBUS_LOCATION}/share/certificates/."; then - set -- "$@" "${GLOBUS_LOCATION}/share/certificates" +if test -d "${GLOBUS_LOCATION:-/usr}/share/certificates/."; then + set -- "$@" "${GLOBUS_LOCATION:-/usr}/share/certificates" fi found_ca=0 @@ -325,7 +337,7 @@ echo exit 1 fi - TMP_SUBJECT=`openssl x509 -in ${CA_CERT} -noout -subject` + TMP_SUBJECT=`${SSL_EXEC} x509 -in ${CA_CERT} -noout -subject` CA_SUBJECT=`echo ${TMP_SUBJECT} | ${GLOBUS_SH_SED-sed} -e "s|subject= ||"` fi @@ -344,7 +356,7 @@ echo "setting the default CA to: ${CA_SUBJECT}" echo -NEW_DEFAULT_CA_HASH=`openssl x509 -in ${CA_CERT} -noout -hash` +NEW_DEFAULT_CA_HASH=`${SSL_EXEC} x509 -in ${CA_CERT} -noout -hash` GRID_SECURITY_FILE=${CA_CERT_DIR}/grid-security.conf.${NEW_DEFAULT_CA_HASH} CA_SSL_HOST_CONFIG_FILE=${CA_CERT_DIR}/globus-host-ssl.conf.${NEW_DEFAULT_CA_HASH} diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/gssapi/source/configure.in gt4.2.1-all-source-installer/source-trees/gsi/gssapi/source/configure.in --- gt4.2.1-all-source-installer.orig/source-trees/gsi/gssapi/source/configure.in 2002-08-17 09:23:14.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gsi/gssapi/source/configure.in 2009-03-16 08:59:33.000000000 +0100 @@ -12,6 +12,17 @@ dnl Initialize the automake rules the last argument AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION, 0) +case "$GLOBUS_HOST" in +*-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu) + use_symbol_labels="yes" + ;; +*) + use_symbol_labels="no" + ;; +esac + +AM_CONDITIONAL(USE_SYMBOL_LABELS, test x$use_symbol_labels = "xyes") + GLOBUS_FINALIZE LAC_DOXYGEN(["../library"]) diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/gssapi/source/library/globus_i_gsi_gss_utils.c gt4.2.1-all-source-installer/source-trees/gsi/gssapi/source/library/globus_i_gsi_gss_utils.c --- gt4.2.1-all-source-installer.orig/source-trees/gsi/gssapi/source/library/globus_i_gsi_gss_utils.c 2008-09-24 22:26:34.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gsi/gssapi/source/library/globus_i_gsi_gss_utils.c 2009-03-16 08:59:51.000000000 +0100 @@ -2149,14 +2149,6 @@ goto exit; } - /* - * post-0.9.8 versions of the SSL library seem to move part of the - * cipher setup code into SSL_library_init(). Without this call, the - * SSL_CTX_new routine comaplains at not being able to initialize the - * list of ciphers. - */ - SSL_library_init(); - #if (OPENSSL_VERSION_NUMBER >= 0x00908000L) && !defined(OPENSSL_NO_COMP) /* * post-0.9.8 versions of OpenSSL include data compression. unfortunately, @@ -2475,7 +2467,7 @@ local_result = globus_gsi_callback_get_extension_oids( callback_data, - (void **) &extension_oids); + (void **) (void *) &extension_oids); if(local_result != GLOBUS_SUCCESS) { diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/gssapi/source/library/gssapi.h gt4.2.1-all-source-installer/source-trees/gsi/gssapi/source/library/gssapi.h --- gt4.2.1-all-source-installer.orig/source-trees/gsi/gssapi/source/library/gssapi.h 2006-01-19 06:56:09.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gsi/gssapi/source/library/gssapi.h 2009-03-16 08:59:40.000000000 +0100 @@ -265,7 +265,6 @@ * @deprecated We now accept proxies signed by limited proxies if * they are limited or independent. */ -/* @{ */ #define GSS_C_GLOBUS_ACCEPT_PROXY_SIGNED_BY_LIMITED_PROXY_FLAG 32768 /* @} */ diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/gssapi/source/library/gssapi.sym gt4.2.1-all-source-installer/source-trees/gsi/gssapi/source/library/gssapi.sym --- gt4.2.1-all-source-installer.orig/source-trees/gsi/gssapi/source/library/gssapi.sym 1970-01-01 01:00:00.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gsi/gssapi/source/library/gssapi.sym 2009-03-16 08:59:33.000000000 +0100 @@ -0,0 +1,69 @@ +globus_gssapi_gsi { + gss_acquire_cred; + gss_release_cred; + gss_init_sec_context; + gss_accept_sec_context; + gss_process_context_token; + gss_delete_sec_context; + gss_context_time; + gss_get_mic; + gss_verify_mic; + gss_wrap; + gss_unwrap; + gss_display_status; + gss_indicate_mechs; + gss_compare_name; + gss_display_name; + gss_import_name; + gss_export_name; + gss_release_name; + gss_release_buffer; + gss_release_oid_set; + gss_inquire_cred; + gss_inquire_context; + gss_wrap_size_limit; + gss_add_cred; + gss_inquire_cred_by_mech; + gss_export_sec_context; + gss_import_sec_context; + gss_create_empty_oid_set; + gss_add_oid_set_member; + gss_test_oid_set_member; + gss_inquire_names_for_mech; + gss_inquire_mechs_for_name; + gss_canonicalize_name; + gss_duplicate_name; + gss_sign; + gss_verify; + gss_seal; + gss_unseal; + gss_create_empty_buffer_set; + gss_add_buffer_set_member; + gss_release_buffer_set; + gss_import_cred; + gss_export_cred; + gss_init_delegation; + gss_accept_delegation; + gss_inquire_sec_context_by_oid; + gss_inquire_cred_by_oid; + gss_set_sec_context_option; + gss_set_group; + gss_get_group; + GSS_C_NT_USER_NAME; + GSS_C_NT_MACHINE_UID_NAME; + GSS_C_NT_STRING_UID_NAME; + GSS_C_NT_HOSTBASED_SERVICE_X; + GSS_C_NT_HOSTBASED_SERVICE; + GSS_C_NT_ANONYMOUS; + GSS_C_NT_EXPORT_NAME; + GSS_DISALLOW_ENCRYPTION; + GSS_PROTECTION_FAIL_ON_CONTEXT_EXPIRATION; + GSS_APPLICATION_WILL_HANDLE_EXTENSIONS; + gss_nt_user_name; + gss_nt_machine_uid_name; + gss_nt_string_uid_name; + gss_nt_service_name; + gss_ext_x509_cert_chain_oid; + gss_mech_globus_gssapi_openssl; + gss_proxycertinfo_extension; +}; diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/gssapi/source/library/inquire_cred.c gt4.2.1-all-source-installer/source-trees/gsi/gssapi/source/library/inquire_cred.c --- gt4.2.1-all-source-installer.orig/source-trees/gsi/gssapi/source/library/inquire_cred.c 2006-01-19 06:56:09.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gsi/gssapi/source/library/inquire_cred.c 2009-03-16 08:59:40.000000000 +0100 @@ -62,7 +62,7 @@ * @param name * @param lifetime * @param cred_usage - * @param machanisms + * @param mechanisms * * @return */ diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/gssapi/source/library/Makefile.am gt4.2.1-all-source-installer/source-trees/gsi/gssapi/source/library/Makefile.am --- gt4.2.1-all-source-installer.orig/source-trees/gsi/gssapi/source/library/Makefile.am 2008-09-18 22:23:21.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gsi/gssapi/source/library/Makefile.am 2009-03-16 08:59:33.000000000 +0100 @@ -51,6 +51,11 @@ flavorinclude_HEADERS = \ gssapi.h +if USE_SYMBOL_LABELS +LABELFLAGS = -Wl,--version-script,gssapi.sym +else +LABELFLAGS = +endif #AM_CFLAGS = -DDEBUG @@ -61,6 +66,9 @@ libglobus_gssapi_gsi___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources) libglobus_gssapi_gsi___GLOBUS_FLAVOR_NAME__la_LIBADD = $(GPT_LIB_LINKS) -libglobus_gssapi_gsi___GLOBUS_FLAVOR_NAME__la_LDFLAGS = $(GPT_LDFLAGS) +libglobus_gssapi_gsi___GLOBUS_FLAVOR_NAME__la_LDFLAGS = $(GPT_LDFLAGS) \ + $(LABELFLAGS) + +EXTRA_DIST = gssapi.sym include $(top_srcdir)/globus_automake_post diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/gssapi/source/library/wrap.c gt4.2.1-all-source-installer/source-trees/gsi/gssapi/source/library/wrap.c --- gt4.2.1-all-source-installer.orig/source-trees/gsi/gssapi/source/library/wrap.c 2008-01-14 16:58:52.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gsi/gssapi/source/library/wrap.c 2009-03-16 08:59:40.000000000 +0100 @@ -44,7 +44,7 @@ * * @param minor_status * @param context_handle - * @param conf_req_flags + * @param conf_req_flag * @param qop_req * @param req_output_size * @param max_input_size diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/gss_assist/source/accept.c gt4.2.1-all-source-installer/source-trees/gsi/gss_assist/source/accept.c --- gt4.2.1-all-source-installer.orig/source-trees/gsi/gss_assist/source/accept.c 2007-08-09 16:24:23.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gsi/gss_assist/source/accept.c 2009-03-16 09:00:54.000000000 +0100 @@ -45,13 +45,11 @@ * and token processing, using the supplied get_token and * send_token routines. * - * @param token_status - * assist routine get/send token status * @param minor_status * gssapi return code * @param context_handle * pointer to returned context. - * @param initiator_cred_handle + * @param cred_handle * the cred handle obtained by acquire_cred. * @param src_name_char * Pointer to char string repersentation of the @@ -68,9 +66,16 @@ * (Follwing are particular to this assist routine) * @param token_status * assist routine get/send token status + * @param delegated_cred_handle + * pointer to be set to the credential delegated by the client if + * delegation occurs during the security handshake + * @param gss_assist_get_token * a get token routine + * @param gss_assist_get_context * first arg for the get token routine + * @param gss_assist_send_token * a send token routine + * @param gss_assist_send_context * first arg for the send token routine * @return * GSS_S_COMPLETE on sucess @@ -276,13 +281,11 @@ * itself it passes in and out the read and written buffers and * the calling application is responsible for doing the I/O directly. * - * @param token_status - * assist routine get/send token status * @param minor_status * gssapi return code * @param context_handle * pointer to returned context. - * @param initiator_cred_handle + * @param cred_handle * the cred handle obtained by acquire_cred. * @param src_name_char * Pointer to char string repersentation of the @@ -293,11 +296,9 @@ * the connection is established. Maybe NULL if not wanted. * We will also use this to pass in flags to the globus * version of gssapi_ssleay - * * @param user_to_user_flag * Pointer to flag to be set if * the src_name is the same as our name. - * * @param input_buffer * pointer to a buffer received from peer. * @param input_buffer_len @@ -308,11 +309,13 @@ * non-NULL the contents of this block should be written * to the peer where they will be fed into the * gss_assist_init_sec_context_async() function. - * * @param output_buffer_lenp * pointer to an integer which will be filled * in with the length of the allocated output buffer * pointed to by *output_bufferp. + * @param delegated_cred_handle + * pointer to be set to the credential delegated by the client if + * delegation occurs during the security handshake * * @return * GSS_S_COMPLETE on successful completion when this function does not diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/gss_assist/source/display.c gt4.2.1-all-source-installer/source-trees/gsi/gss_assist/source/display.c --- gt4.2.1-all-source-installer.orig/source-trees/gsi/gss_assist/source/display.c 2007-08-09 16:24:23.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gsi/gss_assist/source/display.c 2009-03-16 09:00:54.000000000 +0100 @@ -45,7 +45,7 @@ * @param msg * char * (may not be null terminated) to first string or null * @param msglen - * length of msgring or null + * length of msg * @param post * char * to last string or null * @@ -125,6 +125,8 @@ * The major status to display * @param minor_status * The minor status to display + * @param token_status + * token status to display * @return * 0 */ @@ -175,7 +177,8 @@ * The major status to display * @param minor_status * The minor status to display - * + * @param token_status + * token status to display * @return * 0 */ diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/gss_assist/source/export_sec_context.c gt4.2.1-all-source-installer/source-trees/gsi/gss_assist/source/export_sec_context.c --- gt4.2.1-all-source-installer.orig/source-trees/gsi/gss_assist/source/export_sec_context.c 2006-01-19 06:56:01.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gsi/gss_assist/source/export_sec_context.c 2009-03-16 09:00:54.000000000 +0100 @@ -29,14 +29,6 @@ #include "gssapi.h" #include -/** - * @anchor globus_gsi_gss_assist - * @mainpage Globus GSI GSS Assist - * - * The GSS Assist code provides convenience functions - * for using the Globus GSS-API. - */ - /* @name Export Security Context * @ingroup globus_gsi_gss_assist */ diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/gss_assist/source/gridmap.c gt4.2.1-all-source-installer/source-trees/gsi/gss_assist/source/gridmap.c --- gt4.2.1-all-source-installer.orig/source-trees/gsi/gss_assist/source/gridmap.c 2008-09-15 18:12:49.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gsi/gss_assist/source/gridmap.c 2009-03-16 09:00:49.000000000 +0100 @@ -112,6 +112,393 @@ #endif + + +/****************************************************************************** + Start of gridmapdir functions + + These all use the environment variable GRIDMAPDIR + (a) if not set, then the gridmapdir functions are not used + (b) the value it is set to defines the gridmap directory + (eg export GRIDMAPDIR=/etc/grid-security/gridmapdir) + +******************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include + +/****************************************************************************** +Function: gridmapdir_otherlink +Description: + find another link in GRIDMAPDIR to the same inode as firstlink + and change the modification time of firstlink to now (so that we + always know when this pair was last used) + +Parameters: + firstlink, the filename of the link we already know + +Returns: + a pointer to the other link's filename (without path) or NULL if none + found (this is malloc'd and will need freeing) + +******************************************************************************/ +static char +*gridmapdir_otherlink(char * firstlink) +{ + int ret; + char *firstlinkpath, *otherlinkdup, *otherlinkpath, + *gridmapdir; + struct dirent *gridmapdirentry; + DIR *gridmapdirstream; + struct stat statbuf; + ino_t firstinode; + + gridmapdir = getenv("GRIDMAPDIR"); + if (gridmapdir == NULL) return NULL; + + firstlinkpath = malloc(strlen(gridmapdir) + 2 + strlen(firstlink)); + sprintf(firstlinkpath, "%s/%s", gridmapdir, firstlink); + ret = stat(firstlinkpath, &statbuf); + free(firstlinkpath); + if (ret != 0) return NULL; + if (statbuf.st_nlink != 2) return NULL; + + firstinode = statbuf.st_ino; /* save for comparisons */ + + gridmapdirstream = opendir(gridmapdir); + + if (gridmapdirstream != NULL) + { + while ((gridmapdirentry = readdir(gridmapdirstream)) != NULL) + { + if (strcmp(gridmapdirentry->d_name, firstlink) == 0) continue; + + otherlinkpath = malloc(strlen(gridmapdir) + 2 + + strlen(gridmapdirentry->d_name)); + sprintf(otherlinkpath, "%s/%s", gridmapdir, + gridmapdirentry->d_name); + + ret = stat(otherlinkpath, &statbuf); + if ((ret == 0) && (statbuf.st_ino == firstinode)) + { + utime(otherlinkpath, (struct utimbuf *) NULL); + free(otherlinkpath); + otherlinkdup = strdup(gridmapdirentry->d_name); + closedir(gridmapdirstream); + return otherlinkdup; + } + else free(otherlinkpath); + } + + closedir(gridmapdirstream); + } + + return NULL; +} + +/****************************************************************************** +Function: gridmapdir_urlencode +Description: + Convert string to URL encoded and return pointer to the encoded + version, obtained through malloc. Calling routine must free + this. Here "URL encoded" means anything other than an isalnum() + goes to %HH where HH is its ascii value in hex; also A-Z => a-z + This name is suitable for filenames since no / or spaces. + +Parameters: + rawstring, the string to be converted + +Returns: + a pointer to the encoded string or NULL if the malloc failed + +******************************************************************************/ +static char +*gridmapdir_urlencode(char * rawstring) +{ + int encodedchar = 0, rawchar = 0; + char * encodedstring; + + encodedstring = (char *) malloc(3 * strlen(rawstring) + 1); + + if (encodedstring == NULL) return (char *) NULL; + + while (rawstring[rawchar] != '\0') + { + if (isalnum(rawstring[rawchar])) + { + encodedstring[encodedchar] = tolower(rawstring[rawchar]); + ++rawchar; + ++encodedchar; + } + else + { + sprintf(&encodedstring[encodedchar], "%%%02x", + rawstring[rawchar]); + ++rawchar; + encodedchar = encodedchar + 3; + } + } + + encodedstring[encodedchar] = '\0'; + + return encodedstring; +} + +/****************************************************************************** +Function: gridmapdir_newlease +Description: + Search for an unleased local username to give to the globus user + corresponding to encodedfilename, and then lease it. + +Parameters: + encodedfilename, URL-encoded globus client name and pathname of + the globus user who requested authentication + usernameprefix, the prefix of acceptable usernames (or "\0") + +Returns: + no return value +******************************************************************************/ + +void +gridmapdir_newlease(char * encodedglobusidp, + char * usernameprefix) +{ + int ret; + char *userfilename, *encodedfilename, *gridmapdir; + struct dirent *gridmapdirentry; + DIR *gridmapdirstream; + struct stat statbuf; + + gridmapdir = getenv("GRIDMAPDIR"); + if (gridmapdir == NULL) return; + + encodedfilename = malloc(strlen(gridmapdir) + (size_t) 2 + + strlen(encodedglobusidp)); + sprintf(encodedfilename, "%s/%s", gridmapdir, encodedglobusidp); + + gridmapdirstream = opendir(gridmapdir); + + while ((gridmapdirentry = readdir(gridmapdirstream)) != NULL) + { + /* we dont want any files that dont look like acceptable usernames */ + if ((*(gridmapdirentry->d_name) == '%') || + (strcmp(gridmapdirentry->d_name, "root") == 0)) continue; + else if (*(gridmapdirentry->d_name) == '.') continue; + else if (index(gridmapdirentry->d_name, '~') != NULL) continue; + else if (strncmp(gridmapdirentry->d_name, usernameprefix, + strlen(usernameprefix)) != 0) continue; + + userfilename = malloc(strlen(gridmapdir) + (size_t) 2 + + strlen(gridmapdirentry->d_name)); + sprintf(userfilename, "%s/%s", gridmapdir, gridmapdirentry->d_name); + stat(userfilename, &statbuf); + + if (statbuf.st_nlink == 1) /* this one isnt leased yet */ + { + ret = link(userfilename, encodedfilename); + free(userfilename); + if (ret != 0) + { + /* link failed: this is probably because a VERY lucky + other process has obtained a lease for encodedfilename + while we were faffing around */ + closedir(gridmapdirstream); + free(encodedfilename); + return; + } + + stat(encodedfilename, &statbuf); + if (statbuf.st_nlink > 2) + { + /* two globusIDs have grabbed the same username: back off */ + unlink(encodedfilename); + continue; + } + + closedir(gridmapdirstream); + free(encodedfilename); + return; /* link worked ok, so return */ + } + else free(userfilename); /* already in use, try next one */ + } + + closedir(gridmapdirstream); + free(encodedfilename); + return; /* no unleased names left: give up */ +} + +/****************************************************************************** +Function: gridmapdir_userid +Description: + This is equivalent to globus_gss_assist_gridmap but for the dynamic + user ids in the gridmapdir: maps a globusID to a local unix user id, + either one already leased, or calls gridmapdir_newlease() to obtain + a new lease. This is called by globus_gss_assist_gridmap if the + local user id in the static gridmap file begins . (for a dynamic id) + +Parameters: + globusidp, globus client name who requested authentication + usernameprefix, prefix of the local usernames which would + be acceptable (or "\0" ) + *userid returned userid name for local system. + +Returns: + + 0 on success + !=0 on failure + +******************************************************************************/ + +static int +gridmapdir_userid(char * globusidp, + char * usernameprefix, + char ** useridp) +{ + char *encodedglobusidp; + + if (getenv("GRIDMAPDIR") == NULL) return 1; /* GRIDMAPDIR defined? */ + + if (globusidp[0] != '/') return 1; /* must be a proper subject DN */ + + encodedglobusidp = gridmapdir_urlencode(globusidp); + + *useridp = gridmapdir_otherlink(encodedglobusidp); + + if (*useridp == NULL) /* maybe no lease yet */ + { + gridmapdir_newlease(encodedglobusidp, usernameprefix); + /* try making a lease */ + + *useridp = gridmapdir_otherlink(encodedglobusidp); + /* check if there is a now a lease - possibly made by someone else */ + + if (*useridp == NULL) + { + free(encodedglobusidp); + return 1; /* still no good */ + } + } + + free(encodedglobusidp); + return 0; +} + +/****************************************************************************** +Function: gridmapdir_globusid +Description: + This is equivalent to globus_gss_assist_map_local_user but for the + dynamic user ids in the gridmapdir: search through leases to find + which globusID corresponds to a local unix user id. + This is called by globus_gss_assist_map_local_user + +Parameters: + globus client name who requested authentication + *userid returned userid name for local system. + +Returns: + + 0 on success + !=0 on failure + +******************************************************************************/ + +static int +gridmapdir_globusid(char * useridp, + char ** globusidp) +{ + int encodedptr = 0, decodedptr = 0; + char *encodedglobusidp; + + if (useridp[0] == '/') return 1; /* must not be a subject DN */ + + encodedglobusidp = gridmapdir_otherlink(useridp); + + if (encodedglobusidp == NULL) return 1; /* not leased */ + + *globusidp = malloc(strlen(encodedglobusidp)); + + while (encodedglobusidp[encodedptr] != '\0') + { + if (encodedglobusidp[encodedptr] != '%') + { + (*globusidp)[decodedptr] = encodedglobusidp[encodedptr]; + ++encodedptr; + ++decodedptr; + } + else /* must be a %HH encoded character */ + { + /* even paranoids have enemies ... */ + if (encodedglobusidp[encodedptr+1] == '\0') break; + if (encodedglobusidp[encodedptr+2] == '\0') break; + + (*globusidp)[decodedptr] = + globus_i_gss_assist_xdigit_to_value(encodedglobusidp[encodedptr+1]) * 16 + + globus_i_gss_assist_xdigit_to_value(encodedglobusidp[encodedptr+2]); + + encodedptr = encodedptr + 3; + ++decodedptr; + } + } + + free(encodedglobusidp); + (*globusidp)[decodedptr] = '\0'; + return 0; +} + +/****************************************************************************** +Function: gridmapdir_userok +Description: + This is equivalent to globus_gss_assist_userok but for the dynamic + user ids in the gridmapdir: finds the local unix username leased to + a globusID and compare with the username being checked. + This is called by globus_gss_assist_userok if the local user id in + the static gridmap file is - (for a dynamic id) + +Parameters: + globus client name who requested authentication + userid to be checked + +Returns: + 0 on success (authorization allowed) + !=0 on failure or authorization denied + +******************************************************************************/ + +static int +gridmapdir_userok(char * globusidp, + char * userid) +{ + char *encodedglobusidp, *leasedname; + + if (globusidp[0] != '/') return 1; /* must be a proper subject DN */ + + encodedglobusidp = gridmapdir_urlencode(globusidp); + leasedname = gridmapdir_otherlink(encodedglobusidp); + free(encodedglobusidp); + + if (leasedname == NULL) return 1; + + if (strcmp(userid, leasedname) == 0) + { + free(leasedname); + return 0; + } + else + { + free(leasedname); + return 1; + } +} + +/****************************************************************************** + End of gridmapdir functions +******************************************************************************/ + /** * @name Gridmap */ @@ -152,6 +539,8 @@ globus_result_t result = GLOBUS_SUCCESS; globus_i_gss_assist_gridmap_line_t * gline = NULL; + char *usernameprefix; + int ret; static char * _function_name_ = "globus_gss_assist_gridmap"; @@ -208,6 +597,16 @@ (_GASL("Duplicate string operation failed"))); goto exit; } + + if ((*useridp)[0] == '.') /* need to use gridmapdir */ + { + usernameprefix = strdup(&((*useridp)[1])); + free(*useridp); *useridp = NULL; + ret = gridmapdir_userid(globusidp, usernameprefix, useridp); + free(usernameprefix); + return ret; + } + } else { @@ -319,6 +718,12 @@ goto exit; } + if (*((gline->user_ids)[0]) == '.') /* try using gridmapdir */ + { + globus_i_gss_assist_gridmap_line_free(gline); + return gridmapdir_userok(globusid, userid); + } + else for (useridp = gline->user_ids; *useridp != NULL; useridp++) { if (strcmp(*useridp, userid) == 0) @@ -485,7 +890,8 @@ error_obj = globus_error_get(result); globus_object_free(error_obj); - return 1; + /* try with gridmapdir before giving up completely */ + return gridmapdir_globusid(local_user, globusidp); } } /* globus_gss_assist_map_local_user() */ @@ -1137,6 +1543,9 @@ globus_result_t result = GLOBUS_SUCCESS; static char * _function_name_ = "globus_i_gss_assist_gridmap_parse_globusid"; + + static char * hexdigit = "0123456789ABCDEF"; + GLOBUS_I_GSI_GSS_ASSIST_DEBUG_ENTER; /* @@ -1203,7 +1612,7 @@ * First, make sure we have enough room in our output buffer. */ - if ((buffer_index + 1 /* for NUL */) >= buffer_len) + while ((buffer_index + 4) >= buffer_len) { /* Grow buffer */ char *tmp_buffer; @@ -1228,8 +1637,18 @@ buffer = tmp_buffer; } - - buffer[buffer_index++] = unparsed_char; + + if ((unparsed_char < ' ') || (unparsed_char > '~')) + { + buffer[buffer_index++] = '\\'; + buffer[buffer_index++] = 'x'; + buffer[buffer_index++] = hexdigit[(unparsed_char >> 4) & 0x0f]; + buffer[buffer_index++] = hexdigit[unparsed_char & 0x0f]; + } + else + { + buffer[buffer_index++] = unparsed_char; + } buffer[buffer_index] = NUL; escaped = 0; diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/gss_assist/source/init.c gt4.2.1-all-source-installer/source-trees/gsi/gss_assist/source/init.c --- gt4.2.1-all-source-installer.orig/source-trees/gsi/gss_assist/source/init.c 2007-08-09 16:24:23.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gsi/gss_assist/source/init.c 2009-03-16 09:00:54.000000000 +0100 @@ -49,7 +49,7 @@ * globus error object ID that can be passed to globus_error_get * to get the error object. The error object needs to be freed * with globus_object_free. - * @param initiator_cred_handle + * @param cred_handle * the cred handle obtained by acquire_cred. * @param context_handle * pointer to returned context. @@ -72,9 +72,9 @@ * @param gss_assist_get_context * first argument passed to the * gss_assist_get_token function - * @param gss_assist_set_token + * @param gss_assist_send_token * function pointer for setting the token - * @param gss_assist_set_context + * @param gss_assist_send_context * first argument passed to the * gss_assist_set_token function pointer * @@ -306,7 +306,7 @@ * can be obtained via globus_error_get and should be destroyed * with globus_object_free when no longer needed. If no error * occurred, the minor status is equal to GLOBUS_SUCCESS. - * @param initiator_cred_handle + * @param cred_handle * the cred handle obtained by acquire_cred. * @param context_handle * pointer to returned context. diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/gss_assist/source/programs/grid-mapfile-add-entry.in gt4.2.1-all-source-installer/source-trees/gsi/gss_assist/source/programs/grid-mapfile-add-entry.in --- gt4.2.1-all-source-installer.orig/source-trees/gsi/gss_assist/source/programs/grid-mapfile-add-entry.in 2006-01-19 06:56:02.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gsi/gss_assist/source/programs/grid-mapfile-add-entry.in 2009-03-16 09:00:25.000000000 +0100 @@ -20,16 +20,16 @@ # grid-mapfile-add-entry # -if test -z "${GLOBUS_LOCATION}"; then - echo "" - echo "ERROR: Please set GLOBUS_LOCATION to the Globus installation directory before" - echo "running this script" - echo "" +if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer; then + . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer +elif test -f ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer; then + . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer +else + echo "ERROR: Please set GLOBUS_LOCATION to the Globus installation directory before" 1>&2 + echo "running this script" 1>&2 exit 1 fi - -. ${GLOBUS_LOCATION}/libexec/globus-script-initializer -globus_source ${GLOBUS_LOCATION}/libexec/globus-sh-tools.sh +globus_source ${libexecdir}/globus-sh-tools.sh PROGRAM_NAME=`echo $0 | ${GLOBUS_SH_SED-sed} 's|.*/||g'` @@ -231,9 +231,19 @@ $ECHO_DRYRUN "Verifying that Local Name(s)=($ln) are legitimate local accounts." +if test -x ${sbindir}/globus-is-local-user; then + globus_is_local_user=${sbindir}/globus-is-local-user +elif test -x ${libexecdir}/globus-is-local-user; then + globus_is_local_user=${libexecdir}/globus-is-local-user +else + echo "ERROR: Unable to find globus-is-local-user" 1>&2 + Cleanup + exit 1 +fi + for name in $ln ; do $ECHO_DRYRUN "Checking ln(s)=$name" - ${libexecdir}/globus-is-local-user $name + ${globus_is_local_user} $name if [ "$?" -eq 0 ] ; then $ECHO_DRYRUN "Local Name=$name does exist" else diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/gss_assist/source/programs/grid-mapfile-delete-entry.in gt4.2.1-all-source-installer/source-trees/gsi/gss_assist/source/programs/grid-mapfile-delete-entry.in --- gt4.2.1-all-source-installer.orig/source-trees/gsi/gss_assist/source/programs/grid-mapfile-delete-entry.in 2006-01-19 06:56:02.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gsi/gss_assist/source/programs/grid-mapfile-delete-entry.in 2009-03-16 09:00:25.000000000 +0100 @@ -21,16 +21,16 @@ # grid-mapfile-delete-entry # -if test -z "${GLOBUS_LOCATION}"; then - echo "" - echo "ERROR: Please set GLOBUS_LOCATION to the Globus installation directory before" - echo "running this script" - echo "" +if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer; then + . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer +elif test -f ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer; then + . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer +else + echo "ERROR: Please set GLOBUS_LOCATION to the Globus installation directory before" 1>&2 + echo "running this script" 1>&2 exit 1 fi - -. ${GLOBUS_LOCATION}/libexec/globus-script-initializer -globus_source ${GLOBUS_LOCATION}/libexec/globus-sh-tools.sh +globus_source ${libexecdir}/globus-sh-tools.sh PROGRAM_NAME=`echo $0 |${GLOBUS_SH_SED-sed} 's|.*/||g'` diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/gss_assist/source/tokens_n.c gt4.2.1-all-source-installer/source-trees/gsi/gss_assist/source/tokens_n.c --- gt4.2.1-all-source-installer.orig/source-trees/gsi/gss_assist/source/tokens_n.c 2007-08-09 16:24:23.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gsi/gss_assist/source/tokens_n.c 2009-03-16 09:00:54.000000000 +0100 @@ -51,7 +51,8 @@ * the globus_io_handle_t to get the token from * @param bufp * the buffer to read the token into - * @param the size of what gets read + * @param sizep + * the size of what gets read * * @return * 0 on success diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/gss_assist/source/unwrap.c gt4.2.1-all-source-installer/source-trees/gsi/gss_assist/source/unwrap.c --- gt4.2.1-all-source-installer.orig/source-trees/gsi/gss_assist/source/unwrap.c 2007-08-09 16:24:23.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gsi/gss_assist/source/unwrap.c 2009-03-16 09:00:54.000000000 +0100 @@ -43,9 +43,11 @@ * GSSAPI return code, @see gss_unwrap * @param context_handle * the context - * @param conf_req_flag - * @param qop_req - * @param input_message_buffer + * @param data + * pointer to be set to the unwrapped application data. This must be + * freed by the caller. + * @param length + * pointer to be set to the length of the @a data byte array. * @param token_status * assist routine get/send token status * @param gss_assist_get_token diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/gss_assist/source/wrap.c gt4.2.1-all-source-installer/source-trees/gsi/gss_assist/source/wrap.c --- gt4.2.1-all-source-installer.orig/source-trees/gsi/gss_assist/source/wrap.c 2007-08-09 16:24:23.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gsi/gss_assist/source/wrap.c 2009-03-16 09:00:54.000000000 +0100 @@ -39,14 +39,14 @@ * GSSAPI return code. If the call was successful, the minor * status is equal to GLOBUS_SUCCESS. Otherwise, it is an * error object ID for which - * @ref globus_error_get and @ref globus_object free + * globus_error_get() and globus_object_free() * can be used to get and destroy it. * @param context_handle * the context. - * @param conf_req_flag - * @param qop_req - * @param input_message_buffer - * + * @param data + * pointer to application data to wrap and send + * @param length + * length of the @a data array * @param token_status * assist routine get/send token status * @param gss_assist_send_token @@ -54,6 +54,7 @@ * @param gss_assist_send_context * first arg for the send_token * @param fperr + * file handle to write error message to. * * @return * GSS_S_COMPLETE on sucess diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/openssl_module/source/library/globus_openssl.c gt4.2.1-all-source-installer/source-trees/gsi/openssl_module/source/library/globus_openssl.c --- gt4.2.1-all-source-installer.orig/source-trees/gsi/openssl_module/source/library/globus_openssl.c 2006-01-19 06:56:22.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gsi/openssl_module/source/library/globus_openssl.c 2009-03-16 08:56:07.000000000 +0100 @@ -30,6 +30,7 @@ #include "version.h" #include "openssl/crypto.h" #include "openssl/err.h" +#include "openssl/ssl.h" static int globus_l_openssl_activate(void); @@ -75,6 +76,7 @@ X509V3_EXT_METHOD * pci_x509v3_ext_meth = NULL; X509V3_EXT_METHOD * pci_old_x509v3_ext_meth = NULL; + SSL_library_init(); globus_module_activate(GLOBUS_COMMON_MODULE); globus_module_activate(GLOBUS_GSI_OPENSSL_ERROR_MODULE); mutex_pool = malloc(CRYPTO_num_locks() * sizeof(globus_mutex_t)); diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/openssl_module/source/pkgdata/pkg_data_src.gpt.in gt4.2.1-all-source-installer/source-trees/gsi/openssl_module/source/pkgdata/pkg_data_src.gpt.in --- gt4.2.1-all-source-installer.orig/source-trees/gsi/openssl_module/source/pkgdata/pkg_data_src.gpt.in 2005-03-29 01:32:37.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gsi/openssl_module/source/pkgdata/pkg_data_src.gpt.in 2009-03-16 08:56:12.000000000 +0100 @@ -4,7 +4,7 @@ - Globus OpenSSL Module Wraper + Globus OpenSSL Module Wrapper Security diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/proxy/proxy_ssl/source/library/proxycertinfo.c gt4.2.1-all-source-installer/source-trees/gsi/proxy/proxy_ssl/source/library/proxycertinfo.c --- gt4.2.1-all-source-installer.orig/source-trees/gsi/proxy/proxy_ssl/source/library/proxycertinfo.c 2006-01-19 06:56:28.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gsi/proxy/proxy_ssl/source/library/proxycertinfo.c 2009-03-16 08:55:25.000000000 +0100 @@ -432,15 +432,15 @@ */ /* @{ */ /** - * @ingroup + * @ingroup proxycertinfo * * Convert from a DER encoded ASN.1 string of a PROXYCERTINFO * to its internal structure * * @param cert_info the resulting PROXYCERTINFO in internal form - * @param buffer the DER encoded ASN.1 string containing + * @param pp the DER encoded ASN.1 string containing * the PROXYCERTINFO - * @param the length of the buffer + * @param length the length of the buffer * * @return the resultingin PROXYCERTINFO in internal form */ @@ -535,15 +535,15 @@ */ /* @{ */ /** - * @ingroup + * @ingroup proxycertinfo * * Convert from a DER encoded ASN.1 string of a old PROXYCERTINFO * to its internal structure * * @param cert_info the resulting old PROXYCERTINFO in internal form - * @param buffer the DER encoded ASN.1 string containing + * @param pp the DER encoded ASN.1 string containing * the old PROXYCERTINFO - * @param the length of the buffer + * @param length the length of the buffer * * @return the resulting old PROXYCERTINFO in internal form */ diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/proxy/proxy_ssl/source/library/proxypolicy.c gt4.2.1-all-source-installer/source-trees/gsi/proxy/proxy_ssl/source/library/proxypolicy.c --- gt4.2.1-all-source-installer.orig/source-trees/gsi/proxy/proxy_ssl/source/library/proxypolicy.c 2006-01-19 06:56:29.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gsi/proxy/proxy_ssl/source/library/proxypolicy.c 2009-03-16 08:55:25.000000000 +0100 @@ -279,7 +279,7 @@ * * @param proxypolicy the proxy policy to set the policy of * @param policy the policy to set it to - * @param length the lenght of the policy + * @param length the length of the policy * * @return 1 on success, 0 on error */ diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/proxy/proxy_ssl/source/library/proxypolicy.h gt4.2.1-all-source-installer/source-trees/gsi/proxy/proxy_ssl/source/library/proxypolicy.h --- gt4.2.1-all-source-installer.orig/source-trees/gsi/proxy/proxy_ssl/source/library/proxypolicy.h 2006-01-19 06:56:29.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/gsi/proxy/proxy_ssl/source/library/proxypolicy.h 2009-03-16 08:55:25.000000000 +0100 @@ -31,9 +31,7 @@ * and ultimately gets written to a DER encoded string. * * @see Further Information about proxy policies - * is available in the Internet Draft Document: - * - * draft-ietf-pkix-proxy-01.txt + * is available in the X.509 Proxy Certificate Profile document. */ #ifndef EXTERN_C_BEGIN diff -Nur gt4.2.1-all-source-installer.orig/source-trees/gsi/proxy/proxy_utils/source/programs/Makefile.am gt4.2.1-all-source-installer/source-trees/gsi/proxy/proxy_utils/source/programs/Makefile.am --- gt4.2.1-all-source-installer.orig/source-trees/gsi/proxy/proxy_utils/source/programs/Makefile.am 2008-04-28 20:23:25.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/gsi/proxy/proxy_utils/source/programs/Makefile.am 2009-03-16 14:36:37.000000000 +0100 @@ -11,6 +11,6 @@ grid_proxy_info_SOURCES = grid_proxy_info.c LDADD = $(GPT_PGM_LINKS) -LDFLAGS = $(GPT_LDFLAGS) +LDFLAGS += $(GPT_LDFLAGS) include $(top_srcdir)/globus_automake_post diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/client/configure.in gt4.2.1-all-source-installer/source-trees/replica/rls/client/configure.in --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/client/configure.in 2008-04-01 01:30:26.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/client/configure.in 2009-03-16 09:08:02.000000000 +0100 @@ -3,13 +3,6 @@ AC_REVISION($Revision: 1.7 $) AC_INIT(Makefile.am) -if test "x$GLOBUS_LOCATION" = "x"; then - echo "ERROR Please specify GLOBUS_LOCATION" >&2 - exit 1 -fi - -AC_SUBST(GLOBUS_LOCATION) - GLOBUS_INIT AM_PROG_LIBTOOL diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/client/pkgdata/pkg_data_src.gpt.in gt4.2.1-all-source-installer/source-trees/replica/rls/client/pkgdata/pkg_data_src.gpt.in --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/client/pkgdata/pkg_data_src.gpt.in 2008-05-29 00:31:39.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/client/pkgdata/pkg_data_src.gpt.in 2009-03-16 09:08:02.000000000 +0100 @@ -3,9 +3,7 @@ - - The C client library and globus-rls-cli command-line client for Globus RLS - + Replica Location Service Client Data @@ -23,14 +21,23 @@ - + + + + + + + + + + diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/server/configure.in gt4.2.1-all-source-installer/source-trees/replica/rls/server/configure.in --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/server/configure.in 2007-11-15 19:53:07.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/server/configure.in 2009-03-16 09:08:29.000000000 +0100 @@ -3,13 +3,6 @@ AC_REVISION($Revision: 1.11 $) AC_INIT(Makefile.am) -if test "x$GLOBUS_LOCATION" = "x"; then - echo "ERROR Please specify GLOBUS_LOCATION" >&2 - exit 1 -fi - -AC_SUBST(GLOBUS_LOCATION) - GLOBUS_INIT AM_PROG_LIBTOOL diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/server/db.c gt4.2.1-all-source-installer/source-trees/replica/rls/server/db.c --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/server/db.c 2007-11-10 03:08:06.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/server/db.c 2009-03-16 09:08:42.000000000 +0100 @@ -1950,13 +1950,13 @@ * We're adding a new mapping, so increment ref counts on lfn, lrc and * sender, or create if they don't exist. */ - if ((rc = updateref(h, T_RLILFN, lfn, 1, 1, (SQLINTEGER *) &lfn_id, NULL, + if ((rc = updateref(h, T_RLILFN, lfn, 1, 1, (SQLINTEGER *) (void *) &lfn_id, NULL, errmsg, adjcount)) != GLOBUS_RLS_SUCCESS) goto error; - if ((rc = updateref(h, T_RLILRC, lrc, 1, 1, (SQLINTEGER *) &lrc_id, NULL, + if ((rc = updateref(h, T_RLILRC, lrc, 1, 1, (SQLINTEGER *) (void *) &lrc_id, NULL, errmsg, adjcount)) != GLOBUS_RLS_SUCCESS) goto error; - if ((rc = updateref(h, T_RLISENDER, sender, 1, 1, (SQLINTEGER *) &sender_id, NULL, + if ((rc = updateref(h, T_RLISENDER, sender, 1, 1, (SQLINTEGER *) (void *) &sender_id, NULL, errmsg, adjcount)) != GLOBUS_RLS_SUCCESS) goto error; diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/server/db.h gt4.2.1-all-source-installer/source-trees/replica/rls/server/db.h --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/server/db.h 2007-11-10 03:08:06.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/server/db.h 2009-03-16 09:08:33.000000000 +0100 @@ -18,7 +18,7 @@ * Should be as large as longest string stored in the DB that's returned * by a query (see db schema files), plus one for terminating null byte. */ -#define MAXDBSTR (250+1) +#define MAXDBSTR (500+1) typedef globus_bool_t (*db_str1_callback_t) ( void *a, diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/server/globus-rls-aggregatorsource.pl gt4.2.1-all-source-installer/source-trees/replica/rls/server/globus-rls-aggregatorsource.pl --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/server/globus-rls-aggregatorsource.pl 2006-01-19 21:23:57.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/server/globus-rls-aggregatorsource.pl 2009-03-16 09:08:29.000000000 +0100 @@ -46,7 +46,9 @@ # Command line input $rlsurl = $ARGV[0]; -$rlsstatscmd = $ENV{GLOBUS_LOCATION} . "/bin/globus-rls-admin -S " . $rlsurl; +$globus_location = $ENV{GLOBUS_LOCATION}; +$globus_location = "/usr" unless defined $globus_location; +$rlsstatscmd = $globus_location . "/sbin/globus-rls-admin -S " . $rlsurl; if ($debug) { print "CMD: ", $rlsstatscmd, "\n"; diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/server/Makefile.am gt4.2.1-all-source-installer/source-trees/replica/rls/server/Makefile.am --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/server/Makefile.am 2005-10-27 03:44:54.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/server/Makefile.am 2009-03-16 09:08:29.000000000 +0100 @@ -28,13 +28,10 @@ # a list of header files that are to be installed in $prefix/include include_HEADERS= -bin_PROGRAMS= \ - globus-rls-server globus-rls-admin +sbin_PROGRAMS= \ + globus-rls-server globus-rls-admin globus-rls-reporter -libexec_PROGRAMS = \ - globus-rls-reporter - -libexec_aggrexecdir=$(GLOBUS_LOCATION)/libexec/aggrexec +libexec_aggrexecdir=$(libexecdir)/aggrexec libexec_aggrexec_SCRIPTS = \ globus-rls-aggregatorsource.pl @@ -68,7 +65,6 @@ globus_rls_server_LDFLAGS = \ $(GPT_LDFLAGS) \ - -lglobus_rls_client_$(GLOBUS_FLAVOR_NAME) \ $(ODBCLIB) globus_rls_server_LDADD = \ @@ -78,8 +74,7 @@ admin.c globus_rls_admin_LDFLAGS = \ - $(GPT_LDFLAGS) \ - -lglobus_rls_client_$(GLOBUS_FLAVOR_NAME) + $(GPT_LDFLAGS) globus_rls_admin_LDADD = \ $(GPT_PGM_LINKS) @@ -89,8 +84,7 @@ version.h globus_rls_reporter_LDFLAGS = \ - $(GPT_LDFLAGS) \ - -lglobus_rls_client_$(GLOBUS_FLAVOR_NAME) + $(GPT_LDFLAGS) globus_rls_reporter_LDADD = \ $(GPT_PGM_LINKS) @@ -100,8 +94,7 @@ version.h globus_rls_test_LDFLAGS = \ - $(GPT_LDFLAGS) \ - -lglobus_rls_client_$(GLOBUS_FLAVOR_NAME) + $(GPT_LDFLAGS) globus_rls_test_LDADD = \ $(GPT_PGM_LINKS) diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/server/pkgdata/pkg_data_src.gpt.in gt4.2.1-all-source-installer/source-trees/replica/rls/server/pkgdata/pkg_data_src.gpt.in --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/server/pkgdata/pkg_data_src.gpt.in 2008-06-12 00:48:55.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/server/pkgdata/pkg_data_src.gpt.in 2009-03-16 09:08:29.000000000 +0100 @@ -3,9 +3,7 @@ - - The Globus Replica Location Service globus-rls-server daemon and globus-rls-admin command-line tool. - + Replica Location Service Server Data @@ -27,9 +25,7 @@ - - - + @@ -50,7 +46,7 @@ @GPT_EXTERNAL_INCLUDES@ @GPT_EXTERNAL_LIBS@ @GPT_EXTERNAL_LDFLAGS@ - -lglobus_rls_client + diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/configure.in gt4.2.1-all-source-installer/source-trees/replica/rls/setup/configure.in --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/configure.in 2004-02-11 03:15:25.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/setup/configure.in 2009-03-16 09:08:51.000000000 +0100 @@ -3,13 +3,6 @@ AC_REVISION($Revision: 1.4 $) AC_INIT(Makefile.am) -if test "x$GLOBUS_LOCATION" = "x"; then - echo "ERROR Please specify GLOBUS_LOCATION" >&2 - exit 1 -fi - -AC_SUBST(GLOBUS_LOCATION) - GLOBUS_INIT AM_PROG_LIBTOOL diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/globus-rls-lrc-mysql.sql gt4.2.1-all-source-installer/source-trees/replica/rls/setup/globus-rls-lrc-mysql.sql --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/globus-rls-lrc-mysql.sql 2003-11-04 07:14:41.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/setup/globus-rls-lrc-mysql.sql 2009-03-16 09:09:01.000000000 +0100 @@ -5,14 +5,14 @@ create table t_lfn ( id int not null auto_increment primary key, - name varchar(250) not null, + name varchar(500) not null, ref int default 0 not null ) type = innodb; create unique index t_lfn_name on t_lfn(name); create table t_pfn ( id int not null auto_increment primary key, - name varchar(250) not null, + name varchar(500) not null, ref int default 0 not null ) type = innodb; create unique index t_pfn_name on t_pfn(name); @@ -27,20 +27,20 @@ create table t_rli ( id int not null auto_increment primary key, flags int default 0 not null, - name varchar(250) not null + name varchar(500) not null ) type = innodb; create unique index t_rli_name on t_rli(name); create table t_rlipartition ( rli_id int not null references t_rli(id), - pattern varchar(250) not null + pattern varchar(500) not null ) type = innodb; alter table t_rlipartition add constraint pk_rlipartition primary key(rli_id, pattern); create index t_rlipartition_pattern on t_rlipartition(pattern); create table t_attribute ( id int not null auto_increment primary key, - name varchar(250) not null, + name varchar(500) not null, objtype int not null, type int not null ) type = innodb; @@ -76,7 +76,7 @@ create table t_str_attr ( obj_id int not null, attr_id int not null references t_attribute(id), - value varchar(250) not null + value varchar(500) not null ) type = innodb; create index t_str_attr_attr_id on t_str_attr(attr_id); create index t_str_attr_value on t_str_attr(value); diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/globus-rls-lrc-oracle.sql gt4.2.1-all-source-installer/source-trees/replica/rls/setup/globus-rls-lrc-oracle.sql --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/globus-rls-lrc-oracle.sql 2003-11-04 07:14:41.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/setup/globus-rls-lrc-oracle.sql 2009-03-16 09:09:01.000000000 +0100 @@ -1,6 +1,6 @@ create table t_lfn ( id int primary key, - name varchar(250) not null, + name varchar(500) not null, ref int default 0 not null ); create sequence s_lfn_id start with 1 increment by 1; @@ -15,7 +15,7 @@ create table t_pfn ( id int primary key, - name varchar(250) not null, + name varchar(500) not null, ref int default 0 not null ); create sequence s_pfn_id start with 1 increment by 1; @@ -38,7 +38,7 @@ create table t_rli ( id int primary key, flags int default 0 not null, - name varchar(250) not null + name varchar(500) not null ); create sequence s_rli_id start with 1 increment by 1; create or replace trigger tr_rli @@ -52,14 +52,14 @@ create table t_rlipartition ( rli_id int not null references t_rli(id), - pattern varchar(250) not null + pattern varchar(500) not null ); alter table t_rlipartition add constraint pk_rlipartition primary key(rli_id, pattern); create index t_rlipartition_pattern on t_rlipartition(pattern); create table t_attribute ( id int primary key, - name varchar(250) not null, + name varchar(500) not null, objtype int not null, type int not null ); @@ -103,7 +103,7 @@ create table t_str_attr ( obj_id int not null, attr_id int not null references t_attribute(id), - value varchar(250) not null + value varchar(500) not null ); create index t_str_attr_attr_id on t_str_attr(attr_id); create index t_str_attr_value on t_str_attr(value); diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/globus-rls-lrc-postgres.sql gt4.2.1-all-source-installer/source-trees/replica/rls/setup/globus-rls-lrc-postgres.sql --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/globus-rls-lrc-postgres.sql 2003-11-04 07:14:42.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/setup/globus-rls-lrc-postgres.sql 2009-03-16 09:09:01.000000000 +0100 @@ -1,13 +1,13 @@ create table t_lfn ( id serial primary key, - name varchar(250) not null, + name varchar(500) not null, ref int default 0 not null ); create unique index t_lfn_name on t_lfn(name); create table t_pfn ( id serial primary key, - name varchar(250) not null, + name varchar(500) not null, ref int default 0 not null ); create unique index t_pfn_name on t_pfn(name); @@ -22,20 +22,20 @@ create table t_rli ( id serial primary key, flags int default 0 not null, - name varchar(250) not null + name varchar(500) not null ); create unique index t_rli_name on t_rli(name); create table t_rlipartition ( rli_id int not null references t_rli(id), - pattern varchar(250) not null + pattern varchar(500) not null ); alter table t_rlipartition add constraint pk_rlipartition primary key(rli_id, pattern); create index t_rlipartition_pattern on t_rlipartition(pattern); create table t_attribute ( id serial primary key, - name varchar(250) not null, + name varchar(500) not null, objtype int not null, type int not null ); @@ -71,7 +71,7 @@ create table t_str_attr ( obj_id int not null, attr_id int not null references t_attribute(id), - value varchar(250) not null + value varchar(500) not null ); create index t_str_attr_attr_id on t_str_attr(attr_id); create index t_str_attr_value on t_str_attr(value); diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/globus-rls-lrc-sqlite.sql gt4.2.1-all-source-installer/source-trees/replica/rls/setup/globus-rls-lrc-sqlite.sql --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/globus-rls-lrc-sqlite.sql 2006-08-22 01:12:32.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/setup/globus-rls-lrc-sqlite.sql 2009-03-16 09:09:01.000000000 +0100 @@ -1,13 +1,13 @@ create table t_lfn ( id integer primary key, - name varchar(250) not null, + name varchar(500) not null, ref integer default 0 not null ); create unique index t_lfn_name on t_lfn(name); create table t_pfn ( id integer primary key, - name varchar(250) not null, + name varchar(500) not null, ref integer default 0 not null ); create unique index t_pfn_name on t_pfn(name); @@ -23,13 +23,13 @@ create table t_rli ( id integer primary key, flags integer default 0 not null, - name varchar(250) not null + name varchar(500) not null ); create unique index t_rli_name on t_rli(name); create table t_rlipartition ( rli_id integer not null references t_rli(id), - pattern varchar(250) not null + pattern varchar(500) not null ); create unique index pk_rlipartition on t_rlipartition(rli_id, pattern); create index t_rlipartition_rli_id on t_rlipartition(rli_id); @@ -37,7 +37,7 @@ create table t_attribute ( id integer primary key, - name varchar(250) not null, + name varchar(500) not null, objtype integer not null, type integer not null ); @@ -73,7 +73,7 @@ create table t_str_attr ( obj_id integer not null, attr_id integer not null references t_attribute(id), - value varchar(250) not null + value varchar(500) not null ); create index t_str_attr_attr_id on t_str_attr(attr_id); create index t_str_attr_value on t_str_attr(value); diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/globus-rls-rli-mysql.sql gt4.2.1-all-source-installer/source-trees/replica/rls/setup/globus-rls-rli-mysql.sql --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/globus-rls-rli-mysql.sql 2003-11-04 07:14:42.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/setup/globus-rls-rli-mysql.sql 2009-03-16 09:09:01.000000000 +0100 @@ -6,21 +6,21 @@ create table t_lfn ( id int not null auto_increment primary key, - name varchar(250) not null, + name varchar(500) not null, ref int default 0 not null ) type = innodb; create unique index t_lfn_name on t_lfn(name); create table t_lrc ( id int not null auto_increment primary key, - name varchar(250) not null, + name varchar(500) not null, ref int default 0 not null ) type = innodb; create unique index t_lrc_name on t_lrc(name); create table t_sender ( id int not null auto_increment primary key, - name varchar(250) not null, + name varchar(500) not null, ref int default 0 not null ) type = innodb; create unique index t_sender_name on t_sender(name); @@ -39,13 +39,13 @@ create table t_rli ( id int not null auto_increment primary key, flags int default 0 not null, - name varchar(250) not null + name varchar(500) not null ) type = innodb; create unique index t_rli_name on t_rli(name); create table t_rlipartition ( rli_id int not null references t_rli(id), - pattern varchar(250) not null + pattern varchar(500) not null ) type = innodb; alter table t_rlipartition add constraint pk_rlipartition primary key(rli_id, pattern); create index t_rlipartition_pattern on t_rlipartition(pattern); diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/globus-rls-rli-oracle.sql gt4.2.1-all-source-installer/source-trees/replica/rls/setup/globus-rls-rli-oracle.sql --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/globus-rls-rli-oracle.sql 2003-11-04 07:14:42.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/setup/globus-rls-rli-oracle.sql 2009-03-16 09:09:01.000000000 +0100 @@ -1,6 +1,6 @@ create table t_lfn ( id int primary key, - name varchar(250) not null, + name varchar(500) not null, ref int default 0 not null ); create sequence s_lfn_id start with 1 increment by 1; @@ -15,7 +15,7 @@ create table t_lrc ( id int primary key, - name varchar(250) not null, + name varchar(500) not null, ref int default 0 not null ); create sequence s_lrc_id start with 1 increment by 1; @@ -30,7 +30,7 @@ create table t_sender ( id int primary key, - name varchar(250) not null, + name varchar(500) not null, ref int default 0 not null ); create sequence s_sender_id start with 1 increment by 1; @@ -57,7 +57,7 @@ create table t_rli ( id int primary key, flags int default 0 not null, - name varchar(250) not null + name varchar(500) not null ); create sequence s_rli_id start with 1 increment by 1; create or replace trigger tr_rli @@ -71,7 +71,7 @@ create table t_rlipartition ( rli_id int not null references t_rli(id), - pattern varchar(250) not null + pattern varchar(500) not null ); alter table t_rlipartition add constraint pk_rlipartition primary key(rli_id, pattern); create index t_rlipartition_pattern on t_rlipartition(pattern); diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/globus-rls-rli-postgres.sql gt4.2.1-all-source-installer/source-trees/replica/rls/setup/globus-rls-rli-postgres.sql --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/globus-rls-rli-postgres.sql 2003-11-04 07:14:42.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/setup/globus-rls-rli-postgres.sql 2009-03-16 09:09:01.000000000 +0100 @@ -1,20 +1,20 @@ create table t_lfn ( id serial primary key, - name varchar(250) not null, + name varchar(500) not null, ref int default 0 not null ); create unique index t_lfn_name on t_lfn(name); create table t_lrc ( id serial primary key, - name varchar(250) not null, + name varchar(500) not null, ref int default 0 not null ); create unique index t_lrc_name on t_lrc(name); create table t_sender ( id serial primary key, - name varchar(250) not null, + name varchar(500) not null, ref int default 0 not null ); create unique index t_sender_name on t_sender(name); @@ -33,13 +33,13 @@ create table t_rli ( id serial primary key, flags int default 0 not null, - name varchar(250) not null + name varchar(500) not null ); create unique index t_rli_name on t_rli(name); create table t_rlipartition ( rli_id int not null references t_rli(id), - pattern varchar(250) not null + pattern varchar(500) not null ); alter table t_rlipartition add constraint pk_rlipartition primary key(rli_id, pattern); create index t_rlipartition_pattern on t_rlipartition(pattern); diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/globus-rls-rli-sqlite.sql gt4.2.1-all-source-installer/source-trees/replica/rls/setup/globus-rls-rli-sqlite.sql --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/globus-rls-rli-sqlite.sql 2006-08-22 01:12:32.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/setup/globus-rls-rli-sqlite.sql 2009-03-16 09:09:01.000000000 +0100 @@ -1,20 +1,20 @@ create table t_lfn ( id integer primary key, - name varchar(250) not null, + name varchar(500) not null, ref integer default 0 not null ); create unique index t_lfn_name on t_lfn(name); create table t_lrc ( id integer primary key, - name varchar(250) not null, + name varchar(500) not null, ref integer default 0 not null ); create unique index t_lrc_name on t_lrc(name); create table t_sender ( id integer primary key, - name varchar(250) not null, + name varchar(500) not null, ref integer default 0 not null ); create unique index t_sender_name on t_sender(name); @@ -33,13 +33,13 @@ create table t_rli ( id integer primary key, flags integer default 0 not null, - name varchar(250) not null + name varchar(500) not null ); create unique index t_rli_name on t_rli(name); create table t_rlipartition ( rli_id integer not null references t_rli(id), - pattern varchar(250) not null + pattern varchar(500) not null ); create unique index pk_rlipartition on t_rlipartition(rli_id, pattern); create index t_rlipartition_rli_id on t_rlipartition(rli_id); diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/odbc.ini.in gt4.2.1-all-source-installer/source-trees/replica/rls/setup/odbc.ini.in --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/odbc.ini.in 2007-06-14 09:48:35.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/setup/odbc.ini.in 2009-03-16 09:08:51.000000000 +0100 @@ -1,19 +1,27 @@ [lrc1000] -Driver = @GLOBUS_LOCATION@/lib/libsqlite3odbc@SQLITEODBCFLAVOR@.@LIBSUFFIX@ -Database = @GLOBUS_LOCATION@/var/lrc1000.db +Driver = @libdir@/libsqlite3odbc@SQLITEODBCFLAVOR@.@LIBSUFFIX@ +Database = @localstatedir@/lrc1000.db [rli1000] -Driver = @GLOBUS_LOCATION@/lib/libsqlite3odbc@SQLITEODBCFLAVOR@.@LIBSUFFIX@ -Database = @GLOBUS_LOCATION@/var/rli1000.db +Driver = @libdir@/libsqlite3odbc@SQLITEODBCFLAVOR@.@LIBSUFFIX@ +Database = @localstatedir@/rli1000.db [lrc1000_psql] -Driver = @GLOBUS_LOCATION@/lib/psqlodbc.@LIBSUFFIX@ +Driver = @libdir@/psqlodbc.@LIBSUFFIX@ Database = lrc1000 Servername = localhost Port = 5432 [rli1000_psql] -Driver = @GLOBUS_LOCATION@/lib/psqlodbc.@LIBSUFFIX@ +Driver = @libdir@/psqlodbc.@LIBSUFFIX@ Database = rli1000 Servername = localhost Port = 5432 + +[lrc1000_mysql] +Driver = @libdir@/libmyodbc3_r.@LIBSUFFIX@ +Database = lrc1000 + +[rli1000_mysql] +Driver = @libdir@/libmyodbc3_r.@LIBSUFFIX@ +Database = rli1000 diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/pkgdata/pkg_data_src.gpt.in gt4.2.1-all-source-installer/source-trees/replica/rls/setup/pkgdata/pkg_data_src.gpt.in --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/pkgdata/pkg_data_src.gpt.in 2007-06-14 09:56:07.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/setup/pkgdata/pkg_data_src.gpt.in 2009-03-16 09:08:51.000000000 +0100 @@ -3,8 +3,7 @@ - - + Replica Location Service Server Setup diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/rls-ldif.conf.in gt4.2.1-all-source-installer/source-trees/replica/rls/setup/rls-ldif.conf.in --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/rls-ldif.conf.in 2002-12-22 11:37:17.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/setup/rls-ldif.conf.in 2009-03-16 09:08:51.000000000 +0100 @@ -7,9 +7,9 @@ dn: RLS=stats, Mds-Vo-name=local, o=grid objectclass: GlobusTop objectclass: GlobusActiveObject -objectclass GlobusActiveSearch +objectclass: GlobusActiveSearch type: exec -path: @GLOBUS_LOCATION@/libexec +path: @sbindir@ base: globus-rls-reporter args: -d RLS=stats,Mds-Vo-name=local,o=grid rls://localhost cachetime: 300 diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/setup-globus-rls-server gt4.2.1-all-source-installer/source-trees/replica/rls/setup/setup-globus-rls-server --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/setup-globus-rls-server 2007-07-02 21:13:22.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/setup/setup-globus-rls-server 2009-03-16 09:08:51.000000000 +0100 @@ -1,6 +1,10 @@ #! /bin/sh -. $GLOBUS_LOCATION/etc/globus-user-env.sh -. $GLOBUS_LOCATION/libexec/globus-sh-tools.sh +if test -f "${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer" ; then + . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer +else + . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer +fi +. ${libexecdir}/globus-sh-tools.sh -perl $GLOBUS_LOCATION/setup/globus/setup-globus-rls-server.pl +perl ${setupdir}/setup-globus-rls-server.pl diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/setup-globus-rls-server.pl gt4.2.1-all-source-installer/source-trees/replica/rls/setup/setup-globus-rls-server.pl --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/setup-globus-rls-server.pl 2007-06-14 09:48:35.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/setup/setup-globus-rls-server.pl 2009-03-16 09:08:51.000000000 +0100 @@ -19,12 +19,7 @@ if (!defined($gpath)) { - $gpath = $ENV{GLOBUS_LOCATION}; -} - -if (!defined($gpath)) -{ - die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script" + $gpath = "/usr"; } @INC = (@INC, "$gpath/lib/perl"); @@ -33,19 +28,20 @@ my $metadata = new Grid::GPT::Setup(package_name => "globus_rls_server_setup"); -my $globusdir = $ENV{GLOBUS_LOCATION}; - -if((!defined($globusdir))) -{ - die "GLOBUS_LOCATION needs to be set before running this script" -} +require Globus::Core::Paths; +my $setupdir = $Globus::Core::Paths::setupdir; +my $globusdir = $Globus::Core::Paths::prefix; +my $libdir = $Globus::Core::Paths::libdir; +my $localstatedir = $Globus::Core::Paths::localstatedir; +my $sbindir = $Globus::Core::Paths::sbindir; +my $sysconfdir = $Globus::Core::Paths::sysconfdir; my $shell = $ENV{GLOBUS_SH}; if (!defined($shell)) { $shell = "/bin/sh"; } -my $odbclib = "$globusdir/lib"; +my $odbclib = "$libdir"; my $iodbc = $ENV{GLOBUS_IODBC_PATH}; if (defined($iodbc)) { @@ -66,7 +62,7 @@ my $odbcini = $ENV{ODBCINI}; if (!defined($odbcini)) { - $odbcini = "$globusdir/var/odbc.ini"; + $odbcini = "$localstatedir/odbc.ini"; } # Determine sysname @@ -98,14 +94,15 @@ $sqliteodbcflavor = "_" . @$pkgs[0]->flavor(); } -my $setupdir = "$globusdir/setup/globus"; - for my $f ("SXXrls", "globus-rls-server.conf", "rls-ldif.conf", "odbc.ini") { print "creating $f\n"; open(FIN, "<$setupdir/${f}.in") || die "Can't find $setupdir/${f}.in"; open(FOUT, ">$setupdir/${f}") || die "Can't open $setupdir/${f}.in"; while () { s/\@GLOBUS_LOCATION\@/$globusdir/g; + s/\@libdir\@/$libdir/g; + s/\@localstatedir\@/$localstatedir/g; + s/\@sbindir\@/$sbindir/g; s/\@ODBCLIB\@/$odbclib/g; s/\@ODBCINI\@/$odbcini/g; s/\@SHELL\@/$shell/g; @@ -117,36 +114,36 @@ close FOUT; } -system("cp $setupdir/SXXrls $globusdir/sbin/."); -system("chmod 0755 $globusdir/sbin/SXXrls"); +system("cp $setupdir/SXXrls $sbindir"); +system("chmod 0755 $sbindir/SXXrls"); -if (-e "$globusdir/etc/globus-rls-server.conf") { - print "$globusdir/etc/globus-rls-server.conf already exists, not replacing with $setupdir/globus-rls-server.conf\n"; +if (-e "$sysconfdir/globus-rls-server.conf") { + print "$sysconfdir/globus-rls-server.conf already exists, not replacing with $setupdir/globus-rls-server.conf\n"; } else { - system("cp $setupdir/globus-rls-server.conf $globusdir/etc/."); - system("chmod 0600 $globusdir/etc/globus-rls-server.conf"); + system("cp $setupdir/globus-rls-server.conf $sysconfdir"); + system("chmod 0600 $sysconfdir/globus-rls-server.conf"); } -system("cp $setupdir/rls-ldif.conf $globusdir/etc/."); -system("chmod 0644 $globusdir/etc/rls-ldif.conf"); +system("cp $setupdir/rls-ldif.conf $sysconfdir"); +system("chmod 0644 $sysconfdir/rls-ldif.conf"); -if (-e "$globusdir/var/odbc.ini") { - print "$globusdir/var/odbc.ini already exists, not replacing with $setupdir/odbc.ini\n"; +if (-e "$localstatedir/odbc.ini") { + print "$localstatedir/odbc.ini already exists, not replacing with $setupdir/odbc.ini\n"; } else { - system("cp $setupdir/odbc.ini $globusdir/var/."); - system("chmod 0644 $globusdir/var/odbc.ini"); + system("cp $setupdir/odbc.ini $localstatedir"); + system("chmod 0644 $localstatedir/odbc.ini"); } -if (-e "$globusdir/var/lrc1000.db") { - print "$globusdir/var/lrc1000.db already exists, not recreating lrc1000 database.\n"; +if (-e "$localstatedir/lrc1000.db") { + print "$localstatedir/lrc1000.db already exists, not recreating lrc1000 database.\n"; } else { - system("$globusdir/bin/sqlite3 $globusdir/var/lrc1000.db < $globusdir/setup/globus/globus-rls-lrc-sqlite.sql"); + system("sqlite3 $localstatedir/lrc1000.db < $setupdir/globus-rls-lrc-sqlite.sql"); } -if (-e "$globusdir/var/rli1000.db") { - print "$globusdir/var/rli1000.db already exists, not recreating rli1000 database.\n"; +if (-e "$localstatedir/rli1000.db") { + print "$localstatedir/rli1000.db already exists, not recreating rli1000 database.\n"; } else { - system("$globusdir/bin/sqlite3 $globusdir/var/rli1000.db < $globusdir/setup/globus/globus-rls-rli-sqlite.sql"); + system("sqlite3 $localstatedir/rli1000.db < $setupdir/globus-rls-rli-sqlite.sql"); } print "Done\n"; diff -Nur gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/SXXrls.in gt4.2.1-all-source-installer/source-trees/replica/rls/setup/SXXrls.in --- gt4.2.1-all-source-installer.orig/source-trees/replica/rls/setup/SXXrls.in 2006-06-09 00:30:32.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/replica/rls/setup/SXXrls.in 2009-03-16 09:08:51.000000000 +0100 @@ -5,7 +5,11 @@ export GLOBUS_LOCATION -. ${GLOBUS_LOCATION}/libexec/globus-script-initializer +if test -f "${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer" ; then + . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer +else + . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer +fi . ${libexecdir}/globus-sh-tools.sh case "$1" in @@ -14,7 +18,7 @@ echo "Starting up RLS server" - if [ "$ODBCLIB" != "$GLOBUS_LOCATION" ]; then + if [ "$ODBCLIB" != "${libdir}" ]; then if [ -d ${ODBCLIB} ]; then if [ "X$LD_LIBRARY_PATH" = "X" ]; then LD_LIBRARY_PATH=${ODBCLIB} @@ -25,7 +29,7 @@ fi fi - ${bindir}/globus-rls-server + ${sbindir}/globus-rls-server if [ $? -ne 0 ] ; then echo "Failed to start up RLS server" diff -Nur gt4.2.1-all-source-installer.orig/source-trees/xio/drivers/gsi/configure.in gt4.2.1-all-source-installer/source-trees/xio/drivers/gsi/configure.in --- gt4.2.1-all-source-installer.orig/source-trees/xio/drivers/gsi/configure.in 2006-04-21 21:10:34.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/xio/drivers/gsi/configure.in 2009-03-16 09:03:23.000000000 +0100 @@ -12,7 +12,7 @@ dnl Initialize the automake rules the last argument AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION) -LAC_DOXYGEN("../", "", "$GLOBUS_LOCATION/sbin/globus-vararg-enums-doxygen-filter.pl") +LAC_DOXYGEN("../", "", "${GLOBUS_LOCATION:-/usr}/sbin/globus-vararg-enums-doxygen-filter.pl") GLOBUS_FINALIZE diff -Nur gt4.2.1-all-source-installer.orig/source-trees/xio/drivers/gsi/globus_xio_gsi.c gt4.2.1-all-source-installer/source-trees/xio/drivers/gsi/globus_xio_gsi.c --- gt4.2.1-all-source-installer.orig/source-trees/xio/drivers/gsi/globus_xio_gsi.c 2008-09-18 22:24:06.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/xio/drivers/gsi/globus_xio_gsi.c 2009-03-16 09:03:27.000000000 +0100 @@ -577,11 +577,11 @@ if(driver_server) { - result = globus_l_xio_gsi_attr_copy((void **) &attr, driver_server); + result = globus_l_xio_gsi_attr_copy((void **) (void *) &attr, driver_server); } else { - result = globus_l_xio_gsi_attr_init((void **) &attr); + result = globus_l_xio_gsi_attr_init((void **) (void *) &attr); } if(result != GLOBUS_SUCCESS) { @@ -1715,7 +1715,7 @@ if(driver_attr) { - result = globus_l_xio_gsi_attr_copy((void **) &handle->attr, + result = globus_l_xio_gsi_attr_copy((void **) (void *) &handle->attr, driver_attr); if(result == GLOBUS_SUCCESS && driver_link) { @@ -1724,13 +1724,13 @@ } else if(driver_link) { - result = globus_l_xio_gsi_attr_copy((void **) &handle->attr, + result = globus_l_xio_gsi_attr_copy((void **) (void *) &handle->attr, driver_link); } else { result = globus_l_xio_gsi_attr_copy( - (void **) &handle->attr, + (void **) (void *) &handle->attr, (void *) &globus_l_xio_gsi_attr_default); } diff -Nur gt4.2.1-all-source-installer.orig/source-trees/xio/drivers/gsi/pkgdata/pkg_data_src.gpt.in gt4.2.1-all-source-installer/source-trees/xio/drivers/gsi/pkgdata/pkg_data_src.gpt.in --- gt4.2.1-all-source-installer.orig/source-trees/xio/drivers/gsi/pkgdata/pkg_data_src.gpt.in 2008-09-18 22:29:09.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/xio/drivers/gsi/pkgdata/pkg_data_src.gpt.in 2009-03-16 09:03:18.000000000 +0100 @@ -26,7 +26,7 @@ - + diff -Nur gt4.2.1-all-source-installer.orig/source-trees/xio/drivers/popen/source/pkgdata/pkg_data_src.gpt.in gt4.2.1-all-source-installer/source-trees/xio/drivers/popen/source/pkgdata/pkg_data_src.gpt.in --- gt4.2.1-all-source-installer.orig/source-trees/xio/drivers/popen/source/pkgdata/pkg_data_src.gpt.in 2006-12-07 23:58:11.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/xio/drivers/popen/source/pkgdata/pkg_data_src.gpt.in 2009-03-16 09:04:08.000000000 +0100 @@ -18,7 +18,7 @@ - + @@ -26,14 +26,6 @@ - - - - - - - - @@ -46,5 +38,3 @@ -~ -~ diff -Nur gt4.2.1-all-source-installer.orig/source-trees/xio/src/builtins/http/globus_xio_http.h gt4.2.1-all-source-installer/source-trees/xio/src/builtins/http/globus_xio_http.h --- gt4.2.1-all-source-installer.orig/source-trees/xio/src/builtins/http/globus_xio_http.h 2008-04-30 20:25:27.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/xio/src/builtins/http/globus_xio_http.h 2009-03-16 09:01:37.000000000 +0100 @@ -403,7 +403,7 @@ */ /* int * status_code, char ** reason_phrase, - globus_xio_http_version_t * version, + globus_xio_http_version_t * http_version, globus_hashtable_t * headers */ GLOBUS_XIO_HTTP_GET_RESPONSE @@ -445,8 +445,7 @@ * @ingroup http_driver * Valid HTTP versions, used with the * #GLOBUS_XIO_HTTP_ATTR_SET_REQUEST_HTTP_VERSION attribute and the - * #GLOBUS_XIO_HTTP_HANDLE_SET_RESPONSE_HTTP_VERSION, and - * #GLOBUS_XIO_HTTP_HANDLE_GET_REQUEST_HTTP_VERSION handle controls. + * #GLOBUS_XIO_HTTP_HANDLE_SET_RESPONSE_HTTP_VERSION handle control. */ typedef enum { diff -Nur gt4.2.1-all-source-installer.orig/source-trees/xio/src/builtins/mode_e/globus_xio_mode_e_driver.c gt4.2.1-all-source-installer/source-trees/xio/src/builtins/mode_e/globus_xio_mode_e_driver.c --- gt4.2.1-all-source-installer.orig/source-trees/xio/src/builtins/mode_e/globus_xio_mode_e_driver.c 2006-07-25 18:30:34.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/xio/src/builtins/mode_e/globus_xio_mode_e_driver.c 2009-03-16 09:01:45.000000000 +0100 @@ -526,7 +526,7 @@ memset(handle, 0, sizeof(globus_l_xio_mode_e_handle_t)); if (!attr) { - result = globus_l_xio_mode_e_attr_init((void**)&handle->attr); + result = globus_l_xio_mode_e_attr_init((void**)(void*)&handle->attr); if (result != GLOBUS_SUCCESS) { result = GlobusXIOErrorWrapFailed( @@ -537,7 +537,7 @@ else { result = globus_l_xio_mode_e_attr_copy( - (void**)&handle->attr, (void*)attr); + (void**)(void*)&handle->attr, (void*)attr); if (result != GLOBUS_SUCCESS) { result = GlobusXIOErrorWrapFailed( diff -Nur gt4.2.1-all-source-installer.orig/source-trees/xio/src/builtins/mode_e/globus_xio_mode_e_driver.h gt4.2.1-all-source-installer/source-trees/xio/src/builtins/mode_e/globus_xio_mode_e_driver.h --- gt4.2.1-all-source-installer.orig/source-trees/xio/src/builtins/mode_e/globus_xio_mode_e_driver.h 2006-04-21 21:10:39.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/xio/src/builtins/mode_e/globus_xio_mode_e_driver.h 2009-03-16 09:01:37.000000000 +0100 @@ -176,7 +176,7 @@ * @param num_streams * Specifies the number of streams to use. */ - /* int max_connection_count */ + /* int num_streams */ GLOBUS_XIO_MODE_E_SET_NUM_STREAMS, /** GlobusVarArgEnum(attr) @@ -186,7 +186,7 @@ * @param num_streams_out * The stream count will be stored here. */ - /* int * max_connection_count_out */ + /* int * num_streams_out */ GLOBUS_XIO_MODE_E_GET_NUM_STREAMS, /** GlobusVarArgEnum(attr) @@ -218,10 +218,9 @@ * a data_desc or the driver has to calculate the EODC * @ingroup mode_e_driver_cntls * - * @param eof - * GLOBUS_TRUE to send EOF (default), GLOBUS_FALSE to not send EOF. - * @param eod_count - * Specifies the number of EODs that must be received by the server. + * @param manual_eodc + * GLOBUS_TRUE to set EODC manually, GLOBUS_FALSE to not set EODC + * manually (default). */ /* globus_bool_t manual_eodc */ GLOBUS_XIO_MODE_E_SET_MANUAL_EODC, @@ -230,7 +229,7 @@ * Get MANUAL_EODC flag on the attr. * @ingroup mode_e_driver_cntls * - * @param eof_out + * @param manual_eodc_out * The MANUAL_EODC flag will be stored here. */ /* globus_bool_t * manual_eodc_out */ @@ -292,7 +291,7 @@ * The stack will be stored here. If none is set, GLOBUS_NULL will be * set. */ - /* globus_xio_attr_t * attr_out */ + /* globus_xio_attr_t * stack_out */ GLOBUS_XIO_MODE_E_GET_STACK_ATTR diff -Nur gt4.2.1-all-source-installer.orig/source-trees/xio/src/builtins/ordering/globus_xio_ordering_driver.c gt4.2.1-all-source-installer/source-trees/xio/src/builtins/ordering/globus_xio_ordering_driver.c --- gt4.2.1-all-source-installer.orig/source-trees/xio/src/builtins/ordering/globus_xio_ordering_driver.c 2008-09-26 08:04:52.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/xio/src/builtins/ordering/globus_xio_ordering_driver.c 2009-03-16 09:01:46.000000000 +0100 @@ -367,12 +367,12 @@ } if (!attr) { - result = globus_l_xio_ordering_attr_init((void**)&handle->attr); + result = globus_l_xio_ordering_attr_init((void**)(void*)&handle->attr); } else { result = globus_l_xio_ordering_attr_copy( - (void**)&handle->attr, (void*)attr); + (void**)(void*)&handle->attr, (void*)attr); } if (result != GLOBUS_SUCCESS) { diff -Nur gt4.2.1-all-source-installer.orig/source-trees/xio/src/builtins/tcp/globus_xio_tcp_driver.c gt4.2.1-all-source-installer/source-trees/xio/src/builtins/tcp/globus_xio_tcp_driver.c --- gt4.2.1-all-source-installer.orig/source-trees/xio/src/builtins/tcp/globus_xio_tcp_driver.c 2008-09-18 08:17:07.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/xio/src/builtins/tcp/globus_xio_tcp_driver.c 2009-03-16 09:01:46.000000000 +0100 @@ -2028,7 +2028,7 @@ } result = globus_l_xio_tcp_attr_copy( - (void **) &connect_info->attr, (void *) attr); + (void **) (void *) &connect_info->attr, (void *) attr); if(result != GLOBUS_SUCCESS) { result = GlobusXIOErrorWrapFailed( diff -Nur gt4.2.1-all-source-installer.orig/source-trees/xio/src/builtins/telnet/globus_xio_telnet.c gt4.2.1-all-source-installer/source-trees/xio/src/builtins/telnet/globus_xio_telnet.c --- gt4.2.1-all-source-installer.orig/source-trees/xio/src/builtins/telnet/globus_xio_telnet.c 2007-08-08 00:50:29.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/xio/src/builtins/telnet/globus_xio_telnet.c 2009-03-16 09:01:46.000000000 +0100 @@ -455,7 +455,7 @@ return GLOBUS_SUCCESS; } - res = globus_l_xio_telnet_attr_init((void **) &dest_attr); + res = globus_l_xio_telnet_attr_init((void **) (void *) &dest_attr); if(res == GLOBUS_SUCCESS) { src_attr = (globus_l_xio_telnet_attr_t *) src_driver_attr; @@ -525,7 +525,7 @@ globus_l_xio_telnet_attr_t * attr; GlobusXIOName(globus_l_xio_telnet_server_init); - res = globus_l_xio_telnet_attr_copy((void **)&attr, driver_attr); + res = globus_l_xio_telnet_attr_copy((void **) (void *) &attr, driver_attr); if(res != GLOBUS_SUCCESS) { goto error; @@ -560,7 +560,7 @@ globus_l_xio_telnet_attr_t * attr; GlobusXIOName(globus_l_xio_telnet_accept); - res = globus_l_xio_telnet_attr_copy((void **)&attr, driver_server); + res = globus_l_xio_telnet_attr_copy((void **) (void *) &attr, driver_server); if(res != GLOBUS_SUCCESS) { goto error; diff -Nur gt4.2.1-all-source-installer.orig/source-trees/xio/src/configure.in gt4.2.1-all-source-installer/source-trees/xio/src/configure.in --- gt4.2.1-all-source-installer.orig/source-trees/xio/src/configure.in 2008-10-03 07:13:03.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/xio/src/configure.in 2009-03-16 09:01:37.000000000 +0100 @@ -55,7 +55,7 @@ CFLAGS="$CFLAGS -DGLOBUS_BUILTIN" LAC_DOXYGEN("../ $XIO_BUILTIN_DOXY_DIRS", "*.doc", - "$GLOBUS_LOCATION/sbin/globus-vararg-enums-doxygen-filter.pl") + "${GLOBUS_LOCATION:-/usr}/sbin/globus-vararg-enums-doxygen-filter.pl") AM_CONFIG_HEADER(config.h) AC_CHECK_FUNCS(sysconf) diff -Nur gt4.2.1-all-source-installer.orig/source-trees/xio/src/configure.in.in gt4.2.1-all-source-installer/source-trees/xio/src/configure.in.in --- gt4.2.1-all-source-installer.orig/source-trees/xio/src/configure.in.in 2004-06-01 18:09:16.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/xio/src/configure.in.in 2009-03-16 09:01:37.000000000 +0100 @@ -55,7 +55,7 @@ CFLAGS="$CFLAGS -DGLOBUS_BUILTIN" LAC_DOXYGEN("../ $XIO_BUILTIN_DOXY_DIRS", "*.doc", - "$GLOBUS_LOCATION/sbin/globus-vararg-enums-doxygen-filter.pl") + "${GLOBUS_LOCATION:-/usr}/sbin/globus-vararg-enums-doxygen-filter.pl") AM_CONFIG_HEADER(config.h) AC_CHECK_FUNCS(sysconf) diff -Nur gt4.2.1-all-source-installer.orig/source-trees/xio/src/globus_xio_driver.h gt4.2.1-all-source-installer/source-trees/xio/src/globus_xio_driver.h --- gt4.2.1-all-source-installer.orig/source-trees/xio/src/globus_xio_driver.h 2008-01-19 01:02:21.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/xio/src/globus_xio_driver.h 2009-03-16 09:01:37.000000000 +0100 @@ -1396,11 +1396,11 @@ * many available parsing functions but the developer is free to right their own * if the provided ones are not sufficient. Sample parsing functions follow: * - * - @ref globus_i_xio_attr_string_single_bool - * - @ref globus_i_xio_attr_string_single_float - * - @ref globus_i_xio_attr_string_single_int - * - @ref globus_i_xio_attr_string_single_string - * - @ref globus_i_xio_attr_string_dual_positive_int + * - @ref globus_xio_string_cntl_bool + * - @ref globus_xio_string_cntl_float + * - @ref globus_xio_string_cntl_int + * - @ref globus_xio_string_cntl_string + * - @ref globus_xio_string_cntl_int_int * */ /** diff -Nur gt4.2.1-all-source-installer.orig/source-trees/xio/src/globus_xio.h gt4.2.1-all-source-installer/source-trees/xio/src/globus_xio.h --- gt4.2.1-all-source-installer.orig/source-trees/xio/src/globus_xio.h 2008-02-14 08:04:07.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/xio/src/globus_xio.h 2009-03-16 09:01:37.000000000 +0100 @@ -118,7 +118,7 @@ */ /** - * @addtongroup GLOBUS_XIO_API_ASSIST + * @addtogroup GLOBUS_XIO_API_ASSIST * * \par Timeouts * A user can set a timeout value for any io operation. Each IO diff -Nur gt4.2.1-all-source-installer.orig/source-trees/xio/src/globus_xio_types.h gt4.2.1-all-source-installer/source-trees/xio/src/globus_xio_types.h --- gt4.2.1-all-source-installer.orig/source-trees/xio/src/globus_xio_types.h 2008-03-12 20:01:11.000000000 +0100 +++ gt4.2.1-all-source-installer/source-trees/xio/src/globus_xio_types.h 2009-03-16 09:01:37.000000000 +0100 @@ -189,6 +189,7 @@ * @param config_string * The driver specific paramter string. */ + /* char * config_string */ GLOBUS_XIO_SET_STRING_OPTIONS } globus_xio_handle_cmd_t; diff -Nur gt4.2.1-all-source-installer.orig/source-trees/xio/src/pkgdata/pkg_data_src.gpt.in gt4.2.1-all-source-installer/source-trees/xio/src/pkgdata/pkg_data_src.gpt.in --- gt4.2.1-all-source-installer.orig/source-trees/xio/src/pkgdata/pkg_data_src.gpt.in 2008-04-30 20:25:28.000000000 +0200 +++ gt4.2.1-all-source-installer/source-trees/xio/src/pkgdata/pkg_data_src.gpt.in 2009-03-16 09:01:42.000000000 +0100 @@ -3,7 +3,7 @@ - + Globus XIO Framework Communication