From 847868b4baf57d77e87d0362962397ce311dba57 Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Mon, 7 Mar 2022 09:37:18 +0000 Subject: [PATCH] ftp: hard fork github.com/jlaffaye/ftp to fix go get Having a replace directive in go.mod causes "go get github.com/rclone/rclone" to fail as it discussed in this Go issue: https://github.com/golang/go/issues/44840 This is apparently how the Go team want go.mod to work, so this commit hard forks github.com/jlaffaye/ftp into github.com/rclone/ftp so we can remove the `replace` directive from the go.mod file. Fixes #5810 --- backend/ftp/ftp.go | 2 +- go.mod | 4 +--- go.sum | 4 ++++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/backend/ftp/ftp.go b/backend/ftp/ftp.go index c7a475d88..f9e3d1c83 100644 --- a/backend/ftp/ftp.go +++ b/backend/ftp/ftp.go @@ -15,7 +15,7 @@ import ( "sync" "time" - "github.com/jlaffaye/ftp" + "github.com/rclone/ftp" "github.com/rclone/rclone/fs" "github.com/rclone/rclone/fs/accounting" "github.com/rclone/rclone/fs/config" diff --git a/go.mod b/go.mod index c6e05f4ec..3e2b63cdc 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/rclone/rclone go 1.17 -replace github.com/jlaffaye/ftp => github.com/rclone/ftp v1.0.0-210902f - require ( bazil.org/fuse v0.0.0-20200524192727-fb710f7dfd05 github.com/Azure/azure-pipeline-go v0.2.3 @@ -32,7 +30,6 @@ require ( github.com/hanwen/go-fuse/v2 v2.1.0 github.com/iguanesolutions/go-systemd/v5 v5.1.0 github.com/jcmturner/gokrb5/v8 v8.4.2 - github.com/jlaffaye/ftp v0.0.0-20211029032751-b1140299f4df github.com/jzelinskie/whirlpool v0.0.0-20201016144138-0675e54bb004 github.com/klauspost/compress v1.13.6 github.com/koofr/go-httpclient v0.0.0-20200420163713-93aa7c75b348 @@ -48,6 +45,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 github.com/prometheus/client_golang v1.11.0 github.com/putdotio/go-putio/putio v0.0.0-20200123120452-16d982cac2b8 + github.com/rclone/ftp v1.0.0-210902h github.com/rfjakob/eme v1.1.2 github.com/shirou/gopsutil/v3 v3.21.10 github.com/sirupsen/logrus v1.8.1 diff --git a/go.sum b/go.sum index f4c6cdf45..4488cb677 100644 --- a/go.sum +++ b/go.sum @@ -382,6 +382,8 @@ github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZ github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jlaffaye/ftp v0.0.0-20190624084859-c1312a7102bf h1:2IYBd5TD/maMqTU2YUzp2tJL4cNaOYQ9EBullN9t9pk= +github.com/jlaffaye/ftp v0.0.0-20190624084859-c1312a7102bf/go.mod h1:lli8NYPQOFy3O++YmYbqVgOcQ1JPCwdOy+5zSjKJ9qY= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= @@ -543,6 +545,8 @@ github.com/putdotio/go-putio/putio v0.0.0-20200123120452-16d982cac2b8 h1:Y258uzX github.com/putdotio/go-putio/putio v0.0.0-20200123120452-16d982cac2b8/go.mod h1:bSJjRokAHHOhA+XFxplld8w2R/dXLH7Z3BZ532vhFwU= github.com/rclone/ftp v1.0.0-210902f h1:cm4OxC1S8JARRdEw+CYAyLxg4H+l84STHAdfmK7op2Q= github.com/rclone/ftp v1.0.0-210902f/go.mod h1:2lmrmq866uF2tnje75wQHzmPXhmSWUt7Gyx2vgK1RCU= +github.com/rclone/ftp v1.0.0-210902h h1:e9rbDiTdorXRsRtUOdbr6asesJkYZQ9efy1ts5OEBb8= +github.com/rclone/ftp v1.0.0-210902h/go.mod h1:GtHgnfXJAx17bmdVU8kiItiUNFkMbFt+sIg0SwAfyx0= github.com/rfjakob/eme v1.1.2 h1:SxziR8msSOElPayZNFfQw4Tjx/Sbaeeh3eRvrHVMUs4= github.com/rfjakob/eme v1.1.2/go.mod h1:cVvpasglm/G3ngEfcfT/Wt0GwhkuO32pf/poW6Nyk1k= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=