From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
MIME-Version: 1.0
References: <20200113125512.267496-1-lapeddk@gmail.com>
 <20200201064645.rvdc47g5rb67lfxe@pengutronix.de>
In-Reply-To: <20200201064645.rvdc47g5rb67lfxe@pengutronix.de>
From: Lars Pedersen <lapeddk@gmail.com>
Date: Mon, 3 Feb 2020 09:38:20 +0100
Message-ID: <CAKd8=GuRy++RP-zCKT+hakaFJoi1bi---2i-TfnaN7ejtpTJxw@mail.gmail.com>
Subject: Re: [ptxdist] [PATCH v3] strongswan: Version bump 5.6.1 -> 5.8.2
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=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" <ptxdist-bounces@pengutronix.de>
To: ptxdist@pengutronix.de, m.olbrich@pengutronix.de

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.

/Lars Pedersen

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de