From 19a64e13f2a1f141d62678d58b6d7dc8c4ebc648 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Thu, 26 Dec 2019 14:00:53 -0600 Subject: [PATCH 1/6] Add patch to avoid hanging when command socket disconnects --- disconnected_server.patch | 31 +++++++++++++++++++++++++++++++ uberftp.spec | 7 ++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 disconnected_server.patch diff --git a/disconnected_server.patch b/disconnected_server.patch new file mode 100644 index 0000000..12c284b --- /dev/null +++ b/disconnected_server.patch @@ -0,0 +1,31 @@ +From 4c1cb01d712923c63f23a975eec13170aa57d992 Mon Sep 17 00:00:00 2001 +From: Brian Bockelman +Date: Thu, 26 Dec 2019 13:34:02 -0600 +Subject: [PATCH] Prevent uberftp from hanging when the command socket closes + +--- + ftp.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/ftp.c b/ftp.c +index 3c65d18..dfd4739 100644 +--- a/ftp.c ++++ b/ftp.c +@@ -2742,6 +2742,14 @@ _f_get_resp(fh_t * fh, int * code, char ** resp) + FREE(cptr); + } + ++ /* There was no command sent and the server side closed the socket. */ ++ if (!nl && fh->cc.eof) ++ { ++ ec = ec_create(EC_GSI_SUCCESS, ++ EC_GSI_SUCCESS, ++ "Server unexpectedly closed the socket."); ++ } ++ + if (!ec && *code == 421) + { + ec = ec_create(EC_GSI_SUCCESS, +-- +2.21.0 + diff --git a/uberftp.spec b/uberftp.spec index 4bbc162..f2b03d9 100644 --- a/uberftp.spec +++ b/uberftp.spec @@ -6,7 +6,7 @@ Name: uberftp Version: 2.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GridFTP-enabled ftp client Group: Applications/Internet @@ -16,6 +16,7 @@ URL: https://github.com/JasonAlt/UberFTP Source0: https://github.com/JasonAlt/UberFTP/archive/%{commit}/UberFTP-%{commit}.tar.gz # https://github.com/JasonAlt/UberFTP/pull/6 Patch0: uberftp-32bit-pkg-config.patch +Patch1: disconnected_server.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: globus-gssapi-gsi-devel @@ -30,6 +31,7 @@ third party transfers. iconv -f iso8859-1 -t utf-8 copyright > copyright.conv && mv -f copyright.conv copyright touch -r configure.ac x %patch0 -p1 +%patch1 -p1 touch -r x configure.ac %build @@ -49,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT %doc Changelog.mssftp Changelog copyright %changelog +* Thu Dec 26 2019 Mátyás Selmeci - 2.8-3 +- Add patch to prevent hanging when command socket closes + * Mon Sep 29 2014 Mattias Ellert - 2.8-2 - Adapt to Globus Toolkit 6.0 From 49cb77dbc271fb99193394aec5734e7199eb70c5 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Thu, 26 Dec 2019 14:00:53 -0600 Subject: [PATCH 2/6] Add patch to avoid hanging when command socket disconnects --- uberftp.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/uberftp.spec b/uberftp.spec index f2b03d9..03e04ba 100644 --- a/uberftp.spec +++ b/uberftp.spec @@ -16,6 +16,8 @@ URL: https://github.com/JasonAlt/UberFTP Source0: https://github.com/JasonAlt/UberFTP/archive/%{commit}/UberFTP-%{commit}.tar.gz # https://github.com/JasonAlt/UberFTP/pull/6 Patch0: uberftp-32bit-pkg-config.patch +# Current upstream is now archived but hopefully a new one will appear soon. +# https://mailman.egi.eu/pipermail/discuss/2019-March/000273.html Patch1: disconnected_server.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,7 +53,7 @@ rm -rf $RPM_BUILD_ROOT %doc Changelog.mssftp Changelog copyright %changelog -* Thu Dec 26 2019 Mátyás Selmeci - 2.8-3 +* Thu Jan 9 2020 Mátyás Selmeci - 2.8-3 - Add patch to prevent hanging when command socket closes * Mon Sep 29 2014 Mattias Ellert - 2.8-2 From f46207f76dfe23944e2e9c51aedcc0680cf53222 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Mon, 8 Mar 2021 09:52:08 +0100 Subject: [PATCH 3/6] Upstream changed to gridcf.org --- sources | 2 +- uberftp.spec | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/sources b/sources index f48c7dc..c3c2272 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -57bbba5ed76f2c41ef992072059f32d7 UberFTP-012788f5430c9f7eb03e65b7aa8bcb106f472518.tar.gz +SHA512 (uberftp-2.8.tar.gz) = 8be3fe1767656e43ccac2a2932028247a4314d86112806e604a31718c8a1a4d384c7b8f87222d9757e479f4d4a2f9db809d1edb98faada797ec85ab0fdecdf75 diff --git a/uberftp.spec b/uberftp.spec index 03e04ba..754fdbc 100644 --- a/uberftp.spec +++ b/uberftp.spec @@ -1,8 +1,4 @@ -# $ git rev-parse Version_2_8 -# 012788f5430c9f7eb03e65b7aa8bcb106f472518 - -%global commit 012788f5430c9f7eb03e65b7aa8bcb106f472518 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global gittag Version_2_8 Name: uberftp Version: 2.8 @@ -12,8 +8,8 @@ Summary: GridFTP-enabled ftp client Group: Applications/Internet License: NCSA -URL: https://github.com/JasonAlt/UberFTP -Source0: https://github.com/JasonAlt/UberFTP/archive/%{commit}/UberFTP-%{commit}.tar.gz +URL: https://gridcf.org/ +Source0: https://github.com/gridcf/UberFTP/archive/%{gittag}/%{name}-%{version}.tar.gz # https://github.com/JasonAlt/UberFTP/pull/6 Patch0: uberftp-32bit-pkg-config.patch # Current upstream is now archived but hopefully a new one will appear soon. @@ -29,7 +25,7 @@ It supports GSI authentication, parallel data channels and third party transfers. %prep -%setup -q -n UberFTP-%{commit} +%setup -q -n UberFTP-%{gittag} iconv -f iso8859-1 -t utf-8 copyright > copyright.conv && mv -f copyright.conv copyright touch -r configure.ac x %patch0 -p1 From e0021bd00ea48ee16730e34911cc966fef89c750 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Mon, 8 Mar 2021 09:54:42 +0100 Subject: [PATCH 4/6] Release 2.8-4 --- uberftp.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/uberftp.spec b/uberftp.spec index 754fdbc..0bff8f3 100644 --- a/uberftp.spec +++ b/uberftp.spec @@ -2,7 +2,7 @@ Name: uberftp Version: 2.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GridFTP-enabled ftp client Group: Applications/Internet @@ -49,6 +49,10 @@ rm -rf $RPM_BUILD_ROOT %doc Changelog.mssftp Changelog copyright %changelog +* Mon Mar 8 2021 Steve Traylen - 2.8-4 +- Upstream is now GridCF project + https://mailman.egi.eu/pipermail/discuss/2019-March/000273.html + * Thu Jan 9 2020 Mátyás Selmeci - 2.8-3 - Add patch to prevent hanging when command socket closes From 5dbe958cf395bb4aca21b65d3e9b4d8d1bf79d00 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 20 Jan 2022 11:23:39 +0000 Subject: [PATCH 5/6] Upstream to 2.9 --- disconnected_server.patch | 31 ------------------------------- sources | 2 +- uberftp-32bit-pkg-config.patch | 24 ------------------------ uberftp.spec | 28 +++++++++------------------- 4 files changed, 10 insertions(+), 75 deletions(-) delete mode 100644 disconnected_server.patch delete mode 100644 uberftp-32bit-pkg-config.patch diff --git a/disconnected_server.patch b/disconnected_server.patch deleted file mode 100644 index 12c284b..0000000 --- a/disconnected_server.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4c1cb01d712923c63f23a975eec13170aa57d992 Mon Sep 17 00:00:00 2001 -From: Brian Bockelman -Date: Thu, 26 Dec 2019 13:34:02 -0600 -Subject: [PATCH] Prevent uberftp from hanging when the command socket closes - ---- - ftp.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/ftp.c b/ftp.c -index 3c65d18..dfd4739 100644 ---- a/ftp.c -+++ b/ftp.c -@@ -2742,6 +2742,14 @@ _f_get_resp(fh_t * fh, int * code, char ** resp) - FREE(cptr); - } - -+ /* There was no command sent and the server side closed the socket. */ -+ if (!nl && fh->cc.eof) -+ { -+ ec = ec_create(EC_GSI_SUCCESS, -+ EC_GSI_SUCCESS, -+ "Server unexpectedly closed the socket."); -+ } -+ - if (!ec && *code == 421) - { - ec = ec_create(EC_GSI_SUCCESS, --- -2.21.0 - diff --git a/sources b/sources index c3c2272..d717387 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uberftp-2.8.tar.gz) = 8be3fe1767656e43ccac2a2932028247a4314d86112806e604a31718c8a1a4d384c7b8f87222d9757e479f4d4a2f9db809d1edb98faada797ec85ab0fdecdf75 +SHA512 (uberftp-2.9.tar.gz) = 1ff2573649b2e2b28aed2f31af66196ad7bc677a7944a423cf92cfc18f12e93d3f27f8a10c002ad87c03b226850c9da5950fc4a920b3087e78c4b45ed4cbf95e diff --git a/uberftp-32bit-pkg-config.patch b/uberftp-32bit-pkg-config.patch deleted file mode 100644 index 96062e0..0000000 --- a/uberftp-32bit-pkg-config.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur UberFTP.orig/configure UberFTP/configure ---- UberFTP.orig/configure 2014-02-11 19:35:56.000000000 +0100 -+++ UberFTP/configure 2014-09-29 10:10:45.282934507 +0200 -@@ -3812,7 +3812,7 @@ - - if test "x$globus_location" == "x/usr" ; then - # RPM installation -- CPPFLAGS=-I$globus_location/lib64/globus/include -+ CPPFLAGS="-I$globus_location/lib64/globus/include -I$globus_location/lib/globus/include -I$globus_location/include/globus" - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -diff -ur UberFTP.orig/configure.ac UberFTP/configure.ac ---- UberFTP.orig/configure.ac 2014-02-11 19:35:56.000000000 +0100 -+++ UberFTP/configure.ac 2014-09-29 10:09:35.848741840 +0200 -@@ -109,7 +109,7 @@ - - if test "x$globus_location" == "x/usr" ; then - # RPM installation -- CPPFLAGS=-I$globus_location/lib64/globus/include -+ CPPFLAGS="-I$globus_location/lib64/globus/include -I$globus_location/lib/globus/include -I$globus_location/include/globus" - AC_CHECK_HEADERS([globus_config.h], - [GLOBUS_CONFIG_CPPFLAGS="$CPPFLAGS"], - [AC_MSG_ERROR(globus_config.h not found, install globus-core)]) diff --git a/uberftp.spec b/uberftp.spec index 0bff8f3..efdcd5a 100644 --- a/uberftp.spec +++ b/uberftp.spec @@ -1,21 +1,13 @@ -%global gittag Version_2_8 - Name: uberftp -Version: 2.8 -Release: 4%{?dist} +Version: 2.9 +Release: 1%{?dist} Summary: GridFTP-enabled ftp client Group: Applications/Internet License: NCSA URL: https://gridcf.org/ -Source0: https://github.com/gridcf/UberFTP/archive/%{gittag}/%{name}-%{version}.tar.gz -# https://github.com/JasonAlt/UberFTP/pull/6 -Patch0: uberftp-32bit-pkg-config.patch -# Current upstream is now archived but hopefully a new one will appear soon. -# https://mailman.egi.eu/pipermail/discuss/2019-March/000273.html -Patch1: disconnected_server.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: https://repo.gridcf.org/uberftp/sources/uberftp-%{version}.tar.gz BuildRequires: globus-gssapi-gsi-devel @@ -25,15 +17,10 @@ It supports GSI authentication, parallel data channels and third party transfers. %prep -%setup -q -n UberFTP-%{gittag} -iconv -f iso8859-1 -t utf-8 copyright > copyright.conv && mv -f copyright.conv copyright -touch -r configure.ac x -%patch0 -p1 -%patch1 -p1 -touch -r x configure.ac +%setup -q %build -%configure --with-globus=%{_usr} +%configure make %{?_smp_mflags} %install @@ -46,9 +33,12 @@ rm -rf $RPM_BUILD_ROOT %files %{_bindir}/uberftp %{_mandir}/man1/uberftp.1* -%doc Changelog.mssftp Changelog copyright +%doc Changelog.mssftp ChangeLog COPYING %changelog +* Thu Jan 20 2022 Steve Traylen - 2.9-1 +- Upstream to 2.9 + * Mon Mar 8 2021 Steve Traylen - 2.8-4 - Upstream is now GridCF project https://mailman.egi.eu/pipermail/discuss/2019-March/000273.html From bde0c9718bee2d75364faa6b75dccf19e3ad3eb8 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 20 Oct 2022 12:47:59 +0000 Subject: [PATCH 6/6] Upstream to 2.9.1 --- sources | 2 +- uberftp.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index d717387..5e84d3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uberftp-2.9.tar.gz) = 1ff2573649b2e2b28aed2f31af66196ad7bc677a7944a423cf92cfc18f12e93d3f27f8a10c002ad87c03b226850c9da5950fc4a920b3087e78c4b45ed4cbf95e +SHA512 (uberftp-2.9.1.tar.gz) = adb0161d0959fd819ef31c9ad36719e51ca1baa4ac9ca33b844078315d7253658d02e707b91867d889faa6b889a802b844325f4081ec55ca7b2f88bbc3d71a95 diff --git a/uberftp.spec b/uberftp.spec index efdcd5a..6055f22 100644 --- a/uberftp.spec +++ b/uberftp.spec @@ -1,5 +1,5 @@ Name: uberftp -Version: 2.9 +Version: 2.9.1 Release: 1%{?dist} Summary: GridFTP-enabled ftp client @@ -36,6 +36,9 @@ rm -rf $RPM_BUILD_ROOT %doc Changelog.mssftp ChangeLog COPYING %changelog +* Thu Oct 20 2022 Steve Traylen - 2.9.1-1 +- Upstream to 2.9.1 + * Thu Jan 20 2022 Steve Traylen - 2.9-1 - Upstream to 2.9