From: Michael Olbrich <m.olbrich@pengutronix.de>
To: Lars Pedersen <lapeddk@gmail.com>
Cc: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH v3] strongswan: Version bump 5.6.1 -> 5.8.2
Date: Mon, 17 Feb 2020 11:19:02 +0100 [thread overview]
Message-ID: <20200217101902.GB11721@pengutronix.de> (raw)
In-Reply-To: <CAKd8=GuRy++RP-zCKT+hakaFJoi1bi---2i-TfnaN7ejtpTJxw@mail.gmail.com>
On Mon, Feb 03, 2020 at 09:38:20AM +0100, Lars Pedersen wrote:
> On Sat, 1 Feb 2020 at 07:47, Michael Olbrich <m.olbrich@pengutronix.de> wrote:
> > > +ifdef PTXCONF_STRONGSWAN_SWANCTL
> > > + @$(call install_lib, strongswan, 0, 0, 0644, libvici)
> > > + @$(call install_tree, strongswan, 0, 0, -, /etc/strongswan.d)
> > > + @$(call install_alternative, strongswan, 0, 0, 0644, /etc/swanctl/swanctl.conf)
> > > + @$(call install_alternative, strongswan, 0, 0, 750, /etc/swanctl/conf.d)
> >
> > /etc/swanctl/conf.d does not exist here. From the naming, I expect this to
> > be a directory to extend swanctl.conf. If that is the case, then just
> > remove this here.
> > If someone needs this instead of overwriting swanctl.conf, then an
> > auxiliary package can be used.
> >
> > I can do a local fixup, if this is ok with you. No need to resend.
> >
> > Michael
>
> You are correct that the conf.d directory only extends swanctl.conf.
>
> https://wiki.strongswan.org/projects/strongswan/wiki/SwanctlDirectory
> "conf.d Config snippets, included via include conf.d/*.conf in the
> default swanctl.conf file since 5.6.0"
>
> So your fixup sounds fine by me.
So, I merged this. But now building fails because swanctl needs
src/libcharon/plugins/vici/libvici.la and that is not built when systemd is
disabled. I think the internal handling for libcharon is broken. What do
you think is the correct fix here?
Michael
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2020-02-17 10:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-13 12:55 Lars Pedersen
2020-02-01 6:46 ` Michael Olbrich
2020-02-03 8:38 ` Lars Pedersen
2020-02-17 10:19 ` Michael Olbrich [this message]
2020-02-17 12:44 ` Lars Pedersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200217101902.GB11721@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=lapeddk@gmail.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox