* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/files/, sys-fs/lxcfs/
@ 2019-02-07 4:28 Erik Mackdanz
0 siblings, 0 replies; 13+ messages in thread
From: Erik Mackdanz @ 2019-02-07 4:28 UTC (permalink / raw
To: gentoo-commits
commit: c3a68a71071fca48dc22174dbc6e3fe379e2579a
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 7 04:28:28 2019 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu Feb 7 04:28:28 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3a68a71
sys-fs/lxcfs: Bump to 3.0.3
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-2.3.59, Repoman-2.3.12
sys-fs/lxcfs/Manifest | 1 +
...xcfs-3.0.2-fusermount-path.patch => lxcfs-fusermount-path.patch} | 0
sys-fs/lxcfs/files/{lxcfs-3.0.2.initd => lxcfs.initd} | 2 +-
sys-fs/lxcfs/lxcfs-3.0.2.ebuild | 4 ++--
sys-fs/lxcfs/{lxcfs-3.0.2.ebuild => lxcfs-3.0.3.ebuild} | 6 +++---
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 8b3d028d5c3..c9df8779225 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,2 +1,3 @@
DIST lxcfs-3.0.0.tar.gz 49219 BLAKE2B c21cd9983e9175bf3a31bafd8a29ddd6a6a549226bd432636dd4ea48bf6268c403f236ca39739a989cd89fa7b0b05043c179ca328fd739f5a9d56e27907a7a60 SHA512 99fe11e99c2e487d6ecd9a8484be6413563ddcb33740631ee6fe1b60d3d2d62cea1bb44d1ef6dc45283f5b3d20cd680d48ea3cb5ad17f0c3e7ba6ed56186c42f
DIST lxcfs-3.0.2.tar.gz 49809 BLAKE2B dc73149b92ac040c56de5f4c11aafdf6e744ffd2b17e22ee9c784663ff102dedd74453581a77027037955238e081c596377c28b6066012fa32ee575e6a4c57fa SHA512 2065bbd68fd2974fe28c861b1e77c62a501da85e1bfc19eeafa49fd88c66e8e75ae007781c8bd05caf43fb3b80ad12c81c0f0f03d27ab1131e0cfe6d48443218
+DIST lxcfs-3.0.3.tar.gz 49824 BLAKE2B 02e3a0a6f4fd515924c5f038f00d664ef347c9b685e6561334b460e0ce0ce5580aca67f33df56b44b9cdafa4953f4f92843662f3516e1c923f9242388b17dbc6 SHA512 d994e1dd85f499eba2847d33870281a4bcaf4466e2c8f7acb065f4f3d5688b93b775c486bc6db571e64d09a3567710b0c816e12555ffb3e3e50f81bc7f5f6be6
diff --git a/sys-fs/lxcfs/files/lxcfs-3.0.2-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-fusermount-path.patch
similarity index 100%
rename from sys-fs/lxcfs/files/lxcfs-3.0.2-fusermount-path.patch
rename to sys-fs/lxcfs/files/lxcfs-fusermount-path.patch
diff --git a/sys-fs/lxcfs/files/lxcfs-3.0.2.initd b/sys-fs/lxcfs/files/lxcfs.initd
similarity index 93%
rename from sys-fs/lxcfs/files/lxcfs-3.0.2.initd
rename to sys-fs/lxcfs/files/lxcfs.initd
index 52d8202d7ac..5997426fa8e 100644
--- a/sys-fs/lxcfs/files/lxcfs-3.0.2.initd
+++ b/sys-fs/lxcfs/files/lxcfs.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
DAEMON=/usr/bin/lxcfs
diff --git a/sys-fs/lxcfs/lxcfs-3.0.2.ebuild b/sys-fs/lxcfs/lxcfs-3.0.2.ebuild
index 6c80f13b0e8..f9c354a881a 100644
--- a/sys-fs/lxcfs/lxcfs-3.0.2.ebuild
+++ b/sys-fs/lxcfs/lxcfs-3.0.2.ebuild
@@ -30,7 +30,7 @@ DEPEND="
sys-apps/help2man
${RDEPEND}
"
-PATCHES="${FILESDIR}/${P}-fusermount-path.patch"
+PATCHES="${FILESDIR}/${PN}-fusermount-path.patch"
src_prepare() {
default
@@ -51,7 +51,7 @@ src_configure() {
src_install() {
default
keepdir /var/lib/lxcfs
- newinitd "${FILESDIR}"/${P}.initd lxcfs
+ newinitd "${FILESDIR}"/${PN}.initd lxcfs
systemd_dounit config/init/systemd/lxcfs.service
}
diff --git a/sys-fs/lxcfs/lxcfs-3.0.2.ebuild b/sys-fs/lxcfs/lxcfs-3.0.3.ebuild
similarity index 93%
copy from sys-fs/lxcfs/lxcfs-3.0.2.ebuild
copy to sys-fs/lxcfs/lxcfs-3.0.3.ebuild
index 6c80f13b0e8..4d89fb38cc5 100644
--- a/sys-fs/lxcfs/lxcfs-3.0.2.ebuild
+++ b/sys-fs/lxcfs/lxcfs-3.0.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
KEYWORDS=""
else
SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
- KEYWORDS="amd64"
+ KEYWORDS="~amd64"
fi
# Omit all dbus. Upstream appears to require it because systemd, but
@@ -30,7 +30,7 @@ DEPEND="
sys-apps/help2man
${RDEPEND}
"
-PATCHES="${FILESDIR}/${P}-fusermount-path.patch"
+PATCHES="${FILESDIR}/${PN}-fusermount-path.patch"
src_prepare() {
default
@@ -51,7 +51,7 @@ src_configure() {
src_install() {
default
keepdir /var/lib/lxcfs
- newinitd "${FILESDIR}"/${P}.initd lxcfs
+ newinitd "${FILESDIR}"/${PN}.initd lxcfs
systemd_dounit config/init/systemd/lxcfs.service
}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/files/, sys-fs/lxcfs/
@ 2022-10-14 6:24 Joonas Niilola
0 siblings, 0 replies; 13+ messages in thread
From: Joonas Niilola @ 2022-10-14 6:24 UTC (permalink / raw
To: gentoo-commits
commit: ba996569d35fcbff36dad87464c0cd0d60359370
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 06:05:24 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 06:05:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba996569
sys-fs/lxcfs: drop 5.0.0_p20220524
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-fs/lxcfs/Manifest | 1 -
sys-fs/lxcfs/files/lxcfs-4.0.0.confd | 7 ---
sys-fs/lxcfs/files/lxcfs-4.0.0.initd | 26 -----------
sys-fs/lxcfs/files/lxcfs-4.0.0.service | 18 --------
sys-fs/lxcfs/lxcfs-5.0.0_p20220524.ebuild | 77 -------------------------------
5 files changed, 129 deletions(-)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 93e0ab7ebffd..574a1ae9db4b 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,3 +1,2 @@
-DIST lxcfs-5.0.0_p20220524.tar.gz 101563 BLAKE2B 2bf282aed5490d160a563ae97fdfbb887366a6ec60ea7f36f5400e4a11330c51ac3096d63c99dd4aa2ebe1a3497102af9df41ebd40e38b3bde6c6dcd4265b336 SHA512 c1183096dd2b74ef859183451b8c909f762e3c56dce0b9384ac163a6b6b3f7a17a63e840742f4cc5ac50b1f25d402583ca6cf31c1617754b35e21c5c991515f4
DIST lxcfs-5.0.2.tar.gz 103236 BLAKE2B 5fc8dc437e97a79c78320f8d8111746b171b086beb176a6ada30b8c23164ae4e58ad42806bc0ea73bbbb15d94816bd9b3d5500f9e2a306e2458d23fb111bf68f SHA512 df51e7154060dd7efe992eb2bc40c5a52dce8c52063477110ed414ecc3f430f18d5023a29be6866560fc87b060c2158cc1e947f030c509188320d417eb23d407
DIST lxcfs-5.0.2.tar.gz.asc 833 BLAKE2B a411c6cb4f3382469ea80a974166c98b57ae4b92712bf55507720fc78ec73ef6acbd47f6b3410294b209f77f1f3a17dc4b9fb4dda00bb7323ef32c7185ba4c2e SHA512 f9d54e26d406ebca97c82298361318f13e74fd55285c2b6563ae6c71af63d9b8325ac06b9de8103a95a19c5d965c2d907c313ac151210a162998f8a37ea99676
diff --git a/sys-fs/lxcfs/files/lxcfs-4.0.0.confd b/sys-fs/lxcfs/files/lxcfs-4.0.0.confd
deleted file mode 100644
index ba443ee4b1f1..000000000000
--- a/sys-fs/lxcfs/files/lxcfs-4.0.0.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# /etc/conf.d/lxcfs: config file for /etc/init.d/lxcfs
-
-# lxcfs options:
-# -l == calculate container load average instead of displaying host load average
-# -u == don't display swap usage to containers
-
-LXCFS_OPTS="-l -u"
diff --git a/sys-fs/lxcfs/files/lxcfs-4.0.0.initd b/sys-fs/lxcfs/files/lxcfs-4.0.0.initd
deleted file mode 100644
index d9368e4f28cf..000000000000
--- a/sys-fs/lxcfs/files/lxcfs-4.0.0.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/bin/lxcfs
-PIDFILE=/run/lxcfs.pid
-
-start() {
- ebegin "Starting lxcfs."
- /sbin/modprobe -q fuse
- install -d /var/lib/lxcfs
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- ${LXCFS_OPTS} \
- /var/lib/lxcfs
- eend ${?}
-}
-
-stop() {
- ebegin "Stopping lxcfs."
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend ${?}
-}
diff --git a/sys-fs/lxcfs/files/lxcfs-4.0.0.service b/sys-fs/lxcfs/files/lxcfs-4.0.0.service
deleted file mode 100644
index 0bdab880a790..000000000000
--- a/sys-fs/lxcfs/files/lxcfs-4.0.0.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=FUSE filesystem for LXC
-ConditionVirtualization=!container
-Before=lxc.service
-Documentation=man:lxcfs(1)
-
-[Service]
-ExecStartPre=/sbin/modprobe -q fuse
-ExecStartPre=install -d /var/lib/lxcfs
-ExecStart=/usr/bin/lxcfs /var/lib/lxcfs
-KillMode=process
-Restart=on-failure
-ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
-Delegate=yes
-ExecReload=/bin/kill -USR1 ${MAINPID}
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/lxcfs-5.0.0_p20220524.ebuild b/sys-fs/lxcfs/lxcfs-5.0.0_p20220524.ebuild
deleted file mode 100644
index c9ff5e704ff7..000000000000
--- a/sys-fs/lxcfs/lxcfs-5.0.0_p20220524.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake meson python-any-r1 systemd
-
-MY_COMMIT="18e78f70fa6764be4e4f6fcc6ae8d314da7f3a91"
-
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
-SRC_URI="https://github.com/lxc/lxcfs/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-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}
- $(python_gen_any_dep '
- dev-python/jinja[${PYTHON_USEDEP}]
- ')
- doc? ( sys-apps/help2man )"
-
-# Needs some black magic to work inside container/chroot.
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-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=(
- $(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-4.0.0.confd lxcfs
- newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
-
- # Provide our own service file (copy of upstream) due to paths being different from upstream,
- # #728470
- systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/files/, sys-fs/lxcfs/
@ 2022-09-08 6:43 Joonas Niilola
0 siblings, 0 replies; 13+ messages in thread
From: Joonas Niilola @ 2022-09-08 6:43 UTC (permalink / raw
To: gentoo-commits
commit: cb81fce5810abaf904df8bf3df43cb07b18bf376
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 8 06:38:36 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Sep 8 06:42:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb81fce5
sys-fs/lxcfs: tweak init/service files for fuse:3
- dependency is on fuse:3 instead of fuse:0,
- update openrc files to call fusermount3,
- update openrc files to have LXCFS_PATH config option,
- update systemd service file to call fusermount3.
Closes: https://bugs.gentoo.org/868477
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-fs/lxcfs/files/lxcfs-5.0.2.confd | 8 ++++
sys-fs/lxcfs/files/lxcfs-5.0.2.initd | 27 ++++++++++++
sys-fs/lxcfs/files/lxcfs-5.0.2.service | 18 ++++++++
sys-fs/lxcfs/lxcfs-5.0.2-r1.ebuild | 77 ++++++++++++++++++++++++++++++++++
4 files changed, 130 insertions(+)
diff --git a/sys-fs/lxcfs/files/lxcfs-5.0.2.confd b/sys-fs/lxcfs/files/lxcfs-5.0.2.confd
new file mode 100644
index 000000000000..bc853aa681be
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-5.0.2.confd
@@ -0,0 +1,8 @@
+# /etc/conf.d/lxcfs: config file for /etc/init.d/lxcfs
+
+# lxcfs options:
+# -l == calculate container load average instead of displaying host load average
+# -u == don't display swap usage to containers
+
+LXCFS_OPTS="-l -u"
+LXCFS_PATH="/var/lib/lxcfs"
diff --git a/sys-fs/lxcfs/files/lxcfs-5.0.2.initd b/sys-fs/lxcfs/files/lxcfs-5.0.2.initd
new file mode 100644
index 000000000000..f3119f2e8e82
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-5.0.2.initd
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/bin/lxcfs
+PIDFILE=/run/lxcfs.pid
+
+start() {
+ ebegin "Starting lxcfs."
+ /sbin/modprobe -q fuse
+ install -d "${LXCFS_PATH}"
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- ${LXCFS_OPTS} \
+ "${LXCFS_PATH}"
+ eend ${?}
+}
+
+stop() {
+ ebegin "Stopping lxcfs."
+ /usr/bin/fusermount3 -u "${LXCFS_PATH}"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend ${?}
+}
diff --git a/sys-fs/lxcfs/files/lxcfs-5.0.2.service b/sys-fs/lxcfs/files/lxcfs-5.0.2.service
new file mode 100644
index 000000000000..dc3dc9f18f63
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-5.0.2.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=FUSE filesystem for LXC
+ConditionVirtualization=!container
+Before=lxc.service
+Documentation=man:lxcfs(1)
+
+[Service]
+ExecStartPre=/sbin/modprobe -q fuse
+ExecStartPre=install -d /var/lib/lxcfs
+ExecStart=/usr/bin/lxcfs /var/lib/lxcfs
+KillMode=process
+Restart=on-failure
+ExecStopPost=-/usr/bin/fusermount3 -u /var/lib/lxcfs
+Delegate=yes
+ExecReload=/bin/kill -USR1 ${MAINPID}
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/lxcfs-5.0.2-r1.ebuild b/sys-fs/lxcfs/lxcfs-5.0.2-r1.ebuild
new file mode 100644
index 000000000000..23eccfc4b1f7
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-5.0.2-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+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}
+ $(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
+
+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=(
+ $(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
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/files/, sys-fs/lxcfs/
@ 2022-08-16 7:55 Joonas Niilola
0 siblings, 0 replies; 13+ messages in thread
From: Joonas Niilola @ 2022-08-16 7:55 UTC (permalink / raw
To: gentoo-commits
commit: f6d48291b04a9517f65d4642f663d04552a2d6fc
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 07:52:57 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 07:55:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6d48291
sys-fs/lxcfs: drop 5.0.1-r1
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-fs/lxcfs/Manifest | 2 -
...cfs-5.0.1-fix-reinitialization-with-fuse3.patch | 71 -------------------
sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild | 79 ----------------------
3 files changed, 152 deletions(-)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index be566a9bba41..93e0ab7ebffd 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,5 +1,3 @@
DIST lxcfs-5.0.0_p20220524.tar.gz 101563 BLAKE2B 2bf282aed5490d160a563ae97fdfbb887366a6ec60ea7f36f5400e4a11330c51ac3096d63c99dd4aa2ebe1a3497102af9df41ebd40e38b3bde6c6dcd4265b336 SHA512 c1183096dd2b74ef859183451b8c909f762e3c56dce0b9384ac163a6b6b3f7a17a63e840742f4cc5ac50b1f25d402583ca6cf31c1617754b35e21c5c991515f4
-DIST lxcfs-5.0.1.tar.gz 103221 BLAKE2B 49cd0be04d358db81046ac78e66e8acaa86ef66e51a869b884cb75e98c0501ee7db1b1e5604ca44f105f04378418e8077738a6d6abf85c48b35dfee2b93131e9 SHA512 edc685914e73b055161b8efe9109aca7bc2b1f1285e06a71b697f97d2e7f4cddf5256519325bf628318b64ae0203f594928d9e772e04988971151c4e46788818
-DIST lxcfs-5.0.1.tar.gz.asc 833 BLAKE2B a280e506f154497af3cc6a61bf458830939c67a6a065da1c0509f44ed07bd58bf80c10b5bfdbb18027ae2f200aaa2e9ca4b76cde070b860c34fb2cca7083e809 SHA512 90b982b61fcc56ac23fcef344014252faba280a8fb7539d28dbe2d36dc433c8de93d2c065d160cb98b42ab4b341d01ff2a379cad12827d8b70885c044e9e9ae8
DIST lxcfs-5.0.2.tar.gz 103236 BLAKE2B 5fc8dc437e97a79c78320f8d8111746b171b086beb176a6ada30b8c23164ae4e58ad42806bc0ea73bbbb15d94816bd9b3d5500f9e2a306e2458d23fb111bf68f SHA512 df51e7154060dd7efe992eb2bc40c5a52dce8c52063477110ed414ecc3f430f18d5023a29be6866560fc87b060c2158cc1e947f030c509188320d417eb23d407
DIST lxcfs-5.0.2.tar.gz.asc 833 BLAKE2B a411c6cb4f3382469ea80a974166c98b57ae4b92712bf55507720fc78ec73ef6acbd47f6b3410294b209f77f1f3a17dc4b9fb4dda00bb7323ef32c7185ba4c2e SHA512 f9d54e26d406ebca97c82298361318f13e74fd55285c2b6563ae6c71af63d9b8325ac06b9de8103a95a19c5d965c2d907c313ac151210a162998f8a37ea99676
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
deleted file mode 100644
index 45450504804a..000000000000
--- a/sys-fs/lxcfs/files/lxcfs-5.0.1-fix-reinitialization-with-fuse3.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 5976d0349c1900e2649b7d2904d98ba6a7278e6b Mon Sep 17 00:00:00 2001
-From: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Date: Fri, 29 Jul 2022 09:30:10 +0200
-Subject: [PATCH] fix reinitialization with fuse3
-
-With fuse3 `fuse_get_context` returns NULL before fuse was
-fully initialized, so we must not access it.
-
-Futher, we call 'do_reload' for normal initialization as
-well, so let's prevent that from re-initializing the
-bindings initially and only do this on actual reloads,
-otherwise we do it twice on startup.
-
-Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Fixes #549
----
- src/bindings.c | 2 +-
- src/lxcfs.c | 8 ++++----
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/bindings.c b/src/bindings.c
-index 422a6229..fee7ede0 100644
---- a/src/bindings.c
-+++ b/src/bindings.c
-@@ -943,5 +943,5 @@ void *lxcfs_fuse_init(struct fuse_conn_info *conn, void *data)
- can_use_sys_cpu = true;
- #endif
- has_versioned_opts = true;
-- return fc->private_data;
-+ return fc ? fc->private_data : NULL;
- }
-diff --git a/src/lxcfs.c b/src/lxcfs.c
-index d1a3d805..fed896c9 100644
---- a/src/lxcfs.c
-+++ b/src/lxcfs.c
-@@ -123,7 +123,7 @@ static int lxcfs_init_library(void)
-
- /* do_reload - reload the dynamic library. Done under
- * lock and when we know the user_count was 0 */
--static void do_reload(void)
-+static void do_reload(bool reinit)
- {
- int ret;
- char lxcfs_lib_path[PATH_MAX];
-@@ -164,7 +164,7 @@ static void do_reload(void)
-
- good:
- /* initialize the library */
-- if (lxcfs_init_library() < 0) {
-+ if (reinit && lxcfs_init_library() < 0) {
- log_exit("Failed to initialize liblxcfs.so");
- }
-
-@@ -180,7 +180,7 @@ static void up_users(void)
- {
- users_lock();
- if (users_count == 0 && need_reload)
-- do_reload();
-+ do_reload(true);
- users_count++;
- users_unlock();
- }
-@@ -1362,7 +1362,7 @@ int main(int argc, char *argv[])
- fuse_argv[fuse_argc++] = new_argv[0];
- fuse_argv[fuse_argc] = NULL;
-
-- do_reload();
-+ do_reload(false);
- if (install_signal_handler(SIGUSR1, sigusr1_reload)) {
- lxcfs_error("%s - Failed to install SIGUSR1 signal handler", strerror(errno));
- goto out;
diff --git a/sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild b/sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild
deleted file mode 100644
index 1a0187e1c338..000000000000
--- a/sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-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}
- $(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}"/lxcfs-5.0.1-fix-reinitialization-with-fuse3.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=(
- $(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-4.0.0.confd lxcfs
- newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
-
- # Provide our own service file (copy of upstream) due to paths being different from upstream,
- # #728470
- systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/files/, sys-fs/lxcfs/
@ 2022-08-02 5:35 Joonas Niilola
0 siblings, 0 replies; 13+ messages in thread
From: Joonas Niilola @ 2022-08-02 5:35 UTC (permalink / raw
To: gentoo-commits
commit: a1b35f5980098c9b168d4e02a59acf30bb22da64
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 2 05:34:32 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 2 05:35:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1b35f59
sys-fs/lxcfs: add a patch to fix an issue with fuse3 on 5.0.1
Closes: https://bugs.gentoo.org/862342
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...cfs-5.0.1-fix-reinitialization-with-fuse3.patch | 71 +++++++++++++++++++
sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild | 79 ++++++++++++++++++++++
2 files changed, 150 insertions(+)
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
new file mode 100644
index 000000000000..45450504804a
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-5.0.1-fix-reinitialization-with-fuse3.patch
@@ -0,0 +1,71 @@
+From 5976d0349c1900e2649b7d2904d98ba6a7278e6b Mon Sep 17 00:00:00 2001
+From: Wolfgang Bumiller <w.bumiller@proxmox.com>
+Date: Fri, 29 Jul 2022 09:30:10 +0200
+Subject: [PATCH] fix reinitialization with fuse3
+
+With fuse3 `fuse_get_context` returns NULL before fuse was
+fully initialized, so we must not access it.
+
+Futher, we call 'do_reload' for normal initialization as
+well, so let's prevent that from re-initializing the
+bindings initially and only do this on actual reloads,
+otherwise we do it twice on startup.
+
+Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
+Fixes #549
+---
+ src/bindings.c | 2 +-
+ src/lxcfs.c | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/bindings.c b/src/bindings.c
+index 422a6229..fee7ede0 100644
+--- a/src/bindings.c
++++ b/src/bindings.c
+@@ -943,5 +943,5 @@ void *lxcfs_fuse_init(struct fuse_conn_info *conn, void *data)
+ can_use_sys_cpu = true;
+ #endif
+ has_versioned_opts = true;
+- return fc->private_data;
++ return fc ? fc->private_data : NULL;
+ }
+diff --git a/src/lxcfs.c b/src/lxcfs.c
+index d1a3d805..fed896c9 100644
+--- a/src/lxcfs.c
++++ b/src/lxcfs.c
+@@ -123,7 +123,7 @@ static int lxcfs_init_library(void)
+
+ /* do_reload - reload the dynamic library. Done under
+ * lock and when we know the user_count was 0 */
+-static void do_reload(void)
++static void do_reload(bool reinit)
+ {
+ int ret;
+ char lxcfs_lib_path[PATH_MAX];
+@@ -164,7 +164,7 @@ static void do_reload(void)
+
+ good:
+ /* initialize the library */
+- if (lxcfs_init_library() < 0) {
++ if (reinit && lxcfs_init_library() < 0) {
+ log_exit("Failed to initialize liblxcfs.so");
+ }
+
+@@ -180,7 +180,7 @@ static void up_users(void)
+ {
+ users_lock();
+ if (users_count == 0 && need_reload)
+- do_reload();
++ do_reload(true);
+ users_count++;
+ users_unlock();
+ }
+@@ -1362,7 +1362,7 @@ int main(int argc, char *argv[])
+ fuse_argv[fuse_argc++] = new_argv[0];
+ fuse_argv[fuse_argc] = NULL;
+
+- do_reload();
++ do_reload(false);
+ if (install_signal_handler(SIGUSR1, sigusr1_reload)) {
+ lxcfs_error("%s - Failed to install SIGUSR1 signal handler", strerror(errno));
+ goto out;
diff --git a/sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild b/sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild
new file mode 100644
index 000000000000..1a0187e1c338
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+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}
+ $(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}"/lxcfs-5.0.1-fix-reinitialization-with-fuse3.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=(
+ $(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-4.0.0.confd lxcfs
+ newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
+
+ # Provide our own service file (copy of upstream) due to paths being different from upstream,
+ # #728470
+ systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/files/, sys-fs/lxcfs/
@ 2020-06-26 8:13 Joonas Niilola
0 siblings, 0 replies; 13+ messages in thread
From: Joonas Niilola @ 2020-06-26 8:13 UTC (permalink / raw
To: gentoo-commits
commit: 233276e2457c31e779bf491af2b5462c247831cf
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 26 07:52:10 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jun 26 08:13:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=233276e2
sys-fs/lxcfs: remove old 3.0.3
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-fs/lxcfs/Manifest | 1 -
sys-fs/lxcfs/files/lxcfs-fusermount-path.patch | 15 ------
sys-fs/lxcfs/files/lxcfs.initd | 26 ----------
sys-fs/lxcfs/lxcfs-3.0.3.ebuild | 72 --------------------------
4 files changed, 114 deletions(-)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index e9d5038efe9..1eb6648b2c6 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,3 +1,2 @@
-DIST lxcfs-3.0.3.tar.gz 49824 BLAKE2B 02e3a0a6f4fd515924c5f038f00d664ef347c9b685e6561334b460e0ce0ce5580aca67f33df56b44b9cdafa4953f4f92843662f3516e1c923f9242388b17dbc6 SHA512 d994e1dd85f499eba2847d33870281a4bcaf4466e2c8f7acb065f4f3d5688b93b775c486bc6db571e64d09a3567710b0c816e12555ffb3e3e50f81bc7f5f6be6
DIST lxcfs-4.0.3.tar.gz 100719 BLAKE2B 24371b921ad635f97c51ac8406c949e81330ae358b0166c2af295cb1f630594bb72da802aad41971c11303f393fd05bc9f1b109bd4da4953db2c3bb7e5189315 SHA512 0aaedfe826d982b9464dfb60fb57c58e34ea6022b8503bc858538b6634dc7d0845f65832d6f814043dbc0677f887e1b559549a8f3865c755970c6b47ba65eb2b
DIST lxcfs-4.0.4.tar.gz 101546 BLAKE2B 1e84e3b75bfb39273539ea72f941442cc3c8574c0f55359a38edc04a98a45ea8680f9bf49c5974decf180a8ecf07cadccf4e732d1743c070a740c78b773a3ee8 SHA512 15bcebecc815310870aea58d995d605444b57583b7f1bb2d35b065256ea5f70b071d58887fbf1ca124ea84da99151bbd9dffcca37a2e151677d56229dc8961ce
diff --git a/sys-fs/lxcfs/files/lxcfs-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-fusermount-path.patch
deleted file mode 100644
index 99a5addf1d1..00000000000
--- a/sys-fs/lxcfs/files/lxcfs-fusermount-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- /config/init/systemd/lxcfs.service.orig 2018-10-13 17:24:46.534035126 -0500
-+++ /config/init/systemd/lxcfs.service 2018-10-13 17:25:33.007034294 -0500
-@@ -5,10 +5,10 @@
- Documentation=man:lxcfs(1)
-
- [Service]
--ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
-+ExecStart=/usr/bin/lxcfs -o allow_other,nonempty /var/lib/lxcfs/
- KillMode=process
- Restart=on-failure
--ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
-+ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
- Delegate=yes
-
- [Install]
diff --git a/sys-fs/lxcfs/files/lxcfs.initd b/sys-fs/lxcfs/files/lxcfs.initd
deleted file mode 100644
index 5997426fa8e..00000000000
--- a/sys-fs/lxcfs/files/lxcfs.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/bin/lxcfs
-PIDFILE=/run/lxcfs.pid
-
-start() {
- ebegin "Starting lxcfs"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- -o allow_other,nonempty /var/lib/lxcfs
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping lxcfs"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
-}
diff --git a/sys-fs/lxcfs/lxcfs-3.0.3.ebuild b/sys-fs/lxcfs/lxcfs-3.0.3.ebuild
deleted file mode 100644
index f9c354a881a..00000000000
--- a/sys-fs/lxcfs/lxcfs-3.0.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd vcs-snapshot
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
- KEYWORDS="amd64"
-fi
-
-# Omit all dbus. Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-RDEPEND="
- dev-libs/glib:2
- sys-fs/fuse:0
-"
-DEPEND="
- sys-apps/help2man
- ${RDEPEND}
-"
-PATCHES="${FILESDIR}/${PN}-fusermount-path.patch"
-
-src_prepare() {
- default
- ./bootstrap.sh || die "Failed to bootstrap configure files"
-}
-
-src_configure() {
- # Without the localstatedir the filesystem isn't mounted correctly
- econf --localstatedir=/var
-}
-
-# Test suite fails for me
-# src_test() {
-# emake tests
-# tests/main.sh || die "Tests failed"
-# }
-
-src_install() {
- default
- keepdir /var/lib/lxcfs
- newinitd "${FILESDIR}"/${PN}.initd lxcfs
- systemd_dounit config/init/systemd/lxcfs.service
-}
-
-pkg_preinst() {
- # In an upgrade situation merging /var/lib/lxcfs (an empty dir)
- # fails because that is a live mountpoint when the service is
- # running. It's unnecessary anyway so skip the action.
- [[ -d ${ROOT}/var/lib/lxcfs ]] && rm -rf ${D}/var
-}
-
-pkg_postinst() {
- einfo
- einfo "Starting with version 3.0.0 the cgfs PAM module has moved, and"
- einfo "will eventually be available in app-emulation/lxc. See:"
- einfo "https://brauner.github.io/2018/02/28/lxc-includes-cgroup-pam-module.html"
- einfo "for more information."
- einfo
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/files/, sys-fs/lxcfs/
@ 2019-02-07 4:32 Erik Mackdanz
0 siblings, 0 replies; 13+ messages in thread
From: Erik Mackdanz @ 2019-02-07 4:32 UTC (permalink / raw
To: gentoo-commits
commit: ffe4f60e91de25b0a9d0309cb208f85955bfc2a7
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 7 04:31:07 2019 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Thu Feb 7 04:31:35 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffe4f60e
sys-fs/lxcfs: Remove old version
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-2.3.59, Repoman-2.3.12
sys-fs/lxcfs/Manifest | 1 -
.../lxcfs/files/lxcfs-3.0.0-fusermount-path.patch | 11 ----
sys-fs/lxcfs/files/lxcfs-3.0.0.initd | 26 --------
sys-fs/lxcfs/lxcfs-3.0.0.ebuild | 74 ----------------------
4 files changed, 112 deletions(-)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index c9df8779225..44224535405 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,3 +1,2 @@
-DIST lxcfs-3.0.0.tar.gz 49219 BLAKE2B c21cd9983e9175bf3a31bafd8a29ddd6a6a549226bd432636dd4ea48bf6268c403f236ca39739a989cd89fa7b0b05043c179ca328fd739f5a9d56e27907a7a60 SHA512 99fe11e99c2e487d6ecd9a8484be6413563ddcb33740631ee6fe1b60d3d2d62cea1bb44d1ef6dc45283f5b3d20cd680d48ea3cb5ad17f0c3e7ba6ed56186c42f
DIST lxcfs-3.0.2.tar.gz 49809 BLAKE2B dc73149b92ac040c56de5f4c11aafdf6e744ffd2b17e22ee9c784663ff102dedd74453581a77027037955238e081c596377c28b6066012fa32ee575e6a4c57fa SHA512 2065bbd68fd2974fe28c861b1e77c62a501da85e1bfc19eeafa49fd88c66e8e75ae007781c8bd05caf43fb3b80ad12c81c0f0f03d27ab1131e0cfe6d48443218
DIST lxcfs-3.0.3.tar.gz 49824 BLAKE2B 02e3a0a6f4fd515924c5f038f00d664ef347c9b685e6561334b460e0ce0ce5580aca67f33df56b44b9cdafa4953f4f92843662f3516e1c923f9242388b17dbc6 SHA512 d994e1dd85f499eba2847d33870281a4bcaf4466e2c8f7acb065f4f3d5688b93b775c486bc6db571e64d09a3567710b0c816e12555ffb3e3e50f81bc7f5f6be6
diff --git a/sys-fs/lxcfs/files/lxcfs-3.0.0-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-3.0.0-fusermount-path.patch
deleted file mode 100644
index 61d3494fb7f..00000000000
--- a/sys-fs/lxcfs/files/lxcfs-3.0.0-fusermount-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /config/init/systemd/lxcfs.service.orig 2016-07-11 01:18:57.688074437 +0000
-+++ /config/init/systemd/lxcfs.service 2016-07-11 01:19:48.516477185 +0000
-@@ -7,7 +7,7 @@
- ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
- KillMode=process
- Restart=on-failure
--ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
-+ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
- Delegate=yes
-
- [Install]
diff --git a/sys-fs/lxcfs/files/lxcfs-3.0.0.initd b/sys-fs/lxcfs/files/lxcfs-3.0.0.initd
deleted file mode 100644
index a34e74af7b6..00000000000
--- a/sys-fs/lxcfs/files/lxcfs-3.0.0.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/bin/lxcfs
-PIDFILE=/run/lxcfs.pid
-
-start() {
- ebegin "Starting lxcfs"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- -f -o allow_other /var/lib/lxcfs
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping lxcfs"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
-}
diff --git a/sys-fs/lxcfs/lxcfs-3.0.0.ebuild b/sys-fs/lxcfs/lxcfs-3.0.0.ebuild
deleted file mode 100644
index a16a47a4d9f..00000000000
--- a/sys-fs/lxcfs/lxcfs-3.0.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd vcs-snapshot versionator
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- KEYWORDS=""
-else
- # e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
- UPSTREAM_PV=$(replace_version_separator 3 '.' )
- SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64"
-fi
-
-# Omit all dbus. Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-RDEPEND="
- dev-libs/glib:2
- sys-fs/fuse:0
-"
-DEPEND="
- sys-apps/help2man
- ${RDEPEND}
-"
-PATCHES="${FILESDIR}/${P}-fusermount-path.patch"
-
-src_prepare() {
- default
- ./bootstrap.sh || die "Failed to bootstrap configure files"
-}
-
-src_configure() {
- # Without the localstatedir the filesystem isn't mounted correctly
- econf --localstatedir=/var
-}
-
-# Test suite fails for me
-# src_test() {
-# emake tests
-# tests/main.sh || die "Tests failed"
-# }
-
-src_install() {
- default
- keepdir /var/lib/lxcfs
- newinitd "${FILESDIR}"/${P}.initd lxcfs
- systemd_dounit config/init/systemd/lxcfs.service
-}
-
-pkg_preinst() {
- # In an upgrade situation merging /var/lib/lxcfs (an empty dir)
- # fails because that is a live mountpoint when the service is
- # running. It's unnecessary anyway so skip the action.
- [[ -d ${ROOT}/var/lib/lxcfs ]] && rm -rf ${D}/var
-}
-
-pkg_postinst() {
- einfo
- einfo "Starting with version 3.0.0 the cgfs PAM module has moved, and"
- einfo "will eventually be available in app-emulation/lxc. See:"
- einfo "https://brauner.github.io/2018/02/28/lxc-includes-cgroup-pam-module.html"
- einfo "for more information."
- einfo
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/files/, sys-fs/lxcfs/
@ 2018-10-13 22:40 Erik Mackdanz
0 siblings, 0 replies; 13+ messages in thread
From: Erik Mackdanz @ 2018-10-13 22:40 UTC (permalink / raw
To: gentoo-commits
commit: f92a7ea8a9957b94887bd608f1cc40a03295e691
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 22:40:31 2018 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 22:40:31 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f92a7ea8
sys-fs/lxcfs: Remove old versions
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
sys-fs/lxcfs/Manifest | 2 -
.../lxcfs/files/lxcfs-2.0.4-fusermount-path.patch | 11 ----
sys-fs/lxcfs/files/lxcfs-2.0.4.initd | 26 --------
.../lxcfs/files/lxcfs-2.0.6-fusermount-path.patch | 11 ----
sys-fs/lxcfs/files/lxcfs-2.0.6.initd | 26 --------
sys-fs/lxcfs/lxcfs-2.0.4.ebuild | 70 ----------------------
sys-fs/lxcfs/lxcfs-2.0.6.ebuild | 70 ----------------------
7 files changed, 216 deletions(-)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index cc84b00c2c3..8b3d028d5c3 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,4 +1,2 @@
-DIST lxcfs-2.0.4.tar.gz 52639 BLAKE2B 4ef8509b05ac98338003801afeb67a15fcfd1270f90e7b5d1970c4171b9296b77e116f91ec29ec29f3feb0e03c5f2ddf49d014824869aa6cf9897441ebac17a3 SHA512 1c701fbd60799a1f7ad7e809c2e52ef0d26ed44e96c2c0376d3c4eb203aafb99ddcaff015f3fa8cc9c1219449210f6bf93844cc568de3a9f55cb8801328cec90
-DIST lxcfs-2.0.6.tar.gz 62632 BLAKE2B 2bc76de0a7e2657b0d73e79260bfaf5a1ba070a4571d81a7c26d3637fc93937c824496119ff32fbfa56b6f97deca4bb145a952862aff148932531c489eea57a9 SHA512 52baf15eb9dc2b694085635f7d8e5c6f1207099173cda607d758b8837a720e4808cacbf83f900a6734d3260d34abafbebdcbb0618cb3cf67c5d304f50d66244d
DIST lxcfs-3.0.0.tar.gz 49219 BLAKE2B c21cd9983e9175bf3a31bafd8a29ddd6a6a549226bd432636dd4ea48bf6268c403f236ca39739a989cd89fa7b0b05043c179ca328fd739f5a9d56e27907a7a60 SHA512 99fe11e99c2e487d6ecd9a8484be6413563ddcb33740631ee6fe1b60d3d2d62cea1bb44d1ef6dc45283f5b3d20cd680d48ea3cb5ad17f0c3e7ba6ed56186c42f
DIST lxcfs-3.0.2.tar.gz 49809 BLAKE2B dc73149b92ac040c56de5f4c11aafdf6e744ffd2b17e22ee9c784663ff102dedd74453581a77027037955238e081c596377c28b6066012fa32ee575e6a4c57fa SHA512 2065bbd68fd2974fe28c861b1e77c62a501da85e1bfc19eeafa49fd88c66e8e75ae007781c8bd05caf43fb3b80ad12c81c0f0f03d27ab1131e0cfe6d48443218
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.4-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-2.0.4-fusermount-path.patch
deleted file mode 100644
index 61d3494fb7f..00000000000
--- a/sys-fs/lxcfs/files/lxcfs-2.0.4-fusermount-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /config/init/systemd/lxcfs.service.orig 2016-07-11 01:18:57.688074437 +0000
-+++ /config/init/systemd/lxcfs.service 2016-07-11 01:19:48.516477185 +0000
-@@ -7,7 +7,7 @@
- ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
- KillMode=process
- Restart=on-failure
--ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
-+ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
- Delegate=yes
-
- [Install]
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.4.initd b/sys-fs/lxcfs/files/lxcfs-2.0.4.initd
deleted file mode 100644
index dd556894b7f..00000000000
--- a/sys-fs/lxcfs/files/lxcfs-2.0.4.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/bin/lxcfs
-PIDFILE=/run/lxcfs.pid
-
-start() {
- ebegin "Starting lxcfs"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- -f -o allow_other /var/lib/lxcfs
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping lxcfs"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
-}
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.6-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-2.0.6-fusermount-path.patch
deleted file mode 100644
index 61d3494fb7f..00000000000
--- a/sys-fs/lxcfs/files/lxcfs-2.0.6-fusermount-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /config/init/systemd/lxcfs.service.orig 2016-07-11 01:18:57.688074437 +0000
-+++ /config/init/systemd/lxcfs.service 2016-07-11 01:19:48.516477185 +0000
-@@ -7,7 +7,7 @@
- ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
- KillMode=process
- Restart=on-failure
--ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
-+ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
- Delegate=yes
-
- [Install]
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.6.initd b/sys-fs/lxcfs/files/lxcfs-2.0.6.initd
deleted file mode 100644
index dfc5725f693..00000000000
--- a/sys-fs/lxcfs/files/lxcfs-2.0.6.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/bin/lxcfs
-PIDFILE=/run/lxcfs.pid
-
-start() {
- ebegin "Starting lxcfs"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- -f -o allow_other /var/lib/lxcfs
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping lxcfs"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
-}
diff --git a/sys-fs/lxcfs/lxcfs-2.0.4.ebuild b/sys-fs/lxcfs/lxcfs-2.0.4.ebuild
deleted file mode 100644
index 82ea9915b32..00000000000
--- a/sys-fs/lxcfs/lxcfs-2.0.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd vcs-snapshot versionator
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- KEYWORDS=""
-else
- # e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
- UPSTREAM_PV=$(replace_version_separator 3 '.' )
- SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-IUSE="pam"
-
-# Omit all dbus. Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-RDEPEND="
- dev-libs/glib:2
- sys-fs/fuse
- virtual/pam
-"
-DEPEND="
- sys-apps/help2man
- ${RDEPEND}
-"
-PATCHES="${FILESDIR}/${P}-fusermount-path.patch"
-
-src_prepare() {
- default
- ./bootstrap.sh || die "Failed to bootstrap configure files"
-}
-
-src_configure() {
- use pam || pamflag="--with-pamdir=none"
-
- # Without the localstatedir the filesystem isn't mounted correctly
- econf --localstatedir=/var ${pamflag}
-}
-
-# Test suite fails for me
-# src_test() {
-# emake tests
-# tests/main.sh || die "Tests failed"
-# }
-
-src_install() {
- default
- dodir /var/lib/lxcfs
- newinitd "${FILESDIR}"/${P}.initd lxcfs
- systemd_dounit config/init/systemd/lxcfs.service
-}
-
-pkg_preinst() {
- # In an upgrade situation merging /var/lib/lxcfs (an empty dir)
- # fails because that is a live mountpoint when the service is
- # running. It's unnecessary anyway so skip the action.
- [[ -d ${ROOT}/var/lib/lxcfs ]] && rm -rf ${D}/var
-}
diff --git a/sys-fs/lxcfs/lxcfs-2.0.6.ebuild b/sys-fs/lxcfs/lxcfs-2.0.6.ebuild
deleted file mode 100644
index bc296b6a704..00000000000
--- a/sys-fs/lxcfs/lxcfs-2.0.6.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd vcs-snapshot versionator
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- KEYWORDS=""
-else
- # e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
- UPSTREAM_PV=$(replace_version_separator 3 '.' )
- SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-IUSE="pam"
-
-# Omit all dbus. Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-RDEPEND="
- dev-libs/glib:2
- sys-fs/fuse
- virtual/pam
-"
-DEPEND="
- sys-apps/help2man
- ${RDEPEND}
-"
-PATCHES="${FILESDIR}/${P}-fusermount-path.patch"
-
-src_prepare() {
- default
- ./bootstrap.sh || die "Failed to bootstrap configure files"
-}
-
-src_configure() {
- use pam || pamflag="--with-pamdir=none"
-
- # Without the localstatedir the filesystem isn't mounted correctly
- econf --localstatedir=/var ${pamflag}
-}
-
-# Test suite fails for me
-# src_test() {
-# emake tests
-# tests/main.sh || die "Tests failed"
-# }
-
-src_install() {
- default
- dodir /var/lib/lxcfs
- newinitd "${FILESDIR}"/${P}.initd lxcfs
- systemd_dounit config/init/systemd/lxcfs.service
-}
-
-pkg_preinst() {
- # In an upgrade situation merging /var/lib/lxcfs (an empty dir)
- # fails because that is a live mountpoint when the service is
- # running. It's unnecessary anyway so skip the action.
- [[ -d ${ROOT}/var/lib/lxcfs ]] && rm -rf ${D}/var
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/files/, sys-fs/lxcfs/
@ 2018-10-13 22:38 Erik Mackdanz
0 siblings, 0 replies; 13+ messages in thread
From: Erik Mackdanz @ 2018-10-13 22:38 UTC (permalink / raw
To: gentoo-commits
commit: 2e422564a20244f01f7ae40c7a7d28f43216cd31
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 22:36:11 2018 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 22:37:55 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e422564
sys-fs/lxcfs: Bump to 3.0.2
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
sys-fs/lxcfs/Manifest | 1 +
.../lxcfs/files/lxcfs-3.0.2-fusermount-path.patch | 15 +++++
sys-fs/lxcfs/files/lxcfs-3.0.2.initd | 26 ++++++++
sys-fs/lxcfs/lxcfs-3.0.2.ebuild | 72 ++++++++++++++++++++++
4 files changed, 114 insertions(+)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 7536f41bd56..cc84b00c2c3 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,3 +1,4 @@
DIST lxcfs-2.0.4.tar.gz 52639 BLAKE2B 4ef8509b05ac98338003801afeb67a15fcfd1270f90e7b5d1970c4171b9296b77e116f91ec29ec29f3feb0e03c5f2ddf49d014824869aa6cf9897441ebac17a3 SHA512 1c701fbd60799a1f7ad7e809c2e52ef0d26ed44e96c2c0376d3c4eb203aafb99ddcaff015f3fa8cc9c1219449210f6bf93844cc568de3a9f55cb8801328cec90
DIST lxcfs-2.0.6.tar.gz 62632 BLAKE2B 2bc76de0a7e2657b0d73e79260bfaf5a1ba070a4571d81a7c26d3637fc93937c824496119ff32fbfa56b6f97deca4bb145a952862aff148932531c489eea57a9 SHA512 52baf15eb9dc2b694085635f7d8e5c6f1207099173cda607d758b8837a720e4808cacbf83f900a6734d3260d34abafbebdcbb0618cb3cf67c5d304f50d66244d
DIST lxcfs-3.0.0.tar.gz 49219 BLAKE2B c21cd9983e9175bf3a31bafd8a29ddd6a6a549226bd432636dd4ea48bf6268c403f236ca39739a989cd89fa7b0b05043c179ca328fd739f5a9d56e27907a7a60 SHA512 99fe11e99c2e487d6ecd9a8484be6413563ddcb33740631ee6fe1b60d3d2d62cea1bb44d1ef6dc45283f5b3d20cd680d48ea3cb5ad17f0c3e7ba6ed56186c42f
+DIST lxcfs-3.0.2.tar.gz 49809 BLAKE2B dc73149b92ac040c56de5f4c11aafdf6e744ffd2b17e22ee9c784663ff102dedd74453581a77027037955238e081c596377c28b6066012fa32ee575e6a4c57fa SHA512 2065bbd68fd2974fe28c861b1e77c62a501da85e1bfc19eeafa49fd88c66e8e75ae007781c8bd05caf43fb3b80ad12c81c0f0f03d27ab1131e0cfe6d48443218
diff --git a/sys-fs/lxcfs/files/lxcfs-3.0.2-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-3.0.2-fusermount-path.patch
new file mode 100644
index 00000000000..99a5addf1d1
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-3.0.2-fusermount-path.patch
@@ -0,0 +1,15 @@
+--- /config/init/systemd/lxcfs.service.orig 2018-10-13 17:24:46.534035126 -0500
++++ /config/init/systemd/lxcfs.service 2018-10-13 17:25:33.007034294 -0500
+@@ -5,10 +5,10 @@
+ Documentation=man:lxcfs(1)
+
+ [Service]
+-ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
++ExecStart=/usr/bin/lxcfs -o allow_other,nonempty /var/lib/lxcfs/
+ KillMode=process
+ Restart=on-failure
+-ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
++ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
+ Delegate=yes
+
+ [Install]
diff --git a/sys-fs/lxcfs/files/lxcfs-3.0.2.initd b/sys-fs/lxcfs/files/lxcfs-3.0.2.initd
new file mode 100644
index 00000000000..52d8202d7ac
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-3.0.2.initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/bin/lxcfs
+PIDFILE=/run/lxcfs.pid
+
+start() {
+ ebegin "Starting lxcfs"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ -o allow_other,nonempty /var/lib/lxcfs
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lxcfs"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/sys-fs/lxcfs/lxcfs-3.0.2.ebuild b/sys-fs/lxcfs/lxcfs-3.0.2.ebuild
new file mode 100644
index 00000000000..ce923205a59
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-3.0.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd vcs-snapshot
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
+ EGIT_BRANCH="master"\x0e
+ inherit git-r3
+ SRC_URI=""\x0e
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+# Omit all dbus. Upstream appears to require it because systemd, but
+# lxcfs makes no direct use of dbus.
+RDEPEND="
+ dev-libs/glib:2
+ sys-fs/fuse:0
+"
+DEPEND="
+ sys-apps/help2man
+ ${RDEPEND}
+"
+PATCHES="${FILESDIR}/${P}-fusermount-path.patch"
+
+src_prepare() {
+ default
+ ./bootstrap.sh || die "Failed to bootstrap configure files"
+}
+
+src_configure() {
+ # Without the localstatedir the filesystem isn't mounted correctly
+ econf --localstatedir=/var
+}
+
+# Test suite fails for me
+# src_test() {
+# emake tests
+# tests/main.sh || die "Tests failed"
+# }
+
+src_install() {
+ default
+ keepdir /var/lib/lxcfs
+ newinitd "${FILESDIR}"/${P}.initd lxcfs
+ systemd_dounit config/init/systemd/lxcfs.service
+}
+
+pkg_preinst() {
+ # In an upgrade situation merging /var/lib/lxcfs (an empty dir)
+ # fails because that is a live mountpoint when the service is
+ # running. It's unnecessary anyway so skip the action.
+ [[ -d ${ROOT}/var/lib/lxcfs ]] && rm -rf ${D}/var
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Starting with version 3.0.0 the cgfs PAM module has moved, and"
+ einfo "will eventually be available in app-emulation/lxc. See:"
+ einfo "https://brauner.github.io/2018/02/28/lxc-includes-cgroup-pam-module.html"
+ einfo "for more information."
+ einfo
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/files/, sys-fs/lxcfs/
@ 2017-03-20 5:02 Erik Mackdanz
0 siblings, 0 replies; 13+ messages in thread
From: Erik Mackdanz @ 2017-03-20 5:02 UTC (permalink / raw
To: gentoo-commits
commit: 69695164a6ffc69e419da45d614aeb21533e867e
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 20 05:00:39 2017 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Mon Mar 20 05:00:39 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69695164
sys-fs/lxcfs: remove old version
Package-Manager: Portage-2.3.5, Repoman-2.3.2
sys-fs/lxcfs/Manifest | 1 -
.../lxcfs/files/lxcfs-2.0.3-fusermount-path.patch | 11 ----
sys-fs/lxcfs/files/lxcfs-2.0.3.initd | 26 --------
sys-fs/lxcfs/lxcfs-2.0.3.ebuild | 70 ----------------------
4 files changed, 108 deletions(-)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index f159e85e3f6..a541be13fe4 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,3 +1,2 @@
-DIST lxcfs-2.0.3.tar.gz 51078 SHA256 742a6cc463dc66179c334ebca4c3276888ef27a564e5e47212b60c655a811a72 SHA512 14caa2d6598529610ef6bd4c1d6f4d4598e8dc1378a3ee35ea7a1582c11150c896facc80216e67526384995891d9cc1244796860b790ecfc8bf735cc2cd80923 WHIRLPOOL f2de2438e4e521db5135ca81daceccdc1d3820907de9d37842c9bafa112cc416774cb2efe27b815cecccc26e55617c7eb9f5d076df5423ab354747605fa90643
DIST lxcfs-2.0.4.tar.gz 52639 SHA256 9af8199dba2837542ede6e50489100220472241e4b355b685e66c9a72bbcf81a SHA512 1c701fbd60799a1f7ad7e809c2e52ef0d26ed44e96c2c0376d3c4eb203aafb99ddcaff015f3fa8cc9c1219449210f6bf93844cc568de3a9f55cb8801328cec90 WHIRLPOOL 1ac966bab786b00a236225e1856c46fa9d419e42853edcd1181fc3f43d54becb60435fa0679a6a0f838a5edeb920205e3baa734118a4b5d9587e547fd63e3704
DIST lxcfs-2.0.6.tar.gz 62632 SHA256 be4ea891887aee2c04b2d9ff5dbb6866178cc1276119f5b116bf3f99c7750213 SHA512 52baf15eb9dc2b694085635f7d8e5c6f1207099173cda607d758b8837a720e4808cacbf83f900a6734d3260d34abafbebdcbb0618cb3cf67c5d304f50d66244d WHIRLPOOL 0d7fc69400678f03dd8ccb06fee643feaa62469e6287a6bc3935232f775bc93fa5c1d649e7747b3b09867f2678593eaf923c947499c549cfd6c40fcd28620a95
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.3-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-2.0.3-fusermount-path.patch
deleted file mode 100644
index 61d3494fb7f..00000000000
--- a/sys-fs/lxcfs/files/lxcfs-2.0.3-fusermount-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /config/init/systemd/lxcfs.service.orig 2016-07-11 01:18:57.688074437 +0000
-+++ /config/init/systemd/lxcfs.service 2016-07-11 01:19:48.516477185 +0000
-@@ -7,7 +7,7 @@
- ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
- KillMode=process
- Restart=on-failure
--ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
-+ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
- Delegate=yes
-
- [Install]
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.3.initd b/sys-fs/lxcfs/files/lxcfs-2.0.3.initd
deleted file mode 100644
index dd556894b7f..00000000000
--- a/sys-fs/lxcfs/files/lxcfs-2.0.3.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/bin/lxcfs
-PIDFILE=/run/lxcfs.pid
-
-start() {
- ebegin "Starting lxcfs"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- -f -o allow_other /var/lib/lxcfs
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping lxcfs"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
-}
diff --git a/sys-fs/lxcfs/lxcfs-2.0.3.ebuild b/sys-fs/lxcfs/lxcfs-2.0.3.ebuild
deleted file mode 100644
index 82ea9915b32..00000000000
--- a/sys-fs/lxcfs/lxcfs-2.0.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd vcs-snapshot versionator
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- KEYWORDS=""
-else
- # e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
- UPSTREAM_PV=$(replace_version_separator 3 '.' )
- SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-IUSE="pam"
-
-# Omit all dbus. Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-RDEPEND="
- dev-libs/glib:2
- sys-fs/fuse
- virtual/pam
-"
-DEPEND="
- sys-apps/help2man
- ${RDEPEND}
-"
-PATCHES="${FILESDIR}/${P}-fusermount-path.patch"
-
-src_prepare() {
- default
- ./bootstrap.sh || die "Failed to bootstrap configure files"
-}
-
-src_configure() {
- use pam || pamflag="--with-pamdir=none"
-
- # Without the localstatedir the filesystem isn't mounted correctly
- econf --localstatedir=/var ${pamflag}
-}
-
-# Test suite fails for me
-# src_test() {
-# emake tests
-# tests/main.sh || die "Tests failed"
-# }
-
-src_install() {
- default
- dodir /var/lib/lxcfs
- newinitd "${FILESDIR}"/${P}.initd lxcfs
- systemd_dounit config/init/systemd/lxcfs.service
-}
-
-pkg_preinst() {
- # In an upgrade situation merging /var/lib/lxcfs (an empty dir)
- # fails because that is a live mountpoint when the service is
- # running. It's unnecessary anyway so skip the action.
- [[ -d ${ROOT}/var/lib/lxcfs ]] && rm -rf ${D}/var
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/files/, sys-fs/lxcfs/
@ 2016-10-11 3:39 Erik Mackdanz
0 siblings, 0 replies; 13+ messages in thread
From: Erik Mackdanz @ 2016-10-11 3:39 UTC (permalink / raw
To: gentoo-commits
commit: ff7322fad07652b900900d7a0edb1e95892951bf
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 03:38:34 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 03:38:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff7322fa
sys-fs/lxcfs: Bump to 2.0.4
Package-Manager: portage-2.3.1
sys-fs/lxcfs/Manifest | 1 +
.../lxcfs/files/lxcfs-2.0.4-fusermount-path.patch | 11 ++++
sys-fs/lxcfs/files/lxcfs-2.0.4.initd | 27 ++++++++
sys-fs/lxcfs/lxcfs-2.0.4.ebuild | 71 ++++++++++++++++++++++
4 files changed, 110 insertions(+)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index b8b1bc2..16a455d 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -4,3 +4,4 @@ DIST lxcfs-2.0.0_beta2.tar.gz 44421 SHA256 4eacbbb51031ebd0776f050d7279b2076f7b4
DIST lxcfs-2.0.1.tar.gz 49004 SHA256 4731a4d6939e32f3503560ee953e840d16e6abbb4fc7993c92cc1179e40d4f84 SHA512 3801a1d643b1f4478e702f615c8f9f9bc7070272ef2cca6c22d944a680f6829f0b14b7d193cc5c046f9f1a0a258bd5de68456d884a00d48f0f2639c66975cb23 WHIRLPOOL cbbad76d61a05dbb4750cd8218e1946d6b8b2e798f0a4071c6e706ee6d88a0e36dd9fcc8664c9cb0e3f8bdbac9ba6c548ce0a0829a4bf79d0965f18ee207bb90
DIST lxcfs-2.0.2.tar.gz 49185 SHA256 f3e9c7d53f25c2e71745dbef4c1b96d301fac12cb041329f3bbe438d7d7a4eda SHA512 358ea0d56d02a45cf93799663e067dc14fa6056f63b9047a7c7691ff0ff0ea44312be19baa0438887708de0fe85e10599e6c0178fbcbe483a6aaa56318c46fdd WHIRLPOOL 590ca502c2f72016b58d7fdb43db94ee1fa6f1af5fe9bd7d3b33d0f97fbff766b5adb22356d12f53601f070acb48d7645faa25128168094c8d42db9b39fa0263
DIST lxcfs-2.0.3.tar.gz 51078 SHA256 742a6cc463dc66179c334ebca4c3276888ef27a564e5e47212b60c655a811a72 SHA512 14caa2d6598529610ef6bd4c1d6f4d4598e8dc1378a3ee35ea7a1582c11150c896facc80216e67526384995891d9cc1244796860b790ecfc8bf735cc2cd80923 WHIRLPOOL f2de2438e4e521db5135ca81daceccdc1d3820907de9d37842c9bafa112cc416774cb2efe27b815cecccc26e55617c7eb9f5d076df5423ab354747605fa90643
+DIST lxcfs-2.0.4.tar.gz 52639 SHA256 9af8199dba2837542ede6e50489100220472241e4b355b685e66c9a72bbcf81a SHA512 1c701fbd60799a1f7ad7e809c2e52ef0d26ed44e96c2c0376d3c4eb203aafb99ddcaff015f3fa8cc9c1219449210f6bf93844cc568de3a9f55cb8801328cec90 WHIRLPOOL 1ac966bab786b00a236225e1856c46fa9d419e42853edcd1181fc3f43d54becb60435fa0679a6a0f838a5edeb920205e3baa734118a4b5d9587e547fd63e3704
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.4-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-2.0.4-fusermount-path.patch
new file mode 100644
index 00000000..61d3494
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.4-fusermount-path.patch
@@ -0,0 +1,11 @@
+--- /config/init/systemd/lxcfs.service.orig 2016-07-11 01:18:57.688074437 +0000
++++ /config/init/systemd/lxcfs.service 2016-07-11 01:19:48.516477185 +0000
+@@ -7,7 +7,7 @@
+ ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
+ KillMode=process
+ Restart=on-failure
+-ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
++ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
+ Delegate=yes
+
+ [Install]
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.4.initd b/sys-fs/lxcfs/files/lxcfs-2.0.4.initd
new file mode 100644
index 00000000..7436eee
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.4.initd
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/bin/lxcfs
+PIDFILE=/run/lxcfs.pid
+
+start() {
+ ebegin "Starting lxcfs"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ -f -o allow_other /var/lib/lxcfs
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lxcfs"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/sys-fs/lxcfs/lxcfs-2.0.4.ebuild b/sys-fs/lxcfs/lxcfs-2.0.4.ebuild
new file mode 100644
index 00000000..39c20c4
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-2.0.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit systemd vcs-snapshot versionator
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ KEYWORDS=""
+else
+ # e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
+ UPSTREAM_PV=$(replace_version_separator 3 '.' )
+ SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+IUSE="pam"
+
+# Omit all dbus. Upstream appears to require it because systemd, but
+# lxcfs makes no direct use of dbus.
+RDEPEND="
+ dev-libs/glib:2
+ sys-fs/fuse
+ virtual/pam
+"
+DEPEND="
+ sys-apps/help2man
+ ${RDEPEND}
+"
+PATCHES="${FILESDIR}/${P}-fusermount-path.patch"
+
+src_prepare() {
+ default
+ ./bootstrap.sh || die "Failed to bootstrap configure files"
+}
+
+src_configure() {
+ use pam || pamflag="--with-pamdir=none"
+
+ # Without the localstatedir the filesystem isn't mounted correctly
+ econf --localstatedir=/var ${pamflag}
+}
+
+# Test suite fails for me
+# src_test() {
+# emake tests
+# tests/main.sh || die "Tests failed"
+# }
+
+src_install() {
+ default
+ dodir /var/lib/lxcfs
+ newinitd "${FILESDIR}"/${P}.initd lxcfs
+ systemd_dounit config/init/systemd/lxcfs.service
+}
+
+pkg_preinst() {
+ # In an upgrade situation merging /var/lib/lxcfs (an empty dir)
+ # fails because that is a live mountpoint when the service is
+ # running. It's unnecessary anyway so skip the action.
+ [[ -d ${ROOT}/var/lib/lxcfs ]] && rm -rf ${D}/var
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/files/, sys-fs/lxcfs/
@ 2016-09-03 20:33 Erik Mackdanz
0 siblings, 0 replies; 13+ messages in thread
From: Erik Mackdanz @ 2016-09-03 20:33 UTC (permalink / raw
To: gentoo-commits
commit: be683dcf660b9f522a6abc2c3366ca095046e630
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 3 20:29:05 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Sep 3 20:33:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be683dcf
sys-fs/lxcfs: Bump to 2.0.3
EAPI=6 Also, fix a merge-time failure when /var/lib/lxcfs is installed
to a live mountpoint.
Package-Manager: portage-2.3.0
sys-fs/lxcfs/Manifest | 1 +
.../lxcfs/files/lxcfs-2.0.3-fusermount-path.patch | 11 ++++
sys-fs/lxcfs/files/lxcfs-2.0.3.initd | 27 ++++++++
sys-fs/lxcfs/lxcfs-2.0.3.ebuild | 71 ++++++++++++++++++++++
4 files changed, 110 insertions(+)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 80dc109..b8b1bc2 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -3,3 +3,4 @@ DIST lxcfs-2.0.0.tar.gz 48655 SHA256 4c03114a85aff530bf385b724b992470ffb97c6bf75
DIST lxcfs-2.0.0_beta2.tar.gz 44421 SHA256 4eacbbb51031ebd0776f050d7279b2076f7b4e156503f1bbe88e034f181e1d38 SHA512 d62bccc687873c060f299a726debc4642a0900f7e7a460b5c37dcb0b5d7cb75cd5b98ee03f129ccddbe62085510e1760db73010674333536f7126d01987262f4 WHIRLPOOL 470c6118a5560ff5fd447a409d136453b423d0b27a2f00652316b9415f68e08d349fc0e75edb1d312f7a25709bf96621574bd200c8fc92808a9e4eb59aada971
DIST lxcfs-2.0.1.tar.gz 49004 SHA256 4731a4d6939e32f3503560ee953e840d16e6abbb4fc7993c92cc1179e40d4f84 SHA512 3801a1d643b1f4478e702f615c8f9f9bc7070272ef2cca6c22d944a680f6829f0b14b7d193cc5c046f9f1a0a258bd5de68456d884a00d48f0f2639c66975cb23 WHIRLPOOL cbbad76d61a05dbb4750cd8218e1946d6b8b2e798f0a4071c6e706ee6d88a0e36dd9fcc8664c9cb0e3f8bdbac9ba6c548ce0a0829a4bf79d0965f18ee207bb90
DIST lxcfs-2.0.2.tar.gz 49185 SHA256 f3e9c7d53f25c2e71745dbef4c1b96d301fac12cb041329f3bbe438d7d7a4eda SHA512 358ea0d56d02a45cf93799663e067dc14fa6056f63b9047a7c7691ff0ff0ea44312be19baa0438887708de0fe85e10599e6c0178fbcbe483a6aaa56318c46fdd WHIRLPOOL 590ca502c2f72016b58d7fdb43db94ee1fa6f1af5fe9bd7d3b33d0f97fbff766b5adb22356d12f53601f070acb48d7645faa25128168094c8d42db9b39fa0263
+DIST lxcfs-2.0.3.tar.gz 51078 SHA256 742a6cc463dc66179c334ebca4c3276888ef27a564e5e47212b60c655a811a72 SHA512 14caa2d6598529610ef6bd4c1d6f4d4598e8dc1378a3ee35ea7a1582c11150c896facc80216e67526384995891d9cc1244796860b790ecfc8bf735cc2cd80923 WHIRLPOOL f2de2438e4e521db5135ca81daceccdc1d3820907de9d37842c9bafa112cc416774cb2efe27b815cecccc26e55617c7eb9f5d076df5423ab354747605fa90643
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.3-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-2.0.3-fusermount-path.patch
new file mode 100644
index 00000000..61d3494
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.3-fusermount-path.patch
@@ -0,0 +1,11 @@
+--- /config/init/systemd/lxcfs.service.orig 2016-07-11 01:18:57.688074437 +0000
++++ /config/init/systemd/lxcfs.service 2016-07-11 01:19:48.516477185 +0000
+@@ -7,7 +7,7 @@
+ ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
+ KillMode=process
+ Restart=on-failure
+-ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
++ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
+ Delegate=yes
+
+ [Install]
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.3.initd b/sys-fs/lxcfs/files/lxcfs-2.0.3.initd
new file mode 100644
index 00000000..7436eee
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.3.initd
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/bin/lxcfs
+PIDFILE=/run/lxcfs.pid
+
+start() {
+ ebegin "Starting lxcfs"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ -f -o allow_other /var/lib/lxcfs
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lxcfs"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/sys-fs/lxcfs/lxcfs-2.0.3.ebuild b/sys-fs/lxcfs/lxcfs-2.0.3.ebuild
new file mode 100644
index 00000000..39c20c4
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-2.0.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit systemd vcs-snapshot versionator
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ KEYWORDS=""
+else
+ # e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
+ UPSTREAM_PV=$(replace_version_separator 3 '.' )
+ SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+IUSE="pam"
+
+# Omit all dbus. Upstream appears to require it because systemd, but
+# lxcfs makes no direct use of dbus.
+RDEPEND="
+ dev-libs/glib:2
+ sys-fs/fuse
+ virtual/pam
+"
+DEPEND="
+ sys-apps/help2man
+ ${RDEPEND}
+"
+PATCHES="${FILESDIR}/${P}-fusermount-path.patch"
+
+src_prepare() {
+ default
+ ./bootstrap.sh || die "Failed to bootstrap configure files"
+}
+
+src_configure() {
+ use pam || pamflag="--with-pamdir=none"
+
+ # Without the localstatedir the filesystem isn't mounted correctly
+ econf --localstatedir=/var ${pamflag}
+}
+
+# Test suite fails for me
+# src_test() {
+# emake tests
+# tests/main.sh || die "Tests failed"
+# }
+
+src_install() {
+ default
+ dodir /var/lib/lxcfs
+ newinitd "${FILESDIR}"/${P}.initd lxcfs
+ systemd_dounit config/init/systemd/lxcfs.service
+}
+
+pkg_preinst() {
+ # In an upgrade situation merging /var/lib/lxcfs (an empty dir)
+ # fails because that is a live mountpoint when the service is
+ # running. It's unnecessary anyway so skip the action.
+ [[ -d ${ROOT}/var/lib/lxcfs ]] && rm -rf ${D}/var
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/files/, sys-fs/lxcfs/
@ 2016-04-02 16:02 Erik Mackdanz
0 siblings, 0 replies; 13+ messages in thread
From: Erik Mackdanz @ 2016-04-02 16:02 UTC (permalink / raw
To: gentoo-commits
commit: 1b09d9fca908fb94df2279400169be39b66a1e22
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 2 16:03:46 2016 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sat Apr 2 16:03:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b09d9fc
sys-fs/lxcfs: bump to 2.0
Package-Manager: portage-2.2.28
sys-fs/lxcfs/Manifest | 1 +
sys-fs/lxcfs/files/lxcfs-2.0.0.initd | 27 +++++++++++++++++
sys-fs/lxcfs/lxcfs-2.0.0.ebuild | 59 ++++++++++++++++++++++++++++++++++++
3 files changed, 87 insertions(+)
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 8debc47..556cdef 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,3 +1,4 @@
DIST lxcfs-0.16.tar.gz 35307 SHA256 a43c303ec46f4f25b14b7973726b2dc04231a126763b9fe6e0b080d608c04086 SHA512 536b7b6109b2b9d508c37baa1e4824d0cac37eadc2c046f49db89e24adb5474d6a67410e3c0cbb970c73d2dfe7e3757a4ce08577018c2fdb787668ed31af3a03 WHIRLPOOL 718505531388f517b154aff3cca18d5526a9d18163e22e95a5cd496757f3261b2342d52f0de704d9fe7d41d5623099f3c41493cd17668fc74facf2987b27eea5
DIST lxcfs-0.17.tar.gz 40501 SHA256 bcfe14a1ab4b717af1750b04c891a70b59f167d166c2db74984610041c926745 SHA512 dbc38265a65056330e46b8cc56558c6d14e13102c5e6c65a446749f5370c25d70a3a008d22c64b7d435c60e31bbe3efba887fd4f98c0a62fb5ad60c15366b174 WHIRLPOOL af4c0b03ede15414b53670a1363fa240986252b0ad1de8b0e13f99150ef4b2d419f63b6f96e94015344665c118c8599e1e97fb94854be89fc884ba40b96ec2c0
+DIST lxcfs-2.0.0.tar.gz 48655 SHA256 4c03114a85aff530bf385b724b992470ffb97c6bf759d61900cb93f4d12c517d SHA512 44b35b6c275366f88e036ed1e136cb193b65024fcbdff250658d360fced14bec84a2bcfa9f8ca28af9205f38babdd5520cfa42a5521cf545c42df80eec40c1b8 WHIRLPOOL 8972fe4838a3ec157479a9bed9404ba51d7ea47efe7e37c2b9f872fcab6068daef6898ef143304868003748a50068cc5634041020d6b6ced0acca97ffd9d8d07
DIST lxcfs-2.0.0_beta2.tar.gz 44421 SHA256 4eacbbb51031ebd0776f050d7279b2076f7b4e156503f1bbe88e034f181e1d38 SHA512 d62bccc687873c060f299a726debc4642a0900f7e7a460b5c37dcb0b5d7cb75cd5b98ee03f129ccddbe62085510e1760db73010674333536f7126d01987262f4 WHIRLPOOL 470c6118a5560ff5fd447a409d136453b423d0b27a2f00652316b9415f68e08d349fc0e75edb1d312f7a25709bf96621574bd200c8fc92808a9e4eb59aada971
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.0.initd b/sys-fs/lxcfs/files/lxcfs-2.0.0.initd
new file mode 100644
index 0000000..a850214
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.0.initd
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/bin/lxcfs
+PIDFILE=/run/lxcfs.pid
+
+start() {
+ ebegin "Starting lxcfs"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ -f -o allow_other /var/lib/lxcfs
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lxcfs"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/sys-fs/lxcfs/lxcfs-2.0.0.ebuild b/sys-fs/lxcfs/lxcfs-2.0.0.ebuild
new file mode 100644
index 0000000..7cc6d80
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-2.0.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd vcs-snapshot versionator
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ KEYWORDS=""
+else
+ # e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
+ UPSTREAM_PV=$(replace_version_separator 3 '.' )
+ SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+#IUSE="test"
+
+# Omit all dbus. Upstream appears to require it because systemd, but
+# lxcfs makes no direct use of dbus.
+RDEPEND="
+ dev-libs/glib:2
+ sys-fs/fuse
+ virtual/pam
+"
+DEPEND="
+ sys-apps/help2man
+ ${RDEPEND}
+"
+
+src_prepare() {
+ ./bootstrap.sh || die "Failed to bootstrap configure files"
+}
+
+src_configure() {
+ econf --localstatedir=/var
+}
+
+# Test suite fails for me
+# src_test() {
+# emake tests
+# tests/main.sh || die "Tests failed"
+# }
+
+src_install() {
+ default
+ dodir /var/lib/lxcfs
+ newinitd "${FILESDIR}"/${P}.initd lxcfs
+ systemd_dounit config/init/systemd/lxcfs.service
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2022-10-14 6:24 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-07 4:28 [gentoo-commits] repo/gentoo:master commit in: sys-fs/lxcfs/files/, sys-fs/lxcfs/ Erik Mackdanz
-- strict thread matches above, loose matches on Subject: below --
2022-10-14 6:24 Joonas Niilola
2022-09-08 6:43 Joonas Niilola
2022-08-16 7:55 Joonas Niilola
2022-08-02 5:35 Joonas Niilola
2020-06-26 8:13 Joonas Niilola
2019-02-07 4:32 Erik Mackdanz
2018-10-13 22:40 Erik Mackdanz
2018-10-13 22:38 Erik Mackdanz
2017-03-20 5:02 Erik Mackdanz
2016-10-11 3:39 Erik Mackdanz
2016-09-03 20:33 Erik Mackdanz
2016-04-02 16:02 Erik Mackdanz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox