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