From 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Feb 2019 15:40:27 +0000 Subject: gentoo resync : 10.02.2019 --- sys-fs/lxcfs/Manifest | 12 ++-- .../lxcfs/files/lxcfs-3.0.0-fusermount-path.patch | 11 ---- sys-fs/lxcfs/files/lxcfs-3.0.0.initd | 26 -------- .../lxcfs/files/lxcfs-3.0.2-fusermount-path.patch | 15 ----- sys-fs/lxcfs/files/lxcfs-3.0.2.initd | 26 -------- sys-fs/lxcfs/files/lxcfs-fusermount-path.patch | 15 +++++ sys-fs/lxcfs/files/lxcfs.initd | 26 ++++++++ sys-fs/lxcfs/lxcfs-3.0.0.ebuild | 74 ---------------------- sys-fs/lxcfs/lxcfs-3.0.2.ebuild | 12 ++-- sys-fs/lxcfs/lxcfs-3.0.3.ebuild | 72 +++++++++++++++++++++ 10 files changed, 124 insertions(+), 165 deletions(-) delete mode 100644 sys-fs/lxcfs/files/lxcfs-3.0.0-fusermount-path.patch delete mode 100644 sys-fs/lxcfs/files/lxcfs-3.0.0.initd delete mode 100644 sys-fs/lxcfs/files/lxcfs-3.0.2-fusermount-path.patch delete mode 100644 sys-fs/lxcfs/files/lxcfs-3.0.2.initd create mode 100644 sys-fs/lxcfs/files/lxcfs-fusermount-path.patch create mode 100644 sys-fs/lxcfs/files/lxcfs.initd delete mode 100644 sys-fs/lxcfs/lxcfs-3.0.0.ebuild create mode 100644 sys-fs/lxcfs/lxcfs-3.0.3.ebuild (limited to 'sys-fs/lxcfs') diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest index 8c06e515b480..c3df2501f6ab 100644 --- a/sys-fs/lxcfs/Manifest +++ b/sys-fs/lxcfs/Manifest @@ -1,9 +1,7 @@ -AUX lxcfs-3.0.0-fusermount-path.patch 380 BLAKE2B b69b1d6e74cd434b18fb762aabd8db27f747eeceec7f137c13b0f42a9c445cb12019d21b551bedac815b1fd635d49c3f510b3adee72fb78dd6976ae1ed41a4bd SHA512 ce2f250cc6e8430dd928615d23a37edd136d559e42d2a695222372a2c4300d85753ddb6cc9d0b7a55d34f6f8a01bcf1951fdc815788cb5832bc59385cda43426 -AUX lxcfs-3.0.0.initd 533 BLAKE2B dc9bafd1256ba1e07d774d4629d489c8c073df7e3b57e18e809f97ddc4493cbda1a43594768184906f3f9fac6f9548b00be66d2eff2c2093e41375fe6a34ca5e SHA512 f2347bba95eea6b28f1e0e4bef7bd71ae2ee0283aae73efe57574dbbcd57839235190b460dc853924be84b58ba88e943dc222f538b75daa0fba788a1f1d74a27 -AUX lxcfs-3.0.2-fusermount-path.patch 489 BLAKE2B 3b9aa2d1202dd6b306be6b7820315214fe3b1cb07255a5723c92edf553536f3afb18849551a52a999941d7aeae90e2956e66d18d93d00fce20527a84e8d8e79e SHA512 560f06e7a996c4a2805b5a2c37d652631ad96e1f963f18fc73b72ee535ec333f7ad56a1a92806922dd673ffa512bab2b2c70c4b403b67dc2be02f2293b1221f6 -AUX lxcfs-3.0.2.initd 536 BLAKE2B 273704e8b23ca463d77515c7605f32d0fd9910e6875e28011714e80a9d94dcca5f82668cdd53e8bfa3a62ed2ec64184a99d5187f7cfad7b92e079d13eca3408c SHA512 0abb3d93e77571d3cf319ba5ac2b8e0b2ba3bda4571a8f11f6220310b595cc9f560acbaca941fb0bb25b0c2a3061981c58b9864fd1e135ffc83f8ae8d9008bcc -DIST lxcfs-3.0.0.tar.gz 49219 BLAKE2B c21cd9983e9175bf3a31bafd8a29ddd6a6a549226bd432636dd4ea48bf6268c403f236ca39739a989cd89fa7b0b05043c179ca328fd739f5a9d56e27907a7a60 SHA512 99fe11e99c2e487d6ecd9a8484be6413563ddcb33740631ee6fe1b60d3d2d62cea1bb44d1ef6dc45283f5b3d20cd680d48ea3cb5ad17f0c3e7ba6ed56186c42f +AUX lxcfs-fusermount-path.patch 489 BLAKE2B 3b9aa2d1202dd6b306be6b7820315214fe3b1cb07255a5723c92edf553536f3afb18849551a52a999941d7aeae90e2956e66d18d93d00fce20527a84e8d8e79e SHA512 560f06e7a996c4a2805b5a2c37d652631ad96e1f963f18fc73b72ee535ec333f7ad56a1a92806922dd673ffa512bab2b2c70c4b403b67dc2be02f2293b1221f6 +AUX lxcfs.initd 536 BLAKE2B cc8906ec07679c2aafcfc92e038e0442622ade31a9e7b3745426cfce8e42db3f1c277d84802368f53f656fffdadca747a742b8874e5edb2724dfc74d6e97a628 SHA512 196e59cfc4b8fc06975ed24a38b710916b88a18477a0e6c7f63ff3ee8d9fb395d728bbcbf59c9dc97452262f6e2d74f3b2e6ef205bead907d989cd22bacb74ff DIST lxcfs-3.0.2.tar.gz 49809 BLAKE2B dc73149b92ac040c56de5f4c11aafdf6e744ffd2b17e22ee9c784663ff102dedd74453581a77027037955238e081c596377c28b6066012fa32ee575e6a4c57fa SHA512 2065bbd68fd2974fe28c861b1e77c62a501da85e1bfc19eeafa49fd88c66e8e75ae007781c8bd05caf43fb3b80ad12c81c0f0f03d27ab1131e0cfe6d48443218 -EBUILD lxcfs-3.0.0.ebuild 1878 BLAKE2B 5fd90ffb93644ebf06bfd7f434effad86feb4b2773b8533af4575fde37e14a415abac7980b10f82d0368596bf7a07cd4a1af1d3574e125f7ffad1b9189d54680 SHA512 daa74fcc99c892df783b496eb0d2a38fa4a751610474f6a89c2e543d02f86c4fe7332766c9d686dcec8d4ee832a4a79207f26ded3ce525d2df06b735d4b23083 -EBUILD lxcfs-3.0.2.ebuild 1736 BLAKE2B 32ca0319b2a10bf6c352be5fe5c53e940a7f696d8a00777f6b29a1bd6e02e6bb38c8439e43f929837eb293d6363aad84a5383658228bf9aa8242018dae13fc97 SHA512 1aae443c01905892150204331ca79ed3312292195b64e76febe315c14ebb801833756cc8933c60b1bba1068d5e80e78a2e3741b8d4379345925609c74a35800d +DIST lxcfs-3.0.3.tar.gz 49824 BLAKE2B 02e3a0a6f4fd515924c5f038f00d664ef347c9b685e6561334b460e0ce0ce5580aca67f33df56b44b9cdafa4953f4f92843662f3516e1c923f9242388b17dbc6 SHA512 d994e1dd85f499eba2847d33870281a4bcaf4466e2c8f7acb065f4f3d5688b93b775c486bc6db571e64d09a3567710b0c816e12555ffb3e3e50f81bc7f5f6be6 +EBUILD lxcfs-3.0.2.ebuild 1735 BLAKE2B 51a331b3697b9e74a99de4bfaf1ba57aade89740d353fd0c2587bcb68d3a3a6089f161bc4c41a0f0f175364df9e4f0c829e9237d50460b85b7f3bd8342baf6f9 SHA512 e5bd8924ad6da0650f960ff18ef21f8607eee17e35198a3079a4758cceec5d971089b7118ee25a97a5374a7c9a7a26a4ef34ec3762ab161920d3bda7d5a53e83 +EBUILD lxcfs-3.0.3.ebuild 1736 BLAKE2B c0a4b0fde3609ec039a1c3afc69d71f7afc7c05324f1226305952622f524e558cbb9e56dd61dfcb0aaa72ccf78a4de9491cc887ae8f9c80cc166679c67133ce0 SHA512 09007915f2d9d1343b0318337cbc6146ee750e301fc4c70c127283fd8f389fa64e90ddc09068225d53ea30193a5f9b74d3bdedc4cddaf8df9bddf3eac27c6179 MISC metadata.xml 808 BLAKE2B b8b8be1a8fd8a1a9614dbfeddd97cd322bcf0ed4d11a97bc6680bde28faa0bdaabbf8b5a92242e0da09845f6a08280dd0d6681e3932a7319117c186f167bf6fd SHA512 dfb81661c2feb5abb3397c93eabf26c12af51099f6676d8fec346c83ca3edea788745e4a59ea05035b16b1baf21edd16d9537f66fbd10d0c8da8a7933b35c528 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 61d3494fb7f3..000000000000 --- 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 a34e74af7b69..000000000000 --- 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/files/lxcfs-3.0.2-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-3.0.2-fusermount-path.patch deleted file mode 100644 index 99a5addf1d10..000000000000 --- a/sys-fs/lxcfs/files/lxcfs-3.0.2-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-3.0.2.initd b/sys-fs/lxcfs/files/lxcfs-3.0.2.initd deleted file mode 100644 index 52d8202d7ac3..000000000000 --- a/sys-fs/lxcfs/files/lxcfs-3.0.2.initd +++ /dev/null @@ -1,26 +0,0 @@ -#!/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/files/lxcfs-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-fusermount-path.patch new file mode 100644 index 000000000000..99a5addf1d10 --- /dev/null +++ b/sys-fs/lxcfs/files/lxcfs-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.initd b/sys-fs/lxcfs/files/lxcfs.initd new file mode 100644 index 000000000000..5997426fa8e8 --- /dev/null +++ b/sys-fs/lxcfs/files/lxcfs.initd @@ -0,0 +1,26 @@ +#!/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.0.ebuild b/sys-fs/lxcfs/lxcfs-3.0.0.ebuild deleted file mode 100644 index a16a47a4d9fb..000000000000 --- 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 -} diff --git a/sys-fs/lxcfs/lxcfs-3.0.2.ebuild b/sys-fs/lxcfs/lxcfs-3.0.2.ebuild index ce923205a59a..f9c354a881a3 100644 --- a/sys-fs/lxcfs/lxcfs-3.0.2.ebuild +++ b/sys-fs/lxcfs/lxcfs-3.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,13 +11,13 @@ SLOT="0" if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/lxc/lxcfs.git" - EGIT_BRANCH="master" + EGIT_BRANCH="master" inherit git-r3 - SRC_URI="" + SRC_URI="" 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 } diff --git a/sys-fs/lxcfs/lxcfs-3.0.3.ebuild b/sys-fs/lxcfs/lxcfs-3.0.3.ebuild new file mode 100644 index 000000000000..4d89fb38cc5f --- /dev/null +++ b/sys-fs/lxcfs/lxcfs-3.0.3.ebuild @@ -0,0 +1,72 @@ +# 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 +} -- cgit v1.2.3