diff -Nru globus-gass-copy-10.5/configure globus-gass-copy-10.8/configure --- globus-gass-copy-10.5/configure 2019-08-29 15:30:24.687745679 +0000 +++ globus-gass-copy-10.8/configure 2020-12-12 20:58:07.020897731 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for globus_gass_copy 10.5. +# Generated by GNU Autoconf 2.69 for globus_gass_copy 10.8. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='globus_gass_copy' PACKAGE_TARNAME='globus_gass_copy' -PACKAGE_VERSION='10.5' -PACKAGE_STRING='globus_gass_copy 10.5' +PACKAGE_VERSION='10.8' +PACKAGE_STRING='globus_gass_copy 10.8' PACKAGE_BUGREPORT='https://github.com/gridcf/gct/issues' PACKAGE_URL='' @@ -1352,7 +1352,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_gass_copy 10.5 to adapt to many kinds of systems. +\`configure' configures globus_gass_copy 10.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1423,7 +1423,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of globus_gass_copy 10.5:";; + short | recursive ) echo "Configuration of globus_gass_copy 10.8:";; esac cat <<\_ACEOF @@ -1541,7 +1541,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -globus_gass_copy configure 10.5 +globus_gass_copy configure 10.8 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1819,7 +1819,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_gass_copy $as_me 10.5, which was +It was created by globus_gass_copy $as_me 10.8, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2692,7 +2692,7 @@ # Define the identity of the package. PACKAGE='globus_gass_copy' - VERSION='10.5' + VERSION='10.8' cat >>confdefs.h <<_ACEOF @@ -11686,7 +11686,7 @@ -DIRT_TIMESTAMP=1566483868 +DIRT_TIMESTAMP=1607703417 DIRT_BRANCH_ID=0 @@ -12851,7 +12851,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by globus_gass_copy $as_me 10.5, which was +This file was extended by globus_gass_copy $as_me 10.8, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12908,7 +12908,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -globus_gass_copy config.status 10.5 +globus_gass_copy config.status 10.8 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru globus-gass-copy-10.5/configure.ac globus-gass-copy-10.8/configure.ac --- globus-gass-copy-10.5/configure.ac 2019-08-29 15:23:22.079745679 +0000 +++ globus-gass-copy-10.8/configure.ac 2020-12-12 20:52:21.368897731 +0000 @@ -1,6 +1,6 @@ AC_PREREQ([2.60]) -AC_INIT([globus_gass_copy],[10.5],[https://github.com/gridcf/gct/issues]) +AC_INIT([globus_gass_copy],[10.8],[https://github.com/gridcf/gct/issues]) AC_CONFIG_MACRO_DIR([m4]) AC_SUBST([MAJOR_VERSION], [${PACKAGE_VERSION%%.*}]) AC_SUBST([MINOR_VERSION], [${PACKAGE_VERSION##*.}]) diff -Nru globus-gass-copy-10.5/debian/changelog globus-gass-copy-10.8/debian/changelog --- globus-gass-copy-10.5/debian/changelog 2019-09-02 09:55:40.000000000 +0000 +++ globus-gass-copy-10.8/debian/changelog 2020-12-14 03:37:40.000000000 +0000 @@ -1,3 +1,14 @@ +globus-gass-copy (10.8-1) unstable; urgency=medium + + * Minor fixes to makefiles (10.6) + * Use -nameopt sep_multiline to derive certificate subject string (10.7) + * Document environment variables in globus-url-copy manpage (10.8) + * Change to debhelper compat level 13 + * Remove override_dh_missing rule (--fail-missing is default) + * Drop old symlink-to-dir conversion from 2014 + + -- Mattias Ellert Mon, 14 Dec 2020 04:37:40 +0100 + globus-gass-copy (10.5-1) unstable; urgency=medium * Document guc/dcpriv behaviour with servers not supporting DC encryption diff -Nru globus-gass-copy-10.5/debian/compat globus-gass-copy-10.8/debian/compat --- globus-gass-copy-10.5/debian/compat 2019-07-11 13:07:02.000000000 +0000 +++ globus-gass-copy-10.8/debian/compat 2020-12-12 15:25:06.000000000 +0000 @@ -1 +1 @@ -10 +13 diff -Nru globus-gass-copy-10.5/debian/control globus-gass-copy-10.8/debian/control --- globus-gass-copy-10.5/debian/control 2019-07-11 14:29:27.000000000 +0000 +++ globus-gass-copy-10.8/debian/control 2020-12-12 22:11:41.000000000 +0000 @@ -2,7 +2,7 @@ Priority: optional Maintainer: Mattias Ellert Build-Depends: - debhelper (>= 10), + debhelper (>= 13), pkg-config, libglobus-common-dev (>= 15), libglobus-ftp-client-dev (>= 7), @@ -18,7 +18,7 @@ globus-gridftp-server-progs (>= 7), liburi-perl, openssl -Standards-Version: 4.4.0 +Standards-Version: 4.5.1 Section: net Vcs-Browser: https://salsa.debian.org/ellert/globus-gass-copy Vcs-Git: https://salsa.debian.org/ellert/globus-gass-copy.git @@ -92,8 +92,6 @@ Section: doc Architecture: all Multi-Arch: foreign -Pre-Depends: - dpkg (>= 1.17.5) Depends: ${misc:Depends} Description: Grid Community Toolkit - Globus Gass Copy Documentation Files diff -Nru globus-gass-copy-10.5/debian/copyright globus-gass-copy-10.8/debian/copyright --- globus-gass-copy-10.5/debian/copyright 2019-09-02 09:54:45.000000000 +0000 +++ globus-gass-copy-10.8/debian/copyright 2020-12-12 21:52:20.000000000 +0000 @@ -1,17 +1,17 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: globus_gass_copy Upstream-Contact: https://github.com/gridcf/gct/ -Source: https://repo.gridcf.org/gct6/sources/globus_gass_copy-10.5.tar.gz +Source: https://repo.gridcf.org/gct6/sources/globus_gass_copy-10.8.tar.gz Files: * Copyright: 1999-2018 University of Chicago - 2018-2019 Grid Community Forum + 2018-2020 Grid Community Forum License: Apache-2.0 Files: debian/* Copyright: - 2008-2019 Mattias Ellert + 2008-2020 Mattias Ellert 2010-2013 Initiative for Globus in Europe (IGE), http://www.ige-project.eu/ License: Apache-2.0 diff -Nru globus-gass-copy-10.5/debian/globus-gass-copy-progs.install globus-gass-copy-10.8/debian/globus-gass-copy-progs.install --- globus-gass-copy-10.5/debian/globus-gass-copy-progs.install 2018-03-02 17:16:20.000000000 +0000 +++ globus-gass-copy-10.8/debian/globus-gass-copy-progs.install 2020-12-12 15:26:25.000000000 +0000 @@ -1,2 +1,2 @@ -debian/tmp/usr/bin/globus-url-copy -debian/tmp/usr/share/man/man1/globus-url-copy.1 +/usr/bin/globus-url-copy +/usr/share/man/man1/globus-url-copy.1 diff -Nru globus-gass-copy-10.5/debian/libglobus-gass-copy2.install globus-gass-copy-10.8/debian/libglobus-gass-copy2.install --- globus-gass-copy-10.5/debian/libglobus-gass-copy2.install 2018-03-02 17:16:20.000000000 +0000 +++ globus-gass-copy-10.8/debian/libglobus-gass-copy2.install 2020-12-12 15:26:25.000000000 +0000 @@ -1 +1 @@ -debian/tmp/usr/lib/*/libglobus_gass_copy.so.* +/usr/lib/*/libglobus_gass_copy.so.* diff -Nru globus-gass-copy-10.5/debian/libglobus-gass-copy-dev.install globus-gass-copy-10.8/debian/libglobus-gass-copy-dev.install --- globus-gass-copy-10.5/debian/libglobus-gass-copy-dev.install 2018-03-02 17:16:20.000000000 +0000 +++ globus-gass-copy-10.8/debian/libglobus-gass-copy-dev.install 2020-12-12 15:26:25.000000000 +0000 @@ -1,3 +1,3 @@ -debian/tmp/usr/include/globus/* -debian/tmp/usr/lib/*/libglobus_gass_copy.so -debian/tmp/usr/lib/*/pkgconfig/globus-gass-copy.pc +/usr/include/globus/* +/usr/lib/*/libglobus_gass_copy.so +/usr/lib/*/pkgconfig/globus-gass-copy.pc diff -Nru globus-gass-copy-10.5/debian/libglobus-gass-copy-doc.install globus-gass-copy-10.8/debian/libglobus-gass-copy-doc.install --- globus-gass-copy-10.5/debian/libglobus-gass-copy-doc.install 2018-03-02 17:16:20.000000000 +0000 +++ globus-gass-copy-10.8/debian/libglobus-gass-copy-doc.install 2020-12-12 15:26:25.000000000 +0000 @@ -1,2 +1,2 @@ -debian/tmp/usr/share/doc/libglobus-gass-copy-dev/html -debian/tmp/usr/share/man/man3/* +/usr/share/doc/libglobus-gass-copy-dev/html +/usr/share/man/man3/* diff -Nru globus-gass-copy-10.5/debian/libglobus-gass-copy-doc.maintscript globus-gass-copy-10.8/debian/libglobus-gass-copy-doc.maintscript --- globus-gass-copy-10.5/debian/libglobus-gass-copy-doc.maintscript 2019-02-27 16:39:09.000000000 +0000 +++ globus-gass-copy-10.8/debian/libglobus-gass-copy-doc.maintscript 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -symlink_to_dir /usr/share/doc/libglobus-gass-copy-doc libglobus-gass-copy-dev 9.12-2~ libglobus-gass-copy-doc diff -Nru globus-gass-copy-10.5/debian/rules globus-gass-copy-10.8/debian/rules --- globus-gass-copy-10.5/debian/rules 2019-07-11 17:01:29.000000000 +0000 +++ globus-gass-copy-10.8/debian/rules 2020-12-14 03:37:40.000000000 +0000 @@ -3,6 +3,8 @@ name = globus-gass-copy +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,-z,defs + INSTALLDIR = debian/tmp _docdir = /usr/share/doc/lib$(name)-dev @@ -14,7 +16,6 @@ dh_autoreconf --as-needed override_dh_auto_configure: - LDFLAGS="$(LDFLAGS) -Wl,--as-needed -Wl,-z,defs" \ GLOBUS_VERSION=6.2 \ dh_auto_configure -- \ --disable-static \ @@ -23,7 +24,7 @@ --docdir=$(_docdir) override_dh_auto_test: - GLOBUS_HOSTNAME=localhost dh_auto_test -- VERBOSE=1 + GLOBUS_HOSTNAME=localhost dh_auto_test override_dh_auto_install: dh_auto_install @@ -34,8 +35,5 @@ # Remove installed license file rm $(INSTALLDIR)$(_docdir)/GLOBUS_LICENSE -override_dh_missing: - dh_missing --fail-missing - override_dh_strip: dh_strip --dbgsym-migration='lib$(name)-dbg (<< 9.27-2~), $(name)-dbg (<< 9.27-2~)' diff -Nru globus-gass-copy-10.5/dirt.sh globus-gass-copy-10.8/dirt.sh --- globus-gass-copy-10.5/dirt.sh 2019-08-29 15:25:52.387745679 +0000 +++ globus-gass-copy-10.8/dirt.sh 2020-12-12 20:54:26.368897731 +0000 @@ -1,2 +1,2 @@ -DIRT_TIMESTAMP=1566483868 +DIRT_TIMESTAMP=1607703417 DIRT_BRANCH_ID=0 diff -Nru globus-gass-copy-10.5/globus-url-copy.1 globus-gass-copy-10.8/globus-url-copy.1 --- globus-gass-copy-10.5/globus-url-copy.1 2019-08-29 15:23:22.079745679 +0000 +++ globus-gass-copy-10.8/globus-url-copy.1 2020-12-12 20:52:21.368897731 +0000 @@ -2,12 +2,12 @@ .\" Title: globus-url-copy .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 07/25/2019 +.\" Date: 09/08/2020 .\" Manual: Grid Community Toolkit Manual .\" Source: Grid Community Toolkit 6 .\" Language: English .\" -.TH "GLOBUS\-URL\-COPY" "1" "07/25/2019" "Grid Community Toolkit 6" "Grid Community Toolkit Manual" +.TH "GLOBUS\-URL\-COPY" "1" "09/08/2020" "Grid Community Toolkit 6" "Grid Community Toolkit Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -467,6 +467,29 @@ \fB\-checksum\-alg\fR parameter\&. .RE +.SH "ENVIRONMENT" +.sp +The following environment variables are recognized: +.PP +\fBGLOBUS_HOSTNAME\fR +.RS 4 +Overrides client hostname communicated to the server +.RE +.PP +\fBGLOBUS_DOMAIN_NAME\fR +.RS 4 +Overrides client domainname communicated to the server +.RE +.PP +\fBGLOBUS_FTP_CLIENT_DATA_IP\fR +.RS 4 +Overwrites client IP address communicated to the server for the data connection\&. Used when the receiver is behind a NAT and should be configured to the external address of its gateway\&. +.RE +.PP +\fBGLOBUS_FTP_CLIENT_SOURCE_PASV\fR +.RS 4 +Configures sender side (source) instead of receiver side (destination) to open a data port and establishes the data connection from the receiver to the sender\&. By default the data connection is established from sender to receiver, but if the receiver is behind a NAT this doesn\(cqt work, because the receiver will communicate its own address instead of the external address of its gateway to the sender and its own address can\(cqt be reached directly from the sender\&. +.RE .SH "AUTHOR" .sp Copyright \(co 1999\-2016 University of Chicago diff -Nru globus-gass-copy-10.5/globus-url-copy.txt globus-gass-copy-10.8/globus-url-copy.txt --- globus-gass-copy-10.5/globus-url-copy.txt 2019-08-29 15:23:22.079745679 +0000 +++ globus-gass-copy-10.8/globus-url-copy.txt 2020-12-12 20:52:21.368897731 +0000 @@ -322,6 +322,30 @@ transfer. The default algorithm used for this checksum is MD5, but other algorithms can be specified with the *-checksum-alg* parameter. +[[globus-url-copy-ENVIRONMENT]] +ENVIRONMENT +----------- +The following environment variables are recognized: + +*GLOBUS_HOSTNAME*:: + Overrides client hostname communicated to the server + +*GLOBUS_DOMAIN_NAME*:: + Overrides client domainname communicated to the server + +*GLOBUS_FTP_CLIENT_DATA_IP*:: + Overwrites client IP address communicated to the server for the data + connection. Used when the receiver is behind a NAT and should be configured + to the external address of its gateway. + +*GLOBUS_FTP_CLIENT_SOURCE_PASV*:: + Configures sender side (source) instead of receiver side (destination) to + open a data port and establishes the data connection from the receiver to + the sender. By default the data connection is established from sender to + receiver, but if the receiver is behind a NAT this doesn't work, because + the receiver will communicate its own address instead of the external + address of its gateway to the sender and its own address can't be reached + directly from the sender. [[globus-url-copy-AUTHOR]] AUTHOR diff -Nru globus-gass-copy-10.5/Makefile.am globus-gass-copy-10.8/Makefile.am --- globus-gass-copy-10.5/Makefile.am 2019-08-29 15:23:22.079745679 +0000 +++ globus-gass-copy-10.8/Makefile.am 2020-12-12 20:52:21.368897731 +0000 @@ -63,15 +63,15 @@ install-data-local: $(DOC_STAMPS) if test -d doc/man/man3; then \ - install -d -m 755 $(DESTDIR)$(mandir)/man3; \ + install -d -m 755 $(DESTDIR)$(mandir)/man3 && \ $(INSTALL) -m 644 doc/man/man3/[Gg][Ll][Oo][Bb][Uu][Ss]*.3 $(DESTDIR)$(mandir)/man3 ; \ fi if test -d doc/html; then \ - for dir in `(cd doc; find html -type d)`; do \ - install -d -m 755 $(DESTDIR)$(docdir)/$$dir; \ + for dir in `cd doc; find html -type d`; do \ + install -d -m 755 $(DESTDIR)$(docdir)/$$dir || exit 1; \ done ; \ - for f in `(cd doc; find html -type f)`; do \ - $(INSTALL) -m 644 doc/$$f $(DESTDIR)$(docdir)/$$f ; \ + for f in `cd doc; find html -type f`; do \ + $(INSTALL) -m 644 doc/$$f $(DESTDIR)$(docdir)/$$f || exit 1; \ done ; \ fi diff -Nru globus-gass-copy-10.5/Makefile.in globus-gass-copy-10.8/Makefile.in --- globus-gass-copy-10.5/Makefile.in 2019-08-29 15:30:25.359745679 +0000 +++ globus-gass-copy-10.8/Makefile.in 2020-12-12 20:58:07.528897731 +0000 @@ -1220,15 +1220,15 @@ install-data-local: $(DOC_STAMPS) if test -d doc/man/man3; then \ - install -d -m 755 $(DESTDIR)$(mandir)/man3; \ + install -d -m 755 $(DESTDIR)$(mandir)/man3 && \ $(INSTALL) -m 644 doc/man/man3/[Gg][Ll][Oo][Bb][Uu][Ss]*.3 $(DESTDIR)$(mandir)/man3 ; \ fi if test -d doc/html; then \ - for dir in `(cd doc; find html -type d)`; do \ - install -d -m 755 $(DESTDIR)$(docdir)/$$dir; \ + for dir in `cd doc; find html -type d`; do \ + install -d -m 755 $(DESTDIR)$(docdir)/$$dir || exit 1; \ done ; \ - for f in `(cd doc; find html -type f)`; do \ - $(INSTALL) -m 644 doc/$$f $(DESTDIR)$(docdir)/$$f ; \ + for f in `cd doc; find html -type f`; do \ + $(INSTALL) -m 644 doc/$$f $(DESTDIR)$(docdir)/$$f || exit 1; \ done ; \ fi diff -Nru globus-gass-copy-10.5/test/Makefile.am globus-gass-copy-10.8/test/Makefile.am --- globus-gass-copy-10.5/test/Makefile.am 2019-08-29 15:23:22.083745679 +0000 +++ globus-gass-copy-10.8/test/Makefile.am 2020-12-12 20:52:21.368897731 +0000 @@ -69,7 +69,7 @@ umask 022; $(OPENSSL) x509 -passin pass:globus -req -days 365 -in testcred.req -CA $*.cacert -CAkey $*.cakey -out $@ .cert.gridmap: - subject=`$(OPENSSL) x509 -subject -noout -in $< -nameopt rfc2253,-dn_rev | sed -e 's/subject= */\//' -e 's/,/\//g'` ; \ + subject=`$(OPENSSL) x509 -subject -noout -in $< -nameopt sep_multiline | sed -e '/^subject=/d' -e 's!^\s*!/!' | tr -d '\n'`; \ echo "\"$$subject\" `id -un`" > $@ if CYGPATH_W_DEFINED @@ -104,7 +104,7 @@ testcred.cakey testcred.gridmap clean-local: if [ -f testcred.link ]; then \ - rm -f "$$(cat testcred.link)" testcred.link; \ + rm -f $$(cat testcred.link) testcred.link; \ fi if test -f testcred.signing_policy; then \ rm -f $$(cat testcred.signing_policy) testcred.signing_policy; \ diff -Nru globus-gass-copy-10.5/test/Makefile.in globus-gass-copy-10.8/test/Makefile.in --- globus-gass-copy-10.5/test/Makefile.in 2019-08-29 15:30:25.411745679 +0000 +++ globus-gass-copy-10.8/test/Makefile.in 2020-12-12 20:58:07.568897731 +0000 @@ -968,11 +968,11 @@ @ENABLE_TESTS_TRUE@ umask 022; $(OPENSSL) x509 -passin pass:globus -req -days 365 -in testcred.req -CA $*.cacert -CAkey $*.cakey -out $@ @ENABLE_TESTS_TRUE@.cert.gridmap: -@ENABLE_TESTS_TRUE@ subject=`$(OPENSSL) x509 -subject -noout -in $< -nameopt rfc2253,-dn_rev | sed -e 's/subject= */\//' -e 's/,/\//g'` ; \ +@ENABLE_TESTS_TRUE@ subject=`$(OPENSSL) x509 -subject -noout -in $< -nameopt sep_multiline | sed -e '/^subject=/d' -e 's!^\s*!/!' | tr -d '\n'`; \ @ENABLE_TESTS_TRUE@ echo "\"$$subject\" `id -un`" > $@ @ENABLE_TESTS_TRUE@clean-local: @ENABLE_TESTS_TRUE@ if [ -f testcred.link ]; then \ -@ENABLE_TESTS_TRUE@ rm -f "$$(cat testcred.link)" testcred.link; \ +@ENABLE_TESTS_TRUE@ rm -f $$(cat testcred.link) testcred.link; \ @ENABLE_TESTS_TRUE@ fi @ENABLE_TESTS_TRUE@ if test -f testcred.signing_policy; then \ @ENABLE_TESTS_TRUE@ rm -f $$(cat testcred.signing_policy) testcred.signing_policy; \ diff -Nru globus-gass-copy-10.5/test/test-wrapper globus-gass-copy-10.8/test/test-wrapper --- globus-gass-copy-10.5/test/test-wrapper 2019-08-29 15:23:22.083745679 +0000 +++ globus-gass-copy-10.8/test/test-wrapper 2020-12-12 20:52:21.368897731 +0000 @@ -37,9 +37,7 @@ { $server_args = "-no-fork $server_args"; } -chomp($subject = `env OPENSSL_CONF=testcred.cnf openssl x509 -subject -noout -in \${X509_USER_CERT:-testcred.cert} -nameopt rfc2253,-dn_rev `); -$subject =~ s/^subject= */\//; -$subject =~ s/,/\//g; +$subject = `openssl x509 -subject -noout -in \${X509_USER_CERT:-testcred.cert} -nameopt sep_multiline | sed -e '/^subject=/d' -e 's!^\\s*!/!' | tr -d '\\n'`; $server_pid = open(SERVER, "$server_prog $server_args|");