On 2023/01/26 14:57, Claudio Jeker wrote:
> On Thu, Jan 26, 2023 at 01:54:38PM +0000, Stuart Henderson wrote:
> > On 2023/01/26 13:50, Stuart Henderson wrote:
> > > Since the /var referred to here is the directory used by rpki-client
> > > which can't be overridden by anything in ports, imho it should just
> > > use /var not VARBASE.
> > >
> > > (Similar case to ports which refers to /etc files which are part of the
> > > base system, which should be /etc not SYSCONFDIR).
> >
> > + updated diff with missing @conflict
>
> I think we should just drop gortr and switch to stayrtr. gortr is not
> really maintained and that's why the stayrtr fork happened.
Index: net/Makefile
===================================================================
RCS file: /cvs/ports/net/Makefile,v
retrieving revision 1.1333
diff -u -p -r1.1333 Makefile
--- net/Makefile 9 Jan 2023 12:22:17 -0000 1.1333
+++ net/Makefile 26 Jan 2023 14:00:31 -0000
@@ -124,7 +124,6 @@
SUBDIR += gomuks
SUBDIR += gopher
SUBDIR += gophernicus
- SUBDIR += gortr
SUBDIR += gotthard
SUBDIR += gpodder
SUBDIR += grake
Index: net/gortr/Makefile
===================================================================
RCS file: net/gortr/Makefile
diff -N net/gortr/Makefile
--- net/gortr/Makefile 11 Mar 2022 19:46:01 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-COMMENT = a RPKI-to-Router server
-
-MODGO_MODNAME= github.com/cloudflare/gortr
-MODGO_VERSION= v0.14.7
-
-DISTNAME= gortr-${MODGO_VERSION}
-REVISION= 0
-
-BROKEN-aarch64= pins old version of golang.org/x/sys/unix
-
-CATEGORIES = net
-
-HOMEPAGE = https://github.com/cloudflare/gortr
-
-MAINTAINER = Claudio Jeker <clau...@openbsd.org>
-# BSD 3-Clause
-PERMIT_PACKAGE = Yes
-
-WANTLIB= c pthread
-
-MODULES= lang/go
-
-MODGO_MODULES = \
- github.com/beorn7/perks
v0.0.0-20180321164747-3a771d992973 \
- github.com/davecgh/go-spew v1.1.1 \
- github.com/golang/protobuf v1.2.0 \
- github.com/konsorten/go-windows-terminal-sequences v1.0.1 \
- github.com/matttproud/golang_protobuf_extensions v1.0.1 \
- github.com/pmezard/go-difflib v1.0.0 \
- github.com/prometheus/client_golang v0.9.2 \
- github.com/prometheus/client_model
v0.0.0-20180712105110-5c3871d89910 \
- github.com/prometheus/common
v0.0.0-20181126121408-4724e9255275 \
- github.com/prometheus/procfs
v0.0.0-20181204211112-1dc9a6cbc91a \
- github.com/sirupsen/logrus v1.4.0 \
- github.com/stretchr/objx v0.1.1 \
- github.com/stretchr/testify v1.2.2 \
- golang.org/x/crypto
v0.0.0-20180904163835-0709b304e793 \
- golang.org/x/net
v0.0.0-20181201002055-351d144fa1fc \
- golang.org/x/sync
v0.0.0-20181108010431-42b317875d0f \
- golang.org/x/sys
v0.0.0-20180905080454-ebe1bf3edb33
-
-.include <bsd.port.mk>
Index: net/gortr/distinfo
===================================================================
RCS file: net/gortr/distinfo
diff -N net/gortr/distinfo
--- net/gortr/distinfo 9 Dec 2020 11:11:32 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,70 +0,0 @@
-SHA256
(go_modules/github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod)
= zE0fqtdZZfpp6xMSC/lWgncZAF/z7NxwSzb7WPsf0W4=
-SHA256
(go_modules/github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip)
= U258FdO9386SPrx/Vbh79MevaSC869vyTTlp5iTrdTc=
-SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.1.mod) =
vLKTkyUSN7eaF7bBm/KRNPQ+j0OMMZiYj81GGhzfBcw=
-SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.1.zip) =
a0SoQ5UfNxtwEMdU7MPKvv6BXVztHFuUCfstaX6KiQ0=
-SHA256 (go_modules/github.com/golang/protobuf/@v/v1.2.0.mod) =
wKIDG/J3CHdJ2MzEMkSfaxN1eH6shkHdL5MAdCMar7Q=
-SHA256 (go_modules/github.com/golang/protobuf/@v/v1.2.0.zip) =
dXTmUPbxIYbe+LMbDo2YDMuIpqNluZ+/NlFfbnuZ/Qk=
-SHA256
(go_modules/github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod) =
a2na/Tz2TXtX6XiEin4nGivgoE2aJWTdJVZJHSfQoDQ=
-SHA256
(go_modules/github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip) =
f9AnP8CFXtCBcsFQ91bnCNbkPEptUspJOai0PQM1YJE=
-SHA256
(go_modules/github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod) =
XJwAhrmy623J8nuh0zsopmRj/jDC+Hb/BbfISOd56nc=
-SHA256
(go_modules/github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip) =
5k3FgCP0uMRHLQWkTycZuE1sLMNkzGgoIMn3KyM8nNw=
-SHA256 (go_modules/github.com/pmezard/go-difflib/@v/v1.0.0.mod) =
dLLnZushU3eGTVh7rfV+lVIfaS0qeGCzx3WQk/nJvsI=
-SHA256 (go_modules/github.com/pmezard/go-difflib/@v/v1.0.0.zip) =
3gTOzBpLjVPkNXBRAmeUvLxU8uaiYM+sUIzmnV1kV6A=
-SHA256 (go_modules/github.com/prometheus/client_golang/@v/v0.9.2.mod) =
BXocZOjW9i88x5FE5cNQmTlL1p62eZ9KdW9X5ySbvjU=
-SHA256 (go_modules/github.com/prometheus/client_golang/@v/v0.9.2.zip) =
RBpGgj5HDeSEdq2Euw2/mwVbnjKlZGBmUg+A5HSv5Vg=
-SHA256
(go_modules/github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod)
= ns1IHRDj87hroHVZhqhYUgKLhvK6WXll09NnKy8vtzg=
-SHA256
(go_modules/github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.zip)
= eq7jJln3j8wDL9HmoDCOins4a9VbVxy2pv/ymztquqw=
-SHA256
(go_modules/github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod)
= BQyxxQq3PNWzp4RWTFLeTV03phPn5bx0jnxvXySXwpU=
-SHA256
(go_modules/github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.zip)
= OSqhSJohlC/kLq5wG5M+ASBjoLZnZ95UVTHdcBEWOPc=
-SHA256
(go_modules/github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod)
= Ut7XCWB1iCAO/0vPvWH84yuww/Dv3TLYRuPqFQsZY1I=
-SHA256
(go_modules/github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.zip)
= AN7B1TNQknhWxt+6Lt2R1Ij0YT5KmP5t9D8ipl096bw=
-SHA256 (go_modules/github.com/sirupsen/logrus/@v/v1.4.0.mod) =
1nBJZSdJq8ZWDyLe46J6q3laMu4sfgeKVGFaYberuZs=
-SHA256 (go_modules/github.com/sirupsen/logrus/@v/v1.4.0.zip) =
ixaVSu2VtE46pVgTOCIjK/CuA1wLBIFDtK1+JeBFiEI=
-SHA256 (go_modules/github.com/stretchr/objx/@v/v0.1.1.mod) =
E1A1TVLSKHpiM27MDVYjLUxHaZr5u6ScZ8K0glTamPE=
-SHA256 (go_modules/github.com/stretchr/objx/@v/v0.1.1.zip) =
A1mewdaIjpvwQpNG2VpsB8ZNYGFLXkrzbyNMziIMfKA=
-SHA256 (go_modules/github.com/stretchr/testify/@v/v1.2.2.mod) =
SrRj9ow3AEH5UMEMq1EEkD1FmMUM+CT5qtG3t/aSVa8=
-SHA256 (go_modules/github.com/stretchr/testify/@v/v1.2.2.zip) =
oNEnjptJ9z53C98goq9fIytt9rnw5VdwfbAO/Kbtqe0=
-SHA256
(go_modules/golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod) =
XQEUTZSEElkdjxHUn3p0+trOWOEtc2bPCvmSFH5SSG0=
-SHA256
(go_modules/golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.zip) =
a1E+vdzpE19sCbU3dyhtFbDFGJ6BXvN8/MbEsTZCQBo=
-SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod)
= Pgj0h93aGFG4kd9bHQS7GgG4TW1wKqgtnvvM3gqn34E=
-SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.zip)
= D3YCETwWzI5JaG5n0sNULCNOy2InB0IvGsbgDtyxapI=
-SHA256
(go_modules/golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod) =
Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw=
-SHA256
(go_modules/golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.zip) =
1QdjIf85J5JWi7jsnlgneKYCruvz0nxquZ8Ujq0L8bM=
-SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod)
= iWkRXko5EIhIMk55ob2KhEUjDm46rMvp+AV/tQ//yME=
-SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.zip)
= x/4JmbIDZWxR0YbQIM27xXMlhn0/q1duYYIaHi0CrQk=
-SHA256 (gortr-v0.14.7.zip) = lpGU1n1urU6uP1asAbF1jxi9t+rGXFHt4u02E0CYJS8=
-SIZE
(go_modules/github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod)
= 31
-SIZE
(go_modules/github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip)
= 15013
-SIZE (go_modules/github.com/davecgh/go-spew/@v/v1.1.1.mod) = 34
-SIZE (go_modules/github.com/davecgh/go-spew/@v/v1.1.1.zip) = 60320
-SIZE (go_modules/github.com/golang/protobuf/@v/v1.2.0.mod) = 34
-SIZE (go_modules/github.com/golang/protobuf/@v/v1.2.0.zip) = 482403
-SIZE
(go_modules/github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod) =
58
-SIZE
(go_modules/github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip) =
3567
-SIZE
(go_modules/github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod) = 56
-SIZE
(go_modules/github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip) =
44378
-SIZE (go_modules/github.com/pmezard/go-difflib/@v/v1.0.0.mod) = 37
-SIZE (go_modules/github.com/pmezard/go-difflib/@v/v1.0.0.zip) = 12433
-SIZE (go_modules/github.com/prometheus/client_golang/@v/v0.9.2.mod) = 540
-SIZE (go_modules/github.com/prometheus/client_golang/@v/v0.9.2.zip) = 193855
-SIZE
(go_modules/github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod)
= 42
-SIZE
(go_modules/github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.zip)
= 68325
-SIZE
(go_modules/github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod)
= 36
-SIZE
(go_modules/github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.zip)
= 132691
-SIZE
(go_modules/github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod)
= 36
-SIZE
(go_modules/github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.zip)
= 103337
-SIZE (go_modules/github.com/sirupsen/logrus/@v/v1.4.0.mod) = 393
-SIZE (go_modules/github.com/sirupsen/logrus/@v/v1.4.0.zip) = 57451
-SIZE (go_modules/github.com/stretchr/objx/@v/v0.1.1.mod) = 32
-SIZE (go_modules/github.com/stretchr/objx/@v/v0.1.1.zip) = 37190
-SIZE (go_modules/github.com/stretchr/testify/@v/v1.2.2.mod) = 35
-SIZE (go_modules/github.com/stretchr/testify/@v/v1.2.2.zip) = 81710
-SIZE
(go_modules/golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod) = 27
-SIZE
(go_modules/golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.zip) =
1758421
-SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod) =
24
-SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.zip) =
1322810
-SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod)
= 25
-SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.zip)
= 24743
-SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod) =
24
-SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.zip) =
1347424
-SIZE (gortr-v0.14.7.zip) = 138516
Index: net/gortr/pkg/DESCR
===================================================================
RCS file: net/gortr/pkg/DESCR
diff -N net/gortr/pkg/DESCR
--- net/gortr/pkg/DESCR 9 Dec 2020 11:11:32 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-goRTR is an open-source implementation of the RPKI to Router protocol
-(RFC 6810), normally used with BGP routers, using the Go programming
-language.
-
-Features of the server
- Refreshes a JSON list of prefixes
- Prometheus metrics
- Lightweight
- TLS
- SSH
- Signature verification and expiration control
Index: net/gortr/pkg/PLIST
===================================================================
RCS file: net/gortr/pkg/PLIST
diff -N net/gortr/pkg/PLIST
--- net/gortr/pkg/PLIST 11 Mar 2022 19:46:01 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-@bin bin/gortr
-@bin bin/rtrdump
-@bin bin/rtrmon
Index: net/stayrtr/Makefile
===================================================================
RCS file: /cvs/ports/net/stayrtr/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- net/stayrtr/Makefile 26 Jan 2023 13:38:49 -0000 1.1.1.1
+++ net/stayrtr/Makefile 26 Jan 2023 14:00:31 -0000
@@ -2,6 +2,7 @@ COMMENT= RPKI-To-Router implementation i
MODGO_MODNAME= github.com/bgp/stayrtr
MODGO_VERSION= v0.4.0
+EPOCH= 0
DISTNAME= stayrtr-${MODGO_VERSION}
@@ -10,8 +11,6 @@ HOMEPAGE= https://www.github.com/bgp/sta
# BSD 3-Clause
PERMIT_PACKAGE= yes
-
-SUBST_VARS= VARBASE
MODULES= lang/go
Index: net/stayrtr/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/stayrtr/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- net/stayrtr/pkg/PLIST 26 Jan 2023 13:38:49 -0000 1.1.1.1
+++ net/stayrtr/pkg/PLIST 26 Jan 2023 14:00:31 -0000
@@ -1,3 +1,5 @@
+@pkgpath net/gortr
+@conflict gortr-*
@newgroup _stayrtr:505
@newuser _stayrtr:505:505::StayRTR Account:/var/empty:/sbin/nologin
@rcscript ${RCDIR}/stayrtr
Index: net/stayrtr/pkg/README
===================================================================
RCS file: /cvs/ports/net/stayrtr/pkg/README,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 README
--- net/stayrtr/pkg/README 26 Jan 2023 13:38:49 -0000 1.1.1.1
+++ net/stayrtr/pkg/README 26 Jan 2023 14:00:31 -0000
@@ -8,4 +8,4 @@ To use your local RPKI cache, add to the
And run:
- # rcctl set stayrtr flags -cache ${VARBASE}/db/rpki-client/json
+ # rcctl set stayrtr flags -cache /var/db/rpki-client/json
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1481
diff -u -p -r1.1481 Makefile
--- devel/quirks/Makefile 22 Jan 2023 21:03:41 -0000 1.1481
+++ devel/quirks/Makefile 26 Jan 2023 14:00:31 -0000
@@ -3,7 +3,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-6.97
+PKGNAME = quirks-6.98
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1492
diff -u -p -r1.1492 Quirks.pm
--- devel/quirks/files/Quirks.pm 22 Jan 2023 21:03:41 -0000 1.1492
+++ devel/quirks/files/Quirks.pm 26 Jan 2023 14:00:31 -0000
@@ -764,6 +764,7 @@ my $stem_extensions = {
'py-xdg' => 'py3-xdg',
'i3-gaps' => 'i3',
'rebar' => 'rebar3',
+ 'gortr' => 'stayrtr',
};
my $obsolete_reason = {};
