www/minio: update to 2020.12.18.03.27.42 [1]

While here, fix rc script when using distributed mode [2]

PR:		251889 [2]
Submitted by:	Boris Korzun <drtr0jan@yandex.ru> [2]

3 files changed, 22 insertions, 14 deletions

diff --git a/www/minio/Makefile b/www/minio/Makefile
index d7b6539e64e6..1e5c422e0a69 100644
--- a/www/minio/Makefile
+++ b/www/minio/Makefile
@@ -13,8 +13,8 @@ LICENSE=	APACHE20
 USES=		compiler go:modules
 
 USE_GITHUB=	yes
-GHTAG=		RELEASE.2020-12-16T05-05-17Z
-COMMIT_ID=	c606c76323656944933a5c8d2e6d81d4b3a617c1
+GHTAG=		RELEASE.2020-12-18T03-27-42Z
+COMMIT_ID=	f714840da7c1e4e97687725873f3a9aa8f9b9912
 
 GH_TUPLE=	${PORTNAME}:${PORTNAME}:${GHTAG}:DEFAULT \
 		Azure:azure-pipeline-go:v0.2.2:azure_azure_pipeline_go/vendor/github.com/Azure/azure-pipeline-go \
diff --git a/www/minio/distinfo b/www/minio/distinfo
index ae3a9cf979d2..0678c9d93af4 100644
--- a/www/minio/distinfo
+++ b/www/minio/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1608214415
-SHA256 (minio/minio-minio-2020.12.16.05.05.17-RELEASE.2020-12-16T05-05-17Z_GH0.tar.gz) = f6bc0686431c98e58944077db652745089f0a3b6564ea46246dc02062aa2f33f
-SIZE (minio/minio-minio-2020.12.16.05.05.17-RELEASE.2020-12-16T05-05-17Z_GH0.tar.gz) = 10330784
+TIMESTAMP = 1608301937
+SHA256 (minio/minio-minio-2020.12.18.03.27.42-RELEASE.2020-12-18T03-27-42Z_GH0.tar.gz) = 9667436f8801bace2218c1f4b1c6d6dfa072f7947589b6d9ff50dda8a0289205
+SIZE (minio/minio-minio-2020.12.18.03.27.42-RELEASE.2020-12-18T03-27-42Z_GH0.tar.gz) = 10331579
 SHA256 (minio/Azure-azure-pipeline-go-v0.2.2_GH0.tar.gz) = dc0d15949088e17e74da35c3ae2730f52240ad73e25cf795f532b7282de68e2f
 SIZE (minio/Azure-azure-pipeline-go-v0.2.2_GH0.tar.gz) = 16443
 SHA256 (minio/Azure-azure-storage-blob-go-v0.10.0_GH0.tar.gz) = e3d4304b9fcb7dc5911d648a236fa69c06cb3b33ffb05ac4be6bf3d69125f71e
diff --git a/www/minio/files/minio.in b/www/minio/files/minio.in
index 515496514fd0..e0edcbe9be3b 100644
--- a/www/minio/files/minio.in
+++ b/www/minio/files/minio.in
@@ -9,7 +9,7 @@
 # minio_enable (bool):          Set to "NO" by default.
 #                               Set it to "YES" to enable minio
 # minio_config (path):          Set to "%%ETCDIR%%" by default
-#                               Set to directory to store minio config
+#                               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.
@@ -40,7 +40,6 @@ rcvar=minio_enable
 load_rc_config ${name}
 
 : ${minio_enable:="NO"}
-: ${minio_config="%%ETCDIR%%"}
 : ${minio_certs="%%ETCDIR%%/certs"}
 : ${minio_disks="%%DBDIR%%"}
 : ${minio_address=":9000"}
@@ -67,27 +66,36 @@ else
     minio_syslog_output_flags="-o ${minio_logfile}"
 fi
 
+# legacy compatibility
+if [ -n "${minio_config}" ]; then
+    minio_config_flag="-C \"${minio_config}\""
+fi
+
 pidfile="/var/run/${name}.pid"
 procname="%%PREFIX%%/bin/minio"
 command="/usr/sbin/daemon"
-command_args="-f -t ${name} ${minio_syslog_output_flags} -p ${pidfile} /usr/bin/env ${minio_env} ${procname} -C \"${minio_config}\" -S \"${minio_certs}\" --quiet server --address=\"${minio_address}\" ${minio_disks} ${minio_args}"
+command_args="-f -t ${name} ${minio_syslog_output_flags} -p ${pidfile} /usr/bin/env ${minio_env} ${procname} ${minio_config_flag} -S \"${minio_certs}\" --quiet server --address=\"${minio_address}\" ${minio_disks} ${minio_args}"
 
 minio_start_precmd()
 {
     if [ ! -e "${pidfile}" ]; then
-        install -o "${minio_user}" -g "${minio_group}" "/dev/null" "${pidfile}"
+        install -m 0600 -o "${minio_user}" -g "${minio_group}" /dev/null "${pidfile}"
     fi
 
-    if [ ! -d "${minio_disks}" ]; then
-        install -d -o "${minio_user}" -g "${minio_group}" "${minio_disks}"
+    if echo "${minio_disks}" | egrep -q -v '^[^/]|\.{3}'; then
+        for disk in "${minio_disks}"; do
+            if [ ! -d "${disk}" ]; then
+                install -d -m 0750 -o "${minio_user}" -g "${minio_group}" "${disk}"
+            fi
+        done
     fi
 
-    if [ ! -d "${minio_config}" ]; then
-        install -d -o "${minio_user}" -g "${minio_group}" "${minio_config}"
+    if [ -n "${minio_config}" -a ! -d "${minio_config}" ]; then
+        install -d -m 0750 -o "${minio_user}" -g "${minio_group}" "${minio_config}"
     fi
 
     if ! checkyesno minio_syslog_enable && [ ! -e "${minio_logfile}" ]; then
-        install -o "${minio_user}" -g "${minio_group}" "/dev/null" "${minio_logfile}"
+        install -m 0640 -o "${minio_user}" -g "${minio_group}" /dev/null "${minio_logfile}"
     fi
 }