Upstream to 2.9.1

disconnected_server.patch

@@ -1,31 +0,0 @@
-From 4c1cb01d712923c63f23a975eec13170aa57d992 Mon Sep 17 00:00:00 2001
-From: Brian Bockelman <bbockelman@morgridge.org>
-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
-

sources

@@ -1 +1 @@
-57bbba5ed76f2c41ef992072059f32d7  UberFTP-012788f5430c9f7eb03e65b7aa8bcb106f472518.tar.gz
+SHA512 (uberftp-2.9.1.tar.gz) = adb0161d0959fd819ef31c9ad36719e51ca1baa4ac9ca33b844078315d7253658d02e707b91867d889faa6b889a802b844325f4081ec55ca7b2f88bbc3d71a95

uberftp-32bit-pkg-config.patch

@@ -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)])

uberftp.spec

@@ -1,24 +1,11 @@
-# $ git rev-parse  Version_2_8
-# 012788f5430c9f7eb03e65b7aa8bcb106f472518
-
-%global commit 012788f5430c9f7eb03e65b7aa8bcb106f472518
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
 Name:           uberftp
-Version:        2.8
-Release:        12%{?dist}
+Version:        2.9.1
+Release:        1%{?dist}
 Summary:        GridFTP-enabled ftp client
 
-
 License:        NCSA
-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)
+URL:            https://gridcf.org/
+Source0:        https://repo.gridcf.org/uberftp/sources/uberftp-%{version}.tar.gz
 
 BuildRequires:  gcc
 BuildRequires:  globus-gssapi-gsi-devel
@@ -29,15 +16,10 @@ It supports GSI authentication, parallel data channels and
 third party transfers. 
 
 %prep
-%setup -q -n UberFTP-%{commit}
-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
@@ -47,9 +29,20 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %files
 %{_bindir}/uberftp
 %{_mandir}/man1/uberftp.1*
-%doc Changelog.mssftp Changelog copyright
+%doc Changelog.mssftp ChangeLog
+%license COPYING
 
 %changelog
+* Thu Oct 20 2022 Steve Traylen <steve.traylen@cern.ch> - 2.9.1-1
+- Upstream to 2.9.1
+
+* Thu Jan 20 2022 Steve Traylen <steve.traylen@cern.ch> - 2.9-1
+- Upstream to 2.9
+
+* Mon Mar 8 2021 Steve Traylen <steve.traylen@cern.ch> - 2.8-13
+- Upstream is now GridCF project
+  https://mailman.egi.eu/pipermail/discuss/2019-March/000273.html
+
 * Thu Jan 9 2020 Mátyás Selmeci <matyas@cs.wisc.edu> - 2.8-12
 - Add patch to prevent hanging when command socket closes