From 253efc2f3b2bcde8afa00a7b9a5308aeafea61f7 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Wed, 27 May 2026 13:48:56 +0000
Subject: [PATCH] A new variable (RELINK) makes rules for creating a relink tar
 file and installing it in the correct place.  The variable needs to be a test
 command which verifies the re-linked binary works correctly, which requires
 it to exit(0). This 1-liner will replace the large adhoc relink tarfile
 production in the Makefiles of various relinked programs.

---
 share/mk/bsd.prog.mk | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index dbd1912d3da..7fffb9df397 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.prog.mk,v 1.84 2025/10/27 18:38:54 denis Exp $
+#	$OpenBSD: bsd.prog.mk,v 1.85 2026/05/27 13:48:56 deraadt Exp $
 #	$NetBSD: bsd.prog.mk,v 1.55 1996/04/08 21:19:26 jtc Exp $
 #	@(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
 
@@ -128,6 +128,29 @@ ${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${CRTBEGIN} ${CRTEND} ${DPADD}
 .  endif	# defined(OBJS) && !empty(OBJS)
 .endif
 
+# Construct a re-link kit and install it for boot-time use.
+# RELINK variable is a shell command to test the relinked binary works.
+.if defined(RELINK)
+install.sh: Makefile ${PROG}
+	echo "set -o errexit" > $@
+	echo "${CC} ${LDFLAGS} ${LDSTATIC} -o ${PROG}" \
+	    "\`echo " ${OBJS} "| tr ' ' '\\\n' | sort -R\`" ${LDADD} >> $@
+	echo "${RELINK}" >> $@
+	echo "install -c -s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${PROG} " \
+	    "${BINDIR}/${PROG}" >> $@
+
+${PROG}.tar: ${OBJS} install.sh
+	tar cf $@ ${OBJS} install.sh
+
+afterinstall: ${PROG}.tar
+	install -d -o root -g wheel -m 755 \
+	    ${DESTDIR}/usr/share/relink/${BINDIR}/${PROG}
+	install -o root -g bin -m 640 \
+	    ${PROG}.tar ${DESTDIR}/usr/share/relink/${BINDIR}/${PROG}/${PROG}.tar
+
+CLEANFILES+= ${PROG}.tar install.sh
+.endif
+
 .MAIN: all
 all: ${PROG} ${PROGS} _SUBDIRUSE