gentoo auto-resync : 31:01:2023 - 03:00:52

4 files changed, 49 insertions, 2 deletions

diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index d5afc4221ec0..cd6c39583394 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,7 +1,8 @@
 AUX charliecloud-0.30-dash.patch 1669 BLAKE2B 4e68576d20800c0682b38f6fd5a1a391b860bb3e925ad0503b376f16e01b2fd341a94a03a3644e0dac475e4722547c2098ebc085c56b9f95f38c9ebe174376f2 SHA512 6312e62cbe2ee188a1c683cce4ecc904f529bd76cbf966aeaf175c2173a7f7a4c5f01a0d09ffde252800e6571d588c9ba91728c1b6049f496c701c34faa7c012
+AUX charliecloud-0.31-realpath_return.patch 972 BLAKE2B fa3db3892339f1476ef7e8e7d29cafee04bf02eb0f995196b80dbd4ecab8b0caa27fccec5a2b5f32cb28f37d09b5ec97337742987600ecda0b3be3a682c48dbc SHA512 d782863c4b1c76a5516431634b23ae8f1faed388f7585915a641b0c614fb29d42a12b1466d048804f3441fd7c5061537b81a10ddd0444b4d66da8e7b8d2171a7
 DIST charliecloud-0.30.tar.gz 524870 BLAKE2B 0eadb4abda47554117aa657c3335d0ad95c71a3ccae67af000beeb8e375058002821783824142208ab58dcf7a62141d1eee45ac4241fe53cd2b206bbbbbb10b4 SHA512 a7188594482b712521930b141e10a981f7536b979f14c3a206f02895f8404a9095b17fc6764f937bdb466624ca6074cc0cbc84f33d59b4453b55be5691f4fbd4
 DIST charliecloud-0.31.tar.gz 534662 BLAKE2B 08f95f4e37e4de3590344f14cf1ce6e502af414806cc625b8b4be454c1e1e9611d40e599828033a08dfba8ff6fa6fbcee107f19c38ce247addace6a91876dea8 SHA512 9fdcabbf533ab42556bcd8552c42dce3096dffd1f863e2a7a2e87a4596e1df601d55e56fde48cfd88fac62b31bad4257d1b1cdbb9a82df3e32ad4b5f1842307e
 EBUILD charliecloud-0.30.ebuild 2317 BLAKE2B c2ba01e0a0a303e800b3f135579e6db27399e03d130e664832c655046b2dba97f556eb9e0453f53fe9104f7edcc3edafa9d112a0fafce2de0d9e8b44ab17ef87 SHA512 9a9eaeb0853976bd1f4f9510a20d22b75d5fad3287545843837273211d077617c2176896b7956fe493e3ca4a63586f7421f07ddcc4ffbc6f4aa8d89d5f659d02
-EBUILD charliecloud-0.31.ebuild 2273 BLAKE2B 3d62d8d4df8209640ad81192cc398f0bc9050aa260a7bca4e2e8acc2ae42107151fbe13014b0a6efb0bbdb81290a5f9fa11b6f0cbd42804aac6c51886b9f1251 SHA512 f1acfaff8bbd55cf41ee715b83c895c9f528f6cf537d850d821a6a1e5531add1eb20aa4143913cbc9d94de282aca605914f6d569f084a8bc88138b343eb66434
-EBUILD charliecloud-9999.ebuild 2273 BLAKE2B 3d62d8d4df8209640ad81192cc398f0bc9050aa260a7bca4e2e8acc2ae42107151fbe13014b0a6efb0bbdb81290a5f9fa11b6f0cbd42804aac6c51886b9f1251 SHA512 f1acfaff8bbd55cf41ee715b83c895c9f528f6cf537d850d821a6a1e5531add1eb20aa4143913cbc9d94de282aca605914f6d569f084a8bc88138b343eb66434
+EBUILD charliecloud-0.31-r1.ebuild 2415 BLAKE2B 3b62828f443f792b679117dca447040113a193e678ca99c2c0fe17780c6ebbb2e9a075c722b352decc89322d3a1da4bbfa33fe6e3dcd6ed64c87ef0f5fda9cfe SHA512 b79948ab52e7a8f818a2b6a0c83664423730d17d96e94409e83c68c7c09b23a4850ee04dc753cbff7c49580ef89bd4417b4bc12ff2a292892c26501a9594f5fb
+EBUILD charliecloud-9999.ebuild 2360 BLAKE2B 04a2ef8ad542891672d48a0fb096618e9e425ac60bd1fd1f3d5bc83f5d6e176c09f53d35d16480204235d86956da5faa59b9f3edf688f624d84251d83f19cc0f SHA512 f6adfbe5f25242de9d173d186323b37898499161d65f03269c168e7d6a8339e073ee9c55a270a2f0f7d72fb568f6a5863d7c05b3576bb0fe48572d2c8e93cadc
 MISC metadata.xml 618 BLAKE2B 5f7dbfdb8a940a534ed97b4bd47b05a271d6454b0584ac29db1c2fb533044a2c6d48b8425399866abd8d2ebea1f41199ea4cf23af1c6f2646d4c35b5b4c104a4 SHA512 df1b817bbabc6b227c9a779677d345b9df259444b943b1ab58d55c860cd79ad8f9d4b382dc6c4de0c5daa955fd694990217a559e897a3b11f7e954c7b54d4678
diff --git a/sys-cluster/charliecloud/charliecloud-0.31.ebuild b/sys-cluster/charliecloud/charliecloud-0.31-r1.ebuild
index db6df71719a9..2efd4a83f907 100644
--- a/sys-cluster/charliecloud/charliecloud-0.31.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.31-r1.ebuild
@@ -48,6 +48,10 @@ DEPEND="
 		net-misc/rsync
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-realpath_return.patch
+)
+
 src_prepare() {
 	default
 	eautoreconf
@@ -72,6 +76,11 @@ src_configure() {
 	econf "${econf_args[@]}"
 }
 
+src_install() {
+	docompress -x "${EPREFIX}"/usr/share/doc/"${PF}"/examples
+	default
+}
+
 pkg_postinst() {
 	elog "Various builders are supported, as alternative to the internal ch-image."
 	optfeature "Building with Buildah" app-containers/buildah
diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
index db6df71719a9..3e5a83f42d7e 100644
--- a/sys-cluster/charliecloud/charliecloud-9999.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -72,6 +72,11 @@ src_configure() {
 	econf "${econf_args[@]}"
 }
 
+src_install() {
+	docompress -x "${EPREFIX}"/usr/share/doc/"${PF}"/examples
+	default
+}
+
 pkg_postinst() {
 	elog "Various builders are supported, as alternative to the internal ch-image."
 	optfeature "Building with Buildah" app-containers/buildah
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.31-realpath_return.patch b/sys-cluster/charliecloud/files/charliecloud-0.31-realpath_return.patch
new file mode 100644
index 000000000000..7b320fa9dbab
--- /dev/null
+++ b/sys-cluster/charliecloud/files/charliecloud-0.31-realpath_return.patch
@@ -0,0 +1,32 @@
+From e6d25474fcd326ae657c08d7b49606aeabc98b51 Mon Sep 17 00:00:00 2001
+From: Oliver Freyermuth <o.freyermuth@googlemail.com>
+Date: Sat, 28 Jan 2023 21:25:09 +0100
+Subject: [PATCH] ch-misc: Do not check errno in realpath_ unless realpath
+ returns NULL
+Bug: https://github.com/hpc/charliecloud/pull/1550
+
+glibc's realpath may set errno also on success, as POSIX specifies
+errno should only be checked after realpath if the return value is not NULL.
+
+See for example:
+ https://bugzilla.redhat.com/show_bug.cgi?id=1916968
+---
+ bin/ch_misc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/ch_misc.c b/bin/ch_misc.c
+index 04ac52a..93a3339 100644
+--- a/bin/ch_misc.c
++++ b/bin/ch_misc.c
+@@ -589,7 +589,7 @@ char *realpath_(const char *path, bool fail_ok)
+    errno = 0;
+    pathc = realpath(path, NULL);
+ 
+-   if (errno != 0) {
++   if (pathc == NULL && errno != 0) {
+       if (fail_ok) {
+          T_ (pathc = strdup(path));
+       } else {
+-- 
+2.39.1
+