From 1ebbc9b84b453bdf83d4dca3966ac8a6b5bcdfea Mon Sep 17 00:00:00 2001 From: maarten-k Date: Mon, 25 Jan 2016 16:49:41 +0100 Subject: [PATCH 1/4] uberftp version update and fix for globus-toolkit 6.0 Update uberftp to version 2.8 based on work done by giffels (closed pull request #40848). The patch provided at https://github.com/JasonAlt/UberFTP/pull/8 make the situation worse: another patch is needed to get configure running well and cause more obfuscation than the 2 replace commands. Replaced the single quotes in formula for double qoutes --- Library/Formula/uberftp.rb | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Library/Formula/uberftp.rb b/Library/Formula/uberftp.rb index 5267bef8d658..be6bc5bc3724 100644 --- a/Library/Formula/uberftp.rb +++ b/Library/Formula/uberftp.rb @@ -1,23 +1,19 @@ class Uberftp < Formula desc "Interactive GridFTP client" - homepage "http://dims.ncsa.illinois.edu/set/uberftp/" - url "https://github.com/JasonAlt/UberFTP/archive/Version_2_7.tar.gz" - sha256 "29a111a86fa70dbbc529a5d3e5a6befc1681e64e32dc019a1a6a98cd43ffb204" + homepage 'http://dims.ncsa.illinois.edu/set/uberftp/' + url 'https://github.com/JasonAlt/UberFTP/archive/Version_2_8.tar.gz' + sha256 '8a397d6ef02bb714bb0cbdb259819fc2311f5d36231783cd520d606c97759c2a' depends_on "globus-toolkit" def install - # get the flavor globus = Formula["globus-toolkit"].opt_prefix - core = `"#{globus}/sbin/gpt-query" globus_core` - flavor = case core - when /gcc64dbg/ then "gcc64dbg" - when /gcc32dbg/ then "gcc32dbg" - end + #patches needed since location changed with globus-toolkit versions >= 6.0, patch to upstream not yet merged https://github.com/JasonAlt/UberFTP/pull/8 + inreplace "configure", "globus_location/include/globus/gcc64dbg", "globus_location/libexec/include" + inreplace "configure", "globus_location/lib64", "globus_location/libexec/lib" system "./configure", "--prefix=#{prefix}", - "--with-globus-flavor=#{flavor}", "--with-globus=#{globus}" system "make" system "make", "install" @@ -27,3 +23,4 @@ def install system "#{bin}/uberftp", "-v" end end + From e00d89397c3c38ece35d56ac6ad3573f37859792 Mon Sep 17 00:00:00 2001 From: maarten-k Date: Mon, 25 Jan 2016 17:13:57 +0100 Subject: [PATCH 2/4] uberftp 2.8 Closes #41277 and is based on work desribed in #40848. The single quotes are replaced by double quotes. The patch JasonAlt/UberFTP#8 mentioned in #40848 solves the problem partly: there is still another patch needed which obfuscate the formula even more then the replaces now. --- Library/Formula/uberftp.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Formula/uberftp.rb b/Library/Formula/uberftp.rb index be6bc5bc3724..b1722e5e5848 100644 --- a/Library/Formula/uberftp.rb +++ b/Library/Formula/uberftp.rb @@ -1,15 +1,15 @@ class Uberftp < Formula desc "Interactive GridFTP client" - homepage 'http://dims.ncsa.illinois.edu/set/uberftp/' - url 'https://github.com/JasonAlt/UberFTP/archive/Version_2_8.tar.gz' - sha256 '8a397d6ef02bb714bb0cbdb259819fc2311f5d36231783cd520d606c97759c2a' + homepage "http://dims.ncsa.illinois.edu/set/uberftp/" + url "https://github.com/JasonAlt/UberFTP/archive/Version_2_8.tar.gz" + sha256 "8a397d6ef02bb714bb0cbdb259819fc2311f5d36231783cd520d606c97759c2a" depends_on "globus-toolkit" def install globus = Formula["globus-toolkit"].opt_prefix - #patches needed since location changed with globus-toolkit versions >= 6.0, patch to upstream not yet merged https://github.com/JasonAlt/UberFTP/pull/8 + #patches needed since location changed with globus-toolkit versions >= 6.0, patch to upstream not yet merged https://github.com/JasonAlt/UberFTP/pull/8, but solves not whole problem inreplace "configure", "globus_location/include/globus/gcc64dbg", "globus_location/libexec/include" inreplace "configure", "globus_location/lib64", "globus_location/libexec/lib" From ec9f132529357bd58db491e70ef33416e1c33ae2 Mon Sep 17 00:00:00 2001 From: Maarten Date: Mon, 25 Jan 2016 18:53:45 +0100 Subject: [PATCH 3/4] removed surplus newline and trimmed comments --- Library/Formula/uberftp.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Library/Formula/uberftp.rb b/Library/Formula/uberftp.rb index b1722e5e5848..b3b224751569 100644 --- a/Library/Formula/uberftp.rb +++ b/Library/Formula/uberftp.rb @@ -9,7 +9,10 @@ class Uberftp < Formula def install globus = Formula["globus-toolkit"].opt_prefix - #patches needed since location changed with globus-toolkit versions >= 6.0, patch to upstream not yet merged https://github.com/JasonAlt/UberFTP/pull/8, but solves not whole problem + # patch needed since location changed with globus-toolkit versions>=6.0, + # patch to upstream is not yet merged + # (located at https://github.com/JasonAlt/UberFTP/pull/8) + # but solves not whole problem (needs aditional patch) inreplace "configure", "globus_location/include/globus/gcc64dbg", "globus_location/libexec/include" inreplace "configure", "globus_location/lib64", "globus_location/libexec/lib" @@ -23,4 +26,3 @@ def install system "#{bin}/uberftp", "-v" end end - From 6c501558998b503884c46534804f603d82ce995e Mon Sep 17 00:00:00 2001 From: Maarten Date: Mon, 25 Jan 2016 23:01:59 +0100 Subject: [PATCH 4/4] removed 2 EOL whitespaces --- Library/Formula/uberftp.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Formula/uberftp.rb b/Library/Formula/uberftp.rb index b3b224751569..60b6ea36abcb 100644 --- a/Library/Formula/uberftp.rb +++ b/Library/Formula/uberftp.rb @@ -10,8 +10,8 @@ def install globus = Formula["globus-toolkit"].opt_prefix # patch needed since location changed with globus-toolkit versions>=6.0, - # patch to upstream is not yet merged - # (located at https://github.com/JasonAlt/UberFTP/pull/8) + # patch to upstream is not yet merged + # (located at https://github.com/JasonAlt/UberFTP/pull/8) # but solves not whole problem (needs aditional patch) inreplace "configure", "globus_location/include/globus/gcc64dbg", "globus_location/libexec/include" inreplace "configure", "globus_location/lib64", "globus_location/libexec/lib"