From nobody Mon Jul 25 12:53:52 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ls0NK1SKmz4XQhV; Mon, 25 Jul 2022 12:53:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ls0NK0rLcz4G2n; Mon, 25 Jul 2022 12:53:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658753633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=muL7fJMKdbF3afJOmV+XR5iVFxBiY/NxJau4zGW+He0=; b=opkoQxtdvTiaLLz1lwZkm0tCf2d1vogt8kZnzcnwou8wD1K5iYYwo3vmNPgyLpXUFbImCe ubheaJd2yUiwB8RCYwVhSvGw8ciQrWZ6ndof80hhPg/apkmo5V3fRDk2lwZA7PCGUCXd/k mHY+NGzvVycsl5gVOk+iRSN0TPXjn463ipuFcoDB667+boOlLE1K5D9AH2eZQwkzWZ2+Sj Zz1TUb0W6bGA6vKM/v3QTqEhXcnfgZIIC6AVvv0Ktx8QVyco/68U78DxPtPC88DZqLLoUp JbjIhdp4SeEk4yEQiJTjV7skM7uSRSfagmt1j97HD3lCK+86rpWdekFGblTgaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ls0NJ70X8zyQd; Mon, 25 Jul 2022 12:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26PCrqSE038781; Mon, 25 Jul 2022 12:53:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26PCrqck038780; Mon, 25 Jul 2022 12:53:52 GMT (envelope-from git) Date: Mon, 25 Jul 2022 12:53:52 GMT Message-Id: <202207251253.26PCrqck038780@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jesper Schmitz Mouridsen Subject: git: 90a00bb2eb18 - main - net-im/nextcloud-spreed-signaling: Update to 0.5.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jsm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90a00bb2eb18e66af0e2e8f887a4b9037d9e1f9e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658753633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=muL7fJMKdbF3afJOmV+XR5iVFxBiY/NxJau4zGW+He0=; b=SwWG/OGkPPJpj+z5oaX50tMxaCvhe9LO2eIPQ8vjGkgLkBWFYLTH+hG90FvzsKGbZ1hIIH t98CYDcn8+jRVfxX+d7eKavQEylZCsyA+sU6QsdkoBD7YqVYVEhWw5tVyNsCLTnris1i7A b0qpTTUU2wxNU8cDVOmEPjR563VkX3aaQj608BvEya6h4EFGa2I9HYazLubuaH/L2MUxQu wchC+iKjbQFzaHUlxI5o5HONUvjFrQGJzkwh5i+AhPZ9mxGqHG7NLbg7hymvNuWgHn1fSC m8+yZnkZEG6VPsNLZv68yf9oJJswf4hWGNGySIDOV8h+81bni1lM3CvXdgh1mA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658753633; a=rsa-sha256; cv=none; b=EE8eAPWp2qmJulBKmObxqtkj7Dl2G+dgXTwiY/nQHSsy1dlZ831ofkWYEXQGIOgHqZOi57 4gHPYK/yeIucUOHatD44JFKKg3yt5bdnhZLdG7N7HFoxuW0j0eaiC8EQlWsaZoDgjgj/zY FZ0U1vX58XxfixugCfaItZ0qLaJX4PJz8PUdHl/q+M0m8m1a4sVxuMnzEl8+iHzKCHLUCP kbPOiQ4852Epz6pvJ7TfwfQ0BXlWUG3Y1+gFhCZPLg4tRrAGDihXnb1nkLVDCWskTVyLE2 cU5Ods8+NQKX37w9gBA2Yq+GLs10fZRAPeZMWzYoh7q/q/vfMQx9RgEhdwaLrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jsm: URL: https://cgit.FreeBSD.org/ports/commit/?id=90a00bb2eb18e66af0e2e8f887a4b9037d9e1f9e commit 90a00bb2eb18e66af0e2e8f887a4b9037d9e1f9e Author: Jesper Schmitz Mouridsen AuthorDate: 2022-07-25 12:49:05 +0000 Commit: Jesper Schmitz Mouridsen CommitDate: 2022-07-25 12:49:05 +0000 net-im/nextcloud-spreed-signaling: Update to 0.5.0 --- net-im/nextcloud-spreed-signaling/Makefile | 96 +++++++---- net-im/nextcloud-spreed-signaling/distinfo | 176 ++++++++++++++------- .../files/patch-Makefile | 133 ++++++---------- .../files/patch-dependencies.tsv | 11 -- .../files/patch-proxy_proxy__tokens__etcd.go | 13 ++ .../files/patch-scripts_get-version.sh | 21 +++ .../files/patch-src_proxy_main.go | 11 -- .../files/patch-src_server_main.go | 11 -- .../patch-src_signaling_backend__server__test.go | 11 -- .../files/patch-src_signaling_clientsession.go | 11 -- .../files/patch-src_signaling_mcu__janus.go | 11 -- .../files/patch-src_signaling_natsclient.go | 11 -- .../patch-src_signaling_natsclient__loopback.go | 11 -- ...tch-src_signaling_natsclient__loopback__test.go | 11 -- .../files/patch-src_signaling_room.go | 11 -- ...golang.org_x_sys_unix_ztypes__freebsd__arm64.go | 24 --- 16 files changed, 268 insertions(+), 305 deletions(-) diff --git a/net-im/nextcloud-spreed-signaling/Makefile b/net-im/nextcloud-spreed-signaling/Makefile index 641d5b1613ac..2d39b34c171e 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.2.0 -PORTREVISION= 2 +DISTVERSION= 0.5.0 CATEGORIES= net-im MAINTAINER= jsm@FreeBSD.org @@ -10,43 +9,82 @@ COMMENT= Signaling server used for Nextcloud Talk LICENSE= AGPLv3 USES= gmake go:no_targets + USERS= signaling GROUPS= signaling USE_RC_SUBR= ncs_signaling +USE_GITHUB= yes 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 \ +GH_TUPLE= \ + beorn7:perks:v1.0.1:beorn7_perks/vendor/src/github.com/beorn7/perks \ + cespare:xxhash:v2.1.2:cespare_xxhash_v2/vendor/src/github.com/cespare/xxhash/v2 \ + 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 \ - 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 \ + dustin:go-humanize:v1.0.0:dustin_go_humanize/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: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 \ + golang:sys:36772127a21f:golang_sys/vendor/src/golang.org/x/sys \ + golang:text:v0.3.6:golang_text/vendor/src/golang.org/x/text \ + golang:time:f0f3c7e86c11:golang_time/vendor/src/golang.org/x/time \ + google:btree:v1.0.1:google_btree/vendor/src/github.com/google/btree \ + google:go-genproto:f16073e35f0c:google_go_genproto/vendor/src/google.golang.org/genproto \ + google:uuid:v1.3.0:google_uuid/vendor/src/github.com/google/uuid \ + gorilla:mux:v1.8.0: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 \ + gorilla:websocket:v1.5.0:gorilla_websocket/vendor/src/github.com/gorilla/websocket \ + 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 \ + 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 \ + klauspost:compress:v1.14.4:klauspost_compress/vendor/src/github.com/klauspost/compress \ + kubernetes-sigs:yaml:v1.2.0:kubernetes_sigs_yaml/vendor/src/sigs.k8s.io/yaml \ + mailru:easyjson:v0.7.7:mailru_easyjson/vendor/src/github.com/mailru/easyjson \ + matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/src/github.com/matttproud/golang_protobuf_extensions \ + minio:highwayhash:v1.0.2:minio_highwayhash/vendor/src/github.com/minio/highwayhash \ + modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/vendor/src/github.com/modern-go/concurrent \ + modern-go:reflect2:v1.0.2:modern_go_reflect2/vendor/src/github.com/modern-go/reflect2 \ + natefinch:lumberjack:v2.0.0:natefinch_lumberjack/vendor/src/gopkg.in/natefinch/lumberjack.v2 \ + nats-io:jwt:442af02fd36a:nats_io_jwt_v2/vendor/src/github.com/nats-io/jwt \ + nats-io:nats-server:v2.8.4:nats_io_nats_server_v2/vendor/src/github.com/nats-io/nats-server/v2 \ + nats-io:nats.go:v1.16.0:nats_io_nats_go/vendor/src/github.com/nats-io/nats.go \ + nats-io:nkeys:v0.3.0: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 - + open-telemetry:opentelemetry-go-contrib:v0.20.0:open_telemetry_opentelemetry_go_contrib/vendor/src/go.opentelemetry.io/contrib \ + 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 \ + 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 \ + 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 \ + tmc:grpc-websocket-proxy:e5319fda7802:tmc_grpc_websocket_proxy/vendor/src/github.com/tmc/grpc-websocket-proxy \ + uber-go:atomic:v1.7.0:uber_go_atomic/vendor/src/go.uber.org/atomic \ + uber-go:multierr:v1.6.0:uber_go_multierr/vendor/src/go.uber.org/multierr \ + uber-go:zap:v1.17.0:uber_go_zap/vendor/src/go.uber.org/zap \ + xiang90:probing:43a291ad63a2:xiang90_probing/vendor/src/github.com/xiang90/probing 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} .include diff --git a/net-im/nextcloud-spreed-signaling/distinfo b/net-im/nextcloud-spreed-signaling/distinfo index a4b35e56feef..9adca7844498 100644 --- a/net-im/nextcloud-spreed-signaling/distinfo +++ b/net-im/nextcloud-spreed-signaling/distinfo @@ -1,61 +1,131 @@ -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 +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 +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 +SIZE (cespare-xxhash-v2.1.2_GH0.tar.gz) = 11244 +SHA256 (coreos-go-semver-v0.3.0_GH0.tar.gz) = 1b72134483db366fb43f216727d6bc110086d4450ce0d226960cf4ce823d6eb9 +SIZE (coreos-go-semver-v0.3.0_GH0.tar.gz) = 10663 +SHA256 (coreos-go-systemd-v22.3.2_GH0.tar.gz) = dbb1a3930d43f49e11c53f2010ab9609e18236f776a99921850cd05f54779438 +SIZE (coreos-go-systemd-v22.3.2_GH0.tar.gz) = 72134 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 (dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c50cf5d8774f09cc10dbca5ae9803d8ba +SIZE (dustin-go-humanize-v1.0.0_GH0.tar.gz) = 17260 +SHA256 (etcd-io-bbolt-v1.3.6_GH0.tar.gz) = a2e524f7f32c44fa0765de192ac0789c585010cadd2c2ddcf9518e858a96ec1f +SIZE (etcd-io-bbolt-v1.3.6_GH0.tar.gz) = 98025 +SHA256 (etcd-io-etcd-v3.5.4_GH0.tar.gz) = 10e8c1604578d4a8557263d61d4fbbd2428c8cd8dda3c8a23a8755314af6ef10 +SIZE (etcd-io-etcd-v3.5.4_GH0.tar.gz) = 4036526 +SHA256 (form3tech-oss-jwt-go-v3.2.3_GH0.tar.gz) = ee0244ac3256dce35883baae5a7758fa34a36504ac3bc0a87eb7c9f9c91ece65 +SIZE (form3tech-oss-jwt-go-v3.2.3_GH0.tar.gz) = 38323 +SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0 +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-crypto-3147a52a75dd_GH0.tar.gz) = 25542a72981bc3c33fca702a21feae4d6242298255354cfa2359d6195ff8656a +SIZE (golang-crypto-3147a52a75dd_GH0.tar.gz) = 1630551 +SHA256 (golang-net-69e39bad7dc2_GH0.tar.gz) = 859028b1f77d72031aaeb022812f4040aeee1a64956d4751c35b8b40dea11d70 +SIZE (golang-net-69e39bad7dc2_GH0.tar.gz) = 1263995 +SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3 +SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702 +SHA256 (golang-sys-36772127a21f_GH0.tar.gz) = 7eb6ad2577150df1802a7fdd5f0015229e7e061ddd493cc3859d57e816ba6d80 +SIZE (golang-sys-36772127a21f_GH0.tar.gz) = 1291506 +SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760 +SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095 +SHA256 (golang-time-f0f3c7e86c11_GH0.tar.gz) = 421890dd6e4b7e8d5ca68cc163c8b3b08436898664534aedfefd8602e11a4e53 +SIZE (golang-time-f0f3c7e86c11_GH0.tar.gz) = 9626 +SHA256 (google-btree-v1.0.1_GH0.tar.gz) = 240723cff7c3c28e8444d45e500e65b2c25df519273260f248786e1a7367a654 +SIZE (google-btree-v1.0.1_GH0.tar.gz) = 15381 +SHA256 (google-go-genproto-f16073e35f0c_GH0.tar.gz) = a42664db5442fd4dc4acac922949a735d37f44240394ab55a0d5ee3c9f8410d6 +SIZE (google-go-genproto-f16073e35f0c_GH0.tar.gz) = 9270161 +SHA256 (google-uuid-v1.3.0_GH0.tar.gz) = 7f7f37c47980e0afcc178a9ffc390bec29ed2371919b4c07658eb01791a7f921 +SIZE (google-uuid-v1.3.0_GH0.tar.gz) = 16210 +SHA256 (gorilla-mux-v1.8.0_GH0.tar.gz) = ea2639259d2ce6f402636655e91eb93ba69c139e3cbf80b044ee393ada53757b +SIZE (gorilla-mux-v1.8.0_GH0.tar.gz) = 45517 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 (gorilla-websocket-v1.5.0_GH0.tar.gz) = 5d86f9e1c76ff7ceca0747f78b79864fbaec9d440f4fdb03197466e5102a86b0 +SIZE (gorilla-websocket-v1.5.0_GH0.tar.gz) = 54155 +SHA256 (grpc-ecosystem-go-grpc-middleware-v1.3.0_GH0.tar.gz) = c9b908202c05a7f821b03ee49cd678e7e71469519054629770e0565d78275cbc +SIZE (grpc-ecosystem-go-grpc-middleware-v1.3.0_GH0.tar.gz) = 103780 +SHA256 (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = eba66530952a126ab869205bdb909af607bfd9eb09f00207b62eb29140258aa9 +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 (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 +SIZE (josharian-intern-v1.0.0_GH0.tar.gz) = 1927 +SHA256 (json-iterator-go-v1.1.12_GH0.tar.gz) = ff70e539fd919da757a2f3a530a053e7577cb4d7e2824fc1058d3abbefbb523e +SIZE (json-iterator-go-v1.1.12_GH0.tar.gz) = 84307 +SHA256 (klauspost-compress-v1.14.4_GH0.tar.gz) = 30480619257f7d40fcbfd61b59c34fd36e85220ac2eee400c493b06c37f53740 +SIZE (klauspost-compress-v1.14.4_GH0.tar.gz) = 15502117 +SHA256 (kubernetes-sigs-yaml-v1.2.0_GH0.tar.gz) = 80612b8cc63863556906f04df7eca89179bf81e5b3d1133c082bd7e5e35d5514 +SIZE (kubernetes-sigs-yaml-v1.2.0_GH0.tar.gz) = 92574 +SHA256 (mailru-easyjson-v0.7.7_GH0.tar.gz) = 18ce2051cda6b20a09163d9ecedf905593d7777db043b32b263e62b1cebb7f73 +SIZE (mailru-easyjson-v0.7.7_GH0.tar.gz) = 81404 +SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b +SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184 +SHA256 (minio-highwayhash-v1.0.2_GH0.tar.gz) = 5a89e6f3e77cb77c818c5ce0316812d544e588456fce2e55e02f48d52fa9c5d2 +SIZE (minio-highwayhash-v1.0.2_GH0.tar.gz) = 23056 +SHA256 (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = d673e902118a6ece63198dc7e0961e904d0410f142726df0936ec1a52035a60f +SIZE (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = 7526 +SHA256 (modern-go-reflect2-v1.0.2_GH0.tar.gz) = eab313f24c09d512f004d489aeed0d0a485f789abd07e7df411375035174341b +SIZE (modern-go-reflect2-v1.0.2_GH0.tar.gz) = 14030 +SHA256 (natefinch-lumberjack-v2.0.0_GH0.tar.gz) = 5817941b45096eb70b8114d7a4bf392ea47c4fe8030ff383ca54c67dfa0617bd +SIZE (natefinch-lumberjack-v2.0.0_GH0.tar.gz) = 12631 +SHA256 (nats-io-jwt-442af02fd36a_GH0.tar.gz) = 06093c35694c7408c5f429f84026968b1cf69290f883a14be7e10a49ebfcee6b +SIZE (nats-io-jwt-442af02fd36a_GH0.tar.gz) = 82961 +SHA256 (nats-io-nats-server-v2.8.4_GH0.tar.gz) = 172c5d04c3867adcb6b2322d87d7f7029b63e9465fffffcf99d4ca652820635f +SIZE (nats-io-nats-server-v2.8.4_GH0.tar.gz) = 1479734 +SHA256 (nats-io-nats.go-v1.16.0_GH0.tar.gz) = 0cb65060b6fda71d0e1c37d7d341cfe5ef0696674cafa3e00a98162ade4537f6 +SIZE (nats-io-nats.go-v1.16.0_GH0.tar.gz) = 258314 +SHA256 (nats-io-nkeys-v0.3.0_GH0.tar.gz) = ea281df5dc380b84f61c3712b367f02957cff4cb7802e73b2b0b7588e4f6b809 +SIZE (nats-io-nkeys-v0.3.0_GH0.tar.gz) = 19986 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 +SHA256 (open-telemetry-opentelemetry-go-contrib-v0.20.0_GH0.tar.gz) = 6715d2fe45be282c45197c08002af3bd23ef85abeab9a821c7cd231451a01433 +SIZE (open-telemetry-opentelemetry-go-contrib-v0.20.0_GH0.tar.gz) = 412639 +SHA256 (open-telemetry-opentelemetry-go-v0.20.0_GH0.tar.gz) = 05306a02bbffa2c71a0f0f5c200d006c8ad659b5f86cb67a7c95055d7f740933 +SIZE (open-telemetry-opentelemetry-go-v0.20.0_GH0.tar.gz) = 596424 +SHA256 (open-telemetry-opentelemetry-proto-go-v0.7.0_GH0.tar.gz) = 5d969f208f5cc8e9b3596fe61dde69116d801bca0436325eb05539d123d72a53 +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 (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 +SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986 +SHA256 (prometheus-common-v0.32.1_GH0.tar.gz) = de06f354e24dec3bfeba9a3bd43bd3170b4231dfff3cd338b688a6e8c8050af6 +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 (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 +SIZE (soheilhy-cmux-v0.1.5_GH0.tar.gz) = 22250 +SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808 +SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796 +SHA256 (tmc-grpc-websocket-proxy-e5319fda7802_GH0.tar.gz) = ab27ebe35674bcc777d63bb1d64874310832d857a3eb573192b082f73afde494 +SIZE (tmc-grpc-websocket-proxy-e5319fda7802_GH0.tar.gz) = 10031 +SHA256 (uber-go-atomic-v1.7.0_GH0.tar.gz) = 4d655e90a23d023b36607e2ce94c3b7bf650d41c81c0faff32432581d9099ad1 +SIZE (uber-go-atomic-v1.7.0_GH0.tar.gz) = 18566 +SHA256 (uber-go-multierr-v1.6.0_GH0.tar.gz) = f8a139a06fd70bbda0f089274bd723a00c33c5b269a696de4d6a8ab455a22717 +SIZE (uber-go-multierr-v1.6.0_GH0.tar.gz) = 12369 +SHA256 (uber-go-zap-v1.17.0_GH0.tar.gz) = 9608554d14e846718c5ebe44ab172ce6b748356679c17e144226af94ff232d9a +SIZE (uber-go-zap-v1.17.0_GH0.tar.gz) = 142719 +SHA256 (xiang90-probing-43a291ad63a2_GH0.tar.gz) = 576dd87a3b8729fd6f2422664897e285d43254138831aaedfac797813964d255 +SIZE (xiang90-probing-43a291ad63a2_GH0.tar.gz) = 3468 diff --git a/net-im/nextcloud-spreed-signaling/files/patch-Makefile b/net-im/nextcloud-spreed-signaling/files/patch-Makefile index 0c749be520b6..6afb865e7a16 100644 --- a/net-im/nextcloud-spreed-signaling/files/patch-Makefile +++ b/net-im/nextcloud-spreed-signaling/files/patch-Makefile @@ -1,104 +1,59 @@ ---- Makefile.orig 2020-12-08 13:00:05 UTC +--- Makefile.orig 2022-06-02 12:16:33 UTC +++ Makefile -@@ -1,8 +1,8 @@ +@@ -1,7 +1,7 @@ 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 +-GOPATH := $(shell "$(GO)" env GOPATH) ++GOPATH := $(CURDIR):$(CURDIR)/vendor + GODIR := $(shell dirname "$(GO)") + GOFMT := "$(GODIR)/gofmt" + GOOS ?= linux +@@ -52,10 +52,8 @@ endif + 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/... +- $(GO) install github.com/mailru/easyjson/... - --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: ++ GOPATH=$(GOPATH):$(CURDIR) $(GO) build -o ./bin/easyjson ./vendor/src/github.com/mailru/easyjson/easyjson/main.go + 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/... && \ +@@ -91,8 +89,8 @@ coverhtml: vet common 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 + $(GO) tool cover -html=cover.out -o coverage.html + +-%_easyjson.go: %.go $(GOPATHBIN)/easyjson +- 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) - GOPATH=$(GOPATH) $(GO) build $(BUILDARGS) -ldflags '$(INTERNALLDFLAGS)' -o $(BINDIR)/client ./src/client/... +@@ -112,7 +109,7 @@ server: common $(BINDIR) + $(GO) build $(BUILDARGS) -ldflags '$(INTERNALLDFLAGS)' -o $(BINDIR)/signaling ./server/... --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/... + 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/... clean: - rm -f src/signaling/*_easyjson.go -@@ -123,6 +108,13 @@ tarball: - --prefix=nextcloud-spreed-signaling-$(TARVERSION)/ \ - -o nextcloud-spreed-signaling-$(TARVERSION).tar.gz \ + rm -f *_easyjson.go +@@ -126,6 +123,13 @@ tarball: HEAD + + dist: tarball +install: + install -d $(DESTDIR)$(PREFIX)/etc/ncs/ + install -m 644 server.conf.in $(DESTDIR)$(PREFIX)/etc/ncs/server.conf.sample @@ -107,5 +62,5 @@ + install -m 755 bin/signaling $(DESTDIR)$(PREFIX)/bin/ncs-signaling + install -m 755 bin/proxy $(DESTDIR)$(PREFIX)/bin/ncs-proxy - dist: tarball - + .NOTPARALLEL: %_easyjson.go + .PHONY: continentmap.go diff --git a/net-im/nextcloud-spreed-signaling/files/patch-dependencies.tsv b/net-im/nextcloud-spreed-signaling/files/patch-dependencies.tsv deleted file mode 100644 index bb5c7989ca35..000000000000 --- a/net-im/nextcloud-spreed-signaling/files/patch-dependencies.tsv +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 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 new file mode 100644 index 000000000000..325a824d2600 --- /dev/null +++ b/net-im/nextcloud-spreed-signaling/files/patch-proxy_proxy__tokens__etcd.go @@ -0,0 +1,13 @@ +--- 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 new file mode 100644 index 000000000000..dd62f00d9ad1 --- /dev/null +++ b/net-im/nextcloud-spreed-signaling/files/patch-scripts_get-version.sh @@ -0,0 +1,21 @@ +--- scripts/get-version.sh.orig 2022-07-25 12:17:08 UTC ++++ scripts/get-version.sh +@@ -1,7 +1,6 @@ +-#!/usr/bin/env bash ++#!/bin/sh + set -e +-ROOT="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" +- ++ROOT="$(cd "$( dirname $0 )" && pwd)" + VERSION= + if [ -s "$ROOT/../version.txt" ]; then + VERSION=$(cat "$ROOT/../version.txt" | tr -d '[:space:]') +@@ -15,7 +14,7 @@ if [ -z $VERSION ] && [ -d "$ROOT/../.git" ]; then + fi + + if [ -z $VERSION ]; then +- VERSION=unknown ++ VERSION=v0.5.0 + fi + + echo $VERSION diff --git a/net-im/nextcloud-spreed-signaling/files/patch-src_proxy_main.go b/net-im/nextcloud-spreed-signaling/files/patch-src_proxy_main.go deleted file mode 100644 index e9ad58918cb7..000000000000 --- a/net-im/nextcloud-spreed-signaling/files/patch-src_proxy_main.go +++ /dev/null @@ -1,11 +0,0 @@ ---- 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" - ) diff --git a/net-im/nextcloud-spreed-signaling/files/patch-src_server_main.go b/net-im/nextcloud-spreed-signaling/files/patch-src_server_main.go deleted file mode 100644 index f3a62748c1c2..000000000000 --- a/net-im/nextcloud-spreed-signaling/files/patch-src_server_main.go +++ /dev/null @@ -1,11 +0,0 @@ ---- 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" - ) diff --git a/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_backend__server__test.go b/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_backend__server__test.go deleted file mode 100644 index dd8e89c9bfdf..000000000000 --- a/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_backend__server__test.go +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 ( diff --git a/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_clientsession.go b/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_clientsession.go deleted file mode 100644 index b5215441773a..000000000000 --- a/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_clientsession.go +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 ( diff --git a/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_mcu__janus.go b/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_mcu__janus.go deleted file mode 100644 index f674f9f21da8..000000000000 --- a/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_mcu__janus.go +++ /dev/null @@ -1,11 +0,0 @@ ---- 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" - ) - diff --git a/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_natsclient.go b/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_natsclient.go deleted file mode 100644 index 9f842a9c08f6..000000000000 --- a/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_natsclient.go +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 ( diff --git a/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_natsclient__loopback.go b/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_natsclient__loopback.go deleted file mode 100644 index 4c10c3524195..000000000000 --- a/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_natsclient__loopback.go +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 { diff --git a/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_natsclient__loopback__test.go b/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_natsclient__loopback__test.go deleted file mode 100644 index bdd01f9772e3..000000000000 --- a/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_natsclient__loopback__test.go +++ /dev/null @@ -1,11 +0,0 @@ ---- 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) { diff --git a/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_room.go b/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_room.go deleted file mode 100644 index 742defccca7d..000000000000 --- a/net-im/nextcloud-spreed-signaling/files/patch-src_signaling_room.go +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 ( diff --git a/net-im/nextcloud-spreed-signaling/files/patch-vendor_src_golang.org_x_sys_unix_ztypes__freebsd__arm64.go b/net-im/nextcloud-spreed-signaling/files/patch-vendor_src_golang.org_x_sys_unix_ztypes__freebsd__arm64.go deleted file mode 100644 index 9a218e1128c3..000000000000 --- a/net-im/nextcloud-spreed-signaling/files/patch-vendor_src_golang.org_x_sys_unix_ztypes__freebsd__arm64.go +++ /dev/null @@ -1,24 +0,0 @@ -From 33540a1f603772f9d4b761f416f5c10dade23e96 Mon Sep 17 00:00:00 2001 -From: Tobias Klauser -Date: Fri, 25 Oct 2019 21:13:51 +0200 -Subject: [PATCH] unix: don't use non-existing uint128 type on freebsd/arm64 - -CL 179099 introduced type FpReg on freebsd, on freebsd/arm64 using a -type uint128. This type doesn't exist in Go. - -Change-Id: Ie7f065f38f2cc2c163abdfa7dddad886b8edbe3b -Reviewed-on: https://go-review.googlesource.com/c/sys/+/203419 -Run-TryBot: Tobias Klauser -TryBot-Result: Gobot Gobot -Reviewed-by: Brad Fitzpatrick ---- vendor/src/golang.org/x/sys/unix/ztypes_freebsd_arm64.go 2019-08-18 13:42:05 UTC -+++ vendor/src/golang.org/x/sys/unix/ztypes_freebsd_arm64.go -@@ -397,7 +397,7 @@ type Reg struct { - } - - type FpReg struct { -- Fp_q [32]uint128 -+ Fp_q [512]uint8 - Fp_sr uint32 - Fp_cr uint32 - }