From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Date: Mon, 17 Feb 2020 11:19:02 +0100 From: Michael Olbrich Message-ID: <20200217101902.GB11721@pengutronix.de> References: <20200113125512.267496-1-lapeddk@gmail.com> <20200201064645.rvdc47g5rb67lfxe@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Subject: Re: [ptxdist] [PATCH v3] strongswan: Version bump 5.6.1 -> 5.8.2 List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: Lars Pedersen Cc: ptxdist@pengutronix.de On Mon, Feb 03, 2020 at 09:38:20AM +0100, Lars Pedersen wrote: > On Sat, 1 Feb 2020 at 07:47, Michael Olbrich 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