diff --git a/net/rclone/Makefile b/net/rclone/Makefile index 145636911b65..72a6f57de96c 100644 --- a/net/rclone/Makefile +++ b/net/rclone/Makefile @@ -1,162 +1,162 @@ PORTNAME= rclone DISTVERSIONPREFIX= v DISTVERSION= 1.58.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MAINTAINER= tremere@cainites.net COMMENT= Sync files to and from various cloud services LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss USES= cpe go:modules USE_GITHUB= yes GH_ACCOUNT= ncw GH_TUPLE= Azure:azure-pipeline-go:v0.2.3:azure_azure_pipeline_go/vendor/github.com/Azure/azure-pipeline-go \ Azure:azure-storage-blob-go:v0.14.0:azure_azure_storage_blob_go/vendor/github.com/Azure/azure-storage-blob-go \ Azure:go-autorest:38e5c4b3db96:azure_go_autorest_adal \ Azure:go-autorest:b3a0b30a7423:azure_go_autorest_date \ Azure:go-autorest:logger/v0.2.1:azure_go_autorest_logger \ Azure:go-autorest:tracing/v0.6.0:azure_go_autorest_tracing \ Azure:go-autorest:v14.2.0:azure_go_autorest/vendor/github.com/Azure/go-autorest \ Azure:go-ntlmssp:66371956d46c:azure_go_ntlmssp/vendor/github.com/Azure/go-ntlmssp \ Max-Sum:base32768:7937843c71d5:max_sum_base32768/vendor/github.com/Max-Sum/base32768 \ Microsoft:go-winio:v0.5.1:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \ StackExchange:wmi:v1.2.1:stackexchange_wmi/vendor/github.com/StackExchange/wmi \ Unknwon:goconfig:df7de6a44db8:unknwon_goconfig/vendor/github.com/Unknwon/goconfig \ a8m:tree:ce3525c5c2ef:a8m_tree/vendor/github.com/a8m/tree \ aalpar:deheap:0cc84d79dec3:aalpar_deheap/vendor/github.com/aalpar/deheap \ abbot:go-http-auth:v0.4.0:abbot_go_http_auth/vendor/github.com/abbot/go-http-auth \ anacrolix:dms:v1.3.0:anacrolix_dms/vendor/github.com/anacrolix/dms \ artyom:mtab:74b6fd01d416:artyom_mtab/vendor/github.com/artyom/mtab \ atotto:clipboard:v0.1.4:atotto_clipboard/vendor/github.com/atotto/clipboard \ aws:aws-sdk-go:v1.42.1:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \ bazil:fuse:fb710f7dfd05:bazil_fuse/vendor/bazil.org/fuse \ beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \ btcsuite:btcutil:a53e38424cce:btcsuite_btcutil/vendor/github.com/btcsuite/btcutil \ buengese:sgzip:v0.1.1:buengese_sgzip/vendor/github.com/buengese/sgzip \ calebcase:tmpfile:v1.0.3:calebcase_tmpfile/vendor/github.com/calebcase/tmpfile \ census-instrumentation:opencensus-go:v0.23.0:census_instrumentation_opencensus_go/vendor/go.opencensus.io \ cespare:xxhash:v2.1.2:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \ colinmarc:hdfs:v2.2.0:colinmarc_hdfs_v2/vendor/github.com/colinmarc/hdfs/v2 \ coreos:go-semver:v0.3.0:coreos_go_semver/vendor/github.com/coreos/go-semver \ coreos:go-systemd:d3cd4ed1dbcf:coreos_go_systemd/vendor/github.com/coreos/go-systemd \ cpuguy83:go-md2man:v2.0.1:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \ davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ dop251:scsu:f677eef82431:dop251_scsu/vendor/github.com/dop251/scsu \ dropbox:dropbox-sdk-go-unofficial:v6.0.3:dropbox_dropbox_sdk_go_unofficial_v6/vendor/github.com/dropbox/dropbox-sdk-go-unofficial \ etcd-io:bbolt:v1.3.6:etcd_io_bbolt/vendor/go.etcd.io/bbolt \ gabriel-vasile:mimetype:v1.4.0:gabriel_vasile_mimetype/vendor/github.com/gabriel-vasile/mimetype \ go-chi:chi:v5.0.5:go_chi_chi_v5/vendor/github.com/go-chi/chi/v5 \ go-ole:go-ole:v1.2.6:go_ole_go_ole/vendor/github.com/go-ole/go-ole \ go-yaml:yaml:496545a6307b:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \ go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ gogo:protobuf:v1.3.2:gogo_protobuf/vendor/github.com/gogo/protobuf \ golang-jwt:jwt:v4.1.0:golang_jwt_jwt_v4/vendor/github.com/golang-jwt/jwt/v4 \ golang:appengine:v1.6.7:golang_appengine/vendor/google.golang.org/appengine \ golang:crypto:ae2d96664a29:golang_crypto/vendor/golang.org/x/crypto \ golang:groupcache:41bb18bfe9da:golang_groupcache/vendor/github.com/golang/groupcache \ golang:net:69e39bad7dc2:golang_net/vendor/golang.org/x/net \ golang:oauth2:d3ed0bb246c8:golang_oauth2/vendor/golang.org/x/oauth2 \ golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \ golang:sync:036812b2e83c:golang_sync/vendor/golang.org/x/sync \ golang:sys:1d35b9e2eb4e:golang_sys/vendor/golang.org/x/sys \ golang:term:03fcf44c2211:golang_term/vendor/golang.org/x/term \ golang:text:v0.3.7:golang_text/vendor/golang.org/x/text \ golang:time:1f47c861a9ac:golang_time/vendor/golang.org/x/time \ google:go-genproto:4c6863e31247:google_go_genproto/vendor/google.golang.org/genproto \ google:go-querystring:v1.1.0:google_go_querystring/vendor/github.com/google/go-querystring \ google:uuid:v1.3.0:google_uuid/vendor/github.com/google/uuid \ googleapis:gax-go:v2.1.1:googleapis_gax_go_v2/vendor/github.com/googleapis/gax-go \ googleapis:google-api-go-client:v0.60.0:googleapis_google_api_go_client/vendor/google.golang.org/api \ googleapis:google-cloud-go:v0.97.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \ grpc:grpc-go:v1.42.0:grpc_grpc_go/vendor/google.golang.org/grpc \ hanwen:go-fuse:v2.1.0:hanwen_go_fuse_v2/vendor/github.com/hanwen/go-fuse/v2 \ hashicorp:go-uuid:v1.0.2:hashicorp_go_uuid/vendor/github.com/hashicorp/go-uuid \ iguanesolutions:go-systemd:v5.1.0:iguanesolutions_go_systemd_v5/vendor/github.com/iguanesolutions/go-systemd/v5 \ inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \ jcmturner:aescts:v2.0.0:jcmturner_aescts_v2/vendor/github.com/jcmturner/aescts \ jcmturner:dnsutils:v2.0.0:jcmturner_dnsutils_v2/vendor/github.com/jcmturner/dnsutils \ jcmturner:gofork:v1.0.0:jcmturner_gofork/vendor/github.com/jcmturner/gofork \ jcmturner:goidentity:v6.0.1:jcmturner_goidentity_v6/vendor/github.com/jcmturner/goidentity \ jcmturner:gokrb5:v8.4.2:jcmturner_gokrb5_v8/vendor/github.com/jcmturner/gokrb5 \ jcmturner:rpc:v2.0.3:jcmturner_rpc_v2/vendor/github.com/jcmturner/rpc \ jmespath:go-jmespath:v0.4.0:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \ jzelinskie:whirlpool:0675e54bb004:jzelinskie_whirlpool/vendor/github.com/jzelinskie/whirlpool \ klauspost:compress:v1.13.6:klauspost_compress/vendor/github.com/klauspost/compress \ koofr:go-httpclient:93aa7c75b348:koofr_go_httpclient/vendor/github.com/koofr/go-httpclient \ koofr:go-koofrclient:8e5366da203a:koofr_go_koofrclient/vendor/github.com/koofr/go-koofrclient \ kr:fs:v0.1.0:kr_fs/vendor/github.com/kr/fs \ lufia:plan9stats:39d0f177ccd0:lufia_plan9stats/vendor/github.com/lufia/plan9stats \ mattn:go-colorable:v0.1.11:mattn_go_colorable/vendor/github.com/mattn/go-colorable \ mattn:go-ieproxy:v0.0.1:mattn_go_ieproxy/vendor/github.com/mattn/go-ieproxy \ mattn:go-isatty:v0.0.14:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ mattn:go-runewidth:v0.0.13:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \ ncw:go-acd:fe55f33415b1:ncw_go_acd/vendor/github.com/ncw/go-acd \ ncw:swift:v2.0.1:ncw_swift_v2/vendor/github.com/ncw/swift/v2 \ nsf:termbox-go:v1.1.1:nsf_termbox_go/vendor/github.com/nsf/termbox-go \ patrickmn:go-cache:v2.1.0:patrickmn_go_cache/vendor/github.com/patrickmn/go-cache \ pengsrc:go-shared:1999055a4a14:pengsrc_go_shared/vendor/github.com/pengsrc/go-shared \ pkg:sftp:31aac3e1878d:pkg_sftp/vendor/github.com/pkg/sftp \ pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ prometheus:client_golang:v1.11.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \ prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \ prometheus:common:v0.32.1:prometheus_common/vendor/github.com/prometheus/common \ prometheus:procfs:v0.7.3:prometheus_procfs/vendor/github.com/prometheus/procfs \ protocolbuffers:protobuf-go:v1.27.1:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \ putdotio:go-putio:16d982cac2b8:putdotio_go_putio_putio/vendor/github.com/putdotio/go-putio \ rclone:ftp:v1.0.0-210902h:rclone_ftp/vendor/github.com/rclone/ftp \ rfjakob:eme:v1.1.2:rfjakob_eme/vendor/github.com/rfjakob/eme \ rivo:uniseg:v0.2.0:rivo_uniseg/vendor/github.com/rivo/uniseg \ russross:blackfriday:v2.1.0:russross_blackfriday_v2/vendor/github.com/russross/blackfriday/v2 \ shirou:gopsutil:v3.21.10:shirou_gopsutil_v3/vendor/github.com/shirou/gopsutil \ sirupsen:logrus:v1.8.1:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ skratchdot:open-golang:eef842397966:skratchdot_open_golang/vendor/github.com/skratchdot/open-golang \ spacemonkeygo:monkit:v3.0.17:spacemonkeygo_monkit_v3/vendor/github.com/spacemonkeygo/monkit/v3 \ spf13:cobra:v1.2.1:spf13_cobra/vendor/github.com/spf13/cobra \ spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \ storj:common:6aaeb34bb916:storj_common/vendor/storj.io/common \ storj:drpc:v0.0.26:storj_drpc/vendor/storj.io/drpc \ storj:uplink:v1.7.0:storj_uplink/vendor/storj.io/uplink \ stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \ t3rm1n4l:go-mega:ffad7fcb44b8:t3rm1n4l_go_mega/vendor/github.com/t3rm1n4l/go-mega \ tklauser:go-sysconf:v0.3.9:tklauser_go_sysconf/vendor/github.com/tklauser/go-sysconf \ tklauser:numcpus:v0.3.0:tklauser_numcpus/vendor/github.com/tklauser/numcpus \ vivint:infectious:25a574ae18a3:vivint_infectious/vendor/github.com/vivint/infectious \ winfsp:cgofuse:v1.5.0:winfsp_cgofuse/vendor/github.com/winfsp/cgofuse \ xanzy:ssh-agent:v0.3.1:xanzy_ssh_agent/vendor/github.com/xanzy/ssh-agent \ youmark:pkcs8:1326539a0a0a:youmark_pkcs8/vendor/github.com/youmark/pkcs8 \ yunify:qingstor-sdk-go:v3.2.0:yunify_qingstor_sdk_go_v3/vendor/github.com/yunify/qingstor-sdk-go/v3 \ zeebo:errs:v1.2.2:zeebo_errs/vendor/github.com/zeebo/errs _GITEA_TUPLE= goftp:server:v0.4.1:vendor/goftp.io/server PLIST_FILES= bin/rclone .include .for account project tag subdir in ${_GITEA_TUPLE:S/:/ /g} MASTER_SITES+= https://gitea.com/${account}/${project}/archive/${tag}${EXTRACT_SUFX}?dummy=/:${account}_${project} DISTFILES+= ${account}-${project}-${tag}_GITEA0${EXTRACT_SUFX}:${account}_${project} .endfor post-extract: @${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/adal @${RLN} ${WRKSRC_azure_go_autorest_adal}/autorest/adal ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/adal @${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/date @${RLN} ${WRKSRC_azure_go_autorest_date}/autorest/date ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/date @${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/logger @${RLN} ${WRKSRC_azure_go_autorest_logger}/logger ${WRKSRC}/vendor/github.com/Azure/go-autorest/logger @${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/tracing @${RLN} ${WRKSRC_azure_go_autorest_tracing}/tracing ${WRKSRC}/vendor/github.com/Azure/go-autorest/tracing .for account project tag subdir in ${_GITEA_TUPLE:S/:/ /g} @${MKDIR} ${WRKSRC}/${subdir:H} @${RLN} ${WRKDIR}/${project} ${WRKSRC}/${subdir} .endfor .include diff --git a/net/rclone/files/patch-vendor_bazil.org_fuse_mount__freebsd.go b/net/rclone/files/patch-vendor_bazil.org_fuse_mount__freebsd.go new file mode 100644 index 000000000000..6e65abfd799a --- /dev/null +++ b/net/rclone/files/patch-vendor_bazil.org_fuse_mount__freebsd.go @@ -0,0 +1,15 @@ +--- vendor/bazil.org/fuse/mount_freebsd.go.orig 2022-08-09 15:43:51 UTC ++++ vendor/bazil.org/fuse/mount_freebsd.go +@@ -56,10 +56,11 @@ func mount(dir string, conf *mountConfig) (*os.File, e + } + } + +- f, err := os.OpenFile("/dev/fuse", os.O_RDWR, 0o000) ++ fd, err := syscall.Open("/dev/fuse", os.O_RDWR|syscall.O_CLOEXEC, 0o000) + if err != nil { + return nil, err + } ++ f := os.NewFile(uintptr(fd), "/dev/fuse") + + cmd := exec.Command( + "/sbin/mount_fusefs",