Attachment 243740 Details for Bug 272816 – Implements the suggested approach for reorganising caroot and openssl

[patch] Implements the suggested approach for reorganising caroot and openssl

file_272816.txt (text/plain), 2.93 KB, created by dfr on 2023-07-31 14:43:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: dfr

Created: 2023-07-31 14:43:42 UTC

Size: 2.93 KB

patch

obsolete

>diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
>index 9687f2bdef85..af6e41bccad3 100644
>--- a/etc/mtree/BSD.usr.dist
>+++ b/etc/mtree/BSD.usr.dist
>@@ -203,9 +203,9 @@
>         calendar
>         ..
>         certs
>-            trusted tags=package=caroot
>+            trusted tags=package=caroot-data
>             ..
>-            untrusted tags=package=caroot
>+            untrusted tags=package=caroot-data
>             ..
>         ..
>         dict
>diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
>index 9bd2994c882a..365f81044bab 100644
>--- a/release/packages/Makefile.package
>+++ b/release/packages/Makefile.package
>@@ -113,8 +113,8 @@ 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
> pkg-bootstrap_COMMENT=	pkg bootstrap Utility
> pkg-bootstrap_DESC=	pkg bootstrap Utility
> periodic_COMMENT=	Periodic Utility
>diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
>index 2b1f71e95c11..22d51a550f63 100755
>--- a/release/packages/generate-ucl.sh
>+++ b/release/packages/generate-ucl.sh
>@@ -43,7 +43,7 @@ main() {
> 			# else imposed on it.
> 			;;
> 		caroot)
>-			pkgdeps="openssl"
>+			pkgdeps="caroot-data openssl"
> 			;;
>
> 		# -dev packages that have no corresponding non-dev package
>@@ -139,14 +139,16 @@ main() {
>
> 	cp "${uclsource}" "${uclfile}"
> 	if [ ! -z "${pkgdeps}" ]; then
>-		cat <<EOF >> ${uclfile}
>-deps: {
>-	FreeBSD-${pkgdeps}: {
>+		echo 'deps: {' >> ${uclfile}
>+		for dep in ${pkgdeps}; do
>+			cat <<EOF >> ${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/caroot/Makefile.inc b/secure/caroot/Makefile.inc
>index 9475e35f5854..00b76675276a 100644
>--- a/secure/caroot/Makefile.inc
>+++ b/secure/caroot/Makefile.inc
>@@ -1,3 +1,3 @@
> # $FreeBSD$
>
>-PACKAGE=	caroot
>+PACKAGE=	caroot-data
>diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
>index 89f330ca2800..d4f3bef1d803 100644
>--- a/secure/lib/libcrypto/Makefile
>+++ b/secure/lib/libcrypto/Makefile
>@@ -6,7 +6,7 @@ SUBDIR=		engines modules
> .include <bsd.own.mk>
> .include <src.opts.mk>
>
>-PACKAGE=	openssl
>+PACKAGE=	libssl
> LIB=		crypto
> SHLIB_MAJOR=	30
> VERSION_MAP=	${.CURDIR}/Version.map
>diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile
>index 4cf17b8d5c51..289a31d7f58c 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=	libssl
>
> NO_LINT=

Actions: View | Diff

Attachments on bug 272816: 243740