Date: Sat, 4 Feb 2023 10:39:40 GMT From: Jesper Schmitz Mouridsen <jsm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0b4ba6d207b5 - main - net-im/nextcloud-spreed-signaling: Update to 1.0.0 Message-ID: <202302041039.314Adesv021974@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jsm: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b4ba6d207b5ee48bba33cf92a48e012a3176c0a commit 0b4ba6d207b5ee48bba33cf92a48e012a3176c0a Author: Jesper Schmitz Mouridsen <jsm@FreeBSD.org> AuthorDate: 2023-02-04 10:28:38 +0000 Commit: Jesper Schmitz Mouridsen <jsm@FreeBSD.org> CommitDate: 2023-02-04 10:38:52 +0000 net-im/nextcloud-spreed-signaling: Update to 1.0.0 --- net-im/nextcloud-spreed-signaling/Makefile | 22 +++++--- net-im/nextcloud-spreed-signaling/distinfo | 26 ++++----- .../files/patch-Makefile | 63 ++++++++++------------ .../files/patch-proxy_proxy__tokens__etcd.go | 13 ----- .../files/patch-scripts_get-version.sh | 2 +- 5 files changed, 55 insertions(+), 71 deletions(-) diff --git a/net-im/nextcloud-spreed-signaling/Makefile b/net-im/nextcloud-spreed-signaling/Makefile index 19a8e5e3e64c..d510736acd96 100644 --- a/net-im/nextcloud-spreed-signaling/Makefile +++ b/net-im/nextcloud-spreed-signaling/Makefile @@ -1,7 +1,6 @@ PORTNAME= nextcloud-spreed-signaling DISTVERSIONPREFIX= v -DISTVERSION= 0.5.0 -PORTREVISION= 5 +DISTVERSION= 1.0.0 CATEGORIES= net-im MAINTAINER= jsm@FreeBSD.org @@ -10,6 +9,8 @@ WWW= https://github.com/strukturag/nextcloud-spreed-signaling LICENSE= AGPLv3 +BUILD_DEPENDS= protoc:devel/protobuf + USES= gmake go:no_targets USERS= signaling @@ -26,13 +27,13 @@ GH_TUPLE= \ coreos:go-semver:v0.3.0:coreos_go_semver/vendor/src/github.com/coreos/go-semver \ coreos:go-systemd:v22.3.2:coreos_go_systemd_v22/vendor/src/github.com/coreos/go-systemd/v22 \ dlintw:goconf:dcc070983490:dlintw_goconf/vendor/src/github.com/dlintw/goconf \ - dustin:go-humanize:v1.0.0:dustin_go_humanize/src/github.com/dustin/go-humanize \ + dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/src/github.com/dustin/go-humanize \ etcd-io:bbolt:v1.3.6:etcd_io_bbolt/vendor/src/go.etcd.io/bbolt \ etcd-io:etcd:v3.5.4:etcd_io_etcd/vendor/src/go.etcd.io/etcd \ form3tech-oss:jwt-go:v3.2.3:form3tech_oss_jwt_go/vendor/src/github.com/form3tech-oss/jwt-go \ go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/src/gopkg.in/yaml.v2 \ gogo:protobuf:v1.3.2:gogo_protobuf/vendor/src/github.com/gogo/protobuf \ - golang-jwt:jwt:v3.2.2:golang_jwt_jwt/vendor/src/github.com/golang-jwt/jwt \ + golang-jwt:jwt:v4.4.2:golang_jwt_jwt_v4/vendor/src/github.com/golang-jwt/jwt/v4 \ golang:crypto:3147a52a75dd:golang_crypto/vendor/src/golang.org/x/crypto \ golang:net:69e39bad7dc2:golang_net/vendor/src/golang.org/x/net \ golang:protobuf:v1.5.2:golang_protobuf/vendor/src/github.com/golang/protobuf \ @@ -48,7 +49,7 @@ GH_TUPLE= \ grpc-ecosystem:go-grpc-middleware:v1.3.0:grpc_ecosystem_go_grpc_middleware/vendor/src/github.com/grpc-ecosystem/go-grpc-middleware \ grpc-ecosystem:go-grpc-prometheus:v1.2.0:grpc_ecosystem_go_grpc_prometheus/vendor/src/github.com/grpc-ecosystem/go-grpc-prometheus \ grpc-ecosystem:grpc-gateway:v1.16.0:grpc_ecosystem_grpc_gateway/vendor/src/github.com/grpc-ecosystem/grpc-gateway \ - grpc:grpc-go:v1.38.0:grpc_grpc_go/vendor/src/google.golang.org/grpc \ + grpc:grpc-go:v1.48.0:grpc_grpc_go/vendor/src/google.golang.org/grpc \ jonboulle:clockwork:v0.2.2:jonboulle_clockwork/vendor/src/github.com/jonboulle/clockwork \ josharian:intern:v1.0.0:josharian_intern/vendor/src/github.com/josharian/intern \ json-iterator:go:v1.1.12:json_iterator_go/vendor/src/github.com/json-iterator/go \ @@ -70,13 +71,13 @@ GH_TUPLE= \ open-telemetry:opentelemetry-go:v0.20.0:open_telemetry_opentelemetry_go/vendor/src/go.opentelemetry.io/otel \ open-telemetry:opentelemetry-proto-go:v0.7.0:open_telemetry_opentelemetry_proto_go/vendor/src/go.opentelemetry.io/proto/otlp \ oschwald:maxminddb-golang:v1.9.0:oschwald_maxminddb_golang/vendor/src/github.com/oschwald/maxminddb-golang \ - pion:sdp:v1.3.0:pion_sdp/vendor/src/github.com/pion/sdp \ - pkg:errors:v0.9.1:pkg_errors/vendor/src/github.com/pkg/errors \ + pion:randutil:v0.1.0:pion_randutil/vendor/src/github.com/pion/randutil \ + pion:sdp:v3.0.5:pion_sdp_v3/vendor/src/github.com/pion/sdp/v3 \ prometheus:client_golang:v1.12.2:prometheus_client_golang/vendor/src/github.com/prometheus/client_golang \ prometheus:client_model:v0.2.0:prometheus_client_model/vendor/src/github.com/prometheus/client_model \ prometheus:common:v0.32.1:prometheus_common/vendor/src/github.com/prometheus/common \ prometheus:procfs:v0.7.3:prometheus_procfs/vendor/src/github.com/prometheus/procfs \ - protocolbuffers:protobuf-go:v1.26.0:protocolbuffers_protobuf_go/vendor/src/google.golang.org/protobuf \ + protocolbuffers:protobuf-go:v1.28.1:protocolbuffers_protobuf_go/vendor/src/google.golang.org/protobuf \ sirupsen:logrus:v1.7.0:sirupsen_logrus/vendor/src/github.com/sirupsen/logrus \ soheilhy:cmux:v0.1.5:soheilhy_cmux/vendor/src/github.com/soheilhy/cmux \ spf13:pflag:v1.0.5:spf13_pflag/vendor/src/github.com/spf13/pflag \ @@ -89,4 +90,9 @@ MAKE_ENV= ${GO_ENV} post-extract: ${MKDIR} ${WRKDIR}/${PORTNAME}-${DISTVERSION}/vendor/src/github.com/strukturag ${LN} -s ${WRKDIR}/${PORTNAME}-${DISTVERSION}/ ${WRKDIR}/${PORTNAME}-${DISTVERSION}/vendor/src/github.com/strukturag/${PORTNAME} +post-patch: + @${REINPLACE_CMD} 's|PORTVERSION|${PORTVERSION}|g' ${WRKSRC}/scripts/get-version.sh +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ncs-signaling + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ncs-proxy .include <bsd.port.mk> diff --git a/net-im/nextcloud-spreed-signaling/distinfo b/net-im/nextcloud-spreed-signaling/distinfo index 9adca7844498..1ddfa8fab236 100644 --- a/net-im/nextcloud-spreed-signaling/distinfo +++ b/net-im/nextcloud-spreed-signaling/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1658693683 -SHA256 (strukturag-nextcloud-spreed-signaling-v0.5.0_GH0.tar.gz) = c5e48634cf2e607228ff4f448d00a09fa758130bab27224fe3b42aecc309376a -SIZE (strukturag-nextcloud-spreed-signaling-v0.5.0_GH0.tar.gz) = 210410 +TIMESTAMP = 1674507860 +SHA256 (strukturag-nextcloud-spreed-signaling-v1.0.0_GH0.tar.gz) = 8217b469a608892f17126877c60079d015ddfb129f644df9ff82ee9856b7f8d3 +SIZE (strukturag-nextcloud-spreed-signaling-v1.0.0_GH0.tar.gz) = 251258 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825 SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867 SHA256 (cespare-xxhash-v2.1.2_GH0.tar.gz) = 471399cfcf0b1bd188add8d34435b91e7011cedbfe76e29687803a9d74320352 @@ -23,8 +23,8 @@ SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209 SHA256 (gogo-protobuf-v1.3.2_GH0.tar.gz) = 2bb4b13d6e56b3911f09b8e9ddd15708477fbff8823c057cc79dd99c9a452b34 SIZE (gogo-protobuf-v1.3.2_GH0.tar.gz) = 2038725 -SHA256 (golang-jwt-jwt-v3.2.2_GH0.tar.gz) = 4cd18a4bb5d949244f137fed0884f93695ff268cb9efaba71ddcf4c50b17efe0 -SIZE (golang-jwt-jwt-v3.2.2_GH0.tar.gz) = 39887 +SHA256 (golang-jwt-jwt-v4.4.2_GH0.tar.gz) = 5c48e918854c3fc1c9bbb9ebf747addb960250f977aa8523344f60f4c423c7c1 +SIZE (golang-jwt-jwt-v4.4.2_GH0.tar.gz) = 51392 SHA256 (golang-crypto-3147a52a75dd_GH0.tar.gz) = 25542a72981bc3c33fca702a21feae4d6242298255354cfa2359d6195ff8656a SIZE (golang-crypto-3147a52a75dd_GH0.tar.gz) = 1630551 SHA256 (golang-net-69e39bad7dc2_GH0.tar.gz) = 859028b1f77d72031aaeb022812f4040aeee1a64956d4751c35b8b40dea11d70 @@ -55,8 +55,8 @@ SHA256 (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = eba66530952a126ab SIZE (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = 24760 SHA256 (grpc-ecosystem-grpc-gateway-v1.16.0_GH0.tar.gz) = 20ba8f2aeb4a580109357fffaa42f8400aba1155b95c8845e412287907e64379 SIZE (grpc-ecosystem-grpc-gateway-v1.16.0_GH0.tar.gz) = 521578 -SHA256 (grpc-grpc-go-v1.38.0_GH0.tar.gz) = fd6a2e2ae9e810670fdb63d196275ddb171e7f99f3bb801a02dde973de2f557b -SIZE (grpc-grpc-go-v1.38.0_GH0.tar.gz) = 1253222 +SHA256 (grpc-grpc-go-v1.48.0_GH0.tar.gz) = c553a4e65896dceacdef14b1c517d682d68e86fc8aa146f43cba3d034e7b5a91 +SIZE (grpc-grpc-go-v1.48.0_GH0.tar.gz) = 1522270 SHA256 (jonboulle-clockwork-v0.2.2_GH0.tar.gz) = 79ac7c0e53dfa48aac0622745f133b2438542f1c11d2c09ec1c98affbd62e1f0 SIZE (jonboulle-clockwork-v0.2.2_GH0.tar.gz) = 9588 SHA256 (josharian-intern-v1.0.0_GH0.tar.gz) = 7c7df6e792ed5db0b1a63c8ec74236b70958ad36c9fe5a02b52b1a418b177b5e @@ -99,10 +99,10 @@ SHA256 (open-telemetry-opentelemetry-proto-go-v0.7.0_GH0.tar.gz) = 5d969f208f5cc SIZE (open-telemetry-opentelemetry-proto-go-v0.7.0_GH0.tar.gz) = 57286 SHA256 (oschwald-maxminddb-golang-v1.9.0_GH0.tar.gz) = 433c1fc1fd664788529ba37e23dc7fedff830c0ca051e6d6b7e621e723e5e0fe SIZE (oschwald-maxminddb-golang-v1.9.0_GH0.tar.gz) = 25364 -SHA256 (pion-sdp-v1.3.0_GH0.tar.gz) = 754e5b0d6feaf09782336a2cf5d5158136ca1f76df7bd5a857259cabcb2d522c -SIZE (pion-sdp-v1.3.0_GH0.tar.gz) = 14685 -SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608 -SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415 +SHA256 (pion-randutil-v0.1.0_GH0.tar.gz) = 4b0301915ebbfa77c8621cebf99c6c7d71651762a33ce4fa4e6af8994ecd4993 +SIZE (pion-randutil-v0.1.0_GH0.tar.gz) = 7521 +SHA256 (pion-sdp-v3.0.5_GH0.tar.gz) = f42b004a8fe64ddd3dc0d9b6a45d7c25adfa729f8e6547bf59d1e7aea486ca63 +SIZE (pion-sdp-v3.0.5_GH0.tar.gz) = 30400 SHA256 (prometheus-client_golang-v1.12.2_GH0.tar.gz) = ab01b65e6c24a41e856986076d0de2d38d379253eb78160edd8d8235f789c94a SIZE (prometheus-client_golang-v1.12.2_GH0.tar.gz) = 197117 SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12 @@ -111,8 +111,8 @@ SHA256 (prometheus-common-v0.32.1_GH0.tar.gz) = de06f354e24dec3bfeba9a3bd43bd317 SIZE (prometheus-common-v0.32.1_GH0.tar.gz) = 146585 SHA256 (prometheus-procfs-v0.7.3_GH0.tar.gz) = 5514e8b18c38b6376a84c623d59735d4eefb61fb3a14eb1f45e0a4c848f14a2b SIZE (prometheus-procfs-v0.7.3_GH0.tar.gz) = 178957 -SHA256 (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 26218474bcf776ecf32d7d194c6bfaca8e7b4f0c087e5b595fd50fbb31409676 -SIZE (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 1270215 +SHA256 (protocolbuffers-protobuf-go-v1.28.1_GH0.tar.gz) = df0b3dceeff0e1b6d029e60f076edd0d852cb8f3c2fe4fe3fe40164f16ec9b6b +SIZE (protocolbuffers-protobuf-go-v1.28.1_GH0.tar.gz) = 1280756 SHA256 (sirupsen-logrus-v1.7.0_GH0.tar.gz) = a7baaa1c646441d002f3867b5998b6b45b629ecfad317d468a981e23e0c9c6ca SIZE (sirupsen-logrus-v1.7.0_GH0.tar.gz) = 46392 SHA256 (soheilhy-cmux-v0.1.5_GH0.tar.gz) = 199232ece74332f408a38e4d38e7ca942b3e66ae58074ca95d3f069693e0dca1 diff --git a/net-im/nextcloud-spreed-signaling/files/patch-Makefile b/net-im/nextcloud-spreed-signaling/files/patch-Makefile index 6afb865e7a16..d2861ab54562 100644 --- a/net-im/nextcloud-spreed-signaling/files/patch-Makefile +++ b/net-im/nextcloud-spreed-signaling/files/patch-Makefile @@ -1,57 +1,48 @@ ---- Makefile.orig 2022-06-02 12:16:33 UTC +--- Makefile.orig 2022-08-04 09:52:36 UTC +++ Makefile @@ -1,7 +1,7 @@ all: build GO := $(shell which go) -GOPATH := $(shell "$(GO)" env GOPATH) -+GOPATH := $(CURDIR):$(CURDIR)/vendor ++GOPATH := $(CURDIR)/vendor GODIR := $(shell dirname "$(GO)") GOFMT := "$(GODIR)/gofmt" GOOS ?= linux -@@ -52,10 +52,8 @@ endif - hook: +@@ -56,15 +56,13 @@ hook: [ ! -d "$(CURDIR)/.git/hooks" ] || ln -sf "$(CURDIR)/scripts/pre-commit.hook" "$(CURDIR)/.git/hooks/pre-commit" --$(GOPATHBIN)/easyjson: -- $(GO) get -u -d github.com/mailru/easyjson/... + $(GOPATHBIN)/easyjson: +- [ "$(GOPROXY)" = "off" ] || $(GO) get -u -d github.com/mailru/easyjson/... - $(GO) install github.com/mailru/easyjson/... -- -+easyjson: -+ GOPATH=$(GOPATH):$(CURDIR) $(GO) build -o ./bin/easyjson ./vendor/src/github.com/mailru/easyjson/easyjson/main.go ++ $(GO) build -o $(CURDIR)/easyjson ./vendor/src/github.com/mailru/easyjson/easyjson/main.go + + $(GOPATHBIN)/protoc-gen-go: +- $(GO) install google.golang.org/protobuf/cmd/protoc-gen-go ++ $(GO) build google.golang.org/protobuf/cmd/protoc-gen-go + + $(GOPATHBIN)/protoc-gen-go-grpc: +- [ "$(GOPROXY)" = "off" ] || $(GO) get -u -d google.golang.org/grpc/cmd/protoc-gen-go-grpc +- $(GO) install google.golang.org/grpc/cmd/protoc-gen-go-grpc ++ $(GO) build google.golang.org/grpc/cmd/protoc-gen-go-grpc + continentmap.go: $(CURDIR)/scripts/get_continent_map.py $@ - -@@ -91,8 +89,8 @@ coverhtml: vet common - sed -i "/_easyjson/d" cover.out && \ +@@ -104,10 +102,10 @@ coverhtml: vet common $(GO) tool cover -html=cover.out -o coverage.html --%_easyjson.go: %.go $(GOPATHBIN)/easyjson + %_easyjson.go: %.go $(GOPATHBIN)/easyjson | common_proto - PATH="$(GODIR)":$(PATH) "$(GOPATHBIN)/easyjson" -all $*.go -+%_easyjson.go: %.go easyjson -+ PATH="$(GODIR)":$(PATH) ./bin/easyjson -all $(CURDIR)/vendor/src/github.com/strukturag/nextcloud-spreed-signaling/$*.go - - common: \ - api_signaling_easyjson.go \ -@@ -100,7 +98,6 @@ common: \ - api_proxy_easyjson.go \ - natsclient_easyjson.go \ - room_easyjson.go -- $(GO) mod tidy - - $(BINDIR): - mkdir -p $(BINDIR) -@@ -112,7 +109,7 @@ server: common $(BINDIR) - $(GO) build $(BUILDARGS) -ldflags '$(INTERNALLDFLAGS)' -o $(BINDIR)/signaling ./server/... ++ PATH="$(GODIR)":$(PATH) "$(CURDIR)/easyjson" -all $(CURDIR)/vendor/src/github.com/strukturag/nextcloud-spreed-signaling/$*.go - proxy: common $(BINDIR) -- $(GO) build $(BUILDARGS) -ldflags '$(INTERNALLDFLAGS)' -o $(BINDIR)/proxy ./proxy/... -+ GOPATH=$(GOPATH):$(CURDIR) GOPATH="$(CURDIR)/vendor" $(GO) build $(BUILDARGS) -ldflags '$(INTERNALLDFLAGS)' -o $(BINDIR)/proxy ./proxy/... + %.pb.go: %.proto $(GOPATHBIN)/protoc-gen-go $(GOPATHBIN)/protoc-gen-go-grpc +- PATH="$(GODIR)":"$(GOPATHBIN)":$(PATH) protoc --go_out=. --go_opt=paths=source_relative \ ++ PATH="$(GODIR)":"$(GOPATHBIN)":"$(CURDIR)":$(PATH) protoc --go_out=. --go_opt=paths=source_relative \ + --go-grpc_out=. --go-grpc_opt=paths=source_relative \ + $*.proto - clean: - rm -f *_easyjson.go -@@ -126,6 +123,13 @@ tarball: - HEAD +@@ -173,6 +171,13 @@ tarball: vendor + gzip --force nextcloud-spreed-signaling-$(TARVERSION).tar dist: tarball +install: @@ -63,4 +54,4 @@ + install -m 755 bin/proxy $(DESTDIR)$(PREFIX)/bin/ncs-proxy .NOTPARALLEL: %_easyjson.go - .PHONY: continentmap.go + .PHONY: continentmap.go vendor diff --git a/net-im/nextcloud-spreed-signaling/files/patch-proxy_proxy__tokens__etcd.go b/net-im/nextcloud-spreed-signaling/files/patch-proxy_proxy__tokens__etcd.go deleted file mode 100644 index 325a824d2600..000000000000 --- a/net-im/nextcloud-spreed-signaling/files/patch-proxy_proxy__tokens__etcd.go +++ /dev/null @@ -1,13 +0,0 @@ ---- proxy/proxy_tokens_etcd.go.orig 2022-07-24 20:09:05 UTC -+++ proxy/proxy_tokens_etcd.go -@@ -33,8 +33,8 @@ import ( - "github.com/dlintw/goconf" - "github.com/golang-jwt/jwt" - -- "go.etcd.io/etcd/client/pkg/v3/srv" -- "go.etcd.io/etcd/client/pkg/v3/transport" -+ "go.etcd.io/etcd/client/pkg/srv" -+ "go.etcd.io/etcd/client/pkg/transport" - clientv3 "go.etcd.io/etcd/client/v3" - - signaling "github.com/strukturag/nextcloud-spreed-signaling" diff --git a/net-im/nextcloud-spreed-signaling/files/patch-scripts_get-version.sh b/net-im/nextcloud-spreed-signaling/files/patch-scripts_get-version.sh index dd62f00d9ad1..1f00cb90e707 100644 --- a/net-im/nextcloud-spreed-signaling/files/patch-scripts_get-version.sh +++ b/net-im/nextcloud-spreed-signaling/files/patch-scripts_get-version.sh @@ -15,7 +15,7 @@ if [ -z $VERSION ]; then - VERSION=unknown -+ VERSION=v0.5.0 ++ VERSION=PORTVERSION fi echo $VERSION
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302041039.314Adesv021974>