1 |
From: Robert Günzler <r@××××××.io> |
2 |
|
3 |
Closes: https://bugs.gentoo.org/709982 |
4 |
Signed-off-by: Robert Günzler <r@××××××.io> |
5 |
--- |
6 |
Splits the removal of the old package and adding of the new one into |
7 |
separate commits |
8 |
|
9 |
app-emulation/crun/Manifest | 1 + |
10 |
app-emulation/crun/crun-0.13.ebuild | 74 +++++++++++++++++++ |
11 |
...duplicate-json_common-in-makefile-am.patch | 31 ++++++++ |
12 |
3 files changed, 106 insertions(+) |
13 |
create mode 100644 app-emulation/crun/crun-0.13.ebuild |
14 |
create mode 100644 app-emulation/crun/files/libocispec-deduplicate-json_common-in-makefile-am.patch |
15 |
|
16 |
diff --git a/app-emulation/crun/Manifest b/app-emulation/crun/Manifest |
17 |
index 1652b2325..56e3366c8 100644 |
18 |
--- a/app-emulation/crun/Manifest |
19 |
+++ b/app-emulation/crun/Manifest |
20 |
@@ -1 +1,2 @@ |
21 |
+DIST crun-0.13.tar.gz 1305048 BLAKE2B fbffabf4cfc744522147b47c5e2bf2bc48e074866108ec4ec8ab94e7ebdc39451851696fabde268b5853e1c3fafb0ac93527e08fdb766acebdd7cf952a9e1a9e SHA512 314612eaf3097160e9369b3400ac8a83e173ef1a53295191c925e96212ba00d032883db1e4615b8ba42ddb08f1e31ca5e5088ea583a469835ac3c27087a88d6e |
22 |
DIST crun-0.10.6.tar.gz 1242736 BLAKE2B 840699c6a07ddaef3f6ab4ce226fa6c4ebf0e32641012b6467a2a622d575a48286555b84140d5a1c947b5ef00a691045b0618533fb246bfb6d605baa262febe4 SHA512 b7db09d0c7d2d6e8b1ea239ead5a2ca2b97f188a74f08f0d5ac787e0a698fddf596e7cfdde482c6bc8790d06a7705613e877344a44691c0be7388e6d046c4b15 |
23 |
diff --git a/app-emulation/crun/crun-0.13.ebuild b/app-emulation/crun/crun-0.13.ebuild |
24 |
new file mode 100644 |
25 |
index 000000000..7b7d5fcda |
26 |
--- /dev/null |
27 |
+++ b/app-emulation/crun/crun-0.13.ebuild |
28 |
@@ -0,0 +1,74 @@ |
29 |
+# Copyright 2019-2020 Gentoo Authors |
30 |
+# Distributed under the terms of the GNU General Public License v2 |
31 |
+ |
32 |
+EAPI=7 |
33 |
+ |
34 |
+PYTHON_COMPAT=( python3_{6,7} ) |
35 |
+ |
36 |
+inherit autotools python-any-r1 |
37 |
+ |
38 |
+DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C" |
39 |
+HOMEPAGE="https://github.com/containers/crun" |
40 |
+SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz" |
41 |
+ |
42 |
+LICENSE="GPL-2+ LGPL-2.1+" |
43 |
+SLOT="0" |
44 |
+KEYWORDS="~amd64" |
45 |
+IUSE="bpf +caps doc seccomp systemd static-libs" |
46 |
+ |
47 |
+DEPEND=" |
48 |
+ dev-libs/yajl |
49 |
+ caps? ( sys-libs/libcap ) |
50 |
+ seccomp? ( sys-libs/libseccomp ) |
51 |
+ systemd? ( sys-apps/systemd:= ) |
52 |
+" |
53 |
+RDEPEND="${DEPEND}" |
54 |
+BDEPEND=" |
55 |
+ ${PYTHON_DEPS} |
56 |
+ doc? ( dev-go/go-md2man ) |
57 |
+" |
58 |
+ |
59 |
+# the crun test suite is comprehensive to the extent that tests will fail |
60 |
+# within a sandbox environment, due to the nature of the privileges |
61 |
+# required to create linux "containers". |
62 |
+RESTRICT="test" |
63 |
+ |
64 |
+DOCS=README.md |
65 |
+ |
66 |
+ |
67 |
+PATCHES=( |
68 |
+ # see https://709982.bugs.gentoo.org/attachment.cgi?id=614208 |
69 |
+ "${FILESDIR}/libocispec-deduplicate-json_common-in-makefile-am.patch" |
70 |
+) |
71 |
+ |
72 |
+src_prepare() { |
73 |
+ default |
74 |
+ eautoreconf |
75 |
+} |
76 |
+ |
77 |
+src_configure() { |
78 |
+ econf \ |
79 |
+ --disable-criu \ |
80 |
+ $(use_enable bpf) \ |
81 |
+ $(use_enable caps) \ |
82 |
+ $(use_enable seccomp) \ |
83 |
+ $(use_enable systemd) \ |
84 |
+ $(usex static-libs '--enabled-shared --enabled-static' '--enable-shared --disable-static' '' '') |
85 |
+} |
86 |
+ |
87 |
+src_compile() { |
88 |
+ emake -C libocispec |
89 |
+ emake crun |
90 |
+ if use doc ; then |
91 |
+ emake generate-man |
92 |
+ fi |
93 |
+} |
94 |
+ |
95 |
+src_install() { |
96 |
+ emake "DESTDIR=${D}" install-exec |
97 |
+ if use doc ; then |
98 |
+ emake "DESTDIR=${D}" install-man |
99 |
+ fi |
100 |
+ |
101 |
+ einstalldocs |
102 |
+} |
103 |
diff --git a/app-emulation/crun/files/libocispec-deduplicate-json_common-in-makefile-am.patch b/app-emulation/crun/files/libocispec-deduplicate-json_common-in-makefile-am.patch |
104 |
new file mode 100644 |
105 |
index 000000000..7d188abf8 |
106 |
--- /dev/null |
107 |
+++ b/app-emulation/crun/files/libocispec-deduplicate-json_common-in-makefile-am.patch |
108 |
@@ -0,0 +1,31 @@ |
109 |
+From 9d58891c058efa55c7b95cb90597d4cadc5c66d8 Mon Sep 17 00:00:00 2001 |
110 |
+From: Bruce Guenter <bruce@××××××××××.org> |
111 |
+Date: Mon, 17 Feb 2020 13:54:14 -0600 |
112 |
+Subject: [PATCH] De-duplicate json_common in Makefile.am |
113 |
+ |
114 |
+The source file src/json_common.c is listed twice in Makefile.am, |
115 |
+leading libtool to produce an archive with duplicated symbols. This |
116 |
+change removes the duplicate source. |
117 |
+ |
118 |
+This was introduced in commit 2e318803a2c49521ea448e3ae010b1564a7e95ed |
119 |
+ |
120 |
+Signed-off-by: Bruce Guenter <bruce@××××××××××.org> |
121 |
+--- |
122 |
+ Makefile.am | 2 +- |
123 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
124 |
+ |
125 |
+diff --git a/Makefile.am b/Makefile.am |
126 |
+index 65bed45..c7ede83 100644 |
127 |
+--- a/libocispec/Makefile.am |
128 |
++++ b/libocispec/Makefile.am |
129 |
+@@ -7,7 +7,7 @@ GITIGNOREFILES = build-aux/ gtk-doc.make config.h.in aclocal.m4 |
130 |
+ noinst_LTLIBRARIES = libocispec.la |
131 |
+ noinst_LIBRARIES = libocispec.a |
132 |
+ |
133 |
+-SOURCE_FILES = src/json_common.c \ |
134 |
++SOURCE_FILES = \ |
135 |
+ src/image_spec_schema_config_schema.c \ |
136 |
+ src/image_spec_schema_content_descriptor.c \ |
137 |
+ src/image_spec_schema_defs.c \ |
138 |
+-- |
139 |
+2.24.1 |
140 |
-- |
141 |
2.26.2 |