diff -Nru globus-gsi-credential-7.14/aclocal.m4 globus-gsi-credential-8.0/aclocal.m4 --- globus-gsi-credential-7.14/aclocal.m4 2017-11-08 14:39:49.925754981 +0000 +++ globus-gsi-credential-8.0/aclocal.m4 2018-09-10 19:19:49.459630942 +0000 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.13.4 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -220,21 +220,6 @@ m4_popdef([pkg_description]) ]) dnl PKG_NOARCH_INSTALLDIR - -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. -AC_DEFUN([PKG_CHECK_VAR], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl - -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) - -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR - # Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -247,10 +232,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.13' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.13.4], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -266,7 +251,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.13.4])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -633,12 +618,6 @@ # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. -dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. -m4_define([AC_PROG_CC], -m4_defn([AC_PROG_CC]) -[_AM_PROG_CC_C_O -]) - # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -747,48 +726,7 @@ AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl - -# POSIX will say in a future version that running "rm -f" with no argument -# is OK; and we want to be able to make that assumption in our Makefile -# recipes. So use an aggressive probe to check that the usage we want is -# actually supported "in the wild" to an acceptable degree. -# See automake bug#10828. -# To make any issue more visible, cause the running configure to be aborted -# by default if the 'rm' program in use doesn't match our expectations; the -# user can still override this though. -if rm -f && rm -fr && rm -rf; then : OK; else - cat >&2 <<'END' -Oops! - -Your 'rm' program seems unable to run without file operands specified -on the command line, even when the '-f' option is present. This is contrary -to the behaviour of most rm programs out there, and not conforming with -the upcoming POSIX standard: - -Please tell bug-automake@gnu.org about your system, including the value -of your $PATH and any error possibly output before this message. This -can help us improve future automake versions. - -END - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then - echo 'Configuration will proceed anyway, since you have set the' >&2 - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 - echo >&2 - else - cat >&2 <<'END' -Aborting the configuration process, to ensure you take notice of the issue. - -You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . - -If you want to complete the configuration process using your problematic -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -to "yes", and re-run configure. - -END - AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) - fi -fi]) +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -796,6 +734,7 @@ m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -977,53 +916,6 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# _AM_PROG_CC_C_O -# --------------- -# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC -# to automatically call this. -AC_DEFUN([_AM_PROG_CC_C_O], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -AC_LANG_PUSH([C])dnl -AC_CACHE_CHECK( - [whether $CC understands -c and -o together], - [am_cv_prog_cc_c_o], - [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ - && test -f conftest2.$ac_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break - fi - done - rm -f core conftest* - unset am_i]) -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -AC_LANG_POP([C])]) - -# For backward compatibility. -AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) - # Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -Nru globus-gsi-credential-7.14/build-aux/compile globus-gsi-credential-8.0/build-aux/compile --- globus-gsi-credential-7.14/build-aux/compile 2017-11-08 14:39:52.826754981 +0000 +++ globus-gsi-credential-8.0/build-aux/compile 1970-01-01 00:00:00.000000000 +0000 @@ -1,347 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand '-c -o'. - -scriptversion=2012-10-14.11; # UTC - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# Written by Tom Tromey . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -nl=' -' - -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent tools from complaining about whitespace usage. -IFS=" "" $nl" - -file_conv= - -# func_file_conv build_file lazy -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. -func_file_conv () -{ - file=$1 - case $file in - / | /[!/]*) # absolute file, and not a UNC file - if test -z "$file_conv"; then - # lazily determine how to convert abs files - case `uname -s` in - MINGW*) - file_conv=mingw - ;; - CYGWIN*) - file_conv=cygwin - ;; - *) - file_conv=wine - ;; - esac - fi - case $file_conv/,$2, in - *,$file_conv,*) - ;; - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; - cygwin/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) - file=`winepath -w "$file" || echo "$file"` - ;; - esac - ;; - esac -} - -# func_cl_dashL linkdir -# Make cl look for libraries in LINKDIR -func_cl_dashL () -{ - func_file_conv "$1" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" -} - -# func_cl_dashl library -# Do a library search-path lookup for cl -func_cl_dashl () -{ - lib=$1 - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - lib=$dir/$lib.dll.lib - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - lib=$dir/$lib.lib - break - fi - if test -f "$dir/lib$lib.a"; then - found=yes - lib=$dir/lib$lib.a - break - fi - done - IFS=$save_IFS - - if test "$found" != yes; then - lib=$lib.lib - fi -} - -# func_cl_wrapper cl arg... -# Adjust compile command to suit cl -func_cl_wrapper () -{ - # Assume a capable shell - lib_path= - shared=: - linker_opts= - for arg - do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - eat=1 - case $2 in - *.o | *.[oO][bB][jJ]) - func_file_conv "$2" - set x "$@" -Fo"$file" - shift - ;; - *) - func_file_conv "$2" - set x "$@" -Fe"$file" - shift - ;; - esac - ;; - -I) - eat=1 - func_file_conv "$2" mingw - set x "$@" -I"$file" - shift - ;; - -I*) - func_file_conv "${1#-I}" mingw - set x "$@" -I"$file" - shift - ;; - -l) - eat=1 - func_cl_dashl "$2" - set x "$@" "$lib" - shift - ;; - -l*) - func_cl_dashl "${1#-l}" - set x "$@" "$lib" - shift - ;; - -L) - eat=1 - func_cl_dashL "$2" - ;; - -L*) - func_cl_dashL "${1#-L}" - ;; - -static) - shared=false - ;; - -Wl,*) - arg=${1#-Wl,} - save_ifs="$IFS"; IFS=',' - for flag in $arg; do - IFS="$save_ifs" - linker_opts="$linker_opts $flag" - done - IFS="$save_ifs" - ;; - -Xlinker) - eat=1 - linker_opts="$linker_opts $2" - ;; - -*) - set x "$@" "$1" - shift - ;; - *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) - func_file_conv "$1" - set x "$@" -Tp"$file" - shift - ;; - *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) - func_file_conv "$1" mingw - set x "$@" "$file" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift - done - if test -n "$linker_opts"; then - linker_opts="-link$linker_opts" - fi - exec "$@" $linker_opts - exit 1 -} - -eat= - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand '-c -o'. -Remove '-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file 'INSTALL'. - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) - func_cl_wrapper "$@" # Doesn't return... - ;; -esac - -ofile= -cfile= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - # So we strip '-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no '-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # '.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` - -# Create the lock directory. -# Note: use '[/\\:.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - test "$cofile" = "$ofile" || mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff -Nru globus-gsi-credential-7.14/build-aux/config.guess globus-gsi-credential-8.0/build-aux/config.guess --- globus-gsi-credential-7.14/build-aux/config.guess 2017-11-08 14:39:52.840754981 +0000 +++ globus-gsi-credential-8.0/build-aux/config.guess 2018-09-10 19:19:50.428114790 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2014-03-23' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ;; esac @@ -826,7 +826,7 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - *:MSYS*:*) + i*:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +969,10 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; - or32:Linux:*:* | or1k*:Linux:*:*) + or32:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1260,26 +1260,16 @@ if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac fi - elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; @@ -1371,6 +1361,154 @@ exit ;; esac +eval $set_cc_for_build +cat >$dummy.c < +# include +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix\n"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + +# Convex versions that predate uname can use getsysinfo(1) + +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + c34*) + echo c34-convex-bsd + exit ;; + c38*) + echo c38-convex-bsd + exit ;; + c4*) + echo c4-convex-bsd + exit ;; + esac +fi + cat >&2 <, 1996. @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'autom4te' program to be rebuilt." + echo "the 'automa4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff -Nru globus-gsi-credential-7.14/configure globus-gsi-credential-8.0/configure --- globus-gsi-credential-7.14/configure 2017-11-08 14:39:51.148754981 +0000 +++ globus-gsi-credential-8.0/configure 2018-09-10 19:19:49.919860870 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for globus_gsi_credential 7.14. +# Generated by GNU Autoconf 2.69 for globus_gsi_credential 8.0. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -275,10 +275,10 @@ $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: https://github.com/globus/globus-toolkit/issues about -$0: your system, including any error possibly output before -$0: this message. Then install a modern shell, or manually -$0: run the script under such a shell if you do have one." +$0: https://github.com/gridcf/gct/issues about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." fi exit 1 fi @@ -590,9 +590,9 @@ # Identity of this package. PACKAGE_NAME='globus_gsi_credential' PACKAGE_TARNAME='globus_gsi_credential' -PACKAGE_VERSION='7.14' -PACKAGE_STRING='globus_gsi_credential 7.14' -PACKAGE_BUGREPORT='https://github.com/globus/globus-toolkit/issues' +PACKAGE_VERSION='8.0' +PACKAGE_STRING='globus_gsi_credential 8.0' +PACKAGE_BUGREPORT='https://github.com/gridcf/gct/issues' PACKAGE_URL='' # Factoring default headers for most tests. @@ -1334,7 +1334,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures globus_gsi_credential 7.14 to adapt to many kinds of systems. +\`configure' configures globus_gsi_credential 8.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1405,7 +1405,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of globus_gsi_credential 7.14:";; + short | recursive ) echo "Configuration of globus_gsi_credential 8.0:";; esac cat <<\_ACEOF @@ -1460,7 +1460,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -1523,7 +1523,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -globus_gsi_credential configure 7.14 +globus_gsi_credential configure 8.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1801,7 +1801,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by globus_gsi_credential $as_me 7.14, which was +It was created by globus_gsi_credential $as_me 8.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2154,7 +2154,7 @@ MINOR_VERSION=${PACKAGE_VERSION##*.} -AGE_VERSION=6 +AGE_VERSION=7 PACKAGE_DEPS="globus-common >= 14, globus-gsi-openssl-error >= 2, globus-gsi-cert-utils >= 8, globus-gsi-sysconfig >= 5, globus-gsi-callback >= 4" @@ -2188,7 +2188,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -am__api_version='1.14' +am__api_version='1.13' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2674,7 +2674,7 @@ # Define the identity of the package. PACKAGE='globus_gsi_credential' - VERSION='7.14' + VERSION='8.0' cat >>confdefs.h <<_ACEOF @@ -2810,47 +2810,6 @@ -# POSIX will say in a future version that running "rm -f" with no argument -# is OK; and we want to be able to make that assumption in our Makefile -# recipes. So use an aggressive probe to check that the usage we want is -# actually supported "in the wild" to an acceptable degree. -# See automake bug#10828. -# To make any issue more visible, cause the running configure to be aborted -# by default if the 'rm' program in use doesn't match our expectations; the -# user can still override this though. -if rm -f && rm -fr && rm -rf; then : OK; else - cat >&2 <<'END' -Oops! - -Your 'rm' program seems unable to run without file operands specified -on the command line, even when the '-f' option is present. This is contrary -to the behaviour of most rm programs out there, and not conforming with -the upcoming POSIX standard: - -Please tell bug-automake@gnu.org about your system, including the value -of your $PATH and any error possibly output before this message. This -can help us improve future automake versions. - -END - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then - echo 'Configuration will proceed anyway, since you have set the' >&2 - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 - echo >&2 - else - cat >&2 <<'END' -Aborting the configuration process, to ensure you take notice of the issue. - -You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . - -If you want to complete the configuration process using your problematic -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -to "yes", and re-run configure. - -END - as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 - fi -fi case `pwd` in *\ * | *\ *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 @@ -3868,65 +3827,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 - ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } \ - && test -f conftest2.$ac_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break - fi - done - rm -f core conftest* - unset am_i -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -6294,7 +6194,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6312,10 +6212,7 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - powerpc64le-*linux*) - LD="${LD-ld} -m elf32lppclinux" - ;; - powerpc64-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6334,10 +6231,7 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*linux*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*linux*) + ppc*-*linux*|powerpc*-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -11774,8 +11668,8 @@ -DIRT_TIMESTAMP=1510151535 -DIRT_BRANCH_ID=85 +DIRT_TIMESTAMP=1536386276 +DIRT_BRANCH_ID=0 @@ -12131,7 +12025,7 @@ done - if test "$DOXYGEN" != "no"; then + if test "$DOXYGEN" != ""; then ENABLE_DOXYGEN_TRUE= ENABLE_DOXYGEN_FALSE='#' else @@ -12711,7 +12605,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by globus_gsi_credential $as_me 7.14, which was +This file was extended by globus_gsi_credential $as_me 8.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12762,13 +12656,13 @@ Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -globus_gsi_credential config.status 7.14 +globus_gsi_credential config.status 8.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru globus-gsi-credential-7.14/configure.ac globus-gsi-credential-8.0/configure.ac --- globus-gsi-credential-7.14/configure.ac 2017-11-08 14:37:04.639754981 +0000 +++ globus-gsi-credential-8.0/configure.ac 2018-09-10 19:16:52.791380914 +0000 @@ -1,10 +1,10 @@ AC_PREREQ([2.60]) -AC_INIT([globus_gsi_credential],[7.14],[https://github.com/globus/globus-toolkit/issues]) +AC_INIT([globus_gsi_credential],[8.0],[https://github.com/gridcf/gct/issues]) AC_CONFIG_MACRO_DIR([m4]) AC_SUBST([MAJOR_VERSION], [${PACKAGE_VERSION%%.*}]) AC_SUBST([MINOR_VERSION], [${PACKAGE_VERSION##*.}]) -AC_SUBST([AGE_VERSION], [6]) +AC_SUBST([AGE_VERSION], [7]) AC_SUBST([PACKAGE_DEPS], ["globus-common >= 14, globus-gsi-openssl-error >= 2, globus-gsi-cert-utils >= 8, globus-gsi-sysconfig >= 5, globus-gsi-callback >= 4"]) AC_CONFIG_AUX_DIR([build-aux]) @@ -15,8 +15,7 @@ AC_SUBST(DIRT_TIMESTAMP) AC_SUBST(DIRT_BRANCH_ID) -PKG_CHECK_MODULES( - [OPENSSL], [openssl >= 1.0], +PKG_CHECK_MODULES([OPENSSL], [openssl >= 1.0], [OPENSSL_PKGCONFIG="openssl >= 1.0"]) AC_SUBST([OPENSSL_PKGCONFIG]) @@ -24,7 +23,7 @@ AC_PATH_PROGS([DOXYGEN], doxygen) -AM_CONDITIONAL([ENABLE_DOXYGEN], [test "$DOXYGEN" != "no"]) +AM_CONDITIONAL([ENABLE_DOXYGEN], [test "$DOXYGEN" != ""]) AC_CONFIG_FILES( globus-gsi-credential-uninstalled.pc globus-gsi-credential.pc diff -Nru globus-gsi-credential-7.14/debian/changelog globus-gsi-credential-8.0/debian/changelog --- globus-gsi-credential-7.14/debian/changelog 2018-02-05 23:21:37.000000000 +0000 +++ globus-gsi-credential-8.0/debian/changelog 2018-09-16 01:16:31.000000000 +0000 @@ -1,8 +1,10 @@ -globus-gsi-credential (7.14-1build1) bionic; urgency=high +globus-gsi-credential (8.0-1) unstable; urgency=medium - * No change rebuild against openssl1.1. + * Switch upstream to Grid Community Toolkit + * First Grid Community Toolkit release + * Move VCS to salsa.debian.org - -- Dimitri John Ledkov Mon, 05 Feb 2018 23:21:37 +0000 + -- Mattias Ellert Sun, 16 Sep 2018 03:16:31 +0200 globus-gsi-credential (7.14-1) unstable; urgency=medium diff -Nru globus-gsi-credential-7.14/debian/control globus-gsi-credential-8.0/debian/control --- globus-gsi-credential-7.14/debian/control 2018-02-05 23:21:37.000000000 +0000 +++ globus-gsi-credential-8.0/debian/control 2018-09-04 11:03:02.000000000 +0000 @@ -1,13 +1,12 @@ Source: globus-gsi-credential Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Mattias Ellert -Build-Depends: debhelper (>= 9), dh-autoreconf, pkg-config, libglobus-common-dev (>= 15), libglobus-gsi-openssl-error-dev (>= 2), libglobus-gsi-cert-utils-dev (>= 8), libglobus-gsi-sysconfig-dev (>= 5), libglobus-gsi-callback-dev (>= 4), libssl-dev, doxygen, graphviz -Standards-Version: 4.1.1 +Maintainer: Mattias Ellert +Build-Depends: debhelper (>= 9), dh-autoreconf, pkg-config, libglobus-common-dev (>= 15), libglobus-gsi-openssl-error-dev (>= 2), libglobus-gsi-cert-utils-dev (>= 8), libglobus-gsi-sysconfig-dev (>= 5), libglobus-gsi-callback-dev (>= 4), libssl-dev, doxygen +Standards-Version: 4.2.1 Section: net -Vcs-Browser: http://svn.nordugrid.org/trac/packaging/browser/debian/globus-gsi-credential -Vcs-Svn: http://svn.nordugrid.org/repos/packaging/debian/globus-gsi-credential -Homepage: http://toolkit.globus.org/ +Vcs-Browser: https://salsa.debian.org/ellert/globus-gsi-credential +Vcs-Git: https://salsa.debian.org/ellert/globus-gsi-credential.git +Homepage: https://github.com/gridcf/gct/ Package: libglobus-gsi-credential1 Section: libs @@ -15,12 +14,12 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Globus Toolkit - Globus GSI Credential Library - The Globus Toolkit is an open source software toolkit used for - building Grid systems and applications. It is being developed by the - Globus Alliance and many others all over the world. A growing number - of projects and companies are using the Globus Toolkit to unlock the - potential of grids for their cause. +Description: Grid Community Toolkit - Globus GSI Credential Library + The Grid Community Toolkit (GCT) is an open source software toolkit used for + building grid systems and applications. It is a fork of the Globus Toolkit + originally created by the Globus Alliance. It is supported by the Grid + Community Forum (GridCF) that provides community-based support for core + software packages in grid computing. . The libglobus-gsi-credential1 package contains: Globus GSI Credential Library @@ -30,13 +29,13 @@ Architecture: any Multi-Arch: same Depends: libglobus-gsi-credential1 (= ${binary:Version}), ${misc:Depends}, libglobus-common-dev (>= 15), libglobus-gsi-openssl-error-dev (>= 2), libglobus-gsi-cert-utils-dev (>= 8), libglobus-gsi-sysconfig-dev (>= 5), libglobus-gsi-callback-dev (>= 4), libssl-dev -Recommends: libglobus-gsi-credential-doc (= ${source:Version}) -Description: Globus Toolkit - Globus GSI Credential Library Development Files - The Globus Toolkit is an open source software toolkit used for - building Grid systems and applications. It is being developed by the - Globus Alliance and many others all over the world. A growing number - of projects and companies are using the Globus Toolkit to unlock the - potential of grids for their cause. +Suggests: libglobus-gsi-credential-doc (= ${source:Version}) +Description: Grid Community Toolkit - Globus GSI Credential Library Development Files + The Grid Community Toolkit (GCT) is an open source software toolkit used for + building grid systems and applications. It is a fork of the Globus Toolkit + originally created by the Globus Alliance. It is supported by the Grid + Community Forum (GridCF) that provides community-based support for core + software packages in grid computing. . The libglobus-gsi-credential-dev package contains: Globus GSI Credential Library Development Files @@ -47,12 +46,12 @@ Multi-Arch: foreign Pre-Depends: dpkg (>= 1.17.5) Depends: ${misc:Depends} -Description: Globus Toolkit - Globus GSI Credential Library Documentation Files - The Globus Toolkit is an open source software toolkit used for - building Grid systems and applications. It is being developed by the - Globus Alliance and many others all over the world. A growing number - of projects and companies are using the Globus Toolkit to unlock the - potential of grids for their cause. +Description: Grid Community Toolkit - Globus GSI Credential Library Documentation Files + The Grid Community Toolkit (GCT) is an open source software toolkit used for + building grid systems and applications. It is a fork of the Globus Toolkit + originally created by the Globus Alliance. It is supported by the Grid + Community Forum (GridCF) that provides community-based support for core + software packages in grid computing. . The libglobus-gsi-credential-doc package contains: Globus GSI Credential Library Documentation Files diff -Nru globus-gsi-credential-7.14/debian/copyright globus-gsi-credential-8.0/debian/copyright --- globus-gsi-credential-7.14/debian/copyright 2017-11-09 10:14:43.000000000 +0000 +++ globus-gsi-credential-8.0/debian/copyright 2018-09-16 00:55:21.000000000 +0000 @@ -1,16 +1,17 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: globus_gsi_credential -Upstream-Contact: http://toolkit.globus.org/ -Source: https://downloads.globus.org/toolkit/gt6/packages/globus_gsi_credential-7.14.tar.gz +Upstream-Contact: https://github.com/gridcf/gct/ +Source: https://repo.gridcf.org/gct6/sources/globus_gsi_credential-8.0.tar.gz Files: * Copyright: 1999-2017 University of Chicago + 2018 Grid Community Forum License: Apache-2.0 Files: debian/* Copyright: - 2008-2017 Mattias Ellert + 2008-2018 Mattias Ellert 2010-2013 Initiative for Globus in Europe (IGE), http://www.ige-project.eu/ License: Apache-2.0 diff -Nru globus-gsi-credential-7.14/debian/libglobus-gsi-credential-doc.doc-base globus-gsi-credential-8.0/debian/libglobus-gsi-credential-doc.doc-base --- globus-gsi-credential-7.14/debian/libglobus-gsi-credential-doc.doc-base 2011-12-27 11:31:26.000000000 +0000 +++ globus-gsi-credential-8.0/debian/libglobus-gsi-credential-doc.doc-base 2018-03-10 08:10:39.000000000 +0000 @@ -1,7 +1,7 @@ Document: globus-gsi-credential Title: Debian globus-gsi-credential Manual -Author: Globus Alliance -Abstract: The Globus toolkit, Globus GSI Credential Library +Author: Globus Alliance and Grid Community Forum +Abstract: The Grid Community Toolkit, Globus GSI Credential Library Section: Programming Format: HTML diff -Nru globus-gsi-credential-7.14/debian/libglobus-gsi-credential-doc.lintian-overrides globus-gsi-credential-8.0/debian/libglobus-gsi-credential-doc.lintian-overrides --- globus-gsi-credential-7.14/debian/libglobus-gsi-credential-doc.lintian-overrides 2014-09-26 13:47:03.000000000 +0000 +++ globus-gsi-credential-8.0/debian/libglobus-gsi-credential-doc.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -# See /usr/share/doc/doxygen/README.jquery -embedded-javascript-library usr/share/doc/*/html/jquery.js * diff -Nru globus-gsi-credential-7.14/debian/README globus-gsi-credential-8.0/debian/README --- globus-gsi-credential-7.14/debian/README 2016-02-16 06:41:13.000000000 +0000 +++ globus-gsi-credential-8.0/debian/README 2018-03-23 15:16:57.000000000 +0000 @@ -1,28 +1,28 @@ This package is part of the Grid Security Infrastructure in C (GSI C) component -of the Globus Toolkit. For more information visit: +of the Grid Community Toolkit. For more information visit: -http://toolkit.globus.org/toolkit/docs/latest-stable/gsic/ +https://gridcf.org/gct-docs/gsic/ Key Concepts: -http://toolkit.globus.org/toolkit/docs/latest-stable/gsic/key/ +https://gridcf.org/gct-docs/gsic/key/ Admin Guide: -http://toolkit.globus.org/toolkit/docs/latest-stable/gsic/admin/ +https://gridcf.org/gct-docs/gsic/admin/ User's Guide: -http://toolkit.globus.org/toolkit/docs/latest-stable/gsic/user/ +https://gridcf.org/gct-docs/gsic/user/ Developer's Guide: -http://toolkit.globus.org/toolkit/docs/latest-stable/gsic/developer/ +https://gridcf.org/gct-docs/gsic/developer/ Release Notes: -http://toolkit.globus.org/toolkit/docs/latest-stable/gsic/rn/ +https://gridcf.org/gct-docs/gsic/rn/ Public Interface Guide: -http://toolkit.globus.org/toolkit/docs/latest-stable/gsic/pi/ +https://gridcf.org/gct-docs/gsic/pi/ Quality Profile: -http://toolkit.globus.org/toolkit/docs/latest-stable/gsic/qp/ +https://gridcf.org/gct-docs/gsic/qp/ Migrating Guide: -http://toolkit.globus.org/toolkit/docs/latest-stable/gsic/mig/ +https://gridcf.org/gct-docs/gsic/mig/ diff -Nru globus-gsi-credential-7.14/debian/rules globus-gsi-credential-8.0/debian/rules --- globus-gsi-credential-7.14/debian/rules 2017-07-06 10:58:34.000000000 +0000 +++ globus-gsi-credential-8.0/debian/rules 2018-09-16 01:16:31.000000000 +0000 @@ -11,6 +11,7 @@ _prefix = /usr _bindir = $(_prefix)/bin _sbindir = $(_prefix)/sbin +_includedir = $(_prefix)/include _libdir = $(_prefix)/lib _datadir = $(_prefix)/share _mandir = $(_datadir)/man @@ -31,9 +32,8 @@ LDFLAGS="$(LDFLAGS) -Wl,--as-needed -Wl,-z,defs" \ dh_auto_configure -- \ --disable-static \ - --sharedstatedir=/var/lib \ - --includedir='$${prefix}/include/globus' \ - --libexecdir='$${datadir}/globus' \ + --includedir=$(_includedir)/globus \ + --libexecdir=$(_datadir)/globus \ --docdir=$(_docdir) # Reduce overlinking @@ -109,7 +109,6 @@ dh_install -i dh_missing -i --fail-missing dh_installman -i - dh_lintian -i dh_link -i dh_compress -i dh_fixperms -i diff -Nru globus-gsi-credential-7.14/dirt.sh globus-gsi-credential-8.0/dirt.sh --- globus-gsi-credential-7.14/dirt.sh 2017-11-08 14:38:40.760754981 +0000 +++ globus-gsi-credential-8.0/dirt.sh 2018-09-10 19:18:15.692788734 +0000 @@ -1,2 +1,2 @@ -DIRT_TIMESTAMP=1510151535 -DIRT_BRANCH_ID=85 +DIRT_TIMESTAMP=1536386276 +DIRT_BRANCH_ID=0 diff -Nru globus-gsi-credential-7.14/globus-gsi-credential.pc.in globus-gsi-credential-8.0/globus-gsi-credential.pc.in --- globus-gsi-credential-7.14/globus-gsi-credential.pc.in 2017-11-08 14:37:04.640754981 +0000 +++ globus-gsi-credential-8.0/globus-gsi-credential.pc.in 2018-09-10 19:16:52.791380914 +0000 @@ -4,7 +4,7 @@ includedir=@includedir@ Name: globus-gsi-credential -Description: Globus Toolkit - Globus GSI Credential Library +Description: Grid Community Toolkit - Globus GSI Credential Library Version: @PACKAGE_VERSION@ Requires.private: @PACKAGE_DEPS@, @OPENSSL_PKGCONFIG@ Libs: -L${libdir} -lglobus_gsi_credential diff -Nru globus-gsi-credential-7.14/globus-gsi-credential-uninstalled.pc.in globus-gsi-credential-8.0/globus-gsi-credential-uninstalled.pc.in --- globus-gsi-credential-7.14/globus-gsi-credential-uninstalled.pc.in 2017-11-08 14:37:04.640754981 +0000 +++ globus-gsi-credential-8.0/globus-gsi-credential-uninstalled.pc.in 2018-09-10 19:16:52.791380914 +0000 @@ -6,7 +6,7 @@ abs_top_builddir=@abs_top_builddir@ Name: globus-gsi-credential -Description: Globus Toolkit - Globus GSI Credential Library +Description: Grid Community Toolkit - Globus GSI Credential Library Version: @VERSION@ Requires.private: @PACKAGE_DEPS@, @OPENSSL_PKGCONFIG@ Libs: ${abs_top_builddir}/library/libglobus_gsi_credential.la diff -Nru globus-gsi-credential-7.14/library/Makefile.in globus-gsi-credential-8.0/library/Makefile.in --- globus-gsi-credential-7.14/library/Makefile.in 2017-11-08 14:39:53.115754981 +0000 +++ globus-gsi-credential-8.0/library/Makefile.in 2018-09-10 19:19:50.528164775 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -447,14 +447,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff -Nru globus-gsi-credential-7.14/m4/libtool.m4 globus-gsi-credential-8.0/m4/libtool.m4 --- globus-gsi-credential-7.14/m4/libtool.m4 2017-11-08 14:39:45.848754981 +0000 +++ globus-gsi-credential-8.0/m4/libtool.m4 2018-09-10 19:19:46.938371340 +0000 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1326,10 +1326,7 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - powerpc64le-*linux*) - LD="${LD-ld} -m elf32lppclinux" - ;; - powerpc64-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1348,10 +1345,7 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*linux*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*linux*) + ppc*-*linux*|powerpc*-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) diff -Nru globus-gsi-credential-7.14/Makefile.in globus-gsi-credential-8.0/Makefile.in --- globus-gsi-credential-7.14/Makefile.in 2017-11-08 14:39:52.973754981 +0000 +++ globus-gsi-credential-8.0/Makefile.in 2018-09-10 19:19:50.476138783 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -83,9 +83,8 @@ $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/globus-gsi-credential-uninstalled.pc.in \ $(srcdir)/globus-gsi-credential.pc.in $(srcdir)/version.h.in \ - build-aux/compile build-aux/config.guess build-aux/config.sub \ + build-aux/config.guess build-aux/config.sub \ build-aux/install-sh build-aux/missing build-aux/ltmain.sh \ - $(top_srcdir)/build-aux/compile \ $(top_srcdir)/build-aux/config.guess \ $(top_srcdir)/build-aux/config.sub \ $(top_srcdir)/build-aux/install-sh \ @@ -652,16 +651,10 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -703,10 +696,9 @@ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \