Date: Sun, 30 Jun 2024 10:43:58 GMT From: John Hixson <jhixson@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fc2f8f7ed067 - main - sysutils/kubo: update ipfs port to kubo version v0.2.9 Message-ID: <202406301043.45UAhwRi085485@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhixson: URL: https://cgit.FreeBSD.org/ports/commit/?id=fc2f8f7ed067de1d4b2682cb5cf8a65807d81978 commit fc2f8f7ed067de1d4b2682cb5cf8a65807d81978 Author: John Hixson <jhixson@FreeBSD.org> AuthorDate: 2024-06-30 10:37:05 +0000 Commit: John Hixson <jhixson@FreeBSD.org> CommitDate: 2024-06-30 10:43:54 +0000 sysutils/kubo: update ipfs port to kubo version v0.2.9 --- GIDs | 2 +- UIDs | 2 +- sysutils/Makefile | 2 +- sysutils/ipfs-go/distinfo | 5 ---- sysutils/ipfs-go/files/ipfs-go.in | 50 ------------------------------- sysutils/ipfs-go/pkg-plist | 2 -- sysutils/{ipfs-go => kubo-go}/Makefile | 33 ++++++++++---------- sysutils/kubo-go/distinfo | 5 ++++ sysutils/kubo-go/files/kubo-go.in | 50 +++++++++++++++++++++++++++++++ sysutils/{ipfs-go => kubo-go}/pkg-descr | 4 +-- sysutils/{ipfs-go => kubo-go}/pkg-message | 2 +- sysutils/kubo-go/pkg-plist | 2 ++ 12 files changed, 79 insertions(+), 80 deletions(-) diff --git a/GIDs b/GIDs index a68dfd3cc521..2fe7c6905e41 100644 --- a/GIDs +++ b/GIDs @@ -824,7 +824,7 @@ _encrypted-dns:*:879: pyspf-milter:*:880: ultimaker:*:881: midpoint:*:882: -ipfs-go:*:883: +kubo-go:*:883: telegraf:*:884: tcpdump:*:885: miniflux:*:886: diff --git a/UIDs b/UIDs index 0f9bc5e64d9a..c4f31fcd8949 100644 --- a/UIDs +++ b/UIDs @@ -829,7 +829,7 @@ _encrypted-dns:*:879:879::0:0:encrypted-dns user:/var/empty:/usr/sbin/nologin pyspf-milter:*:880:880::0:0:pyspf-milter:/nonexistent:/usr/sbin/nologin ultimaker:*:881:881::0:0:Ultimaker user:/nonexistent:/usr/sbin/nologin midpoint:*:882:882::0:0:midPoint user:/var/db/midpoint:/usr/sbin/nologin -ipfs-go:*:883:883::0:0:ipfs-go user:/var/db/ipfs-go:/bin/sh +kubo-go:*:883:883::0:0:kubo-go user:/var/db/kubo-go:/bin/sh telegraf:*:884:884::0:0:telegraf user:/nonexistent:/usr/sbin/nologin tcpdump:*:885:885::0:0:tcpdump user:/nonexistent:/usr/sbin/nologin miniflux:*:886:886::0:0:Miniflux:/nonexistent:/usr/sbin/nologin diff --git a/sysutils/Makefile b/sysutils/Makefile index 5021696dc3fb..b000e4982f67 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -600,7 +600,6 @@ SUBDIR += ipa SUBDIR += ipad_charge SUBDIR += ipdbtools - SUBDIR += ipfs-go SUBDIR += ipfs-go-fs-repo-migrations SUBDIR += ipget SUBDIR += ipmi_exporter @@ -659,6 +658,7 @@ SUBDIR += kshutdown SUBDIR += ksystemlog SUBDIR += kubectl + SUBDIR += kubo-go SUBDIR += kvmclock-kmod SUBDIR += lava SUBDIR += lbl-cf diff --git a/sysutils/ipfs-go/distinfo b/sysutils/ipfs-go/distinfo deleted file mode 100644 index cad276cfb2b3..000000000000 --- a/sysutils/ipfs-go/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1706918873 -SHA256 (go/sysutils_ipfs-go/ipfs-v0.26.0/v0.26.0.mod) = 93aa3aa155466dd5d68e1898c79eb9715f501de663fb20197e9995b8863280a6 -SIZE (go/sysutils_ipfs-go/ipfs-v0.26.0/v0.26.0.mod) = 12260 -SHA256 (go/sysutils_ipfs-go/ipfs-v0.26.0/v0.26.0.zip) = 0880f8c0dd2b2efeef748cdf5cc8084631016662cb5339f7c1973146cbed2dd2 -SIZE (go/sysutils_ipfs-go/ipfs-v0.26.0/v0.26.0.zip) = 4136356 diff --git a/sysutils/ipfs-go/files/ipfs-go.in b/sysutils/ipfs-go/files/ipfs-go.in deleted file mode 100644 index f7a16f796113..000000000000 --- a/sysutils/ipfs-go/files/ipfs-go.in +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -# PROVIDE: ipfs_go -# REQUIRE: DAEMON NETWORKING -# KEYWORD: shutdown - -# ipfs_go_enable (bool): Set to NO by default -# Set to YES to enable ipfs_go -# ipfs_go_user (str): Set to %%IPFS_USER%% by default -# Set it to ipfs_go daemon user -# ipfs_go_group (str): Set to %%IPFS_GROUP%% by default -# Set it to ipfs_go daemon group -# ipfs_go_path (str): Set to %%IPFS_HOME%%/.ipfs by default -# Set it to ipfs repo path -# ipfs_go_syslog_priority (str): Set to "info" by default. -# Set it to priority to be used by syslog -# ipfs_go_syslog_facility (str): Set to "daemon" by default. -# Set it to facility to be used by syslog -# ipfs_go_syslog_tag (str): Set to "ipfs-go" by default. -# Set it to tag to be used by syslog - -. /etc/rc.subr - -name=ipfs_go -rcvar=ipfs_go_enable -load_rc_config $name - -: ${ipfs_go_enable:="NO"} -: ${ipfs_go_user:="%%IPFS_USER%%"} -: ${ipfs_go_group:="%%IPFS_GROUP%%"} -: ${ipfs_go_path:="%%IPFS_HOME%%/.ipfs"} -: ${ipfs_go_syslog_priority:="info"} -: ${ipfs_go_syslog_facility:="daemon"} -: ${ipfs_go_syslog_tag:="ipfs-go"} - -pidfile="/var/run/${name}.pid" - -command="/usr/sbin/daemon" -command_args="-S -m 3 -s ${ipfs_go_syslog_priority} -l ${ipfs_go_syslog_facility} -T ${ipfs_go_syslog_tag} -p ${pidfile} /usr/bin/env IPFS_PATH=${ipfs_go_path} ${ipfs_go_env} %%PREFIX%%/bin/ipfs-go daemon --init --init-profile=server --migrate=true ${ipfs_go_args}" -procname="%%PREFIX%%/bin/ipfs-go" - -start_precmd="ipfs_go_startprecmd" - -ipfs_go_startprecmd() { - if [ ! -e "${pidfile}" ]; then - install -g ${ipfs_go_group} -o ${ipfs_go_user} -- /dev/null "${pidfile}" - fi -} - -run_rc_command "$1" diff --git a/sysutils/ipfs-go/pkg-plist b/sysutils/ipfs-go/pkg-plist deleted file mode 100644 index cb26f81c3676..000000000000 --- a/sysutils/ipfs-go/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/ipfs-go -@dir(%%IPFS_USER%%,%%IPFS_GROUP%%,755) %%IPFS_HOME%% diff --git a/sysutils/ipfs-go/Makefile b/sysutils/kubo-go/Makefile similarity index 52% rename from sysutils/ipfs-go/Makefile rename to sysutils/kubo-go/Makefile index bafa89cb9733..c8fb5203a558 100644 --- a/sysutils/ipfs-go/Makefile +++ b/sysutils/kubo-go/Makefile @@ -1,7 +1,6 @@ -PORTNAME= ipfs +PORTNAME= kubo DISTVERSIONPREFIX= v -DISTVERSION= 0.26.0 -PORTREVISION= 1 +DISTVERSION= 0.29.0 CATEGORIES= sysutils PKGNAMESUFFIX= -go @@ -14,33 +13,33 @@ LICENSE_COMB= dual LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE -USES= cpe go:1.20,modules +USES= cpe go:1.22,modules CPE_VENDOR= protocol GO_MODULE= github.com/ipfs/kubo -GO_TARGET= ./cmd/ipfs:ipfs-go +GO_TARGET= ./cmd/ipfs:kubo USE_RC_SUBR= ${PORTNAME}${PKGNAMESUFFIX} SUB_FILES= ${FULLNAME} -SUB_LIST= IPFS_USER=${IPFS_USER} \ - IPFS_GROUP=${IPFS_GROUP} \ - IPFS_HOME=${IPFS_HOME} -PLIST_SUB= IPFS_USER=${IPFS_USER} \ - IPFS_GROUP=${IPFS_GROUP} \ - IPFS_HOME=${IPFS_HOME} +SUB_LIST= KUBO_USER=${KUBO_USER} \ + KUBO_GROUP=${KUBO_GROUP} \ + KUBO_HOME=${KUBO_HOME} +PLIST_SUB= KUBO_USER=${KUBO_USER} \ + KUBO_GROUP=${KUBO_GROUP} \ + KUBO_HOME=${KUBO_HOME} -IPFS_USER?= ${FULLNAME} -IPFS_GROUP?= ${FULLNAME} -IPFS_HOME?= /var/db/${FULLNAME} +KUBO_USER?= ${FULLNAME} +KUBO_GROUP?= ${FULLNAME} +KUBO_HOME?= /var/db/${FULLNAME} -USERS= ${IPFS_USER} -GROUPS= ${IPFS_GROUP} +USERS= ${KUBO_USER} +GROUPS= ${KUBO_GROUP} FULLNAME= ${PORTNAME}${PKGNAMESUFFIX} post-install: - @${MKDIR} ${STAGEDIR}${IPFS_HOME} + @${MKDIR} ${STAGEDIR}${KUBO_HOME} .include <bsd.port.mk> diff --git a/sysutils/kubo-go/distinfo b/sysutils/kubo-go/distinfo new file mode 100644 index 000000000000..941eee07c5b6 --- /dev/null +++ b/sysutils/kubo-go/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1719737224 +SHA256 (go/sysutils_kubo-go/kubo-v0.29.0/v0.29.0.mod) = 6612cbcd3a7b628723a62f9eb63febaa4f6abe57deaec05ab2f274523eb1727b +SIZE (go/sysutils_kubo-go/kubo-v0.29.0/v0.29.0.mod) = 12047 +SHA256 (go/sysutils_kubo-go/kubo-v0.29.0/v0.29.0.zip) = f90cb3ed8c05967b31a6330b26d393fd95be314994d56efbb9253380ee5f1f08 +SIZE (go/sysutils_kubo-go/kubo-v0.29.0/v0.29.0.zip) = 4133213 diff --git a/sysutils/kubo-go/files/kubo-go.in b/sysutils/kubo-go/files/kubo-go.in new file mode 100644 index 000000000000..082d49dedcee --- /dev/null +++ b/sysutils/kubo-go/files/kubo-go.in @@ -0,0 +1,50 @@ +#!/bin/sh + +# PROVIDE: kubo_go +# REQUIRE: DAEMON NETWORKING +# KEYWORD: shutdown + +# kubo_enable (bool): Set to NO by default +# Set to YES to enable kubo_go +# kubo_user (str): Set to %%KUBO_USER%% by default +# Set it to kubo_go daemon user +# kubo_group (str): Set to %%KUBO_GROUP%% by default +# Set it to kubo_go daemon group +# kubo_path (str): Set to %%KUBO_HOME%%/.kubo by default +# Set it to kubo repo path +# kubo_syslog_priority (str): Set to "info" by default. +# Set it to priority to be used by syslog +# kubo_syslog_facility (str): Set to "daemon" by default. +# Set it to facility to be used by syslog +# kubo_syslog_tag (str): Set to "kubo-go" by default. +# Set it to tag to be used by syslog + +. /etc/rc.subr + +name=kubo_go +rcvar=kubo_enable +load_rc_config $name + +: ${kubo_enable:="NO"} +: ${kubo_user:="%%KUBO_USER%%"} +: ${kubo_group:="%%KUBO_GROUP%%"} +: ${kubo_path:="%%KUBO_HOME%%/.kubo"} +: ${kubo_syslog_priority:="info"} +: ${kubo_syslog_facility:="daemon"} +: ${kubo_syslog_tag:="kubo-go"} + +pidfile="/var/run/${name}.pid" + +command="/usr/sbin/daemon" +command_args="-S -m 3 -s ${kubo_syslog_priority} -l ${kubo_syslog_facility} -T ${kubo_syslog_tag} -p ${pidfile} /usr/bin/env KUBO_PATH=${kubo_path} ${kubo_env} %%PREFIX%%/bin/kubo-go daemon --init --init-profile=server --migrate=true ${kubo_args}" +procname="%%PREFIX%%/bin/kubo-go" + +start_precmd="kubo_startprecmd" + +kubo_startprecmd() { + if [ ! -e "${pidfile}" ]; then + install -g ${kubo_group} -o ${kubo_user} -- /dev/null "${pidfile}" + fi +} + +run_rc_command "$1" diff --git a/sysutils/ipfs-go/pkg-descr b/sysutils/kubo-go/pkg-descr similarity index 53% rename from sysutils/ipfs-go/pkg-descr rename to sysutils/kubo-go/pkg-descr index 4dd02ef8920e..494bc156f3c5 100644 --- a/sysutils/ipfs-go/pkg-descr +++ b/sysutils/kubo-go/pkg-descr @@ -1,4 +1,4 @@ -IPFS is a global, versioned, peer-to-peer filesystem. It combines good ideas +kubo is a global, versioned, peer-to-peer filesystem. It combines good ideas from Git, BitTorrent, Kademlia, SFS, and the Web. It is like a single -bittorrent swarm, exchanging git objects. IPFS provides an interface as simple +bittorrent swarm, exchanging git objects. kubo provides an interface as simple as the HTTP web, but with permanence built in. diff --git a/sysutils/ipfs-go/pkg-message b/sysutils/kubo-go/pkg-message similarity index 74% rename from sysutils/ipfs-go/pkg-message rename to sysutils/kubo-go/pkg-message index bdc98a3771b5..5321f506ab71 100644 --- a/sysutils/ipfs-go/pkg-message +++ b/sysutils/kubo-go/pkg-message @@ -3,7 +3,7 @@ message: <<EOM You may wish to install ipfs-go-fs-repo-migrations (sysutils/ipfs-go-fs-repo-migrations) in order to do db -migration with the "ipfs daemon --migrate" command. +migration with the "kubo daemon --migrate" command. EOM } ] diff --git a/sysutils/kubo-go/pkg-plist b/sysutils/kubo-go/pkg-plist new file mode 100644 index 000000000000..9dabedfdaaf4 --- /dev/null +++ b/sysutils/kubo-go/pkg-plist @@ -0,0 +1,2 @@ +bin/kubo +@dir(%%KUBO_USER%%,%%KUBO_GROUP%%,755) %%KUBO_HOME%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406301043.45UAhwRi085485>