Re: [UPDATE] geo/gpsbabel 1.4.4 -> 1.6.0

On 2019/08/26 11:24, Kirill Bychkov wrote:
> On Sat, August 24, 2019 17:19, SASANO Takayoshi wrote:
> > Hello,
>
> Hi,
> I have almost the same patch sitting in my tree for a long time.
> I've completly disabled building of docs in my patch.
> With your diff I get only display($template); ?> in all html docs.
> See comments below.
> >
> [...]
> >
> >
> > diff -uNpr gpsbabel/Makefile gpsbabel.new/Makefile
> > --- gpsbabel/Makefile Sat Aug 24 23:05:29 2019
> > +++ gpsbabel.new/Makefile Sat Aug 24 23:05:31 2019
> > @@ -1,30 +1,32 @@
> > -# $OpenBSD: Makefile,v 1.33 2018/10/24 14:28:04 sthen Exp $
> > +# $OpenBSD: Makefile,v 1.34 2019/07/12 20:46:29 sthen Exp $

Diff against -current, please.

> > COMMENT-main= GPS waypoint, track, and route conversion tool
> > COMMENT-tk= Tk front-end to gpsbabel
> > COMMENT-qt= Qt front-end to gpsbabel
> >
> > -VERSION= 1.4.4
> > +VERSION= 1.6.0
> > +GH_ACCOUNT= gpsbabel
> > +GH_PROJECT= gpsbabel
> > +GH_TAGNAME= gpsbabel_1_6_0
> > DISTNAME= gpsbabel-${VERSION}
> > PKGNAME-main= gpsbabel-${VERSION}
> > PKGNAME-tk= gpsbabel-tk-${VERSION}
> > PKGNAME-qt= gpsbabel-qt-${VERSION}
> > CATEGORIES= geo
>
> No need for GH_* vars - upstream is publishing normal releases.
> DISTNAME= gpsbabel_1_6_0
> MASTER_SITES= https://github.com/gpsbabel/gpsbabel/archive/

No that isn't a normal release - /archive/ URL means that it *should* use GH_* vars.

> >
> > -REVISION-main= 2
> > -REVISION-tk= 2
> > -REVISION-qt= 3
> > +REVISION-main=
> > +REVISION-tk=
> > +REVISION-qt=

REVISION lines should be removed.

Re: relayd: "listen on egress" only listens to IPv4 and not IPv6

Sebastian Benoit(benoit-lists@fb12.de) on 2019.09.01 16:44:37 +0200:
> Muhammad Kaisar Arkhan(hi@yukiisbo.red) on 2019.08.29 14:55:03 +0200:
> > Hi Tom,
> >
> > > listen on 2a03:6000:9106::50f7:f07a:d1cc port 443 tls
> >
> > I've tried this before, it just results in this:
> >
> > /etc/relayd.conf:33: cannot load certificates for relay https2:443
>
> Your error says "for relay https2", but the relayd.conf file you quote does
> not have a relay "https2".
>
> Please show the output of "relayd -nvv" and *exactly* the /etc/relayd.conf
> file at the time when you ran the command.

sorry, my mistake: the https2 there is fine, it comes from the second
"listen ..." directive.

I think i found the issue: relays with multiple listen statements do not
work with keypair currently.

Can you test this diff with a config that has a listen on the v4 adress and
a listen on the v6 adress, not the "egress" method.

If it does not work, please show again your config and "relayd -nvv".

/Benno

diff --git usr.sbin/relayd/parse.y usr.sbin/relayd/parse.y
index c6e2bcacdfb..8338d5c9e6d 100644
--- usr.sbin/relayd/parse.y
+++ usr.sbin/relayd/parse.y
@@ -3323,11 +3312,19 @@ relay_inherit(struct relay *ra, struct relay *rb)
goto err;
}

- if (relay_load_certfiles(conf, rb, NULL) == -1) {
+ if (TAILQ_EMPTY(&rb->rl_proto->tlscerts) &&
+ relay_load_certfiles(conf, rb, NULL) == -1) {
yyerror("cannot load certificates for relay %s",
rb->rl_conf.name);
goto err;
}
+ TAILQ_FOREACH(name, &rlay->rl_proto->tlscerts, entry) {
+ if (relay_load_certfiles(conf, rb, name->name) == -1) {
+ yyerror("cannot load keypair %s for relay %s",
+ name->name, rb->rl_conf.name);
+ goto err;
+ }
+ }

TAILQ_FOREACH(rta, &ra->rl_tables, rlt_entry) {
if ((rtb = calloc(1, sizeof(*rtb))) == NULL) {