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