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: Sat, 30 Apr 2022 22:12:08
Message-Id: 1651356718.17a71a514ac86bc4b76a668d27ec07bc666d34ed.zmedico@gentoo
1 commit: 17a71a514ac86bc4b76a668d27ec07bc666d34ed
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 30 22:11:37 2022 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 30 22:11:58 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17a71a51
7
8 app-containers/snapd: add 2.55.4
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.4.ebuild | 183 +++++++++++++++++++++++++++++++
14 2 files changed, 184 insertions(+)
15
16 diff --git a/app-containers/snapd/Manifest b/app-containers/snapd/Manifest
17 index 5f54536fa3c7..613fc7fd3d6a 100644
18 --- a/app-containers/snapd/Manifest
19 +++ b/app-containers/snapd/Manifest
20 @@ -1,2 +1,3 @@
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
25 diff --git a/app-containers/snapd/snapd-2.55.4.ebuild b/app-containers/snapd/snapd-2.55.4.ebuild
26 new file mode 100644
27 index 000000000000..4e8c75f7a53b
28 --- /dev/null
29 +++ b/app-containers/snapd/snapd-2.55.4.ebuild
30 @@ -0,0 +1,183 @@
31 +# Copyright 2020-2022 Gentoo Authors
32 +# Distributed under the terms of the GNU General Public License v2
33 +
34 +EAPI=7
35 +
36 +EGO_PN="github.com/snapcore/${PN}"
37 +inherit autotools bash-completion-r1 flag-o-matic golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils
38 +
39 +DESCRIPTION="Service and tools for management of snap packages"
40 +HOMEPAGE="http://snapcraft.io/"
41 +
42 +MY_S="${S}/src/github.com/snapcore/${PN}"
43 +
44 +SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
45 +MY_PV=${PV}
46 +KEYWORDS="~amd64"
47 +
48 +LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
49 +SLOT="0"
50 +IUSE="apparmor +forced-devmode gtk kde systemd"
51 +REQUIRED_USE="!forced-devmode? ( apparmor ) systemd"
52 +
53 +CONFIG_CHECK="~CGROUPS
54 + ~CGROUP_DEVICE
55 + ~CGROUP_FREEZER
56 + ~NAMESPACES
57 + ~SQUASHFS
58 + ~SQUASHFS_ZLIB
59 + ~SQUASHFS_LZO
60 + ~SQUASHFS_XZ
61 + ~BLK_DEV_LOOP
62 + ~SECCOMP
63 + ~SECCOMP_FILTER"
64 +
65 +RDEPEND="
66 + sys-libs/libseccomp:=
67 + apparmor? (
68 + sec-policy/apparmor-profiles
69 + sys-apps/apparmor:=
70 + )
71 + dev-libs/glib
72 + virtual/libudev
73 + systemd? ( sys-apps/systemd )
74 + sys-libs/libcap:=
75 + sys-fs/squashfs-tools[lzma]"
76 +
77 +DEPEND="${RDEPEND}"
78 +
79 +BDEPEND="
80 + >=dev-lang/go-1.9
81 + dev-python/docutils
82 + sys-devel/gettext
83 + sys-fs/xfsprogs"
84 +
85 +PDEPEND="sys-auth/polkit[gtk?,kde?]"
86 +
87 +README_GENTOO_SUFFIX=""
88 +
89 +pkg_setup() {
90 + if use apparmor; then
91 + CONFIG_CHECK+=" ~SECURITY_APPARMOR"
92 + fi
93 + linux-info_pkg_setup
94 +
95 + # Seems to have issues building with -O3, switch to -O2
96 + replace-flags -O3 -O2
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#if !apparmorFull {\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-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 +}