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-containers/snapd/
Date: Fri, 13 May 2022 21:45:32
Message-Id: 1652478324.df9ea0aeab636e3a85c77aaad179d8a519dbae48.zmedico@gentoo
1 commit: df9ea0aeab636e3a85c77aaad179d8a519dbae48
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 13 21:45:03 2022 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Fri May 13 21:45:24 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df9ea0ae
7
8 app-containers/snapd: add 2.55.5
9
10 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
11
12 app-containers/snapd/Manifest | 1 +
13 app-containers/snapd/snapd-2.55.5.ebuild | 183 +++++++++++++++++++++++++++++++
14 2 files changed, 184 insertions(+)
15
16 diff --git a/app-containers/snapd/Manifest b/app-containers/snapd/Manifest
17 index 613fc7fd3d6a..0dc20cf1629f 100644
18 --- a/app-containers/snapd/Manifest
19 +++ b/app-containers/snapd/Manifest
20 @@ -1,3 +1,4 @@
21 DIST snapd-2.55.2.tar.xz 6659212 BLAKE2B a76cec2bf0f3c44212a20c8b0744e4327a725b28a0055be49dfbe638020532f4933c20edda3bdab20290d38f602459fd0962413a9c58400cdc8d6ef3b4634a41 SHA512 8fee8bb6ff52d3cbd5f0a9f206e7c93dea1b6c0ade9c2b6fbd7b0d729b6eeeb1fb01a28dab53543671c42ceac25d6d8932a8b4b9349332b0cde9b9226f6ec063
22 DIST snapd-2.55.3.tar.xz 6673552 BLAKE2B 8a34a568a1563c786e6975fb44d6a23f8a943906ff16b4c587fcca9e1d6ae033d8389b069235e62449a327dff8f1d11e83528fecf02768c730aede72b6cd6790 SHA512 e9dbdc47a9b83792f32fa66d558b0602100ac2b7cfd02ea96e4346fe1bdda7aa5fbe23cfba090e1ba61430ce9cfb0e9bd015c420c13bdca282a500c6ab222817
23 DIST snapd-2.55.4.tar.xz 6669776 BLAKE2B 024c03d163f23da8a26076dfb9fd2edc44807731c40b74b554132753b20ff6a7ae454dfee4f20e05bbf7f596e09bbd7378cbe5d8625c3dfb43e94d84578b8e81 SHA512 990266ac37e0d0da433ea3dacdd97806cc3ea5d1d94e068e5b945da54d87d965860ad290799c0bca29dab35069a449fa483b4f51c1cbab83d7745ec7a6cabd9e
24 +DIST snapd-2.55.5.tar.xz 6670928 BLAKE2B 3bbc4d0fa8e842a400107934518e0f7d0b4e4a26f70a3538590faea631920229e5ba79d023eeda12da71a1f4fcdaa4476efb858130cac600894c1bf0a54be6e6 SHA512 445d0a21a28c994c2608dcb6ea09f6f53398564b644b1f489ed68f1f48c45281d284cd65699f65f9e0b653ef4efeea771bf3cceeeadb71f1a1267c522587e353
25
26 diff --git a/app-containers/snapd/snapd-2.55.5.ebuild b/app-containers/snapd/snapd-2.55.5.ebuild
27 new file mode 100644
28 index 000000000000..4e8c75f7a53b
29 --- /dev/null
30 +++ b/app-containers/snapd/snapd-2.55.5.ebuild
31 @@ -0,0 +1,183 @@
32 +# Copyright 2020-2022 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 flag-o-matic 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 +forced-devmode gtk kde systemd"
52 +REQUIRED_USE="!forced-devmode? ( apparmor ) 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 )
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 + # Seems to have issues building with -O3, switch to -O2
97 + replace-flags -O3 -O2
98 +}
99 +
100 +src_prepare() {
101 + default
102 + # Update apparmor profile to allow libtinfow.so*
103 + sed -i 's/libtinfo/libtinfo{,w}/' \
104 + "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
105 +
106 + if ! use forced-devmode; then
107 + sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
108 + -i "${MY_S}/sandbox/forcedevmode.go" || die
109 + grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
110 + fi
111 +
112 + sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh" || die
113 +
114 + pushd "${MY_S}" >/dev/null || die
115 + ./mkversion.sh "${PV}"
116 + popd >/dev/null || die
117 + pushd "${MY_S}/cmd" >/dev/null || die
118 + eautoreconf
119 +}
120 +
121 +src_configure() {
122 + SNAPD_MAKEARGS=(
123 + "BINDIR=${EPREFIX}/usr/bin"
124 + "DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
125 + "LIBEXECDIR=${EPREFIX}/usr/lib"
126 + "SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
127 + "SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
128 + )
129 + export CGO_ENABLED="1"
130 + export CGO_CFLAGS="${CFLAGS}"
131 + export CGO_CPPFLAGS="${CPPFLAGS}"
132 + export CGO_CXXFLAGS="${CXXFLAGS}"
133 +
134 + pushd "${MY_S}/cmd" >/dev/null || die
135 + econf --libdir="${EPREFIX}/usr/lib" \
136 + --libexecdir="${EPREFIX}/usr/lib/snapd" \
137 + $(use_enable apparmor) \
138 + --enable-nvidia-biarch \
139 + --with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
140 +}
141 +
142 +src_compile() {
143 + export -n GOCACHE XDG_CACHE_HOME
144 + export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}"
145 +
146 + local file
147 + for file in "${MY_S}/po/"*.po; do
148 + msgfmt "${file}" -o "${file%.po}.mo" || die
149 + done
150 +
151 + emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}"
152 +
153 + local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
154 + local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
155 +
156 + local cmd
157 + for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
158 + go build -o "${GOBIN}/${cmd}" "${flags[@]}" \
159 + -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
160 + [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
161 + done
162 + for cmd in snapctl snap-exec snap-update-ns; do
163 + go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
164 + -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
165 + [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
166 + done
167 +}
168 +
169 +src_install() {
170 + emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
171 + emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
172 +
173 + if use apparmor; then
174 + mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
175 + keepdir /var/lib/snapd/apparmor/profiles
176 + fi
177 + keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
178 + fperms 700 /var/lib/snapd/{cache,cookie}
179 +
180 + dobin "${GOBIN}/"{snap,snapctl}
181 + ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
182 +
183 + exeinto /usr/lib/snapd
184 + doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
185 + "${MY_S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
186 + "${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
187 +
188 + dobashcomp "${MY_S}/data/completion/bash/snap"
189 +
190 + insinto /usr/share/zsh/site-functions
191 + doins "${MY_S}/data/completion/zsh/_snap"
192 +
193 + insinto "/usr/share/polkit-1/actions"
194 + doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy"
195 +
196 + dodoc "${MY_S}/packaging/ubuntu-16.04/changelog"
197 + domo "${MY_S}/po/"*.mo
198 +
199 + readme.gentoo_create_doc
200 +}
201 +
202 +pkg_postinst() {
203 + readme.gentoo_print_elog
204 + xdg_desktop_database_update
205 +
206 + if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
207 + $(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
208 + apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
209 + fi
210 +}
211 +
212 +pkg_postrm() {
213 + xdg_desktop_database_update
214 +}