From nobody Sat Jan 11 02:48:41 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YVNJB6nPKz5l4Mw; Sat, 11 Jan 2025 02:48:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YVNJ96W83z4HZ3; Sat, 11 Jan 2025 02:48:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736563721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sx9AXl//SLuaJNEMIUWGpN/cHYLxOv+WShkOIfk0nH0=; b=wejP96GI46qt8qoTXW6KVuN5hA3HFqEkfX+2JGIS1j2oq4VxekKyad4thGRpi+Ckp0R+hI yixi/yYCqpMT5rml4n73iCUCEXOtzMAytuAFGaSBHsJFIqVUK68l6sHp1a90y/XYxCWg4Q QToTCeajDMkddPHGNRhTKarPDgW7C83js9/JuWLQO8pYVkdGWUn7Zhgn778r2cCyrh0th9 Kypmy+Vt0yepmmV06MkAMuSmJBXAPxlxoYCZz14vw+dkWF+KuKOcki1MPAryEDDoii3Fsv 3PuXFtBfP4rMsS/n90YoObT1POTX9GZshHFlTaM6h297si++nL2NCzEmaB71xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736563721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sx9AXl//SLuaJNEMIUWGpN/cHYLxOv+WShkOIfk0nH0=; b=F0iVVENWg2YYoOK0m687BoVJDdF8+0FjRP5bXDNkHhfoETK39ErWnOpLxY1tos0ROKybt+ KuLBEo5pJ5cRGWN7pe8ShMnMKFpTYlRKx2wY7kiddBJvIPvuICbw1O4nJkfA+sHlH+CHZs iKzMPV1+Q3O9oEVNN/ufcQodVZ5YUi1ihFxdBI7XH08UAWuK54oLSyKtinRbyceJDhtAqw VwgBH92//Ri1G3RlI7A9uTmQ60pElR1VeEWEShzgpi8XMIXuJXJdM0BAO0tXFSW0mwLF/j KgBAyUhNBMaj3P9t0pS+dA8x3OwyBilAISFM3jjQhaNce39ImxhQwbSkzJi9xA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736563721; a=rsa-sha256; cv=none; b=viWzmlGw6ykThFzXWZrdTB6KjSUpuHU0ODCQ1f07+kMLM92jwiuxOjRVtkA/PKOWkTS3aZ eD9cg6Ri8MCncpJqw8CL0wvHK58Eq1PIhBpr71sBqa0X5Yo7AIwQFStth5UNC9wMONZipD TfAjs+HcCj7iFivPFXUVjKVIWv2WRtcTsMF3FB5ylG4EuKyzMzVhlr2lzPk4qIP27iZPV6 uifgIkY9BlJsH0qDAUi8i8YqWKAqSfhltI3doEc8Hr1e2olgpap3aYORbdUFRsqhiSQcpt mEdqjuDHmyIIqLIln7Wr/jKIusfpxt3wfBziY8akCnNOKhNc47G2XMM7Z1GTxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YVNJ960GtzgYs; Sat, 11 Jan 2025 02:48:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50B2mf2i065964; Sat, 11 Jan 2025 02:48:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50B2mfX9065961; Sat, 11 Jan 2025 02:48:41 GMT (envelope-from git) Date: Sat, 11 Jan 2025 02:48:41 GMT Message-Id: <202501110248.50B2mfX9065961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 98b689134b69 - stable/13 - lib: hook libder up to the build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 98b689134b696023b35197479f1fe553e22087ff Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=98b689134b696023b35197479f1fe553e22087ff commit 98b689134b696023b35197479f1fe553e22087ff Author: Kyle Evans AuthorDate: 2025-01-01 21:10:27 +0000 Commit: Kyle Evans CommitDate: 2025-01-11 02:48:28 +0000 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(+) diff --git a/lib/Makefile b/lib/Makefile index 49a57d619fb9..cbc38fceb2c7 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -16,6 +16,7 @@ SUBDIR_BOOTSTRAP= \ ${_libclang_rt} \ ${_libcplusplus} \ ${_libcxxrt} \ + libder \ libelf \ libssp \ libssp_nonshared \ diff --git a/lib/libder/Makefile b/lib/libder/Makefile new file mode 100644 index 000000000000..bdd2225f0ff3 --- /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 diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 0a2dd0a758bc..c372614037c7 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -42,6 +42,7 @@ _INTERNALLIBS= \ bsnmptools \ c_nossp_pic \ cron \ + der \ elftc \ fifolog \ ifconfig \ @@ -572,6 +573,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