Index: head/GIDs =================================================================== --- head/GIDs +++ head/GIDs @@ -211,7 +211,7 @@ tenshi:*:268:tenshi dendrite:*:269: _rpki-client:*:270: -# free: 271 +signaling:*:271: # free: 272 # free: 273 # free: 274 Index: head/UIDs =================================================================== --- head/UIDs +++ head/UIDs @@ -216,7 +216,7 @@ tenshi:*:268:268::0:0:Tenshi user:/var/lib/tenshi:/usr/sbin/nologin dendrite:*:269:269::0:0:Dendrite user:/nonexistent:/usr/sbin/nologin _rpki-client:*:270:270::0:0:rpki-client user:/nonexistent:/usr/sbin/nologin -# free: 271 +signaling:*:271:271::0:0:Signaling server:/nonexistent:/usr/sbin/nologin # free: 272 # free: 273 # free: 274 Index: head/net-im/Makefile =================================================================== --- head/net-im/Makefile +++ head/net-im/Makefile @@ -78,6 +78,7 @@ SUBDIR += mikutter SUBDIR += mtxclient SUBDIR += neochat + SUBDIR += nextcloud-spreed-signaling SUBDIR += nextcloud-talk SUBDIR += nheko SUBDIR += openfire Index: head/net-im/nextcloud-spreed-signaling/Makefile =================================================================== --- head/net-im/nextcloud-spreed-signaling/Makefile +++ head/net-im/nextcloud-spreed-signaling/Makefile @@ -0,0 +1,53 @@ +# $FreeBSD$ + +PORTNAME= nextcloud-spreed-signaling +DISTVERSIONPREFIX= v +DISTVERSION= 0.2.0 +CATEGORIES= net-im + +MAINTAINER= jsm@FreeBSD.org +COMMENT= Signaling server used for Nextcloud Talk + +LICENSE= AGPLv3 + +BUILD_DEPENDS= go:lang/go + +USES= gmake +USERS= signaling +GROUPS= signaling + +USE_RC_SUBR= ncs_signaling + +USE_GITHUB= yes +GH_ACCOUNT= strukturag +GH_TUPLE= coreos:go-semver:v0.2.0:coreos_go_semver/vendor/src/github.com/coreos/go-semver \ + coreos:go-systemd:39ca1b05acc7:coreos_go_systemd/vendor/src/github.com/coreos/go-systemd \ + coreos:pkg:3ac0863d7acf:coreos_pkg/vendor/src/github.com/coreos/pkg \ + dgrijalva:jwt-go:v3.2.0:dgrijalva_jwt_go/vendor/src/gopkg.in/dgrijalva/jwt-go.v3 \ + dlintw:goconf:dcc070983490:dlintw_goconf/vendor/src/github.com/dlintw/goconf \ + etcd-io:etcd:ae9734ed278b:etcd_io_etcd/vendor/src/go.etcd.io/etcd \ + gogo:protobuf:v1.2.1:gogo_protobuf/vendor/src/github.com/gogo/protobuf \ + golang:crypto:0ec3e9974c59:golang_crypto/vendor/src/golang.org/x/crypto \ + golang:net:74dc4d7220e7:golang_net/vendor/src/golang.org/x/net \ + golang:protobuf:v1.3.2:golang_protobuf/vendor/src/github.com/golang/protobuf \ + golang:sys:c7b8b68b1456:golang_sys/vendor/src/golang.org/x/sys \ + golang:text:v0.3.3:golang_text/vendor/src/golang.org/x/text \ + google:go-genproto:24fa4b261c55:google_go_genproto/vendor/src/google.golang.org/genproto \ + google:uuid:v1.1.2:google_uuid/vendor/src/github.com/google/uuid \ + gorilla:context:v1.1.1:gorilla_context/vendor/src/github.com/gorilla/context \ + gorilla:mux:ac112f7d75a0:gorilla_mux/vendor/src/github.com/gorilla/mux \ + gorilla:securecookie:v1.1.1:gorilla_securecookie/vendor/src/github.com/gorilla/securecookie \ + gorilla:websocket:v1.2.0:gorilla_websocket/vendor/src/github.com/gorilla/websocket \ + grpc:grpc-go:v1.26.0:grpc_grpc_go/vendor/src/google.golang.org/grpc \ + mailru:easyjson:2f5df55504eb:mailru_easyjson/vendor/src/github.com/mailru/easyjson \ + nats-io:jwt:v0.3.2:nats_io_jwt/vendor/src/github.com/nats-io/jwt \ + nats-io:nats.go:v1.10.0:nats_io_nats_go/vendor/src/github.com/nats-io/nats.go \ + nats-io:nkeys:v0.1.4:nats_io_nkeys/vendor/src/github.com/nats-io/nkeys \ + nats-io:nuid:v1.0.1:nats_io_nuid/vendor/src/github.com/nats-io/nuid \ + notedit:janus-go:10eb8b95d1a0:notedit_janus_go/vendor/src/github.com/notedit/janus-go \ + oschwald:maxminddb-golang:1960b16a5147:oschwald_maxminddb_golang/vendor/src/github.com/oschwald/maxminddb-golang \ + uber-go:atomic:v1.3.2:uber_go_atomic/vendor/src/go.uber.org/atomic \ + uber-go:multierr:v1.1.0:uber_go_multierr/vendor/src/go.uber.org/multierr \ + uber-go:zap:v1.10.0:uber_go_zap/vendor/src/go.uber.org/zap \ + +.include Index: head/net-im/nextcloud-spreed-signaling/distinfo =================================================================== --- head/net-im/nextcloud-spreed-signaling/distinfo +++ head/net-im/nextcloud-spreed-signaling/distinfo @@ -0,0 +1,61 @@ +TIMESTAMP = 1608946421 +SHA256 (strukturag-nextcloud-spreed-signaling-v0.2.0_GH0.tar.gz) = f745927d8a7b36390179f7c7c6b12c44050946fc9770ed1ab5edda29ceb2e3c4 +SIZE (strukturag-nextcloud-spreed-signaling-v0.2.0_GH0.tar.gz) = 135029 +SHA256 (coreos-go-semver-v0.2.0_GH0.tar.gz) = 0f15084aee23324e12e5e4542c9f7b0c809d7207b0e90829d1554b234cd8dd4a +SIZE (coreos-go-semver-v0.2.0_GH0.tar.gz) = 8474 +SHA256 (coreos-go-systemd-39ca1b05acc7_GH0.tar.gz) = 56bb345a9ab6838b652e70dbb2d50930e0f0f8f5fa32de0d1b67fef8841a6fe6 +SIZE (coreos-go-systemd-39ca1b05acc7_GH0.tar.gz) = 60403 +SHA256 (coreos-pkg-3ac0863d7acf_GH0.tar.gz) = 47b8ca2aa02823801b4744653a74a489fbdd8d9c5c67e205781f07b8b6b6c8f4 +SIZE (coreos-pkg-3ac0863d7acf_GH0.tar.gz) = 31017 +SHA256 (dgrijalva-jwt-go-v3.2.0_GH0.tar.gz) = 197465ef53219f3aeb1a6940b70e16d288fe4e4108d4831b91ea101118440e63 +SIZE (dgrijalva-jwt-go-v3.2.0_GH0.tar.gz) = 36960 +SHA256 (dlintw-goconf-dcc070983490_GH0.tar.gz) = 658234767ec03d81dcdee9cdf4790c359bba8399e7281a125bd7a5e480bf712d +SIZE (dlintw-goconf-dcc070983490_GH0.tar.gz) = 6199 +SHA256 (etcd-io-etcd-ae9734ed278b_GH0.tar.gz) = 97a61ce7fa7a47329a6b8f231754a38d39ee47ced5c79635b5cd68de54cb3b22 +SIZE (etcd-io-etcd-ae9734ed278b_GH0.tar.gz) = 9181961 +SHA256 (gogo-protobuf-v1.2.1_GH0.tar.gz) = 99e423905ba8921e86817607a5294ffeedb66fdd4a85efce5eb2848f715fdb3a +SIZE (gogo-protobuf-v1.2.1_GH0.tar.gz) = 2017393 +SHA256 (golang-crypto-0ec3e9974c59_GH0.tar.gz) = 737fd8da273ec11281d2ff8798d6847ab1be9ebfa94bbc5a7252e0b04e1373a5 +SIZE (golang-crypto-0ec3e9974c59_GH0.tar.gz) = 1727772 +SHA256 (golang-net-74dc4d7220e7_GH0.tar.gz) = e974b081e105d9c61374fd026aa89bff010cc58b676dddf67a319dbba8df35fa +SIZE (golang-net-74dc4d7220e7_GH0.tar.gz) = 1099877 +SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65 +SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285 +SHA256 (golang-sys-c7b8b68b1456_GH0.tar.gz) = 826e76dcb9c9c2ed234d81b2f4d8cb960a4fec707814521f938c9be99e9f1d80 +SIZE (golang-sys-c7b8b68b1456_GH0.tar.gz) = 1455888 +SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185 +SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332 +SHA256 (google-go-genproto-24fa4b261c55_GH0.tar.gz) = 96481b64c5971de2dd22d7c6f764d2acbeb4cd85ab6166856284115c3f99238c +SIZE (google-go-genproto-24fa4b261c55_GH0.tar.gz) = 5332241 +SHA256 (google-uuid-v1.1.2_GH0.tar.gz) = e650558e314307cf33391d0a9ef575b418188206d61cb9751e9f11bceb0874d0 +SIZE (google-uuid-v1.1.2_GH0.tar.gz) = 13871 +SHA256 (gorilla-context-v1.1.1_GH0.tar.gz) = 2dfdd051c238695bf9ebfed0bf6a8c533507ac0893bce23be5930e973736bb03 +SIZE (gorilla-context-v1.1.1_GH0.tar.gz) = 4574 +SHA256 (gorilla-mux-ac112f7d75a0_GH0.tar.gz) = 535ff4b953581922ef462e8be27acb9507c05e4621068a5f650d4f7ab752b224 +SIZE (gorilla-mux-ac112f7d75a0_GH0.tar.gz) = 29562 +SHA256 (gorilla-securecookie-v1.1.1_GH0.tar.gz) = b7897b2243f0d43913aca318593c5c2586294fcd3265189d564ddda1b880fe95 +SIZE (gorilla-securecookie-v1.1.1_GH0.tar.gz) = 41240 +SHA256 (gorilla-websocket-v1.2.0_GH0.tar.gz) = 04d1c4fa839a01d32d3c8c558370a964d83b5c980f74c4b965f3dd04f8cb9276 +SIZE (gorilla-websocket-v1.2.0_GH0.tar.gz) = 42984 +SHA256 (grpc-grpc-go-v1.26.0_GH0.tar.gz) = a594cbd8f7d545d181c92b27aafd5d4824459e3a729a8bd67a0c8b99c411f05a +SIZE (grpc-grpc-go-v1.26.0_GH0.tar.gz) = 765416 +SHA256 (mailru-easyjson-2f5df55504eb_GH0.tar.gz) = 70f112ac56f62ec20912060e70a7249ed9e2222467e8eb73f58798a9980c5603 +SIZE (mailru-easyjson-2f5df55504eb_GH0.tar.gz) = 70434 +SHA256 (nats-io-jwt-v0.3.2_GH0.tar.gz) = e7a3435d52849657f5d1c8126fa0c49720e97ec5ef6e48aa0dd5aee2ccb46355 +SIZE (nats-io-jwt-v0.3.2_GH0.tar.gz) = 34513 +SHA256 (nats-io-nats.go-v1.10.0_GH0.tar.gz) = 0167dfb6ea5bb420f78f9c4343434ae1032bacb4baf0391f910a980bc667b8de +SIZE (nats-io-nats.go-v1.10.0_GH0.tar.gz) = 130626 +SHA256 (nats-io-nkeys-v0.1.4_GH0.tar.gz) = 6928e7a74e8dac41cec5c403fd7605541632428280cbd01c573ed90cde1849cc +SIZE (nats-io-nkeys-v0.1.4_GH0.tar.gz) = 18534 +SHA256 (nats-io-nuid-v1.0.1_GH0.tar.gz) = a0b4fe5b40781add2a9fdb5d723313be5f5d11c1a79ea1dd2671278826ef078d +SIZE (nats-io-nuid-v1.0.1_GH0.tar.gz) = 7529 +SHA256 (notedit-janus-go-10eb8b95d1a0_GH0.tar.gz) = 007fa7a626a0d2034ee4f2e2695f51c86e943ab012af167cbcd8373a75f73989 +SIZE (notedit-janus-go-10eb8b95d1a0_GH0.tar.gz) = 4309 +SHA256 (oschwald-maxminddb-golang-1960b16a5147_GH0.tar.gz) = eec9a08e94802948210b920911b5bcb5f332139041ef4cf710dc24719f6c52bc +SIZE (oschwald-maxminddb-golang-1960b16a5147_GH0.tar.gz) = 18101 +SHA256 (uber-go-atomic-v1.3.2_GH0.tar.gz) = ee2ec763758d8ab2095ee927086a1ed057212fa27660614448d4bbcbdc4ffe61 +SIZE (uber-go-atomic-v1.3.2_GH0.tar.gz) = 8047 +SHA256 (uber-go-multierr-v1.1.0_GH0.tar.gz) = 45405583513302d57d4715fada5ef8c8dbd9c9992956f2d0faa8758d9d885851 +SIZE (uber-go-multierr-v1.1.0_GH0.tar.gz) = 9234 +SHA256 (uber-go-zap-v1.10.0_GH0.tar.gz) = 9122a10e6cca67b5231036b8da73f3ce5c7ba6ebae94314533f04e200973002e +SIZE (uber-go-zap-v1.10.0_GH0.tar.gz) = 112084 Index: head/net-im/nextcloud-spreed-signaling/files/ncs_signaling.in =================================================================== --- head/net-im/nextcloud-spreed-signaling/files/ncs_signaling.in +++ head/net-im/nextcloud-spreed-signaling/files/ncs_signaling.in @@ -0,0 +1,30 @@ +#!/bin/sh + +# $FreeBSD$ +# +# PROVIDE: ncs_signaling +# REQUIRE: DAEMON nats +# KEYWORD: shutdown +# +# Add these lines to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: +# +# ncs_signaling_enable (bool): Set to NO by default. +# Set it to YES to enable ncs_signaling. +# ncs_signaling_config (path): Set to %%PREFIX%%/etc/ncs_signaling/ncs-signaling.cf +# by default. + +. /etc/rc.subr + +name=ncs_signaling +rcvar=ncs_signaling_enable + +load_rc_config $name +: ${ncs_signaling_enable:="NO"} +: ${ncs_signaling_config:="%%PREFIX%%/etc/ncs/server.conf"} + +command=/usr/sbin/daemon + +command_args="-u signaling -f -T ncs_signaling -S %%PREFIX%%/bin/ncs-signaling -config $ncs_signaling_config" + +run_rc_command "$1" Index: head/net-im/nextcloud-spreed-signaling/files/patch-Makefile =================================================================== --- head/net-im/nextcloud-spreed-signaling/files/patch-Makefile +++ head/net-im/nextcloud-spreed-signaling/files/patch-Makefile @@ -0,0 +1,111 @@ +--- Makefile.orig 2020-12-08 13:00:05 UTC ++++ Makefile +@@ -1,8 +1,8 @@ + all: build + + GO := $(shell which go) +-GOPATH := "$(CURDIR)/vendor:$(CURDIR)" +-BINDIR := "$(CURDIR)/bin" ++GOPATH := $(CURDIR)/vendor:$(CURDIR) ++BINDIR := $(CURDIR)/bin + VERSION := $(shell "$(CURDIR)/scripts/get-version.sh") + TARVERSION := $(shell "$(CURDIR)/scripts/get-version.sh" --tar) + ifneq ($(VERSION),) +@@ -35,26 +35,10 @@ ifneq ($(COUNT),) + TESTARGS := $(TESTARGS) -count $(COUNT) + endif + +-hook: +- [ ! -d "$(CURDIR)/.git/hooks" ] || ln -sf "$(CURDIR)/scripts/pre-commit.hook" "$(CURDIR)/.git/hooks/pre-commit" +- +-godeps: +- GOPATH=$(GOPATH) $(GO) get github.com/rogpeppe/godeps +- +-easyjson: dependencies +- GOPATH=$(GOPATH) $(GO) get -d github.com/mailru/easyjson/... ++easyjson: + GOPATH=$(GOPATH) $(GO) build -o ./vendor/bin/easyjson ./vendor/src/github.com/mailru/easyjson/easyjson/main.go + +-dependencies: hook godeps +- GOPATH=$(GOPATH) ./vendor/bin/godeps -u dependencies.tsv + +-dependencies.tsv: godeps +- set -e ;\ +- TMP=$$(mktemp -d) ;\ +- echo Make sure to remove $$TMP on error ;\ +- cp -r "$(CURDIR)/vendor" $$TMP ;\ +- GOPATH=$$TMP/vendor:"$(CURDIR)" "$(CURDIR)/vendor/bin/godeps" ./src/... > "$(CURDIR)/dependencies.tsv" ;\ +- rm -rf $$TMP + + src/signaling/continentmap.go: + $(CURDIR)/scripts/get_continent_map.py $@ +@@ -73,27 +57,28 @@ get: + fmt: hook + $(GO) fmt ./src/... + +-vet: dependencies common ++vet: common + GOPATH=$(GOPATH) $(GO) vet ./src/... + +-test: dependencies vet common ++test: vet common + GOPATH=$(GOPATH) $(GO) test -v -timeout $(TIMEOUT) $(TESTARGS) ./src/... + +-cover: dependencies vet common ++cover: vet common + rm -f cover.out && \ + GOPATH=$(GOPATH) $(GO) test -v -timeout $(TIMEOUT) -coverprofile cover.out ./src/signaling/... && \ + sed -i "/_easyjson/d" cover.out && \ + GOPATH=$(GOPATH) $(GO) tool cover -func=cover.out + +-coverhtml: dependencies vet common ++coverhtml: vet common + rm -f cover.out && \ + GOPATH=$(GOPATH) $(GO) test -v -timeout $(TIMEOUT) -coverprofile cover.out ./src/signaling/... && \ + sed -i "/_easyjson/d" cover.out && \ + GOPATH=$(GOPATH) $(GO) tool cover -html=cover.out -o coverage.html + +-%_easyjson.go: %.go ++%_easyjson.go: %.go | easyjson + PATH=$(shell dirname $(GO)):$(PATH) GOPATH=$(GOPATH) ./vendor/bin/easyjson -all $*.go + ++ + common: easyjson \ + src/signaling/api_signaling_easyjson.go \ + src/signaling/api_backend_easyjson.go \ +@@ -101,17 +86,17 @@ common: easyjson \ + src/signaling/natsclient_easyjson.go \ + src/signaling/room_easyjson.go + +-client: dependencies common ++client: common + mkdir -p $(BINDIR) + GOPATH=$(GOPATH) $(GO) build $(BUILDARGS) -ldflags '$(INTERNALLDFLAGS)' -o $(BINDIR)/client ./src/client/... + +-server: dependencies common ++server: common + mkdir -p $(BINDIR) + GOPATH=$(GOPATH) $(GO) build $(BUILDARGS) -ldflags '$(INTERNALLDFLAGS)' -o $(BINDIR)/signaling ./src/server/... + +-proxy: dependencies common ++proxy: common + mkdir -p $(BINDIR) +- GOPATH=$(GOPATH) $(GO) build $(BUILDARGS) -ldflags '$(INTERNALLDFLAGS)' -o $(BINDIR)/proxy ./src/proxy/... ++ GOPATH="$(GOPATH)" $(GO) build $(BUILDARGS) -ldflags '$(INTERNALLDFLAGS)' -o $(BINDIR)/proxy ./src/proxy/... + + clean: + rm -f src/signaling/*_easyjson.go +@@ -123,6 +108,13 @@ tarball: + --prefix=nextcloud-spreed-signaling-$(TARVERSION)/ \ + -o nextcloud-spreed-signaling-$(TARVERSION).tar.gz \ + HEAD ++install: ++ install -d $(DESTDIR)$(PREFIX)/etc/ncs/ ++ install -m 644 server.conf.in $(DESTDIR)$(PREFIX)/etc/ncs/server.conf.sample ++ install -m 644 proxy.conf.in $(DESTDIR)$(PREFIX)/etc/ncs/proxy.conf.sample ++ install -m 644 gnatsd.conf $(DESTDIR)$(PREFIX)/etc/ncs/gnatsd.conf.sample ++ install -m 755 bin/signaling $(DESTDIR)$(PREFIX)/bin/ncs-signaling ++ install -m 755 bin/proxy $(DESTDIR)$(PREFIX)/bin/ncs-proxy + + dist: tarball + Index: head/net-im/nextcloud-spreed-signaling/files/patch-dependencies.tsv =================================================================== --- head/net-im/nextcloud-spreed-signaling/files/patch-dependencies.tsv +++ head/net-im/nextcloud-spreed-signaling/files/patch-dependencies.tsv @@ -0,0 +1,11 @@ +--- dependencies.tsv.orig 2020-12-08 13:00:05 UTC ++++ dependencies.tsv +@@ -5,7 +5,7 @@ github.com/gorilla/mux git ac112f7d75a0714af1bd86ab177 + github.com/gorilla/securecookie git e59506cc896acb7f7bf732d4fdf5e25f7ccd8983 2017-02-24T19:38:04Z + github.com/gorilla/websocket git ea4d1f681babbce9545c9c5f3d5194a789c89f5b 2017-06-20T19:01:03Z + github.com/mailru/easyjson git 2f5df55504ebc322e4d52d34df6a1f5b503bf26d 2017-06-24T19:09:25Z +-github.com/nats-io/go-nats git d4ca4c8b588d5da9c2ac82d6e445ce4feaba18ba 2017-06-01T15:47:09Z ++github.com/nats-io/nats.go git 120703c6d80965e2f1e7a542c88dc574987b17e1 2020-05-13T13:22:14Z + github.com/nats-io/nuid git 3cf34f9fca4e88afa9da8eabd75e3326c9941b44 2017-03-03T15:02:24Z + github.com/notedit/janus-go git 10eb8b95d1a0469ac8921c5ce5fb55b4c0d3ad7d 2020-05-17T10:12:15Z + github.com/oschwald/maxminddb-golang git 1960b16a5147df3a4c61ac83b2f31cd8f811d609 2019-05-23T23:57:38Z Index: head/net-im/nextcloud-spreed-signaling/files/patch-src_proxy_main.go =================================================================== --- head/net-im/nextcloud-spreed-signaling/files/patch-src_proxy_main.go +++ head/net-im/nextcloud-spreed-signaling/files/patch-src_proxy_main.go @@ -0,0 +1,11 @@ +--- src/proxy/main.go.orig 2020-12-25 20:55:38 UTC ++++ src/proxy/main.go +@@ -36,7 +36,7 @@ import ( + + "github.com/dlintw/goconf" + "github.com/gorilla/mux" +- "github.com/nats-io/go-nats" ++ "github.com/nats-io/nats.go" + + "signaling" + ) Index: head/net-im/nextcloud-spreed-signaling/files/patch-src_server_main.go =================================================================== --- head/net-im/nextcloud-spreed-signaling/files/patch-src_server_main.go +++ head/net-im/nextcloud-spreed-signaling/files/patch-src_server_main.go @@ -0,0 +1,11 @@ +--- src/server/main.go.orig 2020-12-25 20:55:38 UTC ++++ src/server/main.go +@@ -40,7 +40,7 @@ import ( + "github.com/dlintw/goconf" + _ "github.com/gorilla/context" + "github.com/gorilla/mux" +- "github.com/nats-io/go-nats" ++ "github.com/nats-io/nats.go" + + "signaling" + ) Index: head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_backend__server__test.go =================================================================== --- head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_backend__server__test.go +++ head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_backend__server__test.go @@ -0,0 +1,11 @@ +--- src/signaling/backend_server_test.go.orig 2020-12-25 20:55:38 UTC ++++ src/signaling/backend_server_test.go +@@ -42,7 +42,7 @@ import ( + "github.com/dlintw/goconf" + "github.com/gorilla/mux" + "github.com/gorilla/websocket" +- "github.com/nats-io/go-nats" ++ "github.com/nats-io/nats.go" + ) + + var ( Index: head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_clientsession.go =================================================================== --- head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_clientsession.go +++ head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_clientsession.go @@ -0,0 +1,11 @@ +--- src/signaling/clientsession.go.orig 2020-12-25 20:55:38 UTC ++++ src/signaling/clientsession.go +@@ -32,7 +32,7 @@ import ( + "time" + "unsafe" + +- "github.com/nats-io/go-nats" ++ "github.com/nats-io/nats.go" + ) + + var ( Index: head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_mcu__janus.go =================================================================== --- head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_mcu__janus.go +++ head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_mcu__janus.go @@ -0,0 +1,11 @@ +--- src/signaling/mcu_janus.go.orig 2020-12-25 20:55:38 UTC ++++ src/signaling/mcu_janus.go +@@ -33,7 +33,7 @@ import ( + "time" + + "github.com/dlintw/goconf" +- "github.com/nats-io/go-nats" ++ "github.com/nats-io/nats.go" + "github.com/notedit/janus-go" + ) + Index: head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_natsclient.go =================================================================== --- head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_natsclient.go +++ head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_natsclient.go @@ -0,0 +1,11 @@ +--- src/signaling/natsclient.go.orig 2020-12-25 20:55:38 UTC ++++ src/signaling/natsclient.go +@@ -29,7 +29,7 @@ import ( + "os/signal" + "time" + +- "github.com/nats-io/go-nats" ++ "github.com/nats-io/nats.go" + ) + + const ( Index: head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_natsclient__loopback.go =================================================================== --- head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_natsclient__loopback.go +++ head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_natsclient__loopback.go @@ -0,0 +1,11 @@ +--- src/signaling/natsclient_loopback.go.orig 2020-12-25 20:55:38 UTC ++++ src/signaling/natsclient_loopback.go +@@ -29,7 +29,7 @@ import ( + "sync" + "time" + +- "github.com/nats-io/go-nats" ++ "github.com/nats-io/nats.go" + ) + + type LoopbackNatsClient struct { Index: head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_natsclient__loopback__test.go =================================================================== --- head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_natsclient__loopback__test.go +++ head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_natsclient__loopback__test.go @@ -0,0 +1,11 @@ +--- src/signaling/natsclient_loopback_test.go.orig 2020-12-25 20:55:38 UTC ++++ src/signaling/natsclient_loopback_test.go +@@ -29,7 +29,7 @@ import ( + "testing" + "time" + +- "github.com/nats-io/go-nats" ++ "github.com/nats-io/nats.go" + ) + + func (c *LoopbackNatsClient) waitForSubscriptionsEmpty(ctx context.Context, t *testing.T) { Index: head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_room.go =================================================================== --- head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_room.go +++ head/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_room.go @@ -0,0 +1,11 @@ +--- src/signaling/room.go.orig 2020-12-25 20:55:38 UTC ++++ src/signaling/room.go +@@ -31,7 +31,7 @@ import ( + "sync" + "time" + +- "github.com/nats-io/go-nats" ++ "github.com/nats-io/nats.go" + ) + + const ( Index: head/net-im/nextcloud-spreed-signaling/pkg-descr =================================================================== --- head/net-im/nextcloud-spreed-signaling/pkg-descr +++ head/net-im/nextcloud-spreed-signaling/pkg-descr @@ -0,0 +1,3 @@ +The standalone signaling server which can be used for Nextcloud + +WWW: https://github.com/strukturag/nextcloud-spreed-signaling Index: head/net-im/nextcloud-spreed-signaling/pkg-plist =================================================================== --- head/net-im/nextcloud-spreed-signaling/pkg-plist +++ head/net-im/nextcloud-spreed-signaling/pkg-plist @@ -0,0 +1,5 @@ +bin/ncs-proxy +bin/ncs-signaling +@sample etc/ncs/gnatsd.conf.sample +@sample etc/ncs/proxy.conf.sample +@sample etc/ncs/server.conf.sample