From nobody Sat Aug 5 08:32:17 2023 X-Original-To: dev-commits-src-main@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 4RHwmy1rr5z4Tpdy; Sat, 5 Aug 2023 08:32:18 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RHwmy1NNSz4pkY; Sat, 5 Aug 2023 08:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691224338; 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=QU3aZRPsJkdx/o4Vp7u7huE+BlCwG4BdB/hgdyz2kcA=; b=RsVpt+VrOj1XAraiNE35xRgH6SFKGU3lqdZuHBDYe4EJpiw0VQIpekVeUrYcjJPMX1+pDs xoazEsuwSBFlanG772Sl3vlJFxI5Izm/s0SDpNs8IbK7yPNeFtEthr1VA7m01lw9Pded+m u0BhVc0/lX2NVwpQKbFjYWicaw4whVHq1jorgmMyeJFrk0daFEwVfNJGsaAv77OnXe2he+ wZ2hKj00CWF9Di1y5UEWPYZKZGejAyWbrIxp9I+MaMDAdH38JJxScVH86o5Nim+b8bqkP8 BBOjPPgqE1QXw41k5mZkfBfqOOMtK0+wcb4U5NxRT2g3VC6fwns8Pstw7BxMYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691224338; 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=QU3aZRPsJkdx/o4Vp7u7huE+BlCwG4BdB/hgdyz2kcA=; b=iVfdu0U+TzmYCXUWdVGV9l1qQO6riAV4vdW+AlvL5ONCXEoxiUu5/jNX61c+jy4hwcUG3i 4K9HvhbbwleHxT/0bXZFepNaJWjDDaOOkkbp1Fv4zR5RTTRw0Riu0e9TYTCsBxGam2L9/U uz7OULVCHMU1xAVfvphlg/XQNEe14bMFrC+sWphs4h2ckgkE65X+NKGkaQu/UOHLKiEOXT m5TTVAG3rq/bT7pWF5/hvg7YaNm2STKqvUOB4uhtqbLExYJN4iuxsstpQAXePyVtgeznmf BIYBr4AfeJHR7CkLo0VufdkXHKxGDn2MANHbfPB8IDw23s51c01Nr1ElJBSfuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691224338; a=rsa-sha256; cv=none; b=LgqPXQf3rLBveldukeiU6NiZCrzuMCGJN4qVC0FN+euJIYdZCvTuKBykdO1FYUpKQO5pc3 5+wLHKhqV6gp+CiQJSMIS+qAUbj4IZBGmksjk+urZK8dzO6L9vV+ayZFJzw2m6vghKIjJI wgrEPRjytazRcESH4ASY55CkmrU0KsxGPvwS8/79KOJTBeToqpYzTYjM6uvVVRdUt2Yg5w EEKa4vsiZxth4QnM2Bfg+hYQPKuJBoQdkDsOhKTcYawnRa+1kvK9avJzZ+EZY+CpQCw4ld iksFCAPpx6yqF4CC7vgt+lR//jEFPj6ZzHfGAh+vr4ZDXV+tqs8z62fg3BAyHA== 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 4RHwmy081yz7X4; Sat, 5 Aug 2023 08:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3758WHmY042624; Sat, 5 Aug 2023 08:32:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3758WHqC042623; Sat, 5 Aug 2023 08:32:17 GMT (envelope-from git) Date: Sat, 5 Aug 2023 08:32:17 GMT Message-Id: <202308050832.3758WHqC042623@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: 1d7ffb373c9d - main - pkgbase: reorganise caroot and openssl packages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d7ffb373c9d639c9645a6b09ae46b2b92adb2e3 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=1d7ffb373c9d639c9645a6b09ae46b2b92adb2e3 commit 1d7ffb373c9d639c9645a6b09ae46b2b92adb2e3 Author: Doug Rabson AuthorDate: 2023-07-31 14:38:45 +0000 Commit: Doug Rabson CommitDate: 2023-08-05 08:30:35 +0000 pkgbase: reorganise caroot and openssl packages This splits out the certctl utility into a new certctl package and the openssl libs into an openssl-lib package. PR: 272816 Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D41321 --- release/packages/Makefile.package | 10 ++++++++-- release/packages/{caroot.ucl => certctl.ucl} | 0 release/packages/generate-ucl.sh | 14 ++++++++------ secure/lib/libcrypto/Makefile | 2 +- secure/lib/libssl/Makefile | 2 +- usr.sbin/certctl/Makefile | 2 +- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index 9bd2994c882a..e1256e02b2ad 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -26,10 +26,14 @@ bsdinstall_COMMENT= BSDInstall Utilities bsdinstall_DESC= BSDInstall Utilities bsnmp_COMMENT= BSNMP Utilities bsnmp_DESC= BSNMP Utilities +caroot_COMMENT= SSL Certificates +caroot_DESC= SSL Certificates clang_COMMENT= Clang Utilities clang_DESC= Clang Utilities clibs_COMMENT= Core C Libraries clibs_DESC= Core C Libraries +certctl_COMMENT= SSL Certificate Utility +certctl_DESC= SSL Certificate Utility console-tools_COMMENT= Console Utilities console-tools_DESC= Console Utilities csh_COMMENT= C Shell @@ -113,8 +117,10 @@ nfs_COMMENT= NFS Utilities nfs_DESC= NFS Utilities nvme-tools_COMMENT= NVME Utilities nvme-tools_DESC= NVME Utilities -openssl_COMMENT= OpenSSL Library and Utility -openssl_DESC= OpenSSL Library and Utility +openssl_COMMENT= OpenSSL Utility +openssl_DESC= OpenSSL Utility +openssl-lib_COMMENT= OpenSSL Libraries +openssl-lib_DESC= OpenSSL Libraries pkg-bootstrap_COMMENT= pkg bootstrap Utility pkg-bootstrap_DESC= pkg bootstrap Utility periodic_COMMENT= Periodic Utility diff --git a/release/packages/caroot.ucl b/release/packages/certctl.ucl similarity index 100% rename from release/packages/caroot.ucl rename to release/packages/certctl.ucl diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index 2b1f71e95c11..0c90a9ec4553 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -42,8 +42,8 @@ main() { # clibs should not have any dependencies or anything # else imposed on it. ;; - caroot) - pkgdeps="openssl" + certctl) + pkgdeps="caroot openssl" ;; # -dev packages that have no corresponding non-dev package @@ -139,14 +139,16 @@ main() { cp "${uclsource}" "${uclfile}" if [ ! -z "${pkgdeps}" ]; then - cat <> ${uclfile} -deps: { - FreeBSD-${pkgdeps}: { + echo 'deps: {' >> ${uclfile} + for dep in ${pkgdeps}; do + cat <> ${uclfile} + FreeBSD-${dep}: { origin: "base", version: "${PKG_VERSION}" } -} EOF + done + echo '}' >> ${uclfile} fi cap_arg="$( make -f ${srctree}/share/mk/bsd.endian.mk -VCAP_MKDB_ENDIAN )" sed -i '' -e "s/%VERSION%/${PKG_VERSION}/" \ diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 89f330ca2800..6b2a1f3bd157 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -6,7 +6,7 @@ SUBDIR= engines modules .include .include -PACKAGE= openssl +PACKAGE= openssl-lib LIB= crypto SHLIB_MAJOR= 30 VERSION_MAP= ${.CURDIR}/Version.map diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile index 4cf17b8d5c51..dc308bcfb146 100644 --- a/secure/lib/libssl/Makefile +++ b/secure/lib/libssl/Makefile @@ -5,7 +5,7 @@ LIB= ssl SHLIB_MAJOR= 30 VERSION_MAP= ${.CURDIR}/Version.map -PACKAGE= openssl +PACKAGE= openssl-lib NO_LINT= diff --git a/usr.sbin/certctl/Makefile b/usr.sbin/certctl/Makefile index df5acb606143..d583bf3055bd 100644 --- a/usr.sbin/certctl/Makefile +++ b/usr.sbin/certctl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE= caroot +PACKAGE= certctl SCRIPTS=certctl.sh MAN= certctl.8