git: cfc31ec5f49d - main - security/linux-rl9-ca-certificates: Further improve the port

From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Tue, 15 Apr 2025 18:05:46 UTC
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cfc31ec5f49d2e4175a3532ae4e0b8a7474de4ca

commit cfc31ec5f49d2e4175a3532ae4e0b8a7474de4ca
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2025-04-15 18:02:48 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-04-15 18:05:34 +0000

    security/linux-rl9-ca-certificates: Further improve the port
    
    - Reforge absolute symlinks into relative ones. This is important for Linux
      programs running outside of chroot, which are otherwise look for the symlink
      target relative to / rather than /compat/linux
    - Dynamically generate part of plist to better support builds outside of Poudriere
---
 security/linux-rl9-ca-certificates/Makefile  | 7 ++++++-
 security/linux-rl9-ca-certificates/pkg-plist | 2 --
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/security/linux-rl9-ca-certificates/Makefile b/security/linux-rl9-ca-certificates/Makefile
index b5c4e7a12c36..064b97daa74e 100644
--- a/security/linux-rl9-ca-certificates/Makefile
+++ b/security/linux-rl9-ca-certificates/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ca-certificates
 PORTVERSION=	2024.2.69
 DISTVERSIONSUFFIX=	_v8.0.303-91.4.el9_4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security linux
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -18,5 +18,10 @@ OPTIONS_DEFINE=	DOCS
 post-stage:
 	${LINUXBASE}/bin/sh ${STAGEDIR}${PREFIX}/usr/bin/update-ca-trust \
 		extract -o ${STAGEDIR}${PREFIX}/etc/pki/ca-trust/extracted
+	${FIND} ${STAGEDIR}${PREFIX} -type l -exec \
+		${SH} -c "tgt=\$$(readlink {}) ; [ \$$tgt != \$${tgt#/} ] && ${RLN} ${STAGEDIR}${PREFIX}\$$tgt {}" \; || ${TRUE}
+	cd ${STAGEDIR}${PREFIX} && \
+		${FIND} etc/pki/ca-trust/extracted/pem/directory-hash -type f -or -type l >> ${TMPPLIST}
+
 
 .include <bsd.port.mk>
diff --git a/security/linux-rl9-ca-certificates/pkg-plist b/security/linux-rl9-ca-certificates/pkg-plist
index 6b8db78f6226..12ad61e71023 100644
--- a/security/linux-rl9-ca-certificates/pkg-plist
+++ b/security/linux-rl9-ca-certificates/pkg-plist
@@ -8,8 +8,6 @@ etc/pki/ca-trust/extracted/java/cacerts
 etc/pki/ca-trust/extracted/openssl/README
 etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt
 etc/pki/ca-trust/extracted/pem/README
-etc/pki/ca-trust/extracted/pem/directory-hash/ca-bundle.crt
-etc/pki/ca-trust/extracted/pem/directory-hash/ca-certificates.crt
 etc/pki/ca-trust/extracted/pem/email-ca-bundle.pem
 etc/pki/ca-trust/extracted/pem/objsign-ca-bundle.pem
 etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem