diff --git a/net/seaweedfs/Makefile b/net/seaweedfs/Makefile index 99b0a93b0d85..8bed03b321ff 100644 --- a/net/seaweedfs/Makefile +++ b/net/seaweedfs/Makefile @@ -1,5 +1,5 @@ PORTNAME= seaweedfs -DISTVERSION= 2.81 +DISTVERSION= 2.82 CATEGORIES= net sysutils MAINTAINER= dch@FreeBSD.org @@ -23,9 +23,9 @@ SEAWEEDFS_USER?= seaweedfs SEAWEEDFS_GROUP?= seaweedfs SUB_FILES= pkg-message -SUB_LIST= GROUP=${SEAWEEDFS_GROUP} \ - SEAWEEDFS_DIR=${SEAWEEDFS_DIR} \ - USER=${SEAWEEDFS_USER} +SUB_LIST= SEAWEEDFS_DIR=${SEAWEEDFS_DIR} \ + USER=${SEAWEEDFS_USER} \ + GROUP=${SEAWEEDFS_GROUP} USERS= ${SEAWEEDFS_USER} GROUPS= ${SEAWEEDFS_GROUP} @@ -38,10 +38,7 @@ post-build: .endfor post-install: - ${MKDIR} \ - ${STAGEDIR}/var/db/${PORTNAME} \ - ${STAGEDIR}/var/log/${PORTNAME} \ - ${STAGEDIR}${ETCDIR} + ${MKDIR} ${STAGEDIR}${ETCDIR} .for cfg in filer master notification replication security ${INSTALL_DATA} ${WRKDIR}/${cfg}.toml \ ${STAGEDIR}${ETCDIR}/${cfg}.toml.sample diff --git a/net/seaweedfs/Makefile.deps b/net/seaweedfs/Makefile.deps index 3ea3630feec0..28b04d9c8125 100644 --- a/net/seaweedfs/Makefile.deps +++ b/net/seaweedfs/Makefile.deps @@ -29,6 +29,7 @@ GH_TUPLE= \ facebookgo:stats:1b76add642e4:facebookgo_stats/vendor/github.com/facebookgo/stats \ facebookgo:subset:c811ad88dec4:facebookgo_subset/vendor/github.com/facebookgo/subset \ fclairamb:ftpserverlib:v0.8.0:fclairamb_ftpserverlib/vendor/github.com/fclairamb/ftpserverlib \ + fluent:fluent-logger-golang:v1.8.0:fluent_fluent_logger_golang/vendor/github.com/fluent/fluent-logger-golang \ frankban:quicktest:v1.7.2:frankban_quicktest/vendor/github.com/frankban/quicktest \ fsnotify:fsnotify:v1.4.9:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \ go-errors:errors:v1.1.1:go_errors_errors/vendor/github.com/go-errors/errors \ @@ -115,6 +116,7 @@ GH_TUPLE= \ open-telemetry:opentelemetry-go:v0.15.0:open_telemetry_opentelemetry_go/vendor/go.opentelemetry.io/otel \ pelletier:go-toml:v1.7.0:pelletier_go_toml/vendor/github.com/pelletier/go-toml \ peterh:liner:v1.1.0:peterh_liner/vendor/github.com/peterh/liner \ + philhofer:fwd:v1.1.1:philhofer_fwd/vendor/github.com/philhofer/fwd \ pierrec:lz4:v2.2.7:pierrec_lz4/vendor/github.com/pierrec/lz4 \ pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \ pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ @@ -142,6 +144,7 @@ GH_TUPLE= \ tidwall:gjson:v1.10.2:tidwall_gjson/vendor/github.com/tidwall/gjson \ tidwall:match:v1.1.1:tidwall_match/vendor/github.com/tidwall/match \ tidwall:pretty:v1.2.0:tidwall_pretty/vendor/github.com/tidwall/pretty \ + tinylib:msgp:v1.1.6:tinylib_msgp/vendor/github.com/tinylib/msgp \ tsuna:gohbase:348991136365:tsuna_gohbase/vendor/github.com/tsuna/gohbase \ tylertreat:BoomFilters:1a82519a3e43:tylertreat_boomfilters/vendor/github.com/tylertreat/BoomFilters \ uber-go:atomic:v1.7.0:uber_go_atomic/vendor/go.uber.org/atomic \ diff --git a/net/seaweedfs/distinfo b/net/seaweedfs/distinfo index 8e0f41dff266..05a22d87e9ea 100644 --- a/net/seaweedfs/distinfo +++ b/net/seaweedfs/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1638864065 -SHA256 (chrislusf-seaweedfs-2.81_GH0.tar.gz) = 2b2e083545c02f1b36a69b4c03b2f61faf01e8a5ce6f424dbfb37e21ecfd2eee -SIZE (chrislusf-seaweedfs-2.81_GH0.tar.gz) = 27543358 +TIMESTAMP = 1640148566 +SHA256 (chrislusf-seaweedfs-2.82_GH0.tar.gz) = 10bd05b022136905cf880bd6bcead2d4cc32ab9d5fed71aaa1bf154ec4be1b12 +SIZE (chrislusf-seaweedfs-2.82_GH0.tar.gz) = 27545782 SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e SIZE (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 17102 SHA256 (Azure-azure-storage-blob-go-v0.14.0_GH0.tar.gz) = 1c76f91c4bd60073dff822a4414005f8f1e0f84b922aae87a4392e4b8a0d2561 @@ -61,6 +61,8 @@ SHA256 (facebookgo-subset-c811ad88dec4_GH0.tar.gz) = 6f63a444d615a9bb6fc5ee18528 SIZE (facebookgo-subset-c811ad88dec4_GH0.tar.gz) = 3659 SHA256 (fclairamb-ftpserverlib-v0.8.0_GH0.tar.gz) = 419cb35b1614ea847827cc13c72c208b60110732df78553a27d20a975f6a8936 SIZE (fclairamb-ftpserverlib-v0.8.0_GH0.tar.gz) = 47967 +SHA256 (fluent-fluent-logger-golang-v1.8.0_GH0.tar.gz) = c003a70edfae9e6d401faba40cc70f70c6ce8d9a8223b2828efacf39a7cd9662 +SIZE (fluent-fluent-logger-golang-v1.8.0_GH0.tar.gz) = 22860 SHA256 (frankban-quicktest-v1.7.2_GH0.tar.gz) = 8b883315184c93a95bfd92696576e1cfde4c89e5e16d50cca4be5c9541003ede SIZE (frankban-quicktest-v1.7.2_GH0.tar.gz) = 31735 SHA256 (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 4f888b1cb132026227826751d156c0a2958e7d492e5e38386cde8848ef494dcb @@ -233,6 +235,8 @@ SHA256 (pelletier-go-toml-v1.7.0_GH0.tar.gz) = f42a6e1ff00e3be16bd379697fd3892cc SIZE (pelletier-go-toml-v1.7.0_GH0.tar.gz) = 86417 SHA256 (peterh-liner-v1.1.0_GH0.tar.gz) = 777446ea21f92cbf15b5c69e0374978c015a228bd0013c606aba3236ba8bd157 SIZE (peterh-liner-v1.1.0_GH0.tar.gz) = 20929 +SHA256 (philhofer-fwd-v1.1.1_GH0.tar.gz) = f8a9e7bc2fffb117eec31666b8aa61bfb3d46e858b0b50fa90d98a6f1f0ebf18 +SIZE (philhofer-fwd-v1.1.1_GH0.tar.gz) = 9790 SHA256 (pierrec-lz4-v2.2.7_GH0.tar.gz) = fa7a12486049ad3a8757759eb78a3350a1c3017b200933fda1297e4b1cade6bf SIZE (pierrec-lz4-v2.2.7_GH0.tar.gz) = 20506693 SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608 @@ -287,6 +291,8 @@ SHA256 (tidwall-match-v1.1.1_GH0.tar.gz) = 1fc2ff17ecdd82c7ba739b4f373b9df731a8e SIZE (tidwall-match-v1.1.1_GH0.tar.gz) = 5931 SHA256 (tidwall-pretty-v1.2.0_GH0.tar.gz) = fda514a386aff71cf7a4639a8fb8e1133bf8f583eba902b3c844a176401fad7d SIZE (tidwall-pretty-v1.2.0_GH0.tar.gz) = 11224 +SHA256 (tinylib-msgp-v1.1.6_GH0.tar.gz) = ccb0d93c1ffc9f27b052772fcde03a40c172daaeebba37e2fd00efd413822d8a +SIZE (tinylib-msgp-v1.1.6_GH0.tar.gz) = 85282 SHA256 (tsuna-gohbase-348991136365_GH0.tar.gz) = d07fadd6aece4926b87514cc3f76d97f2537f6101c07e419b8185a6234a2b7ef SIZE (tsuna-gohbase-348991136365_GH0.tar.gz) = 222251 SHA256 (tylertreat-BoomFilters-1a82519a3e43_GH0.tar.gz) = d19d757804dec5b2c68f54f372cf34bbbcff4dcdccd87facefba92f24bd3a6a1 diff --git a/net/seaweedfs/files/pkg-message.in b/net/seaweedfs/files/pkg-message.in index a54e166d0a70..390d8cb09e35 100644 --- a/net/seaweedfs/files/pkg-message.in +++ b/net/seaweedfs/files/pkg-message.in @@ -19,6 +19,27 @@ Please read the documentation carefully, particularly around data replication, and running redundant masters. Prime numbers of servers are your friend, choose them wisely. +EOM +} +{ type: upgrade + maximum_version: "2.82" + message: <&1 | grep -q syslog ; echo $?) -if [ ${DAEMON} -eq 0 ]; then - : ${seaweedfs_syslog_enable:="NO"} - : ${seaweedfs_syslog_priority:="info"} - : ${seaweedfs_syslog_facility:="daemon"} - if checkyesno seaweedfs_syslog_enable; then - seaweedfs_syslog_flags="-T ${name}" +# backwards compatibility +if [ -d "${seaweedfs_dir}/data" -a \( "${seaweedfs_options}" = "server -dir=${seaweedfs_dir}" \) ]; then + seaweedfs_dir="${seaweedfs_dir}/data" + seaweedfs_options="server -dir=${seaweedfs_dir}" +fi +if [ -n "${seaweedfs_syslog_enable}" ]; then + seaweedfs_syslog_output_enable="YES" + seaweedfs_syslog_output_priority="${seaweedfs_syslog_priority}" + seaweedfs_syslog_output_facility="${seaweedfs_syslog_facility}" +fi + +if checkyesno seaweedfs_syslog_output_enable; then + if [ -n "${seaweedfs_syslog_output_tag}" ]; then + seaweedfs_syslog_output_flags="-T ${seaweedfs_syslog_output_tag}" + else + seaweedfs_syslog_output_flags="-T ${name}" + fi - if [ -n "${seaweedfs_syslog_priority}" ]; then - seaweedfs_syslog_flags="${seaweedfs_syslog_flags} -s ${seaweedfs_syslog_priority}" - fi + if [ -n "${seaweedfs_syslog_output_priority}" ]; then + seaweedfs_syslog_output_flags="${seaweedfs_syslog_output_flags} -s ${seaweedfs_syslog_output_priority}" + fi - if [ -n "${seaweedfs_syslog_facility}" ]; then - seaweedfs_syslog_flags="${seaweedfs_syslog_flags} -l ${seaweedfs_syslog_facility}" - fi - fi -else - seaweedfs_syslog_enable="NO" - seaweedfs_syslog_flags="" + if [ -n "${seaweedfs_syslog_output_facility}" ]; then + seaweedfs_syslog_output_flags="${seaweedfs_syslog_output_flags} -l ${seaweedfs_syslog_output_facility}" + fi fi -pidfile=/var/run/seaweedfs.pid +pidfile=${seaweedfs_pidfile} procname="%%PREFIX%%/bin/weed" command="/usr/sbin/daemon" -command_args="-f -t ${name} ${seaweedfs_syslog_flags} -p ${pidfile} ${procname} ${seaweedfs_options}" +command_args="-f -t ${name} ${seaweedfs_syslog_output_flags} -p ${pidfile} ${procname} ${seaweedfs_options}" -extra_commands="reload monitor" -monitor_cmd=seaweedfs_monitor start_precmd=seaweedfs_startprecmd -required_files="${seaweedfs_dir}" - -seaweedfs_monitor() -{ - sig_reload=USR1 - run_rc_command "reload" -} seaweedfs_startprecmd() { - if [ ! -e ${pidfile} ]; then - install -o ${seaweedfs_user} -g ${seaweedfs_group} /dev/null ${pidfile}; - fi + if [ ! -e "${pidfile}" ]; then + install -m 0600 -o "${seaweedfs_user}" -g "${seaweedfs_group}" /dev/null "${pidfile}"; + fi - if [ ! -d ${seaweedfs_dir}/data ]; then - install -d -m 0750 -o ${seaweedfs_user} -g ${seaweedfs_group} ${seaweedfs_dir}/data - fi - if [ ! -d ${seaweedfs_dir}/metadata ]; then - install -d -m 0750 -o ${seaweedfs_user} -g ${seaweedfs_group} ${seaweedfs_dir}/metadata - fi - chdir ${seaweedfs_dir} + if [ ! -d "${seaweedfs_dir}" ]; then + install -d -m 0750 -o "${seaweedfs_user}" -g "${seaweedfs_group}" "${seaweedfs_dir}" + fi } run_rc_command "$1" diff --git a/net/seaweedfs/pkg-plist b/net/seaweedfs/pkg-plist index 815b7c1e006e..034ae7900cf5 100644 --- a/net/seaweedfs/pkg-plist +++ b/net/seaweedfs/pkg-plist @@ -1,5 +1,3 @@ -@dir(seaweedfs,seaweedfs,750) /var/db/seaweedfs -@dir(seaweedfs,seaweedfs,750) /var/log/seaweedfs @comment normally these would auto-populate your etc dir but these generated @comment files contain conflicting options; users must read the wiki first! %%ETCDIR%%/filer.toml.sample