1 |
commit: f6d48291b04a9517f65d4642f663d04552a2d6fc |
2 |
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 16 07:52:57 2022 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 16 07:55:02 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6d48291 |
7 |
|
8 |
sys-fs/lxcfs: drop 5.0.1-r1 |
9 |
|
10 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
11 |
|
12 |
sys-fs/lxcfs/Manifest | 2 - |
13 |
...cfs-5.0.1-fix-reinitialization-with-fuse3.patch | 71 ------------------- |
14 |
sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild | 79 ---------------------- |
15 |
3 files changed, 152 deletions(-) |
16 |
|
17 |
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest |
18 |
index be566a9bba41..93e0ab7ebffd 100644 |
19 |
--- a/sys-fs/lxcfs/Manifest |
20 |
+++ b/sys-fs/lxcfs/Manifest |
21 |
@@ -1,5 +1,3 @@ |
22 |
DIST lxcfs-5.0.0_p20220524.tar.gz 101563 BLAKE2B 2bf282aed5490d160a563ae97fdfbb887366a6ec60ea7f36f5400e4a11330c51ac3096d63c99dd4aa2ebe1a3497102af9df41ebd40e38b3bde6c6dcd4265b336 SHA512 c1183096dd2b74ef859183451b8c909f762e3c56dce0b9384ac163a6b6b3f7a17a63e840742f4cc5ac50b1f25d402583ca6cf31c1617754b35e21c5c991515f4 |
23 |
-DIST lxcfs-5.0.1.tar.gz 103221 BLAKE2B 49cd0be04d358db81046ac78e66e8acaa86ef66e51a869b884cb75e98c0501ee7db1b1e5604ca44f105f04378418e8077738a6d6abf85c48b35dfee2b93131e9 SHA512 edc685914e73b055161b8efe9109aca7bc2b1f1285e06a71b697f97d2e7f4cddf5256519325bf628318b64ae0203f594928d9e772e04988971151c4e46788818 |
24 |
-DIST lxcfs-5.0.1.tar.gz.asc 833 BLAKE2B a280e506f154497af3cc6a61bf458830939c67a6a065da1c0509f44ed07bd58bf80c10b5bfdbb18027ae2f200aaa2e9ca4b76cde070b860c34fb2cca7083e809 SHA512 90b982b61fcc56ac23fcef344014252faba280a8fb7539d28dbe2d36dc433c8de93d2c065d160cb98b42ab4b341d01ff2a379cad12827d8b70885c044e9e9ae8 |
25 |
DIST lxcfs-5.0.2.tar.gz 103236 BLAKE2B 5fc8dc437e97a79c78320f8d8111746b171b086beb176a6ada30b8c23164ae4e58ad42806bc0ea73bbbb15d94816bd9b3d5500f9e2a306e2458d23fb111bf68f SHA512 df51e7154060dd7efe992eb2bc40c5a52dce8c52063477110ed414ecc3f430f18d5023a29be6866560fc87b060c2158cc1e947f030c509188320d417eb23d407 |
26 |
DIST lxcfs-5.0.2.tar.gz.asc 833 BLAKE2B a411c6cb4f3382469ea80a974166c98b57ae4b92712bf55507720fc78ec73ef6acbd47f6b3410294b209f77f1f3a17dc4b9fb4dda00bb7323ef32c7185ba4c2e SHA512 f9d54e26d406ebca97c82298361318f13e74fd55285c2b6563ae6c71af63d9b8325ac06b9de8103a95a19c5d965c2d907c313ac151210a162998f8a37ea99676 |
27 |
|
28 |
diff --git a/sys-fs/lxcfs/files/lxcfs-5.0.1-fix-reinitialization-with-fuse3.patch b/sys-fs/lxcfs/files/lxcfs-5.0.1-fix-reinitialization-with-fuse3.patch |
29 |
deleted file mode 100644 |
30 |
index 45450504804a..000000000000 |
31 |
--- a/sys-fs/lxcfs/files/lxcfs-5.0.1-fix-reinitialization-with-fuse3.patch |
32 |
+++ /dev/null |
33 |
@@ -1,71 +0,0 @@ |
34 |
-From 5976d0349c1900e2649b7d2904d98ba6a7278e6b Mon Sep 17 00:00:00 2001 |
35 |
-From: Wolfgang Bumiller <w.bumiller@×××××××.com> |
36 |
-Date: Fri, 29 Jul 2022 09:30:10 +0200 |
37 |
-Subject: [PATCH] fix reinitialization with fuse3 |
38 |
- |
39 |
-With fuse3 `fuse_get_context` returns NULL before fuse was |
40 |
-fully initialized, so we must not access it. |
41 |
- |
42 |
-Futher, we call 'do_reload' for normal initialization as |
43 |
-well, so let's prevent that from re-initializing the |
44 |
-bindings initially and only do this on actual reloads, |
45 |
-otherwise we do it twice on startup. |
46 |
- |
47 |
-Signed-off-by: Wolfgang Bumiller <w.bumiller@×××××××.com> |
48 |
-Fixes #549 |
49 |
---- |
50 |
- src/bindings.c | 2 +- |
51 |
- src/lxcfs.c | 8 ++++---- |
52 |
- 2 files changed, 5 insertions(+), 5 deletions(-) |
53 |
- |
54 |
-diff --git a/src/bindings.c b/src/bindings.c |
55 |
-index 422a6229..fee7ede0 100644 |
56 |
---- a/src/bindings.c |
57 |
-+++ b/src/bindings.c |
58 |
-@@ -943,5 +943,5 @@ void *lxcfs_fuse_init(struct fuse_conn_info *conn, void *data) |
59 |
- can_use_sys_cpu = true; |
60 |
- #endif |
61 |
- has_versioned_opts = true; |
62 |
-- return fc->private_data; |
63 |
-+ return fc ? fc->private_data : NULL; |
64 |
- } |
65 |
-diff --git a/src/lxcfs.c b/src/lxcfs.c |
66 |
-index d1a3d805..fed896c9 100644 |
67 |
---- a/src/lxcfs.c |
68 |
-+++ b/src/lxcfs.c |
69 |
-@@ -123,7 +123,7 @@ static int lxcfs_init_library(void) |
70 |
- |
71 |
- /* do_reload - reload the dynamic library. Done under |
72 |
- * lock and when we know the user_count was 0 */ |
73 |
--static void do_reload(void) |
74 |
-+static void do_reload(bool reinit) |
75 |
- { |
76 |
- int ret; |
77 |
- char lxcfs_lib_path[PATH_MAX]; |
78 |
-@@ -164,7 +164,7 @@ static void do_reload(void) |
79 |
- |
80 |
- good: |
81 |
- /* initialize the library */ |
82 |
-- if (lxcfs_init_library() < 0) { |
83 |
-+ if (reinit && lxcfs_init_library() < 0) { |
84 |
- log_exit("Failed to initialize liblxcfs.so"); |
85 |
- } |
86 |
- |
87 |
-@@ -180,7 +180,7 @@ static void up_users(void) |
88 |
- { |
89 |
- users_lock(); |
90 |
- if (users_count == 0 && need_reload) |
91 |
-- do_reload(); |
92 |
-+ do_reload(true); |
93 |
- users_count++; |
94 |
- users_unlock(); |
95 |
- } |
96 |
-@@ -1362,7 +1362,7 @@ int main(int argc, char *argv[]) |
97 |
- fuse_argv[fuse_argc++] = new_argv[0]; |
98 |
- fuse_argv[fuse_argc] = NULL; |
99 |
- |
100 |
-- do_reload(); |
101 |
-+ do_reload(false); |
102 |
- if (install_signal_handler(SIGUSR1, sigusr1_reload)) { |
103 |
- lxcfs_error("%s - Failed to install SIGUSR1 signal handler", strerror(errno)); |
104 |
- goto out; |
105 |
|
106 |
diff --git a/sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild b/sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild |
107 |
deleted file mode 100644 |
108 |
index 1a0187e1c338..000000000000 |
109 |
--- a/sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild |
110 |
+++ /dev/null |
111 |
@@ -1,79 +0,0 @@ |
112 |
-# Copyright 2022 Gentoo Authors |
113 |
-# Distributed under the terms of the GNU General Public License v2 |
114 |
- |
115 |
-EAPI=8 |
116 |
- |
117 |
-PYTHON_COMPAT=( python3_{9..11} ) |
118 |
- |
119 |
-inherit cmake meson python-any-r1 systemd verify-sig |
120 |
- |
121 |
-DESCRIPTION="FUSE filesystem for LXC" |
122 |
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/" |
123 |
-SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz |
124 |
- verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )" |
125 |
- |
126 |
-LICENSE="Apache-2.0 LGPL-2+" |
127 |
-SLOT="0" |
128 |
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86" |
129 |
-IUSE="doc test" |
130 |
- |
131 |
-DEPEND="sys-fs/fuse:3" |
132 |
-RDEPEND="${DEPEND}" |
133 |
-BDEPEND="${PYTHON_DEPS} |
134 |
- $(python_gen_any_dep ' |
135 |
- dev-python/jinja[${PYTHON_USEDEP}] |
136 |
- ') |
137 |
- doc? ( sys-apps/help2man ) |
138 |
- verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )" |
139 |
- |
140 |
-# Needs some black magic to work inside container/chroot. |
141 |
-RESTRICT="test" |
142 |
- |
143 |
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc |
144 |
- |
145 |
-PATCHES=( "${FILESDIR}"/lxcfs-5.0.1-fix-reinitialization-with-fuse3.patch ) |
146 |
- |
147 |
-python_check_deps() { |
148 |
- python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" |
149 |
-} |
150 |
- |
151 |
-pkg_setup() { |
152 |
- python-any-r1_pkg_setup |
153 |
-} |
154 |
- |
155 |
-src_prepare() { |
156 |
- default |
157 |
- |
158 |
- # Fix python shebangs for python-exec[-native-symlinks], #851480 |
159 |
- local shebangs=($(grep -rl "#!/usr/bin/env python3" || die)) |
160 |
- python_fix_shebang -q ${shebangs[*]} |
161 |
-} |
162 |
- |
163 |
-src_configure() { |
164 |
- local emesonargs=( |
165 |
- $(meson_use doc docs) |
166 |
- $(meson_use test tests) |
167 |
- |
168 |
- -Dfuse-version=3 |
169 |
- -Dinit-script="" |
170 |
- -Dwith-init-script="" |
171 |
- ) |
172 |
- |
173 |
- meson_src_configure |
174 |
-} |
175 |
- |
176 |
-src_test() { |
177 |
- cd "${BUILD_DIR}"/tests || die "failed to change into tests/ directory." |
178 |
- ./main.sh || die |
179 |
-} |
180 |
- |
181 |
-src_install() { |
182 |
- meson_src_install |
183 |
- |
184 |
- newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs |
185 |
- newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs |
186 |
- |
187 |
- # Provide our own service file (copy of upstream) due to paths being different from upstream, |
188 |
- # #728470 |
189 |
- systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service |
190 |
-} |