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