On Wed, Feb 10, 2021 at 06:33:49PM +0100, Alexander Bluhm wrote:
> Hi,
>
> Every time we ship a libcrypto erratum, we have to relink isakmpd.
> I think that isakmpd and iked are in /sbin due to a historic mistake.
> Probably it is for people who mount /usr via NFS over IPsec.
>
> Moving isakmpd to /usr/sbin is hard, linking dynamically is easy.
> Lines stolen from iked.
>
> Is there any reason to include bsd.subdir.mk?
>
> ok?
>
Indeed bsd.subdir.mk looks unreasonable here, but I'm not sure about
isakmpd.
> bluhm
>
> Index: sbin/isakmpd/Makefile
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sbin/isakmpd/Makefile,v
> retrieving revision 1.88
> diff -u -p -r1.88 Makefile
> --- sbin/isakmpd/Makefile 10 Jul 2017 21:30:37 -0000 1.88
> +++ sbin/isakmpd/Makefile 10 Feb 2021 17:21:44 -0000
> @@ -87,4 +87,6 @@ generated: ${GENERATED}
> BUILDFIRST = ${GENERATED}
>
> .include <bsd.prog.mk>
> -.include <bsd.subdir.mk>
> +
> +# Don't compile isakmpd as static binary by default
> +LDSTATIC=
>
