sync with OpenBSD -current

This commit is contained in:
purplerain 2024-04-01 19:33:31 +00:00
parent 61b0c3d2c1
commit 297ba4a59a
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
20 changed files with 338 additions and 251 deletions

View file

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.38 2020/04/03 02:26:56 djm Exp $
# $OpenBSD: Makefile,v 1.39 2024/04/01 15:50:17 deraadt Exp $
.PATH: ${.CURDIR}/..
@ -10,7 +10,7 @@ SRCS+= ${SRCS_SK_CLIENT}
PROG= ssh-agent
BINOWN= root
BINGRP= _sshagnt
BINMODE=2555
BINMODE=2511
BINDIR= /usr/bin
@ -18,3 +18,24 @@ BINDIR= /usr/bin
LDADD+= -lcrypto -lutil
DPADD+= ${LIBCRYPTO} ${LIBUTIL}
# The random relink kit, used on OpenBSD by /etc/rc
CLEANFILES+= ssh-agent.tar install.sh
install.sh: Makefile
echo "set -o errexit" > $@
echo "${CC} ${LDFLAGS} ${LDSTATIC} -o ${PROG}" \
"\`echo " ${OBJS} "| tr ' ' '\\\n' | sort -R\`" ${LDADD} >> $@
echo "./${PROG} /usr/bin/true" >> $@
echo "install -c -s -o root -g bin -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 ${BINOWN} -g ${BINGRP} -m 640 \
${PROG}.tar ${DESTDIR}/usr/share/relink/${BINDIR}/${PROG}/${PROG}.tar