Gentoo Archives: gentoo-commits

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