1 |
commit: 51b92272875fc9faff130e242c421874a089e011 |
2 |
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 11 02:39:06 2016 +0000 |
4 |
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 11 02:39:06 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51b92272 |
7 |
|
8 |
sys-fs/lxcfs: Bump to 2.0.2 |
9 |
|
10 |
Adds pam use flag, uses (patched) upstream systemd service file not our own |
11 |
|
12 |
Package-Manager: portage-2.3.0 |
13 |
|
14 |
sys-fs/lxcfs/Manifest | 1 + |
15 |
.../lxcfs/files/lxcfs-2.0.2-fusermount-path.patch | 11 ++++ |
16 |
sys-fs/lxcfs/files/lxcfs-2.0.2.initd | 27 ++++++++++ |
17 |
sys-fs/lxcfs/lxcfs-2.0.2.ebuild | 63 ++++++++++++++++++++++ |
18 |
4 files changed, 102 insertions(+) |
19 |
|
20 |
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest |
21 |
index fa7dd62..80dc109 100644 |
22 |
--- a/sys-fs/lxcfs/Manifest |
23 |
+++ b/sys-fs/lxcfs/Manifest |
24 |
@@ -2,3 +2,4 @@ DIST lxcfs-0.17.tar.gz 40501 SHA256 bcfe14a1ab4b717af1750b04c891a70b59f167d166c2 |
25 |
DIST lxcfs-2.0.0.tar.gz 48655 SHA256 4c03114a85aff530bf385b724b992470ffb97c6bf759d61900cb93f4d12c517d SHA512 44b35b6c275366f88e036ed1e136cb193b65024fcbdff250658d360fced14bec84a2bcfa9f8ca28af9205f38babdd5520cfa42a5521cf545c42df80eec40c1b8 WHIRLPOOL 8972fe4838a3ec157479a9bed9404ba51d7ea47efe7e37c2b9f872fcab6068daef6898ef143304868003748a50068cc5634041020d6b6ced0acca97ffd9d8d07 |
26 |
DIST lxcfs-2.0.0_beta2.tar.gz 44421 SHA256 4eacbbb51031ebd0776f050d7279b2076f7b4e156503f1bbe88e034f181e1d38 SHA512 d62bccc687873c060f299a726debc4642a0900f7e7a460b5c37dcb0b5d7cb75cd5b98ee03f129ccddbe62085510e1760db73010674333536f7126d01987262f4 WHIRLPOOL 470c6118a5560ff5fd447a409d136453b423d0b27a2f00652316b9415f68e08d349fc0e75edb1d312f7a25709bf96621574bd200c8fc92808a9e4eb59aada971 |
27 |
DIST lxcfs-2.0.1.tar.gz 49004 SHA256 4731a4d6939e32f3503560ee953e840d16e6abbb4fc7993c92cc1179e40d4f84 SHA512 3801a1d643b1f4478e702f615c8f9f9bc7070272ef2cca6c22d944a680f6829f0b14b7d193cc5c046f9f1a0a258bd5de68456d884a00d48f0f2639c66975cb23 WHIRLPOOL cbbad76d61a05dbb4750cd8218e1946d6b8b2e798f0a4071c6e706ee6d88a0e36dd9fcc8664c9cb0e3f8bdbac9ba6c548ce0a0829a4bf79d0965f18ee207bb90 |
28 |
+DIST lxcfs-2.0.2.tar.gz 49185 SHA256 f3e9c7d53f25c2e71745dbef4c1b96d301fac12cb041329f3bbe438d7d7a4eda SHA512 358ea0d56d02a45cf93799663e067dc14fa6056f63b9047a7c7691ff0ff0ea44312be19baa0438887708de0fe85e10599e6c0178fbcbe483a6aaa56318c46fdd WHIRLPOOL 590ca502c2f72016b58d7fdb43db94ee1fa6f1af5fe9bd7d3b33d0f97fbff766b5adb22356d12f53601f070acb48d7645faa25128168094c8d42db9b39fa0263 |
29 |
|
30 |
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.2-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-2.0.2-fusermount-path.patch |
31 |
new file mode 100644 |
32 |
index 0000000..ab25fa8 |
33 |
--- /dev/null |
34 |
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.2-fusermount-path.patch |
35 |
@@ -0,0 +1,11 @@ |
36 |
+--- config/init/systemd/lxcfs.service.orig 2016-07-11 01:18:57.688074437 +0000 |
37 |
++++ config/init/systemd/lxcfs.service 2016-07-11 01:19:48.516477185 +0000 |
38 |
+@@ -7,7 +7,7 @@ |
39 |
+ ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/ |
40 |
+ KillMode=process |
41 |
+ Restart=on-failure |
42 |
+-ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs |
43 |
++ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs |
44 |
+ Delegate=yes |
45 |
+ |
46 |
+ [Install] |
47 |
|
48 |
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.2.initd b/sys-fs/lxcfs/files/lxcfs-2.0.2.initd |
49 |
new file mode 100644 |
50 |
index 0000000..7436eee |
51 |
--- /dev/null |
52 |
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.2.initd |
53 |
@@ -0,0 +1,27 @@ |
54 |
+#!/sbin/openrc-run |
55 |
+# Copyright 1999-2016 Gentoo Foundation |
56 |
+# Distributed under the terms of the GNU General Public License v2 |
57 |
+# $Id$ |
58 |
+ |
59 |
+DAEMON=/usr/bin/lxcfs |
60 |
+PIDFILE=/run/lxcfs.pid |
61 |
+ |
62 |
+start() { |
63 |
+ ebegin "Starting lxcfs" |
64 |
+ |
65 |
+ start-stop-daemon --start \ |
66 |
+ --pidfile ${PIDFILE} \ |
67 |
+ --exec ${DAEMON} \ |
68 |
+ --background \ |
69 |
+ --make-pidfile \ |
70 |
+ -- \ |
71 |
+ -f -o allow_other /var/lib/lxcfs |
72 |
+ |
73 |
+ eend $? |
74 |
+} |
75 |
+ |
76 |
+stop() { |
77 |
+ ebegin "Stopping lxcfs" |
78 |
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE} |
79 |
+ eend $? |
80 |
+} |
81 |
|
82 |
diff --git a/sys-fs/lxcfs/lxcfs-2.0.2.ebuild b/sys-fs/lxcfs/lxcfs-2.0.2.ebuild |
83 |
new file mode 100644 |
84 |
index 0000000..f31b42f |
85 |
--- /dev/null |
86 |
+++ b/sys-fs/lxcfs/lxcfs-2.0.2.ebuild |
87 |
@@ -0,0 +1,63 @@ |
88 |
+# Copyright 1999-2016 Gentoo Foundation |
89 |
+# Distributed under the terms of the GNU General Public License v2 |
90 |
+# $Id$ |
91 |
+ |
92 |
+EAPI=5 |
93 |
+ |
94 |
+inherit eutils systemd vcs-snapshot versionator |
95 |
+DESCRIPTION="FUSE filesystem for LXC" |
96 |
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/" |
97 |
+LICENSE="Apache-2.0" |
98 |
+SLOT="0" |
99 |
+ |
100 |
+if [[ ${PV} == "9999" ]] ; then |
101 |
+ EGIT_REPO_URI="https://github.com/lxc/lxcfs.git" |
102 |
+ EGIT_BRANCH="master" |
103 |
+ inherit git-r3 |
104 |
+ SRC_URI="" |
105 |
+ KEYWORDS="" |
106 |
+else |
107 |
+ # e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2 |
108 |
+ UPSTREAM_PV=$(replace_version_separator 3 '.' ) |
109 |
+ SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz" |
110 |
+ KEYWORDS="~amd64" |
111 |
+fi |
112 |
+ |
113 |
+IUSE="pam" |
114 |
+ |
115 |
+# Omit all dbus. Upstream appears to require it because systemd, but |
116 |
+# lxcfs makes no direct use of dbus. |
117 |
+RDEPEND=" |
118 |
+ dev-libs/glib:2 |
119 |
+ sys-fs/fuse |
120 |
+ virtual/pam |
121 |
+" |
122 |
+DEPEND=" |
123 |
+ sys-apps/help2man |
124 |
+ ${RDEPEND} |
125 |
+" |
126 |
+ |
127 |
+src_prepare() { |
128 |
+ epatch "${FILESDIR}"/${P}-fusermount-path.patch |
129 |
+ ./bootstrap.sh || die "Failed to bootstrap configure files" |
130 |
+} |
131 |
+ |
132 |
+src_configure() { |
133 |
+ use pam || pamflag="--with-pamdir=none" |
134 |
+ |
135 |
+ # Without the localstatedir the filesystem isn't mounted correctly |
136 |
+ econf --localstatedir=/var ${pamflag} |
137 |
+} |
138 |
+ |
139 |
+# Test suite fails for me |
140 |
+# src_test() { |
141 |
+# emake tests |
142 |
+# tests/main.sh || die "Tests failed" |
143 |
+# } |
144 |
+ |
145 |
+src_install() { |
146 |
+ default |
147 |
+ dodir /var/lib/lxcfs |
148 |
+ newinitd "${FILESDIR}"/${P}.initd lxcfs |
149 |
+ systemd_dounit config/init/systemd/lxcfs.service |
150 |
+} |