gentoo auto-resync : 05:09:2023 - 10:23:17

4 files changed, 105 insertions, 0 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 9c12731772d6..dfb2751add4b 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 992258c13384..e7d23efd3e07 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,10 +1,12 @@
 AUX lxcfs-5.0.2.confd 249 BLAKE2B c29c8fceafe435d2e3b064ba0cd372f99b00c89d123d38ed72a45f747377756bc5a7b90c0e71536d7a5fc9e938385ee762f1d0f7b04e967d6a9cd5841db93d90 SHA512 882e3241b402e84537efb841bde13a6efed5244598e3069af2c5e7f93caf6e32da292cd7f087dc364143e59c837d6983397ea27b6709ed0cee9e200d4c833ee4
 AUX lxcfs-5.0.2.initd 576 BLAKE2B 5bda6d018dfb49d167d3fee09f3449e5aba6c0493aff5dec9dabd7a71f0267fb905daeea5734f3ebf2a3280c9f3ef14d046bac1586345de43da4460411e20048 SHA512 3467842276fc574695ca7c87666b6ba4c08a84e2287678e748494416f849646825cebedd5456bc6af9be3aea8e62806d6c135af6a116f089d2391f510c191e6b
 AUX lxcfs-5.0.2.service 428 BLAKE2B effef16bfac727f703b9adfdaa5faf2ce76ac7efef6127873730f2f6482f0b886d96ab9cd0a9589db5b98744ede6b0b89804ad99cd12e0a4b20510eb2d29a097 SHA512 f22242d41cea1f1ea111641e4120d58c321056a49222694d6a15019de3241384f132be114d62df15bc7b0b8ca9a54b4a0daa48a345f1c707dee734ebc59e3967
+AUX lxcfs-5.0.4-fix-incompatible-pointer-conversion.patch 662 BLAKE2B 63ef53897cc254a58dea5eb4c892b1b6f8c49da04b45bf760acb82ca8dbcef9e8ccec54be98f1665ca9dac2d5dcb291c4c75f8a648243c82e8841e02c2eb4512 SHA512 6ecb89e94afc483ca628ca6c6e3e2d1afe0087bd14f917b29be1f60bd31df23e5f48169a9930020e4b8cf1e6366282995ec067ee930d7c0676b48adb45fb295b
 DIST lxcfs-5.0.3.tar.gz 103697 BLAKE2B bdea820f1a5b799309b3d5c8ea439477e6eeda2d9600a348a92b203f2f8a6e0e686d0bf56d8f6b5bbfeb4837dd5737626d7d0610157211f0f189711e9e45a048 SHA512 967e60bd7ea545f1fcdd805adc0083e39684013c18f42a51753b5be8cdabfb86a652d02471a1f71c7b4fa756da09b72d324b724d68091d539edd10ea63add1fd
 DIST lxcfs-5.0.3.tar.gz.asc 833 BLAKE2B 2dc139639431d9430149369b0a28b6debef0de9f5f69854070d8f2e47718bcc130a869683dfa2b0002c6a54978b0550303adbd5a7fa5ef565eb6bc6bbfcde9e0 SHA512 0207c110553b9d62cf88ec70ed4472b9696d74b277af1e53df6d1145228b76d06695fd28bf20c8428bee5b6ff617c617fbf063c1c8ff0bcc44be2e3439c76a64
 DIST lxcfs-5.0.4.tar.gz 104249 BLAKE2B 83a7b861136c34da8a24dd525fd0767193f2bbd92b40e3b9fd5e42d7645465411792e65e95797ab13b33330299d12b19bdd5786352875ed88ac0097b72b711a9 SHA512 b404045dbabe23e1d1f1d74c1648d2596bb70aaa9f9e46f9f5635b0a02d0c451f68b2559920bbefc5b889e908cf1da0a33c148b26bdce3e45c3d0cbdff710604
 DIST lxcfs-5.0.4.tar.gz.asc 833 BLAKE2B aff883d24b374b296ea3678670e5e82c723fd0e35cfd7fed555aabbd811a104becc0b741331b4aa4a5129c9fff4dc88c6a86e7d64a89fe86aea81718f5d432dd SHA512 56b639597dbaf3008fe030147ea37192bd465c467a79e11ce139bcaa6bca1625b4bb9c4eda6ea1877446769f0fad9b4c5a3513d4f4415b841db96d5da8325ddc
 EBUILD lxcfs-5.0.3.ebuild 1888 BLAKE2B 43db5456d78b318aed8c2b7ba5c43c546db0e88e06c76c67a4fc5ce4a86023f0bc6654b814c501adcfc211de8d0442cdd337931d83d6215bc27e03789b242c3d SHA512 e62ccd706013a0abdcc2cc434d8a44f08928e75c981187876ee8657966b6815de7aa7cbb4dd50745ab13507777dc08a1c63c0f10e89d93fb2ecf03aa098be7e5
+EBUILD lxcfs-5.0.4-r1.ebuild 1991 BLAKE2B 48456c8732007fc2968ad806b5b9dee3fb653af6315c01914c300b01019cc8dddd7a4a431f215ff37a8c515d4f9da7218a6bae4cbe6abf78cd5b90a6cc15d750 SHA512 a1e34677def0dad373ce6ece7400e8de8dcd77a2e7ade0ad1f457ecc289dbf9fd2e2abc159eff6d70293959fc78280654e5156583bd092172d3385e79ff40c90
 EBUILD lxcfs-5.0.4.ebuild 1907 BLAKE2B f23b2c9a9d9d3e59aef24e99f5b6ba7d72c8fd0166ca468de4c1d0fbc80c594fb8a293e3df5d8fbfdc25e7afa71700c6c0321ee630e25e4befcc3dbdf58fc89a SHA512 d9e5abde77b561707b442eb002017f08cfac40688e644b7a1e6a53c5122ebaaf6711d36424e8b5c529fd36b552406adaf7b282c4836516aac05cb1cb8bdc3f43
 MISC metadata.xml 710 BLAKE2B ac2111d3b67e2aa7286b98e3069e77e3b852f401b56a921795370febd8836434e13cfec4af92cc83a379037023c3d7af475516bea02545595fe9a58a188dcb2f SHA512 f07ff1acbf28cda31d9d962332ecf473197d2868488e7051185ab5ab792f5bb9405712d68e3f9c3b10f38024d2025784b98ce9513e2978f537c26bc7c4d7caab
diff --git a/sys-fs/lxcfs/files/lxcfs-5.0.4-fix-incompatible-pointer-conversion.patch b/sys-fs/lxcfs/files/lxcfs-5.0.4-fix-incompatible-pointer-conversion.patch
new file mode 100644
index 000000000000..bead63bd52dd
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-5.0.4-fix-incompatible-pointer-conversion.patch
@@ -0,0 +1,19 @@
+Bug: https://bugs.gentoo.org/894348
+Upstream PR: https://github.com/lxc/lxcfs/pull/610
+--- a/src/proc_loadavg.c
++++ b/src/proc_loadavg.c
+@@ -603,12 +603,12 @@ pthread_t load_daemon(int load_use)
+ 
+ 	ret = init_load();
+ 	if (ret == -1)
+-		return log_error(0, "Initialize hash_table fails in load_daemon!");
++		return (pthread_t) log_error(0, "Initialize hash_table fails in load_daemon!");
+ 
+ 	ret = pthread_create(&pid, NULL, load_begin, NULL);
+ 	if (ret != 0) {
+ 		load_free();
+-		return log_error(0, "Create pthread fails in load_daemon!");
++		return (pthread_t) log_error(0, "Create pthread fails in load_daemon!");
+ 	}
+ 
+ 	/* use loadavg, here loadavg = 1*/
diff --git a/sys-fs/lxcfs/lxcfs-5.0.4-r1.ebuild b/sys-fs/lxcfs/lxcfs-5.0.4-r1.ebuild
new file mode 100644
index 000000000000..5ccabb227b11
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-5.0.4-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake meson python-any-r1 systemd verify-sig
+
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
+SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
+	verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )"
+
+LICENSE="Apache-2.0 LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc test"
+
+DEPEND="sys-fs/fuse:3"
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	$(python_gen_any_dep '
+		dev-python/jinja[${PYTHON_USEDEP}]
+	')
+	doc? ( sys-apps/help2man )
+	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+# Needs some black magic to work inside container/chroot.
+RESTRICT="test"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.4-fix-incompatible-pointer-conversion.patch
+)
+
+python_check_deps() {
+	python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Fix python shebangs for python-exec[-native-symlinks], #851480
+	local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
+	python_fix_shebang -q ${shebangs[*]}
+}
+
+src_configure() {
+	local emesonargs=(
+		--localstatedir "${EPREFIX}/var"
+
+		$(meson_use doc docs)
+		$(meson_use test tests)
+
+		-Dfuse-version=3
+		-Dinit-script=""
+		-Dwith-init-script=""
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}"/tests || die "failed to change into tests/ directory."
+	./main.sh || die
+}
+
+src_install() {
+	meson_src_install
+
+	newconfd "${FILESDIR}"/lxcfs-5.0.2.confd lxcfs
+	newinitd "${FILESDIR}"/lxcfs-5.0.2.initd lxcfs
+
+	# Provide our own service file (copy of upstream) due to paths being different from upstream,
+	# #728470
+	systemd_newunit "${FILESDIR}"/lxcfs-5.0.2.service lxcfs.service
+}