From c876932bbafdd20c6d5a1f733c45fc7bc0d67e0c Mon Sep 17 00:00:00 2001
From: Kyle Evans <kevans@FreeBSD.org>
Date: Wed, 1 Jan 2025 15:10:27 -0600
Subject: [PATCH] lib: hook libder up to the build

libder will be used in upcoming ECC support in the pkg(7) bootstrap to
read DER-encoded keys and signatures.

(cherry picked from commit f59bb61e1eb4d1e4fc3c60cc14779d0668267cb2)
---
 lib/Makefile             |  1 +
 lib/libder/Makefile      | 13 +++++++++++++
 share/mk/src.libnames.mk |  4 ++++
 3 files changed, 18 insertions(+)
 create mode 100644 lib/libder/Makefile

diff --git a/lib/Makefile b/lib/Makefile
index 294e2b695bd..6c5edfdc8f7 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -17,6 +17,7 @@ SUBDIR_BOOTSTRAP= \
 	libc++ \
 	libc++experimental \
 	libcxxrt \
+	libder \
 	libelf \
 	libssp \
 	libssp_nonshared \
diff --git a/lib/libder/Makefile b/lib/libder/Makefile
new file mode 100644
index 00000000000..bdd2225f0ff
--- /dev/null
+++ b/lib/libder/Makefile
@@ -0,0 +1,13 @@
+
+LIB=	der
+INTERNALLIB=
+
+.PATH:	${SRCTOP}/contrib/libder/libder
+SRCS+=	libder.c \
+	libder_error.c \
+	libder_obj.c \
+	libder_read.c \
+	libder_type.c \
+	libder_write.c
+
+.include <bsd.lib.mk>
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index d7350ce5c04..9cba6c8cc7c 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -43,6 +43,7 @@ _INTERNALLIBS=	\
 		bsnmptools \
 		c_nossp_pic \
 		cron \
+		der \
 		elftc \
 		fdt \
 		fifolog \
@@ -586,6 +587,9 @@ LIBTELNET?=	${LIBTELNETDIR}/libtelnet${PIE_SUFFIX}.a
 LIBCRONDIR=	${_LIB_OBJTOP}/usr.sbin/cron/lib
 LIBCRON?=	${LIBCRONDIR}/libcron${PIE_SUFFIX}.a
 
+LIBDERDIR=	${_LIB_OBJTOP}/lib/libder
+LIBDER?=	${LIBDERDIR}/libder${PIE_SUFFIX}.a
+
 LIBNTPDIR=	${_LIB_OBJTOP}/usr.sbin/ntp/libntp
 LIBNTP?=	${LIBNTPDIR}/libntp${PIE_SUFFIX}.a