Index: www/minio/Makefile =================================================================== --- www/minio/Makefile (revision 527730) +++ www/minio/Makefile (working copy) @@ -2,7 +2,6 @@ PORTNAME= minio PORTVERSION= ${GH_TAGNAME:S/RELEASE.//:S/Z//:S/T/-/:S/-/./g} -PORTREVISION= 1 CATEGORIES= www MAINTAINER= swills@FreeBSD.org @@ -13,8 +12,8 @@ USES= compiler go:modules USE_GITHUB= yes -GHTAG= RELEASE.2020-01-03T19-12-21Z -COMMIT_ID= b00cda8ad49ed0defa9df5e7230f8b536b8ccb17 +GHTAG= RELEASE.2020-02-27T00-23-05Z +COMMIT_ID= 5d25b10f722165fcff5ee47b241ffbcd155eebbc GH_TUPLE= ${PORTNAME}:${PORTNAME}:${GHTAG}:DEFAULT \ Azure:azure-pipeline-go:v0.2.1:azure_azure_pipeline_go/vendor/github.com/Azure/azure-pipeline-go \ Azure:azure-storage-blob-go:v0.8.0:azure_azure_storage_blob_go/vendor/github.com/Azure/azure-storage-blob-go \ @@ -22,7 +21,7 @@ StackExchange:wmi:cbe66965904d:stackexchange_wmi/vendor/github.com/StackExchange/wmi \ alecthomas:participle:v0.2.1:alecthomas_participle/vendor/github.com/alecthomas/participle \ aliyun:aliyun-oss-go-sdk:86c17b95fcd5:aliyun_aliyun_oss_go_sdk/vendor/github.com/aliyun/aliyun-oss-go-sdk \ - apache:thrift:v0.12.0:apache_thrift/vendor/git.apache.org/thrift.git \ + apache:thrift:v0.13.0:apache_thrift/vendor/git.apache.org/thrift.git \ aws:aws-sdk-go:v1.20.21:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \ bcicen:jstream:16c1f8af81c2:bcicen_jstream/vendor/github.com/bcicen/jstream \ beevik:ntp:v0.2.0:beevik_ntp/vendor/github.com/beevik/ntp \ @@ -51,11 +50,11 @@ gogo:protobuf:v1.2.1:gogo_protobuf/vendor/github.com/gogo/protobuf \ golang:appengine:v1.6.0:golang_appengine/vendor/google.golang.org/appengine \ golang:crypto:497ca9f6d64f:golang_crypto/vendor/golang.org/x/crypto \ - golang:net:83d349e8ac1a:golang_net/vendor/golang.org/x/net \ + golang:net:aa69164e4478:golang_net/vendor/golang.org/x/net \ golang:oauth2:9f3314589c9a:golang_oauth2/vendor/golang.org/x/oauth2 \ golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \ golang:snappy:v0.0.1:golang_snappy/vendor/github.com/golang/snappy \ - golang:sys:33540a1f6037:golang_sys/vendor/golang.org/x/sys \ + golang:sys:0a153f010e69:golang_sys/vendor/golang.org/x/sys \ golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \ golang:time:9d24e82272b4:golang_time/vendor/golang.org/x/time \ gomodule:redigo:v2.0.0:gomodule_redigo/vendor/github.com/gomodule/redigo \ @@ -76,7 +75,7 @@ hashicorp:go-uuid:v1.0.1:hashicorp_go_uuid/vendor/github.com/hashicorp/go-uuid \ hashicorp:golang-lru:v0.5.1:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \ hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \ - hashicorp:vault:v1.3.1:hashicorp_vault/vendor/github.com/hashicorp/vault \ + hashicorp:vault:v1.3.2:hashicorp_vault/vendor/github.com/hashicorp/vault \ inconshreveable:go-update:8152e7eb6ccf:inconshreveable_go_update/vendor/github.com/inconshreveable/go-update \ jcmturner:aescts:v1.0.1:jcmturner_aescts/vendor/gopkg.in/jcmturner/aescts.v1 \ jcmturner:dnsutils:v1.0.1:jcmturner_dnsutils/vendor/gopkg.in/jcmturner/dnsutils.v1 \ @@ -85,9 +84,9 @@ jcmturner:gokrb5:v7.2.3:jcmturner_gokrb5/vendor/gopkg.in/jcmturner/gokrb5.v7 \ jcmturner:rpc:v1.1.0:jcmturner_rpc/vendor/gopkg.in/jcmturner/rpc.v1 \ jmespath:go-jmespath:c2b33e8439af:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \ - json-iterator:go:v1.1.7:json_iterator_go/vendor/github.com/json-iterator/go \ - klauspost:compress:v1.9.4:klauspost_compress/vendor/github.com/klauspost/compress \ - klauspost:cpuid:v1.2.1:klauspost_cpuid/vendor/github.com/klauspost/cpuid \ + json-iterator:go:v1.1.9:json_iterator_go/vendor/github.com/json-iterator/go \ + klauspost:compress:v1.9.8:klauspost_compress/vendor/github.com/klauspost/compress \ + klauspost:cpuid:v1.2.2:klauspost_cpuid/vendor/github.com/klauspost/cpuid \ klauspost:pgzip:v1.2.1:klauspost_pgzip/vendor/github.com/klauspost/pgzip \ klauspost:readahead:v1.3.1:klauspost_readahead/vendor/github.com/klauspost/readahead \ klauspost:reedsolomon:v1.9.3:klauspost_reedsolomon/vendor/github.com/klauspost/reedsolomon \ @@ -106,9 +105,10 @@ minio:hdfs:v3.0.1:minio_hdfs/vendor/github.com/minio/hdfs/v3 \ minio:highwayhash:v1.0.0:minio_highwayhash/vendor/github.com/minio/highwayhash \ minio:lsync:v1.0.1:minio_lsync/vendor/github.com/minio/lsync \ - minio:minio-go:v6.0.44:minio_minio_go/vendor/github.com/minio/minio-go/v6 \ - minio:parquet-go:20b3c07bcd2c:minio_parquet_go/vendor/github.com/minio/parquet-go \ + minio:minio-go:v6.0.45:minio_minio_go/vendor/github.com/minio/minio-go/v6 \ + minio:parquet-go:a1e49702e174:minio_parquet_go/vendor/github.com/minio/parquet-go \ minio:sha256-simd:v0.1.1:minio_sha256_simd/vendor/github.com/minio/sha256-simd \ + minio:simdjson-go:v0.1.3:minio_simdjson_go/vendor/github.com/minio/simdjson-go \ minio:sio:v0.2.0:minio_sio/vendor/github.com/minio/sio \ mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \ mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \ @@ -123,9 +123,8 @@ ncw:directio:v1.0.5:ncw_directio/vendor/github.com/ncw/directio \ nsqio:go-nsq:v1.0.7:nsqio_go_nsq/vendor/github.com/nsqio/go-nsq \ olivere:elastic:v5.0.80:olivere_elastic/vendor/gopkg.in/olivere/elastic.v5 \ - pierrec:lz4:v2.2.6:pierrec_lz4/vendor/github.com/pierrec/lz4 \ + pierrec:lz4:v2.4.0:pierrec_lz4/vendor/github.com/pierrec/lz4 \ pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \ - pkg:profile:v1.3.0:pkg_profile/vendor/github.com/pkg/profile \ prometheus:client_golang:3c4408c8b829:prometheus_client_golang/vendor/github.com/prometheus/client_golang \ prometheus:client_model:fd36f4220a90:prometheus_client_model/vendor/github.com/prometheus/client_model \ prometheus:common:v0.2.0:prometheus_common/vendor/github.com/prometheus/common \ @@ -135,7 +134,7 @@ rs:cors:v1.6.0:rs_cors/vendor/github.com/rs/cors \ ryanuber:go-glob:v1.0.0:ryanuber_go_glob/vendor/github.com/ryanuber/go-glob \ secure-io:sio-go:v0.3.0:secure_io_sio_go/vendor/github.com/secure-io/sio-go \ - shirou:gopsutil:v2.20.1:shirou_gopsutil/vendor/github.com/shirou/gopsutil \ + shirou:gopsutil:v2.18.12:shirou_gopsutil/vendor/github.com/shirou/gopsutil \ sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ skyrings:skyring-common:d1c0bb1cbd5e:skyrings_skyring_common/vendor/github.com/skyrings/skyring-common \ square:go-jose:v2.3.1:square_go_jose/vendor/gopkg.in/square/go-jose.v2 \ @@ -146,19 +145,25 @@ tidwall:sjson:v1.0.4:tidwall_sjson/vendor/github.com/tidwall/sjson \ uber-go:atomic:v1.3.2:uber_go_atomic/vendor/go.uber.org/atomic \ valyala:tcplisten:ceec8f93295a:valyala_tcplisten/vendor/github.com/valyala/tcplisten -GO_BUILDFLAGS= -ldflags='\ + +GO_BUILDFLAGS= -ldflags=" \ -X github.com/minio/minio/cmd.Version=${GH_TAGNAME:C/RELEASE\.//:C|(..)-(..)-(..)Z|\1:\2:\3Z|} \ -X github.com/minio/minio/cmd.ReleaseTag=${GH_TAGNAME} \ -X github.com/minio/minio/cmd.CommitID=${COMMIT_ID} \ - -X github.com/minio/minio/cmd.GOPATH=${WRKSRC} -s -w' + -X github.com/minio/minio/cmd.GOPATH=${WRKSRC} -s -w" PLIST_FILES= bin/${PORTNAME} USE_RC_SUBR= minio -USERS= minio -GROUPS= minio +MINIO_USER?= minio +MINIO_GROUP?= minio +MINIO_DATADIR?= /var/db/${PORTNAME} -SUB_LIST= GROUP="${GROUPS}" \ - USER="${USERS}" +USERS= ${MINIO_USER} +GROUPS= ${MINIO_GROUP} +SUB_LIST= MINIO_USER=${MINIO_USER} \ + MINIO_GROUP=${MINIO_GROUP} \ + MINIO_DATADIR=${MINIO_DATADIR} + .include Index: www/minio/distinfo =================================================================== --- www/minio/distinfo (revision 527730) +++ www/minio/distinfo (working copy) @@ -1,6 +1,6 @@ -TIMESTAMP = 1580641370 -SHA256 (minio-minio-2020.01.03.19.12.21-RELEASE.2020-01-03T19-12-21Z_GH0.tar.gz) = 5676c40de64503c99b48e7738caa5b82c1239b93c76d3319ee11c5b6d37b07ff -SIZE (minio-minio-2020.01.03.19.12.21-RELEASE.2020-01-03T19-12-21Z_GH0.tar.gz) = 7148848 +TIMESTAMP = 1583268169 +SHA256 (minio-minio-2020.02.27.00.23.05-RELEASE.2020-02-27T00-23-05Z_GH0.tar.gz) = feddf518745d5686fca14b9386f17dcced96b4916bee788ccf5a2e5f6de5079b +SIZE (minio-minio-2020.02.27.00.23.05-RELEASE.2020-02-27T00-23-05Z_GH0.tar.gz) = 7206624 SHA256 (Azure-azure-pipeline-go-v0.2.1_GH0.tar.gz) = 97738fe9fe1c5bab41b89fc97cef08537e53cd3f38f5686e3853d2aecb20133d SIZE (Azure-azure-pipeline-go-v0.2.1_GH0.tar.gz) = 16378 SHA256 (Azure-azure-storage-blob-go-v0.8.0_GH0.tar.gz) = e50db03bc05b952159e0a1d393c841c217c3aecd6ce745f8b9c42fd498e476c7 @@ -13,8 +13,8 @@ SIZE (alecthomas-participle-v0.2.1_GH0.tar.gz) = 53390 SHA256 (aliyun-aliyun-oss-go-sdk-86c17b95fcd5_GH0.tar.gz) = ac05cf33cee718ad511e3072e1a80379d0174ab6a3fa5b3f9e85b753e874fcdd SIZE (aliyun-aliyun-oss-go-sdk-86c17b95fcd5_GH0.tar.gz) = 608035 -SHA256 (apache-thrift-v0.12.0_GH0.tar.gz) = b7452d1873c6c43a580d2b4ae38cfaf8fa098ee6dc2925bae98dce0c010b1366 -SIZE (apache-thrift-v0.12.0_GH0.tar.gz) = 2960476 +SHA256 (apache-thrift-v0.13.0_GH0.tar.gz) = 5da60088e60984f4f0801deeea628d193c33cec621e78c8a43a5d8c4055f7ad9 +SIZE (apache-thrift-v0.13.0_GH0.tar.gz) = 3202365 SHA256 (aws-aws-sdk-go-v1.20.21_GH0.tar.gz) = d4ba01e79f394d538df66f12284bdc1802a9ac5e61cbbf296203b70686b2f1fe SIZE (aws-aws-sdk-go-v1.20.21_GH0.tar.gz) = 11606380 SHA256 (bcicen-jstream-16c1f8af81c2_GH0.tar.gz) = 16853f7fe0fc52bc716c6737ec2333d473c6df2d41d0454497d4c905413ced6f @@ -71,8 +71,8 @@ SIZE (golang-appengine-v1.6.0_GH0.tar.gz) = 332522 SHA256 (golang-crypto-497ca9f6d64f_GH0.tar.gz) = 804e2779ac334f8933c0fc68936536131cb0899d15f64132d6541fa9f333db8d SIZE (golang-crypto-497ca9f6d64f_GH0.tar.gz) = 1711629 -SHA256 (golang-net-83d349e8ac1a_GH0.tar.gz) = 5752c376bc6383bf2055281336101c062b881f17ded2e960d718c8256023f9c7 -SIZE (golang-net-83d349e8ac1a_GH0.tar.gz) = 1103298 +SHA256 (golang-net-aa69164e4478_GH0.tar.gz) = b538bbdda3b9f7c93b6bbac94874d8fa85d25e43577f3b356fd825f39410be0f +SIZE (golang-net-aa69164e4478_GH0.tar.gz) = 1100688 SHA256 (golang-oauth2-9f3314589c9a_GH0.tar.gz) = daa93a9035722a6549aad86e440fa1b3b80461f215e2f001c68342e7c05b8ffe SIZE (golang-oauth2-9f3314589c9a_GH0.tar.gz) = 45034 SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65 @@ -79,8 +79,8 @@ SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285 SHA256 (golang-snappy-v0.0.1_GH0.tar.gz) = b1d97f47fcb61cb0cdd54bc424eda980c47838effb0ec9e322506514a50fee85 SIZE (golang-snappy-v0.0.1_GH0.tar.gz) = 62605 -SHA256 (golang-sys-33540a1f6037_GH0.tar.gz) = 09ebdf007413c2eaddce123137443d08d1848be410c58896e772f0481ec385d5 -SIZE (golang-sys-33540a1f6037_GH0.tar.gz) = 1497659 +SHA256 (golang-sys-0a153f010e69_GH0.tar.gz) = e94d8142ef4da4fe015743c65c508a0d39f069b9652b3f37919212589576d376 +SIZE (golang-sys-0a153f010e69_GH0.tar.gz) = 1480740 SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22 SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069 SHA256 (golang-time-9d24e82272b4_GH0.tar.gz) = 7452a7b879ee5984709b2165f6212ad9464977f06d440140b8690e61695aa404 @@ -121,8 +121,8 @@ SIZE (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 12982 SHA256 (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 50632428210503070fd2fde748c88b7414bf84a6a0eadebf9d8e596a033bead2 SIZE (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 70658 -SHA256 (hashicorp-vault-v1.3.1_GH0.tar.gz) = 2fcb4563482be3f4076cc8f9c5be3fe4d86b4e0f9d5ec7197da86d349c09df2e -SIZE (hashicorp-vault-v1.3.1_GH0.tar.gz) = 31112300 +SHA256 (hashicorp-vault-v1.3.2_GH0.tar.gz) = 675961d3c0c933ec260995c1aad024b20ac4ab0816c76b4cb07385a8c25b1d83 +SIZE (hashicorp-vault-v1.3.2_GH0.tar.gz) = 31119205 SHA256 (inconshreveable-go-update-8152e7eb6ccf_GH0.tar.gz) = 507bf16c9e400a4e86954357534d932a18a3c9bbfdd1d6b8f58ddf33b84f7001 SIZE (inconshreveable-go-update-8152e7eb6ccf_GH0.tar.gz) = 27137 SHA256 (jcmturner-aescts-v1.0.1_GH0.tar.gz) = 89d8aa45b05c9cd5e66c40a5c4f3a5224dbf9632d1fd1e27d05f2ad26effae32 @@ -139,12 +139,12 @@ SIZE (jcmturner-rpc-v1.1.0_GH0.tar.gz) = 28845 SHA256 (jmespath-go-jmespath-c2b33e8439af_GH0.tar.gz) = 1ccd468fe91f58cd1b144f6317f06b53bf0a5da5e03e6a399a2d03f087db1fe9 SIZE (jmespath-go-jmespath-c2b33e8439af_GH0.tar.gz) = 48265 -SHA256 (json-iterator-go-v1.1.7_GH0.tar.gz) = fb0560a12eab7071f8518104703b6b2b1e6a5a0b564c8d61b0b68d29f6471233 -SIZE (json-iterator-go-v1.1.7_GH0.tar.gz) = 77936 -SHA256 (klauspost-compress-v1.9.4_GH0.tar.gz) = 93f194bc4e1136839874a675b3c47a35bb15130e8c6bfa4b807e12065d6c06cc -SIZE (klauspost-compress-v1.9.4_GH0.tar.gz) = 15167244 -SHA256 (klauspost-cpuid-v1.2.1_GH0.tar.gz) = fd66be8517ba837d0f582ad095d2e42e7464c08ef2a3eaffa3bf83330223fa92 -SIZE (klauspost-cpuid-v1.2.1_GH0.tar.gz) = 279083 +SHA256 (json-iterator-go-v1.1.9_GH0.tar.gz) = ca1fee8594ea5b4f41bce678c09a7b4b8300bf185701930cc5fcb1758e98dab1 +SIZE (json-iterator-go-v1.1.9_GH0.tar.gz) = 79624 +SHA256 (klauspost-compress-v1.9.8_GH0.tar.gz) = 875db400d8bd838ce050db5931f540c17186f6ec2630420238da48be7bac1f56 +SIZE (klauspost-compress-v1.9.8_GH0.tar.gz) = 16106285 +SHA256 (klauspost-cpuid-v1.2.2_GH0.tar.gz) = 201d620a28f51236fe1e98a07c53f0b9c4f713df771ea315dc85f1befa4bb458 +SIZE (klauspost-cpuid-v1.2.2_GH0.tar.gz) = 279392 SHA256 (klauspost-pgzip-v1.2.1_GH0.tar.gz) = e7e8268df625f6110e5eb56952d0d91565ee5847fde3fb5fd2ee057183296576 SIZE (klauspost-pgzip-v1.2.1_GH0.tar.gz) = 121624 SHA256 (klauspost-readahead-v1.3.1_GH0.tar.gz) = 13a246f5e68b8dc5c7509b7ce22c8b725e031424cb562a0b8cb695ead18d9ad1 @@ -181,12 +181,14 @@ SIZE (minio-highwayhash-v1.0.0_GH0.tar.gz) = 17868 SHA256 (minio-lsync-v1.0.1_GH0.tar.gz) = 4899b3ec870dc3ef90ca8b8915e12ff58fd7fd63c5cba3478328c6955a0df9e8 SIZE (minio-lsync-v1.0.1_GH0.tar.gz) = 8302 -SHA256 (minio-minio-go-v6.0.44_GH0.tar.gz) = 1979f14edbbd79f08725889638bca62312b5c9ef47871ad8f2dcd72883829e85 -SIZE (minio-minio-go-v6.0.44_GH0.tar.gz) = 201238 -SHA256 (minio-parquet-go-20b3c07bcd2c_GH0.tar.gz) = 903a945257e2687a926698b1fba20440e8de9c312b82d924127bc5a709645047 -SIZE (minio-parquet-go-20b3c07bcd2c_GH0.tar.gz) = 78774 +SHA256 (minio-minio-go-v6.0.45_GH0.tar.gz) = 26f5ab0c17a2a8a10b9b6585e4e2e9c9ca39acb0456ba3238066c8d9dddb09ee +SIZE (minio-minio-go-v6.0.45_GH0.tar.gz) = 204175 +SHA256 (minio-parquet-go-a1e49702e174_GH0.tar.gz) = 6a129aa1651d72281de578aec5a6474d7cfb7a830c1113dd7bae44423fb6905e +SIZE (minio-parquet-go-a1e49702e174_GH0.tar.gz) = 79302 SHA256 (minio-sha256-simd-v0.1.1_GH0.tar.gz) = bc1f1e80dc1291f6d26933658155488cc895f6b8a4944479d462cf5a79112109 SIZE (minio-sha256-simd-v0.1.1_GH0.tar.gz) = 65024 +SHA256 (minio-simdjson-go-v0.1.3_GH0.tar.gz) = 00be66ebec61208ebc04f41094437b9b9c1d7964ae0f64e9ed4f7a6e2623729a +SIZE (minio-simdjson-go-v0.1.3_GH0.tar.gz) = 4888138 SHA256 (minio-sio-v0.2.0_GH0.tar.gz) = 95ae305693de1712ed30ff0845d8afd23b6660e61a91a95c03d01c6bc36169f7 SIZE (minio-sio-v0.2.0_GH0.tar.gz) = 53750 SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600 @@ -215,12 +217,10 @@ SIZE (nsqio-go-nsq-v1.0.7_GH0.tar.gz) = 44809 SHA256 (olivere-elastic-v5.0.80_GH0.tar.gz) = 2a900688610043b905f7d59fe149ca4f4159ac5a4d8bfa24710f5b60d06b9c55 SIZE (olivere-elastic-v5.0.80_GH0.tar.gz) = 314075 -SHA256 (pierrec-lz4-v2.2.6_GH0.tar.gz) = 9a20f791c375a48305e29f3de6b56f86f4e245568ee23e97aacc44c0af8d9c24 -SIZE (pierrec-lz4-v2.2.6_GH0.tar.gz) = 20500086 +SHA256 (pierrec-lz4-v2.4.0_GH0.tar.gz) = 8566d2c4494c7a7699c79955a7ca9df785787ff9ec2e81154e1cf6e9ee4ab102 +SIZE (pierrec-lz4-v2.4.0_GH0.tar.gz) = 20509190 SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356 SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009 -SHA256 (pkg-profile-v1.3.0_GH0.tar.gz) = 6af6c06236d24dbabe7d943e08b1bbf24da3ce74985dbb1579ce494548973006 -SIZE (pkg-profile-v1.3.0_GH0.tar.gz) = 5822 SHA256 (prometheus-client_golang-3c4408c8b829_GH0.tar.gz) = 4623ff8925cfd1a7269264317276cb397e85b6f8547d6a933f77b4710909cc13 SIZE (prometheus-client_golang-3c4408c8b829_GH0.tar.gz) = 135112 SHA256 (prometheus-client_model-fd36f4220a90_GH0.tar.gz) = 17571c708bab9a1ba18d9dd0c9bfe96dff3f1b84c63e7d8d4c3489ef5c34ee40 @@ -239,8 +239,8 @@ SIZE (ryanuber-go-glob-v1.0.0_GH0.tar.gz) = 2969 SHA256 (secure-io-sio-go-v0.3.0_GH0.tar.gz) = 36effba2f27efdcd190725417e094fda16b89199c64ad8947020c1215de19d37 SIZE (secure-io-sio-go-v0.3.0_GH0.tar.gz) = 21831 -SHA256 (shirou-gopsutil-v2.20.1_GH0.tar.gz) = f2afad4c7b4be33bafb78e577fd90dfbf46a63eafad480623aead5dd73eec315 -SIZE (shirou-gopsutil-v2.20.1_GH0.tar.gz) = 133895 +SHA256 (shirou-gopsutil-v2.18.12_GH0.tar.gz) = 70e291291c1e2363c1b8d7656c394cbfc8a67c93eb95a861abdcd7644562afba +SIZE (shirou-gopsutil-v2.18.12_GH0.tar.gz) = 117507 SHA256 (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 67f2ddf467b7e63d2d2529d227946a331e245aeef7e2e4521ae82647b5ef84d9 SIZE (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 41373 SHA256 (skyrings-skyring-common-d1c0bb1cbd5e_GH0.tar.gz) = b73144652cfd3fbbd49ce8ed26e781ef8c4f735bbfd6f038b6e14ed5b62181e4 Index: www/minio/files/minio.in =================================================================== --- www/minio/files/minio.in (revision 527730) +++ www/minio/files/minio.in (working copy) @@ -8,9 +8,9 @@ # # minio_enable (bool): Set to "NO" by default. # Set it to "YES" to enable minio -# minio_config (path): Set to "%%PREFIX%%/etc/minio" by default -# Set to directory to store minio config -# minio_certs (path): Set to "/var/tmp/minio" by default +# minio_config (path): Set to "%%ETCDIR%%" by default +# Set to directory to store minio config (deprecated) +# minio_certs (path): Set to "%%ETCDIR%%/certs" by default # Set to directory to certs dir # minio_disks (path): Set to "/var/db/minio" by default. # Set it to directory to store minio data @@ -20,6 +20,14 @@ # Set it to user to run minio under # minio_group (str): Set to "minio" by default. # Set it to group to run minio under +# minio_syslog_enable (bool): Set to YES by default +# Set it to NO to disable syslog output +# minio_syslog_tag (str): Set to "minio" by default. +# Set syslog tag if syslog enabled +# minio_syslog_priority (str): Set to "info" by default. +# Set syslog priority if syslog enabled +# minio_syslog_facility (str): Set to "daemon" by default. +# Set syslog facility if syslog enabled # minio_logfile (str): Set to "/var/log/minio.log" by default. # Set it to file where stdout/stderr are logged. # @@ -32,40 +40,43 @@ load_rc_config ${name} : ${minio_enable:="NO"} -: ${minio_config="%%PREFIX%%/etc/minio"} -: ${minio_certs="/var/tmp/minio"} -: ${minio_disks="/var/db/minio"} +: ${minio_config="%%ETCDIR%%"} +: ${minio_certs="%%ETCDIR%%/certs"} +: ${minio_disks="%%MINIO_DATADIR%%"} : ${minio_address=":9000"} -: ${minio_user:="%%USER%%"} -: ${minio_group:="%%GROUP%%"} +: ${minio_user:="%%MINIO_USER%%"} +: ${minio_group:="%%MINIO_GROUP%%"} +: ${minio_syslog_enable:="YES"} : ${minio_logfile:="/var/log/minio.log"} -pidfile="/var/run/${name}.pid" -procname="%%PREFIX%%/bin/minio" -command="/usr/sbin/daemon" -command_args="-c -p ${pidfile} /usr/bin/env ${minio_env} ${procname} -C \"${minio_config}\" -S \"${minio_certs}\" server --address=\"${minio_address}\" --quiet ${minio_disks} < /dev/null > ${minio_logfile} 2>&1" +start_precmd="minio_start_precmd" -start_precmd="minio_startprecmd" - -minio_startprecmd() -{ - if [ ! -e "${pidfile}" ]; then - install -o "${minio_user}" -g "${minio_group}" "/dev/null" "${pidfile}" +if checkyesno minio_syslog_enable; then + if [ -n "${minio_syslog_output_tag}" ]; then + minio_log_flags="-T ${minio_syslog_output_tag}" + else + minio_log_flags="-T ${name}" fi - - if [ ! -d "${minio_config}" ]; then - install -d -o "${minio_user}" -g "${minio_group}" "${minio_config}" + if [ -n "${minio_syslog_priority}" ]; then + minio_log_flags="${minio_log_flags} -s ${minio_syslog_priority}" fi + if [ -n "${minio_syslog_facility}" ]; then + minio_log_flags="${minio_log_flags} -l ${minio_syslog_facility}" + fi +else + minio_log_flags="-o ${minio_logfile}" +fi - if [ ! -e "${minio_logfile}" ]; then - install -o "${minio_user}" -g "${minio_group}" "/dev/null" "${minio_logfile}" - fi +pidfile="/var/run/${name}/${name}.pid" +command="/usr/sbin/daemon" +minio_main="/usr/bin/env ${minio_env} %%PREFIX%%/bin/minio -C \"${minio_config}\" -S \"${minio_certs}\" --quiet server --address=\"${minio_address}\" ${minio_disks}" +command_args="-f ${minio_log_flags} -P ${pidfile} -t ${name} ${minio_main}" - for disk in "${minio_disks}"; do - if [ ! -d "${disk}" ]; then - install -d -o "${minio_user}" -g "${minio_group}" "${disk}" - fi - done +minio_start_precmd() +{ + if [ ! -d "/var/run/${name}" ]; then + install -d -m 0750 -o ${minio_user} -g ${minio_group} "/var/run/${name}" + fi } run_rc_command "$1" Index: www/minio/files/patch-pkg_event_target_nats.go =================================================================== --- www/minio/files/patch-pkg_event_target_nats.go (revision 527730) +++ www/minio/files/patch-pkg_event_target_nats.go (nonexistent) @@ -1,11 +0,0 @@ ---- pkg/event/target/nats.go.orig 2019-04-26 02:36:49 UTC -+++ pkg/event/target/nats.go -@@ -23,7 +23,7 @@ import ( - - "github.com/minio/minio/pkg/event" - xnet "github.com/minio/minio/pkg/net" -- "github.com/nats-io/nats.go" -+ "github.com/nats-io/nats.go" - "github.com/nats-io/stan.go" - ) - Property changes on: www/minio/files/patch-pkg_event_target_nats.go ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property