1 |
commit: 823d32aa1094ed5fa4e1e9a72d4f32546174d6c7 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 19 18:11:25 2021 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 19 18:16:51 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=823d32aa |
7 |
|
8 |
app-emulation/snapd: Bump to version 2.52 |
9 |
|
10 |
Package-Manager: Portage-3.0.23, Repoman-3.0.3 |
11 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
12 |
|
13 |
app-emulation/snapd/Manifest | 1 + |
14 |
app-emulation/snapd/snapd-2.52.ebuild | 180 ++++++++++++++++++++++++++++++++++ |
15 |
2 files changed, 181 insertions(+) |
16 |
|
17 |
diff --git a/app-emulation/snapd/Manifest b/app-emulation/snapd/Manifest |
18 |
index 4a17ff22271..2e973b4b4c7 100644 |
19 |
--- a/app-emulation/snapd/Manifest |
20 |
+++ b/app-emulation/snapd/Manifest |
21 |
@@ -1,2 +1,3 @@ |
22 |
DIST snapd-2.48.tar.xz 3757292 BLAKE2B 4d1fd4b9ff3bd7cf05ebf0e27db4bcc87b5de689be470b4c62758e411e9d99a541ae084c7b1afe4ede44ad6dce19a53b337dcddc18d0b82957ef537f466e720a SHA512 27e1924d86296a969cd18980d6100c8e41be66f2ad0214ac2857580a2686b1e7ef01e2561c6ed532106eadb1ac2d5fd070ef9eb05e5fabfb8fa9a98456259b89 |
23 |
DIST snapd-2.51.tar.xz 4036884 BLAKE2B debdfe51407306451ecdb7851e3768be5aa5b9714b2861cb17e9989194dfbf441b1569955c6440a7d44f1d36996b398bcf60b903a76116e14dcc3173625e105c SHA512 959cceb8fcb326a14557347cecfb931763084e00639b828dc539646d2988cdeb3c9276ab8b770c6bbe37c7a05fb6548f609f490c55f7ee28713a4eb80cf3da15 |
24 |
+DIST snapd-2.52.tar.xz 4146496 BLAKE2B 49b952503c60b589fe7ddea9ded135139243da34b35b39d9e309df6854109fb3a99f52ca324737fa7f5773221d453f7093047dcdcb1114d0389e20ba24c3d2c3 SHA512 56d3a2c5048d2ffde5b34f63e6a99dc74a7c6e4637f36250f674a68863c4b997cf940689529eca9d3bf58b0148cc18a0b4033d93aa06375a5f12c552d40472da |
25 |
|
26 |
diff --git a/app-emulation/snapd/snapd-2.52.ebuild b/app-emulation/snapd/snapd-2.52.ebuild |
27 |
new file mode 100644 |
28 |
index 00000000000..abc28376ab8 |
29 |
--- /dev/null |
30 |
+++ b/app-emulation/snapd/snapd-2.52.ebuild |
31 |
@@ -0,0 +1,180 @@ |
32 |
+# Copyright 2020-2021 Gentoo Authors |
33 |
+# Distributed under the terms of the GNU General Public License v2 |
34 |
+ |
35 |
+EAPI=7 |
36 |
+ |
37 |
+EGO_PN="github.com/snapcore/${PN}" |
38 |
+inherit autotools bash-completion-r1 golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils |
39 |
+ |
40 |
+DESCRIPTION="Service and tools for management of snap packages" |
41 |
+HOMEPAGE="http://snapcraft.io/" |
42 |
+ |
43 |
+MY_S="${S}/src/github.com/snapcore/${PN}" |
44 |
+ |
45 |
+SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz" |
46 |
+MY_PV=${PV} |
47 |
+KEYWORDS="~amd64" |
48 |
+ |
49 |
+LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT" |
50 |
+SLOT="0" |
51 |
+IUSE="apparmor +cgroup-hybrid +forced-devmode gtk kde systemd" |
52 |
+REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) systemd" |
53 |
+ |
54 |
+CONFIG_CHECK="~CGROUPS |
55 |
+ ~CGROUP_DEVICE |
56 |
+ ~CGROUP_FREEZER |
57 |
+ ~NAMESPACES |
58 |
+ ~SQUASHFS |
59 |
+ ~SQUASHFS_ZLIB |
60 |
+ ~SQUASHFS_LZO |
61 |
+ ~SQUASHFS_XZ |
62 |
+ ~BLK_DEV_LOOP |
63 |
+ ~SECCOMP |
64 |
+ ~SECCOMP_FILTER" |
65 |
+ |
66 |
+RDEPEND=" |
67 |
+ sys-libs/libseccomp:= |
68 |
+ apparmor? ( |
69 |
+ sec-policy/apparmor-profiles |
70 |
+ sys-apps/apparmor:= |
71 |
+ ) |
72 |
+ dev-libs/glib |
73 |
+ virtual/libudev |
74 |
+ systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] ) |
75 |
+ sys-libs/libcap:= |
76 |
+ sys-fs/squashfs-tools[lzma]" |
77 |
+ |
78 |
+DEPEND="${RDEPEND}" |
79 |
+ |
80 |
+BDEPEND=" |
81 |
+ >=dev-lang/go-1.9 |
82 |
+ dev-python/docutils |
83 |
+ sys-devel/gettext |
84 |
+ sys-fs/xfsprogs" |
85 |
+ |
86 |
+PDEPEND="sys-auth/polkit[gtk?,kde?]" |
87 |
+ |
88 |
+README_GENTOO_SUFFIX="" |
89 |
+ |
90 |
+pkg_setup() { |
91 |
+ if use apparmor; then |
92 |
+ CONFIG_CHECK+=" ~SECURITY_APPARMOR" |
93 |
+ fi |
94 |
+ linux-info_pkg_setup |
95 |
+} |
96 |
+ |
97 |
+src_prepare() { |
98 |
+ default |
99 |
+ # Update apparmor profile to allow libtinfow.so* |
100 |
+ sed -i 's/libtinfo/libtinfo{,w}/' \ |
101 |
+ "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die |
102 |
+ |
103 |
+ if ! use forced-devmode; then |
104 |
+ sed -e 's#return \(!apparmorFull || cgroupv2\)#//\1\n\tif !apparmorFull || cgroupv2 {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \ |
105 |
+ -i "${MY_S}/sandbox/forcedevmode.go" || die |
106 |
+ grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode" |
107 |
+ fi |
108 |
+ |
109 |
+ sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh" || die |
110 |
+ |
111 |
+ pushd "${MY_S}" >/dev/null || die |
112 |
+ ./mkversion.sh "${PV}" |
113 |
+ popd >/dev/null || die |
114 |
+ pushd "${MY_S}/cmd" >/dev/null || die |
115 |
+ eautoreconf |
116 |
+} |
117 |
+ |
118 |
+src_configure() { |
119 |
+ SNAPD_MAKEARGS=( |
120 |
+ "BINDIR=${EPREFIX}/usr/bin" |
121 |
+ "DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services" |
122 |
+ "LIBEXECDIR=${EPREFIX}/usr/lib" |
123 |
+ "SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap" |
124 |
+ "SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)" |
125 |
+ ) |
126 |
+ export CGO_ENABLED="1" |
127 |
+ export CGO_CFLAGS="${CFLAGS}" |
128 |
+ export CGO_CPPFLAGS="${CPPFLAGS}" |
129 |
+ export CGO_CXXFLAGS="${CXXFLAGS}" |
130 |
+ |
131 |
+ pushd "${MY_S}/cmd" >/dev/null || die |
132 |
+ econf --libdir="${EPREFIX}/usr/lib" \ |
133 |
+ --libexecdir="${EPREFIX}/usr/lib/snapd" \ |
134 |
+ $(use_enable apparmor) \ |
135 |
+ --enable-nvidia-biarch \ |
136 |
+ --with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap" |
137 |
+} |
138 |
+ |
139 |
+src_compile() { |
140 |
+ export -n GOCACHE XDG_CACHE_HOME |
141 |
+ export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}" |
142 |
+ |
143 |
+ local file |
144 |
+ for file in "${MY_S}/po/"*.po; do |
145 |
+ msgfmt "${file}" -o "${file%.po}.mo" || die |
146 |
+ done |
147 |
+ |
148 |
+ emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}" |
149 |
+ |
150 |
+ local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath) |
151 |
+ local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath) |
152 |
+ |
153 |
+ local cmd |
154 |
+ for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do |
155 |
+ go build -o "${GOBIN}/${cmd}" "${flags[@]}" \ |
156 |
+ -v -x "github.com/snapcore/${PN}/cmd/${cmd}" |
157 |
+ [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}" |
158 |
+ done |
159 |
+ for cmd in snapctl snap-exec snap-update-ns; do |
160 |
+ go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \ |
161 |
+ -v -x "github.com/snapcore/${PN}/cmd/${cmd}" |
162 |
+ [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}" |
163 |
+ done |
164 |
+} |
165 |
+ |
166 |
+src_install() { |
167 |
+ emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}" |
168 |
+ emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}" |
169 |
+ |
170 |
+ if use apparmor; then |
171 |
+ mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die |
172 |
+ keepdir /var/lib/snapd/apparmor/profiles |
173 |
+ fi |
174 |
+ keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void} |
175 |
+ fperms 700 /var/lib/snapd/{cache,cookie} |
176 |
+ |
177 |
+ dobin "${GOBIN}/"{snap,snapctl} |
178 |
+ ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die |
179 |
+ |
180 |
+ exeinto /usr/lib/snapd |
181 |
+ doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \ |
182 |
+ "${MY_S}/"{cmd/snap-confine/snap-device-helper,cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \ |
183 |
+ "${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,} |
184 |
+ |
185 |
+ dobashcomp "${MY_S}/data/completion/bash/snap" |
186 |
+ |
187 |
+ insinto /usr/share/zsh/site-functions |
188 |
+ doins "${MY_S}/data/completion/zsh/_snap" |
189 |
+ |
190 |
+ insinto "/usr/share/polkit-1/actions" |
191 |
+ doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy" |
192 |
+ |
193 |
+ dodoc "${MY_S}/packaging/ubuntu-16.04/changelog" |
194 |
+ domo "${MY_S}/po/"*.mo |
195 |
+ |
196 |
+ readme.gentoo_create_doc |
197 |
+} |
198 |
+ |
199 |
+pkg_postinst() { |
200 |
+ readme.gentoo_print_elog |
201 |
+ xdg_desktop_database_update |
202 |
+ |
203 |
+ if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles && |
204 |
+ $(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then |
205 |
+ apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real" |
206 |
+ fi |
207 |
+} |
208 |
+ |
209 |
+pkg_postrm() { |
210 |
+ xdg_desktop_database_update |
211 |
+} |