* [gentoo-commits] repo/gentoo:master commit in: app-emulation/snapd/
@ 2020-11-10 11:41 Zac Medico
0 siblings, 0 replies; 14+ messages in thread
From: Zac Medico @ 2020-11-10 11:41 UTC (permalink / raw
To: gentoo-commits
commit: 0d8dfef3a6de92ef0b63c0cb5e4b93a328b29ce2
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 11:39:14 2020 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 11:39:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d8dfef3
app-emulation/snapd: Add apparmor REQUIRED_USE for !forced-devmode
Bug: https://bugs.gentoo.org/753695
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
app-emulation/snapd/snapd-2.47.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-emulation/snapd/snapd-2.47.1-r1.ebuild b/app-emulation/snapd/snapd-2.47.1-r1.ebuild
index 9abf9d0b4bf..b9ba0a35470 100644
--- a/app-emulation/snapd/snapd-2.47.1-r1.ebuild
+++ b/app-emulation/snapd/snapd-2.47.1-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64"
LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
SLOT="0"
IUSE="apparmor +cgroup-hybrid +forced-devmode gtk kde systemd"
-REQUIRED_USE="!forced-devmode? ( cgroup-hybrid ) systemd"
+REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) systemd"
CONFIG_CHECK="~CGROUPS
~CGROUP_DEVICE
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/snapd/
@ 2020-11-27 20:06 Zac Medico
0 siblings, 0 replies; 14+ messages in thread
From: Zac Medico @ 2020-11-27 20:06 UTC (permalink / raw
To: gentoo-commits
commit: aec992f2d223aea2fbe4142384d8d10a4a024d62
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 20:04:01 2020 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 20:06:21 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec992f2
app-emulation/snapd: don't set CGO_LDFLAGS
Solves errors like this with go-1.15:
go build runtime/cgo: invalid flag in go:cgo_ldflag: -Wl,-O1
Closes: https://bugs.gentoo.org/756205
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
app-emulation/snapd/snapd-2.47.1-r1.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/app-emulation/snapd/snapd-2.47.1-r1.ebuild b/app-emulation/snapd/snapd-2.47.1-r1.ebuild
index b9ba0a35470..863784f7b24 100644
--- a/app-emulation/snapd/snapd-2.47.1-r1.ebuild
+++ b/app-emulation/snapd/snapd-2.47.1-r1.ebuild
@@ -101,7 +101,6 @@ src_configure() {
export CGO_CFLAGS="${CFLAGS}"
export CGO_CPPFLAGS="${CPPFLAGS}"
export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
pushd "${MY_S}/cmd" >/dev/null || die
econf --libdir="${EPREFIX}/usr/lib" \
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/snapd/
@ 2020-11-27 20:40 Zac Medico
0 siblings, 0 replies; 14+ messages in thread
From: Zac Medico @ 2020-11-27 20:40 UTC (permalink / raw
To: gentoo-commits
commit: 8e40ca8b0bac68019c4f74d5f301341b9db1cc32
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 20:39:36 2020 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 20:40:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e40ca8b
app-emulation/snapd: Bump to version 2.48
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
app-emulation/snapd/Manifest | 1 +
app-emulation/snapd/snapd-2.48.ebuild | 179 ++++++++++++++++++++++++++++++++++
2 files changed, 180 insertions(+)
diff --git a/app-emulation/snapd/Manifest b/app-emulation/snapd/Manifest
index 2622b18e103..076c99373bb 100644
--- a/app-emulation/snapd/Manifest
+++ b/app-emulation/snapd/Manifest
@@ -1 +1,2 @@
DIST snapd-2.47.1.tar.xz 3664756 BLAKE2B 90cb117ea385890c38c6efdecd3652c115158ad769858ebe1a5035d37c9543da5b2a8768ce4f56cfcee053701d308f826bf7993d9b5f9d5313f2840ca829ab23 SHA512 e08dd7057b85b970a1177996c483d3f663b1424cdbf6643a69923a7012d38fc13109b449ce3a2c5c8d65e5836f93a36567f2f641a62caea6e9989a458f7f2892
+DIST snapd-2.48.tar.xz 3757292 BLAKE2B 4d1fd4b9ff3bd7cf05ebf0e27db4bcc87b5de689be470b4c62758e411e9d99a541ae084c7b1afe4ede44ad6dce19a53b337dcddc18d0b82957ef537f466e720a SHA512 27e1924d86296a969cd18980d6100c8e41be66f2ad0214ac2857580a2686b1e7ef01e2561c6ed532106eadb1ac2d5fd070ef9eb05e5fabfb8fa9a98456259b89
diff --git a/app-emulation/snapd/snapd-2.48.ebuild b/app-emulation/snapd/snapd-2.48.ebuild
new file mode 100644
index 00000000000..c1a8f5af38b
--- /dev/null
+++ b/app-emulation/snapd/snapd-2.48.ebuild
@@ -0,0 +1,179 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/snapcore/${PN}"
+inherit autotools bash-completion-r1 golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils
+
+DESCRIPTION="Service and tools for management of snap packages"
+HOMEPAGE="http://snapcraft.io/"
+
+MY_S="${S}/src/github.com/snapcore/${PN}"
+
+SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
+MY_PV=${PV}
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
+SLOT="0"
+IUSE="apparmor +cgroup-hybrid +forced-devmode gtk kde systemd"
+REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) systemd"
+
+CONFIG_CHECK="~CGROUPS
+ ~CGROUP_DEVICE
+ ~CGROUP_FREEZER
+ ~NAMESPACES
+ ~SQUASHFS
+ ~SQUASHFS_ZLIB
+ ~SQUASHFS_LZO
+ ~SQUASHFS_XZ
+ ~BLK_DEV_LOOP
+ ~SECCOMP
+ ~SECCOMP_FILTER"
+
+RDEPEND="
+ sys-libs/libseccomp:=
+ apparmor? (
+ sec-policy/apparmor-profiles
+ sys-apps/apparmor:=
+ )
+ dev-libs/glib
+ virtual/libudev
+ systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] )
+ sys-libs/libcap:=
+ sys-fs/squashfs-tools"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ >=dev-lang/go-1.9
+ dev-python/docutils
+ sys-devel/gettext"
+
+PDEPEND="sys-auth/polkit[gtk?,kde?]"
+
+README_GENTOO_SUFFIX=""
+
+pkg_setup() {
+ if use apparmor; then
+ CONFIG_CHECK+=" ~SECURITY_APPARMOR"
+ fi
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ default
+ # Update apparmor profile to allow libtinfow.so*
+ sed -i 's/libtinfo/libtinfo{,w}/' \
+ "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
+
+ if ! use forced-devmode; then
+ sed -e 's#return \(!apparmorFull || cgroupv2\)#//\1\n\tif !apparmorFull || cgroupv2 {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
+ -i "${MY_S}/sandbox/forcedevmode.go" || die
+ grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
+ fi
+
+ sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh" || die
+
+ pushd "${MY_S}" >/dev/null || die
+ ./mkversion.sh "${PV}"
+ popd >/dev/null || die
+ pushd "${MY_S}/cmd" >/dev/null || die
+ eautoreconf
+}
+
+src_configure() {
+ SNAPD_MAKEARGS=(
+ "BINDIR=${EPREFIX}/usr/bin"
+ "DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
+ "LIBEXECDIR=${EPREFIX}/usr/lib"
+ "SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
+ "SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
+ )
+ export CGO_ENABLED="1"
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+
+ pushd "${MY_S}/cmd" >/dev/null || die
+ econf --libdir="${EPREFIX}/usr/lib" \
+ --libexecdir="${EPREFIX}/usr/lib/snapd" \
+ $(use_enable apparmor) \
+ --enable-nvidia-biarch \
+ --with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
+}
+
+src_compile() {
+ export -n GOCACHE XDG_CACHE_HOME
+ export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}"
+
+ local file
+ for file in "${MY_S}/po/"*.po; do
+ msgfmt "${file}" -o "${file%.po}.mo" || die
+ done
+
+ emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}"
+
+ local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
+ local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
+
+ local cmd
+ for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
+ go build -o "${GOBIN}/${cmd}" "${flags[@]}" \
+ -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+ [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+ done
+ for cmd in snapctl snap-exec snap-update-ns; do
+ go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
+ -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+ [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+ done
+}
+
+src_install() {
+ emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+ emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+
+ if use apparmor; then
+ mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
+ keepdir /var/lib/snapd/apparmor/profiles
+ fi
+ keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
+ fperms 700 /var/lib/snapd/{cache,cookie}
+
+ dobin "${GOBIN}/"{snap,snapctl}
+ ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
+
+ exeinto /usr/lib/snapd
+ doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
+ "${MY_S}/"{cmd/snap-confine/snap-device-helper,cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
+ "${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
+
+ dobashcomp "${MY_S}/data/completion/bash/snap"
+
+ insinto /usr/share/zsh/site-functions
+ doins "${MY_S}/data/completion/zsh/_snap"
+
+ insinto "/usr/share/polkit-1/actions"
+ doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy"
+
+ dodoc "${MY_S}/packaging/ubuntu-16.04/changelog"
+ domo "${MY_S}/po/"*.mo
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+ xdg_desktop_database_update
+
+ if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
+ $(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
+ apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
+ fi
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/snapd/
@ 2021-01-04 21:56 Zac Medico
0 siblings, 0 replies; 14+ messages in thread
From: Zac Medico @ 2021-01-04 21:56 UTC (permalink / raw
To: gentoo-commits
commit: 4007a99bd7fc35eee0d7d14d0000543240177084
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 4 21:53:49 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jan 4 21:56:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4007a99b
app-emulation/snapd: add xfsprogs to BDEPEND
Closes: https://bugs.gentoo.org/761505
Reported-by: Artem Ilgamov <a.ilgamov <AT> myhart.ru>
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
app-emulation/snapd/snapd-2.48.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/app-emulation/snapd/snapd-2.48.ebuild b/app-emulation/snapd/snapd-2.48.ebuild
index c1a8f5af38b..b25ca4a9b98 100644
--- a/app-emulation/snapd/snapd-2.48.ebuild
+++ b/app-emulation/snapd/snapd-2.48.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -49,7 +49,8 @@ DEPEND="${RDEPEND}"
BDEPEND="
>=dev-lang/go-1.9
dev-python/docutils
- sys-devel/gettext"
+ sys-devel/gettext
+ sys-fs/xfsprogs"
PDEPEND="sys-auth/polkit[gtk?,kde?]"
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/snapd/
@ 2021-06-05 19:40 Zac Medico
0 siblings, 0 replies; 14+ messages in thread
From: Zac Medico @ 2021-06-05 19:40 UTC (permalink / raw
To: gentoo-commits
commit: fe58d0e2f8f9459fa929c92bff57ffa949682ed3
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 5 19:39:50 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jun 5 19:40:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe58d0e2
app-emulation/snapd: Remove old version 2.47.1-r1
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
app-emulation/snapd/Manifest | 1 -
app-emulation/snapd/snapd-2.47.1-r1.ebuild | 185 -----------------------------
2 files changed, 186 deletions(-)
diff --git a/app-emulation/snapd/Manifest b/app-emulation/snapd/Manifest
index 076c99373bb..505c33b777c 100644
--- a/app-emulation/snapd/Manifest
+++ b/app-emulation/snapd/Manifest
@@ -1,2 +1 @@
-DIST snapd-2.47.1.tar.xz 3664756 BLAKE2B 90cb117ea385890c38c6efdecd3652c115158ad769858ebe1a5035d37c9543da5b2a8768ce4f56cfcee053701d308f826bf7993d9b5f9d5313f2840ca829ab23 SHA512 e08dd7057b85b970a1177996c483d3f663b1424cdbf6643a69923a7012d38fc13109b449ce3a2c5c8d65e5836f93a36567f2f641a62caea6e9989a458f7f2892
DIST snapd-2.48.tar.xz 3757292 BLAKE2B 4d1fd4b9ff3bd7cf05ebf0e27db4bcc87b5de689be470b4c62758e411e9d99a541ae084c7b1afe4ede44ad6dce19a53b337dcddc18d0b82957ef537f466e720a SHA512 27e1924d86296a969cd18980d6100c8e41be66f2ad0214ac2857580a2686b1e7ef01e2561c6ed532106eadb1ac2d5fd070ef9eb05e5fabfb8fa9a98456259b89
diff --git a/app-emulation/snapd/snapd-2.47.1-r1.ebuild b/app-emulation/snapd/snapd-2.47.1-r1.ebuild
deleted file mode 100644
index 863784f7b24..00000000000
--- a/app-emulation/snapd/snapd-2.47.1-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/snapcore/${PN}"
-inherit autotools bash-completion-r1 golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils
-
-DESCRIPTION="Service and tools for management of snap packages"
-HOMEPAGE="http://snapcraft.io/"
-
-MY_S="${S}/src/github.com/snapcore/${PN}"
-
-SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
-MY_PV=${PV}
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
-SLOT="0"
-IUSE="apparmor +cgroup-hybrid +forced-devmode gtk kde systemd"
-REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) systemd"
-
-CONFIG_CHECK="~CGROUPS
- ~CGROUP_DEVICE
- ~CGROUP_FREEZER
- ~NAMESPACES
- ~SQUASHFS
- ~SQUASHFS_ZLIB
- ~SQUASHFS_LZO
- ~SQUASHFS_XZ
- ~BLK_DEV_LOOP
- ~SECCOMP
- ~SECCOMP_FILTER"
-
-RDEPEND="
- sys-libs/libseccomp:=
- apparmor? (
- sec-policy/apparmor-profiles
- sys-apps/apparmor:=
- )
- dev-libs/glib
- virtual/libudev
- systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] )
- sys-libs/libcap:=
- sys-fs/squashfs-tools"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- >=dev-lang/go-1.9
- dev-python/docutils
- sys-devel/gettext"
-
-PDEPEND="sys-auth/polkit[gtk?,kde?]"
-
-README_GENTOO_SUFFIX=""
-
-pkg_setup() {
- if use apparmor; then
- CONFIG_CHECK+=" ~SECURITY_APPARMOR"
- fi
- linux-info_pkg_setup
-}
-
-src_prepare() {
- default
- # Update apparmor profile to allow libtinfow.so*
- sed -i 's/libtinfo/libtinfo{,w}/' \
- "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
-
- # Add "gentoo" to altDirDistros: https://github.com/snapcore/snapd/pull/9588
- echo -e '@@ -289,2 +289,3 @@ func SetRootDir(rootdir string) {
-\x20 "fedora",
-+ "gentoo",
-\x20 "manjaro",' | patch "${MY_S}/dirs/dirs.go" || die
-
- if ! use forced-devmode; then
- sed -e 's#return \(!apparmorFull || cgroupv2\)#//\1\n\tif !apparmorFull || cgroupv2 {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
- -i "${MY_S}/sandbox/forcedevmode.go" || die
- grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
- fi
-
- sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh" || die
-
- pushd "${MY_S}" >/dev/null || die
- ./mkversion.sh "${PV}"
- popd >/dev/null || die
- pushd "${MY_S}/cmd" >/dev/null || die
- eautoreconf
-}
-
-src_configure() {
- SNAPD_MAKEARGS=(
- "BINDIR=${EPREFIX}/usr/bin"
- "DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
- "LIBEXECDIR=${EPREFIX}/usr/lib"
- "SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
- "SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
- )
- export CGO_ENABLED="1"
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
-
- pushd "${MY_S}/cmd" >/dev/null || die
- econf --libdir="${EPREFIX}/usr/lib" \
- --libexecdir="${EPREFIX}/usr/lib/snapd" \
- $(use_enable apparmor) \
- --enable-nvidia-biarch \
- --with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
-}
-
-src_compile() {
- export -n GOCACHE XDG_CACHE_HOME
- export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}"
-
- local file
- for file in "${MY_S}/po/"*.po; do
- msgfmt "${file}" -o "${file%.po}.mo" || die
- done
-
- emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}"
-
- local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
- local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
-
- local cmd
- for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
- go build -o "${GOBIN}/${cmd}" "${flags[@]}" \
- -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
- [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
- done
- for cmd in snapctl snap-exec snap-update-ns; do
- go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
- -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
- [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
- done
-}
-
-src_install() {
- emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
- emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-
- if use apparmor; then
- mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
- keepdir /var/lib/snapd/apparmor/profiles
- fi
- keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
- fperms 700 /var/lib/snapd/{cache,cookie}
-
- dobin "${GOBIN}/"{snap,snapctl}
- ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
-
- exeinto /usr/lib/snapd
- doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
- "${MY_S}/"{cmd/snap-confine/snap-device-helper,cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
- "${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
-
- dobashcomp "${MY_S}/data/completion/bash/snap"
-
- insinto /usr/share/zsh/site-functions
- doins "${MY_S}/data/completion/zsh/_snap"
-
- insinto "/usr/share/polkit-1/actions"
- doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy"
-
- dodoc "${MY_S}/packaging/ubuntu-16.04/changelog"
- domo "${MY_S}/po/"*.mo
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
- xdg_desktop_database_update
-
- if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
- $(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
- apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/snapd/
@ 2021-06-05 19:53 Zac Medico
0 siblings, 0 replies; 14+ messages in thread
From: Zac Medico @ 2021-06-05 19:53 UTC (permalink / raw
To: gentoo-commits
commit: 152f09eae7e4f2ad4b875479d8e6f63e8c90c3a3
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 5 19:48:24 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jun 5 19:52:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=152f09ea
app-emulation/snapd: Bump to version 2.51 and require squashfs-tools[lzma]
Snaps that use xz compression fail to install with squashfs-tools[-lzma]:
error: cannot perform the following tasks:
- Mount snap "snapd" (10492) (cannot run unsquashfs:
-----
Filesystem uses xz compression, this is unsupported by this version
Decompressors available:
gzip
-----)
Reported-by: Artem Ilgamov <a.ilgamov <AT> myhart.ru>
Closes: https://bugs.gentoo.org/761523
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
app-emulation/snapd/Manifest | 1 +
app-emulation/snapd/snapd-2.51.ebuild | 180 ++++++++++++++++++++++++++++++++++
2 files changed, 181 insertions(+)
diff --git a/app-emulation/snapd/Manifest b/app-emulation/snapd/Manifest
index 505c33b777c..4a17ff22271 100644
--- a/app-emulation/snapd/Manifest
+++ b/app-emulation/snapd/Manifest
@@ -1 +1,2 @@
DIST snapd-2.48.tar.xz 3757292 BLAKE2B 4d1fd4b9ff3bd7cf05ebf0e27db4bcc87b5de689be470b4c62758e411e9d99a541ae084c7b1afe4ede44ad6dce19a53b337dcddc18d0b82957ef537f466e720a SHA512 27e1924d86296a969cd18980d6100c8e41be66f2ad0214ac2857580a2686b1e7ef01e2561c6ed532106eadb1ac2d5fd070ef9eb05e5fabfb8fa9a98456259b89
+DIST snapd-2.51.tar.xz 4036884 BLAKE2B debdfe51407306451ecdb7851e3768be5aa5b9714b2861cb17e9989194dfbf441b1569955c6440a7d44f1d36996b398bcf60b903a76116e14dcc3173625e105c SHA512 959cceb8fcb326a14557347cecfb931763084e00639b828dc539646d2988cdeb3c9276ab8b770c6bbe37c7a05fb6548f609f490c55f7ee28713a4eb80cf3da15
diff --git a/app-emulation/snapd/snapd-2.51.ebuild b/app-emulation/snapd/snapd-2.51.ebuild
new file mode 100644
index 00000000000..abc28376ab8
--- /dev/null
+++ b/app-emulation/snapd/snapd-2.51.ebuild
@@ -0,0 +1,180 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/snapcore/${PN}"
+inherit autotools bash-completion-r1 golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils
+
+DESCRIPTION="Service and tools for management of snap packages"
+HOMEPAGE="http://snapcraft.io/"
+
+MY_S="${S}/src/github.com/snapcore/${PN}"
+
+SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
+MY_PV=${PV}
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
+SLOT="0"
+IUSE="apparmor +cgroup-hybrid +forced-devmode gtk kde systemd"
+REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) systemd"
+
+CONFIG_CHECK="~CGROUPS
+ ~CGROUP_DEVICE
+ ~CGROUP_FREEZER
+ ~NAMESPACES
+ ~SQUASHFS
+ ~SQUASHFS_ZLIB
+ ~SQUASHFS_LZO
+ ~SQUASHFS_XZ
+ ~BLK_DEV_LOOP
+ ~SECCOMP
+ ~SECCOMP_FILTER"
+
+RDEPEND="
+ sys-libs/libseccomp:=
+ apparmor? (
+ sec-policy/apparmor-profiles
+ sys-apps/apparmor:=
+ )
+ dev-libs/glib
+ virtual/libudev
+ systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] )
+ sys-libs/libcap:=
+ sys-fs/squashfs-tools[lzma]"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ >=dev-lang/go-1.9
+ dev-python/docutils
+ sys-devel/gettext
+ sys-fs/xfsprogs"
+
+PDEPEND="sys-auth/polkit[gtk?,kde?]"
+
+README_GENTOO_SUFFIX=""
+
+pkg_setup() {
+ if use apparmor; then
+ CONFIG_CHECK+=" ~SECURITY_APPARMOR"
+ fi
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ default
+ # Update apparmor profile to allow libtinfow.so*
+ sed -i 's/libtinfo/libtinfo{,w}/' \
+ "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
+
+ if ! use forced-devmode; then
+ sed -e 's#return \(!apparmorFull || cgroupv2\)#//\1\n\tif !apparmorFull || cgroupv2 {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
+ -i "${MY_S}/sandbox/forcedevmode.go" || die
+ grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
+ fi
+
+ sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh" || die
+
+ pushd "${MY_S}" >/dev/null || die
+ ./mkversion.sh "${PV}"
+ popd >/dev/null || die
+ pushd "${MY_S}/cmd" >/dev/null || die
+ eautoreconf
+}
+
+src_configure() {
+ SNAPD_MAKEARGS=(
+ "BINDIR=${EPREFIX}/usr/bin"
+ "DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
+ "LIBEXECDIR=${EPREFIX}/usr/lib"
+ "SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
+ "SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
+ )
+ export CGO_ENABLED="1"
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+
+ pushd "${MY_S}/cmd" >/dev/null || die
+ econf --libdir="${EPREFIX}/usr/lib" \
+ --libexecdir="${EPREFIX}/usr/lib/snapd" \
+ $(use_enable apparmor) \
+ --enable-nvidia-biarch \
+ --with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
+}
+
+src_compile() {
+ export -n GOCACHE XDG_CACHE_HOME
+ export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}"
+
+ local file
+ for file in "${MY_S}/po/"*.po; do
+ msgfmt "${file}" -o "${file%.po}.mo" || die
+ done
+
+ emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}"
+
+ local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
+ local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
+
+ local cmd
+ for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
+ go build -o "${GOBIN}/${cmd}" "${flags[@]}" \
+ -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+ [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+ done
+ for cmd in snapctl snap-exec snap-update-ns; do
+ go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
+ -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+ [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+ done
+}
+
+src_install() {
+ emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+ emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+
+ if use apparmor; then
+ mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
+ keepdir /var/lib/snapd/apparmor/profiles
+ fi
+ keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
+ fperms 700 /var/lib/snapd/{cache,cookie}
+
+ dobin "${GOBIN}/"{snap,snapctl}
+ ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
+
+ exeinto /usr/lib/snapd
+ doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
+ "${MY_S}/"{cmd/snap-confine/snap-device-helper,cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
+ "${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
+
+ dobashcomp "${MY_S}/data/completion/bash/snap"
+
+ insinto /usr/share/zsh/site-functions
+ doins "${MY_S}/data/completion/zsh/_snap"
+
+ insinto "/usr/share/polkit-1/actions"
+ doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy"
+
+ dodoc "${MY_S}/packaging/ubuntu-16.04/changelog"
+ domo "${MY_S}/po/"*.mo
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+ xdg_desktop_database_update
+
+ if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
+ $(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
+ apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
+ fi
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/snapd/
@ 2021-09-19 18:16 Zac Medico
0 siblings, 0 replies; 14+ messages in thread
From: Zac Medico @ 2021-09-19 18:16 UTC (permalink / raw
To: gentoo-commits
commit: 823d32aa1094ed5fa4e1e9a72d4f32546174d6c7
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 19 18:11:25 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Sep 19 18:16:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=823d32aa
app-emulation/snapd: Bump to version 2.52
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
app-emulation/snapd/Manifest | 1 +
app-emulation/snapd/snapd-2.52.ebuild | 180 ++++++++++++++++++++++++++++++++++
2 files changed, 181 insertions(+)
diff --git a/app-emulation/snapd/Manifest b/app-emulation/snapd/Manifest
index 4a17ff22271..2e973b4b4c7 100644
--- a/app-emulation/snapd/Manifest
+++ b/app-emulation/snapd/Manifest
@@ -1,2 +1,3 @@
DIST snapd-2.48.tar.xz 3757292 BLAKE2B 4d1fd4b9ff3bd7cf05ebf0e27db4bcc87b5de689be470b4c62758e411e9d99a541ae084c7b1afe4ede44ad6dce19a53b337dcddc18d0b82957ef537f466e720a SHA512 27e1924d86296a969cd18980d6100c8e41be66f2ad0214ac2857580a2686b1e7ef01e2561c6ed532106eadb1ac2d5fd070ef9eb05e5fabfb8fa9a98456259b89
DIST snapd-2.51.tar.xz 4036884 BLAKE2B debdfe51407306451ecdb7851e3768be5aa5b9714b2861cb17e9989194dfbf441b1569955c6440a7d44f1d36996b398bcf60b903a76116e14dcc3173625e105c SHA512 959cceb8fcb326a14557347cecfb931763084e00639b828dc539646d2988cdeb3c9276ab8b770c6bbe37c7a05fb6548f609f490c55f7ee28713a4eb80cf3da15
+DIST snapd-2.52.tar.xz 4146496 BLAKE2B 49b952503c60b589fe7ddea9ded135139243da34b35b39d9e309df6854109fb3a99f52ca324737fa7f5773221d453f7093047dcdcb1114d0389e20ba24c3d2c3 SHA512 56d3a2c5048d2ffde5b34f63e6a99dc74a7c6e4637f36250f674a68863c4b997cf940689529eca9d3bf58b0148cc18a0b4033d93aa06375a5f12c552d40472da
diff --git a/app-emulation/snapd/snapd-2.52.ebuild b/app-emulation/snapd/snapd-2.52.ebuild
new file mode 100644
index 00000000000..abc28376ab8
--- /dev/null
+++ b/app-emulation/snapd/snapd-2.52.ebuild
@@ -0,0 +1,180 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/snapcore/${PN}"
+inherit autotools bash-completion-r1 golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils
+
+DESCRIPTION="Service and tools for management of snap packages"
+HOMEPAGE="http://snapcraft.io/"
+
+MY_S="${S}/src/github.com/snapcore/${PN}"
+
+SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
+MY_PV=${PV}
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
+SLOT="0"
+IUSE="apparmor +cgroup-hybrid +forced-devmode gtk kde systemd"
+REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) systemd"
+
+CONFIG_CHECK="~CGROUPS
+ ~CGROUP_DEVICE
+ ~CGROUP_FREEZER
+ ~NAMESPACES
+ ~SQUASHFS
+ ~SQUASHFS_ZLIB
+ ~SQUASHFS_LZO
+ ~SQUASHFS_XZ
+ ~BLK_DEV_LOOP
+ ~SECCOMP
+ ~SECCOMP_FILTER"
+
+RDEPEND="
+ sys-libs/libseccomp:=
+ apparmor? (
+ sec-policy/apparmor-profiles
+ sys-apps/apparmor:=
+ )
+ dev-libs/glib
+ virtual/libudev
+ systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] )
+ sys-libs/libcap:=
+ sys-fs/squashfs-tools[lzma]"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ >=dev-lang/go-1.9
+ dev-python/docutils
+ sys-devel/gettext
+ sys-fs/xfsprogs"
+
+PDEPEND="sys-auth/polkit[gtk?,kde?]"
+
+README_GENTOO_SUFFIX=""
+
+pkg_setup() {
+ if use apparmor; then
+ CONFIG_CHECK+=" ~SECURITY_APPARMOR"
+ fi
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ default
+ # Update apparmor profile to allow libtinfow.so*
+ sed -i 's/libtinfo/libtinfo{,w}/' \
+ "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
+
+ if ! use forced-devmode; then
+ sed -e 's#return \(!apparmorFull || cgroupv2\)#//\1\n\tif !apparmorFull || cgroupv2 {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
+ -i "${MY_S}/sandbox/forcedevmode.go" || die
+ grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
+ fi
+
+ sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh" || die
+
+ pushd "${MY_S}" >/dev/null || die
+ ./mkversion.sh "${PV}"
+ popd >/dev/null || die
+ pushd "${MY_S}/cmd" >/dev/null || die
+ eautoreconf
+}
+
+src_configure() {
+ SNAPD_MAKEARGS=(
+ "BINDIR=${EPREFIX}/usr/bin"
+ "DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
+ "LIBEXECDIR=${EPREFIX}/usr/lib"
+ "SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
+ "SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
+ )
+ export CGO_ENABLED="1"
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+
+ pushd "${MY_S}/cmd" >/dev/null || die
+ econf --libdir="${EPREFIX}/usr/lib" \
+ --libexecdir="${EPREFIX}/usr/lib/snapd" \
+ $(use_enable apparmor) \
+ --enable-nvidia-biarch \
+ --with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
+}
+
+src_compile() {
+ export -n GOCACHE XDG_CACHE_HOME
+ export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}"
+
+ local file
+ for file in "${MY_S}/po/"*.po; do
+ msgfmt "${file}" -o "${file%.po}.mo" || die
+ done
+
+ emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}"
+
+ local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
+ local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
+
+ local cmd
+ for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
+ go build -o "${GOBIN}/${cmd}" "${flags[@]}" \
+ -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+ [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+ done
+ for cmd in snapctl snap-exec snap-update-ns; do
+ go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
+ -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+ [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+ done
+}
+
+src_install() {
+ emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+ emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+
+ if use apparmor; then
+ mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
+ keepdir /var/lib/snapd/apparmor/profiles
+ fi
+ keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
+ fperms 700 /var/lib/snapd/{cache,cookie}
+
+ dobin "${GOBIN}/"{snap,snapctl}
+ ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
+
+ exeinto /usr/lib/snapd
+ doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
+ "${MY_S}/"{cmd/snap-confine/snap-device-helper,cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
+ "${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
+
+ dobashcomp "${MY_S}/data/completion/bash/snap"
+
+ insinto /usr/share/zsh/site-functions
+ doins "${MY_S}/data/completion/zsh/_snap"
+
+ insinto "/usr/share/polkit-1/actions"
+ doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy"
+
+ dodoc "${MY_S}/packaging/ubuntu-16.04/changelog"
+ domo "${MY_S}/po/"*.mo
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+ xdg_desktop_database_update
+
+ if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
+ $(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
+ apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
+ fi
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/snapd/
@ 2021-10-05 21:10 Zac Medico
0 siblings, 0 replies; 14+ messages in thread
From: Zac Medico @ 2021-10-05 21:10 UTC (permalink / raw
To: gentoo-commits
commit: 48e57bce3ebcf466088f97352e368924441ec5d8
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 5 21:09:20 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Oct 5 21:09:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48e57bce
app-emulation/snapd: 2.52.1 bump
Closes: https://bugs.gentoo.org/815240
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
app-emulation/snapd/Manifest | 1 +
app-emulation/snapd/snapd-2.52.1.ebuild | 180 ++++++++++++++++++++++++++++++++
2 files changed, 181 insertions(+)
diff --git a/app-emulation/snapd/Manifest b/app-emulation/snapd/Manifest
index 2e973b4b4c7..181607d2735 100644
--- a/app-emulation/snapd/Manifest
+++ b/app-emulation/snapd/Manifest
@@ -1,3 +1,4 @@
DIST snapd-2.48.tar.xz 3757292 BLAKE2B 4d1fd4b9ff3bd7cf05ebf0e27db4bcc87b5de689be470b4c62758e411e9d99a541ae084c7b1afe4ede44ad6dce19a53b337dcddc18d0b82957ef537f466e720a SHA512 27e1924d86296a969cd18980d6100c8e41be66f2ad0214ac2857580a2686b1e7ef01e2561c6ed532106eadb1ac2d5fd070ef9eb05e5fabfb8fa9a98456259b89
DIST snapd-2.51.tar.xz 4036884 BLAKE2B debdfe51407306451ecdb7851e3768be5aa5b9714b2861cb17e9989194dfbf441b1569955c6440a7d44f1d36996b398bcf60b903a76116e14dcc3173625e105c SHA512 959cceb8fcb326a14557347cecfb931763084e00639b828dc539646d2988cdeb3c9276ab8b770c6bbe37c7a05fb6548f609f490c55f7ee28713a4eb80cf3da15
+DIST snapd-2.52.1.tar.xz 4142764 BLAKE2B aaeebe91ef5d009deae37258cfcdbdcb415d5a2d5f954d01f277d6c4911449c80c49c486f6af71d4a2abc6a1d73f49f54d506dcb178adc33e1d685f1dc3c6b01 SHA512 ae829ff898708843e56688e2c1bd189c765cced11146a504ae8badd1acb1559536e13cec101e57ac4ffed2a3d1fa51323b87785b93290db7a1eec2e1579d1c6c
DIST snapd-2.52.tar.xz 4146496 BLAKE2B 49b952503c60b589fe7ddea9ded135139243da34b35b39d9e309df6854109fb3a99f52ca324737fa7f5773221d453f7093047dcdcb1114d0389e20ba24c3d2c3 SHA512 56d3a2c5048d2ffde5b34f63e6a99dc74a7c6e4637f36250f674a68863c4b997cf940689529eca9d3bf58b0148cc18a0b4033d93aa06375a5f12c552d40472da
diff --git a/app-emulation/snapd/snapd-2.52.1.ebuild b/app-emulation/snapd/snapd-2.52.1.ebuild
new file mode 100644
index 00000000000..abc28376ab8
--- /dev/null
+++ b/app-emulation/snapd/snapd-2.52.1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/snapcore/${PN}"
+inherit autotools bash-completion-r1 golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils
+
+DESCRIPTION="Service and tools for management of snap packages"
+HOMEPAGE="http://snapcraft.io/"
+
+MY_S="${S}/src/github.com/snapcore/${PN}"
+
+SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
+MY_PV=${PV}
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
+SLOT="0"
+IUSE="apparmor +cgroup-hybrid +forced-devmode gtk kde systemd"
+REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) systemd"
+
+CONFIG_CHECK="~CGROUPS
+ ~CGROUP_DEVICE
+ ~CGROUP_FREEZER
+ ~NAMESPACES
+ ~SQUASHFS
+ ~SQUASHFS_ZLIB
+ ~SQUASHFS_LZO
+ ~SQUASHFS_XZ
+ ~BLK_DEV_LOOP
+ ~SECCOMP
+ ~SECCOMP_FILTER"
+
+RDEPEND="
+ sys-libs/libseccomp:=
+ apparmor? (
+ sec-policy/apparmor-profiles
+ sys-apps/apparmor:=
+ )
+ dev-libs/glib
+ virtual/libudev
+ systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] )
+ sys-libs/libcap:=
+ sys-fs/squashfs-tools[lzma]"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ >=dev-lang/go-1.9
+ dev-python/docutils
+ sys-devel/gettext
+ sys-fs/xfsprogs"
+
+PDEPEND="sys-auth/polkit[gtk?,kde?]"
+
+README_GENTOO_SUFFIX=""
+
+pkg_setup() {
+ if use apparmor; then
+ CONFIG_CHECK+=" ~SECURITY_APPARMOR"
+ fi
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ default
+ # Update apparmor profile to allow libtinfow.so*
+ sed -i 's/libtinfo/libtinfo{,w}/' \
+ "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
+
+ if ! use forced-devmode; then
+ sed -e 's#return \(!apparmorFull || cgroupv2\)#//\1\n\tif !apparmorFull || cgroupv2 {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
+ -i "${MY_S}/sandbox/forcedevmode.go" || die
+ grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
+ fi
+
+ sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh" || die
+
+ pushd "${MY_S}" >/dev/null || die
+ ./mkversion.sh "${PV}"
+ popd >/dev/null || die
+ pushd "${MY_S}/cmd" >/dev/null || die
+ eautoreconf
+}
+
+src_configure() {
+ SNAPD_MAKEARGS=(
+ "BINDIR=${EPREFIX}/usr/bin"
+ "DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
+ "LIBEXECDIR=${EPREFIX}/usr/lib"
+ "SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
+ "SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
+ )
+ export CGO_ENABLED="1"
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+
+ pushd "${MY_S}/cmd" >/dev/null || die
+ econf --libdir="${EPREFIX}/usr/lib" \
+ --libexecdir="${EPREFIX}/usr/lib/snapd" \
+ $(use_enable apparmor) \
+ --enable-nvidia-biarch \
+ --with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
+}
+
+src_compile() {
+ export -n GOCACHE XDG_CACHE_HOME
+ export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}"
+
+ local file
+ for file in "${MY_S}/po/"*.po; do
+ msgfmt "${file}" -o "${file%.po}.mo" || die
+ done
+
+ emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}"
+
+ local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
+ local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
+
+ local cmd
+ for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
+ go build -o "${GOBIN}/${cmd}" "${flags[@]}" \
+ -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+ [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+ done
+ for cmd in snapctl snap-exec snap-update-ns; do
+ go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
+ -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+ [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+ done
+}
+
+src_install() {
+ emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+ emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+
+ if use apparmor; then
+ mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
+ keepdir /var/lib/snapd/apparmor/profiles
+ fi
+ keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
+ fperms 700 /var/lib/snapd/{cache,cookie}
+
+ dobin "${GOBIN}/"{snap,snapctl}
+ ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
+
+ exeinto /usr/lib/snapd
+ doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
+ "${MY_S}/"{cmd/snap-confine/snap-device-helper,cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
+ "${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
+
+ dobashcomp "${MY_S}/data/completion/bash/snap"
+
+ insinto /usr/share/zsh/site-functions
+ doins "${MY_S}/data/completion/zsh/_snap"
+
+ insinto "/usr/share/polkit-1/actions"
+ doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy"
+
+ dodoc "${MY_S}/packaging/ubuntu-16.04/changelog"
+ domo "${MY_S}/po/"*.mo
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+ xdg_desktop_database_update
+
+ if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
+ $(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
+ apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
+ fi
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/snapd/
@ 2021-10-05 21:15 Zac Medico
0 siblings, 0 replies; 14+ messages in thread
From: Zac Medico @ 2021-10-05 21:15 UTC (permalink / raw
To: gentoo-commits
commit: 3a07dbbad08e114977cb5e7b64d6618f8d801866
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 5 21:14:50 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Oct 5 21:14:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a07dbba
app-emulation/snapd: Remove old
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
app-emulation/snapd/Manifest | 2 -
app-emulation/snapd/snapd-2.48.ebuild | 180 ----------------------------------
app-emulation/snapd/snapd-2.51.ebuild | 180 ----------------------------------
3 files changed, 362 deletions(-)
diff --git a/app-emulation/snapd/Manifest b/app-emulation/snapd/Manifest
index 181607d2735..90221f78f59 100644
--- a/app-emulation/snapd/Manifest
+++ b/app-emulation/snapd/Manifest
@@ -1,4 +1,2 @@
-DIST snapd-2.48.tar.xz 3757292 BLAKE2B 4d1fd4b9ff3bd7cf05ebf0e27db4bcc87b5de689be470b4c62758e411e9d99a541ae084c7b1afe4ede44ad6dce19a53b337dcddc18d0b82957ef537f466e720a SHA512 27e1924d86296a969cd18980d6100c8e41be66f2ad0214ac2857580a2686b1e7ef01e2561c6ed532106eadb1ac2d5fd070ef9eb05e5fabfb8fa9a98456259b89
-DIST snapd-2.51.tar.xz 4036884 BLAKE2B debdfe51407306451ecdb7851e3768be5aa5b9714b2861cb17e9989194dfbf441b1569955c6440a7d44f1d36996b398bcf60b903a76116e14dcc3173625e105c SHA512 959cceb8fcb326a14557347cecfb931763084e00639b828dc539646d2988cdeb3c9276ab8b770c6bbe37c7a05fb6548f609f490c55f7ee28713a4eb80cf3da15
DIST snapd-2.52.1.tar.xz 4142764 BLAKE2B aaeebe91ef5d009deae37258cfcdbdcb415d5a2d5f954d01f277d6c4911449c80c49c486f6af71d4a2abc6a1d73f49f54d506dcb178adc33e1d685f1dc3c6b01 SHA512 ae829ff898708843e56688e2c1bd189c765cced11146a504ae8badd1acb1559536e13cec101e57ac4ffed2a3d1fa51323b87785b93290db7a1eec2e1579d1c6c
DIST snapd-2.52.tar.xz 4146496 BLAKE2B 49b952503c60b589fe7ddea9ded135139243da34b35b39d9e309df6854109fb3a99f52ca324737fa7f5773221d453f7093047dcdcb1114d0389e20ba24c3d2c3 SHA512 56d3a2c5048d2ffde5b34f63e6a99dc74a7c6e4637f36250f674a68863c4b997cf940689529eca9d3bf58b0148cc18a0b4033d93aa06375a5f12c552d40472da
diff --git a/app-emulation/snapd/snapd-2.48.ebuild b/app-emulation/snapd/snapd-2.48.ebuild
deleted file mode 100644
index b25ca4a9b98..00000000000
--- a/app-emulation/snapd/snapd-2.48.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/snapcore/${PN}"
-inherit autotools bash-completion-r1 golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils
-
-DESCRIPTION="Service and tools for management of snap packages"
-HOMEPAGE="http://snapcraft.io/"
-
-MY_S="${S}/src/github.com/snapcore/${PN}"
-
-SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
-MY_PV=${PV}
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
-SLOT="0"
-IUSE="apparmor +cgroup-hybrid +forced-devmode gtk kde systemd"
-REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) systemd"
-
-CONFIG_CHECK="~CGROUPS
- ~CGROUP_DEVICE
- ~CGROUP_FREEZER
- ~NAMESPACES
- ~SQUASHFS
- ~SQUASHFS_ZLIB
- ~SQUASHFS_LZO
- ~SQUASHFS_XZ
- ~BLK_DEV_LOOP
- ~SECCOMP
- ~SECCOMP_FILTER"
-
-RDEPEND="
- sys-libs/libseccomp:=
- apparmor? (
- sec-policy/apparmor-profiles
- sys-apps/apparmor:=
- )
- dev-libs/glib
- virtual/libudev
- systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] )
- sys-libs/libcap:=
- sys-fs/squashfs-tools"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- >=dev-lang/go-1.9
- dev-python/docutils
- sys-devel/gettext
- sys-fs/xfsprogs"
-
-PDEPEND="sys-auth/polkit[gtk?,kde?]"
-
-README_GENTOO_SUFFIX=""
-
-pkg_setup() {
- if use apparmor; then
- CONFIG_CHECK+=" ~SECURITY_APPARMOR"
- fi
- linux-info_pkg_setup
-}
-
-src_prepare() {
- default
- # Update apparmor profile to allow libtinfow.so*
- sed -i 's/libtinfo/libtinfo{,w}/' \
- "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
-
- if ! use forced-devmode; then
- sed -e 's#return \(!apparmorFull || cgroupv2\)#//\1\n\tif !apparmorFull || cgroupv2 {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
- -i "${MY_S}/sandbox/forcedevmode.go" || die
- grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
- fi
-
- sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh" || die
-
- pushd "${MY_S}" >/dev/null || die
- ./mkversion.sh "${PV}"
- popd >/dev/null || die
- pushd "${MY_S}/cmd" >/dev/null || die
- eautoreconf
-}
-
-src_configure() {
- SNAPD_MAKEARGS=(
- "BINDIR=${EPREFIX}/usr/bin"
- "DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
- "LIBEXECDIR=${EPREFIX}/usr/lib"
- "SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
- "SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
- )
- export CGO_ENABLED="1"
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
-
- pushd "${MY_S}/cmd" >/dev/null || die
- econf --libdir="${EPREFIX}/usr/lib" \
- --libexecdir="${EPREFIX}/usr/lib/snapd" \
- $(use_enable apparmor) \
- --enable-nvidia-biarch \
- --with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
-}
-
-src_compile() {
- export -n GOCACHE XDG_CACHE_HOME
- export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}"
-
- local file
- for file in "${MY_S}/po/"*.po; do
- msgfmt "${file}" -o "${file%.po}.mo" || die
- done
-
- emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}"
-
- local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
- local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
-
- local cmd
- for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
- go build -o "${GOBIN}/${cmd}" "${flags[@]}" \
- -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
- [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
- done
- for cmd in snapctl snap-exec snap-update-ns; do
- go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
- -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
- [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
- done
-}
-
-src_install() {
- emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
- emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-
- if use apparmor; then
- mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
- keepdir /var/lib/snapd/apparmor/profiles
- fi
- keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
- fperms 700 /var/lib/snapd/{cache,cookie}
-
- dobin "${GOBIN}/"{snap,snapctl}
- ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
-
- exeinto /usr/lib/snapd
- doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
- "${MY_S}/"{cmd/snap-confine/snap-device-helper,cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
- "${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
-
- dobashcomp "${MY_S}/data/completion/bash/snap"
-
- insinto /usr/share/zsh/site-functions
- doins "${MY_S}/data/completion/zsh/_snap"
-
- insinto "/usr/share/polkit-1/actions"
- doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy"
-
- dodoc "${MY_S}/packaging/ubuntu-16.04/changelog"
- domo "${MY_S}/po/"*.mo
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
- xdg_desktop_database_update
-
- if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
- $(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
- apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-emulation/snapd/snapd-2.51.ebuild b/app-emulation/snapd/snapd-2.51.ebuild
deleted file mode 100644
index abc28376ab8..00000000000
--- a/app-emulation/snapd/snapd-2.51.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/snapcore/${PN}"
-inherit autotools bash-completion-r1 golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils
-
-DESCRIPTION="Service and tools for management of snap packages"
-HOMEPAGE="http://snapcraft.io/"
-
-MY_S="${S}/src/github.com/snapcore/${PN}"
-
-SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
-MY_PV=${PV}
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
-SLOT="0"
-IUSE="apparmor +cgroup-hybrid +forced-devmode gtk kde systemd"
-REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) systemd"
-
-CONFIG_CHECK="~CGROUPS
- ~CGROUP_DEVICE
- ~CGROUP_FREEZER
- ~NAMESPACES
- ~SQUASHFS
- ~SQUASHFS_ZLIB
- ~SQUASHFS_LZO
- ~SQUASHFS_XZ
- ~BLK_DEV_LOOP
- ~SECCOMP
- ~SECCOMP_FILTER"
-
-RDEPEND="
- sys-libs/libseccomp:=
- apparmor? (
- sec-policy/apparmor-profiles
- sys-apps/apparmor:=
- )
- dev-libs/glib
- virtual/libudev
- systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] )
- sys-libs/libcap:=
- sys-fs/squashfs-tools[lzma]"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- >=dev-lang/go-1.9
- dev-python/docutils
- sys-devel/gettext
- sys-fs/xfsprogs"
-
-PDEPEND="sys-auth/polkit[gtk?,kde?]"
-
-README_GENTOO_SUFFIX=""
-
-pkg_setup() {
- if use apparmor; then
- CONFIG_CHECK+=" ~SECURITY_APPARMOR"
- fi
- linux-info_pkg_setup
-}
-
-src_prepare() {
- default
- # Update apparmor profile to allow libtinfow.so*
- sed -i 's/libtinfo/libtinfo{,w}/' \
- "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
-
- if ! use forced-devmode; then
- sed -e 's#return \(!apparmorFull || cgroupv2\)#//\1\n\tif !apparmorFull || cgroupv2 {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
- -i "${MY_S}/sandbox/forcedevmode.go" || die
- grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
- fi
-
- sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh" || die
-
- pushd "${MY_S}" >/dev/null || die
- ./mkversion.sh "${PV}"
- popd >/dev/null || die
- pushd "${MY_S}/cmd" >/dev/null || die
- eautoreconf
-}
-
-src_configure() {
- SNAPD_MAKEARGS=(
- "BINDIR=${EPREFIX}/usr/bin"
- "DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
- "LIBEXECDIR=${EPREFIX}/usr/lib"
- "SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
- "SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
- )
- export CGO_ENABLED="1"
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
-
- pushd "${MY_S}/cmd" >/dev/null || die
- econf --libdir="${EPREFIX}/usr/lib" \
- --libexecdir="${EPREFIX}/usr/lib/snapd" \
- $(use_enable apparmor) \
- --enable-nvidia-biarch \
- --with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
-}
-
-src_compile() {
- export -n GOCACHE XDG_CACHE_HOME
- export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}"
-
- local file
- for file in "${MY_S}/po/"*.po; do
- msgfmt "${file}" -o "${file%.po}.mo" || die
- done
-
- emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}"
-
- local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
- local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
-
- local cmd
- for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
- go build -o "${GOBIN}/${cmd}" "${flags[@]}" \
- -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
- [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
- done
- for cmd in snapctl snap-exec snap-update-ns; do
- go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
- -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
- [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
- done
-}
-
-src_install() {
- emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
- emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-
- if use apparmor; then
- mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
- keepdir /var/lib/snapd/apparmor/profiles
- fi
- keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
- fperms 700 /var/lib/snapd/{cache,cookie}
-
- dobin "${GOBIN}/"{snap,snapctl}
- ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
-
- exeinto /usr/lib/snapd
- doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
- "${MY_S}/"{cmd/snap-confine/snap-device-helper,cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
- "${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
-
- dobashcomp "${MY_S}/data/completion/bash/snap"
-
- insinto /usr/share/zsh/site-functions
- doins "${MY_S}/data/completion/zsh/_snap"
-
- insinto "/usr/share/polkit-1/actions"
- doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy"
-
- dodoc "${MY_S}/packaging/ubuntu-16.04/changelog"
- domo "${MY_S}/po/"*.mo
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
- xdg_desktop_database_update
-
- if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
- $(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
- apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/snapd/
@ 2021-10-22 6:10 Zac Medico
0 siblings, 0 replies; 14+ messages in thread
From: Zac Medico @ 2021-10-22 6:10 UTC (permalink / raw
To: gentoo-commits
commit: db60c1b4117cffb44f03bba1d961e657330a078a
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 22 06:02:02 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Oct 22 06:10:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db60c1b4
app-emulation/snapd: Bump to version 2.53.1
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
app-emulation/snapd/Manifest | 1 +
app-emulation/snapd/snapd-2.53.1.ebuild | 180 ++++++++++++++++++++++++++++++++
2 files changed, 181 insertions(+)
diff --git a/app-emulation/snapd/Manifest b/app-emulation/snapd/Manifest
index 90221f78f59..d8355d6aaf6 100644
--- a/app-emulation/snapd/Manifest
+++ b/app-emulation/snapd/Manifest
@@ -1,2 +1,3 @@
DIST snapd-2.52.1.tar.xz 4142764 BLAKE2B aaeebe91ef5d009deae37258cfcdbdcb415d5a2d5f954d01f277d6c4911449c80c49c486f6af71d4a2abc6a1d73f49f54d506dcb178adc33e1d685f1dc3c6b01 SHA512 ae829ff898708843e56688e2c1bd189c765cced11146a504ae8badd1acb1559536e13cec101e57ac4ffed2a3d1fa51323b87785b93290db7a1eec2e1579d1c6c
DIST snapd-2.52.tar.xz 4146496 BLAKE2B 49b952503c60b589fe7ddea9ded135139243da34b35b39d9e309df6854109fb3a99f52ca324737fa7f5773221d453f7093047dcdcb1114d0389e20ba24c3d2c3 SHA512 56d3a2c5048d2ffde5b34f63e6a99dc74a7c6e4637f36250f674a68863c4b997cf940689529eca9d3bf58b0148cc18a0b4033d93aa06375a5f12c552d40472da
+DIST snapd-2.53.1.tar.xz 4713180 BLAKE2B 8c46c7257eeb7794d082833448ea30dbeee5ebec3b36dcec1e3d6c9e8b00121319829ceaf354c055a0edd9032f3d74b66823be0f640860b931c461e607b89485 SHA512 167c84fdf5df151c9d06774677649c365a6fd1fbbc68900c060c775fffaa51bf7bfee5a62900035fae3bd5ad1d637bb381fe15e8277a93acc6409028b36ef780
diff --git a/app-emulation/snapd/snapd-2.53.1.ebuild b/app-emulation/snapd/snapd-2.53.1.ebuild
new file mode 100644
index 00000000000..c0a495cddeb
--- /dev/null
+++ b/app-emulation/snapd/snapd-2.53.1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/snapcore/${PN}"
+inherit autotools bash-completion-r1 golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils
+
+DESCRIPTION="Service and tools for management of snap packages"
+HOMEPAGE="http://snapcraft.io/"
+
+MY_S="${S}/src/github.com/snapcore/${PN}"
+
+SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
+MY_PV=${PV}
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
+SLOT="0"
+IUSE="apparmor +cgroup-hybrid +forced-devmode gtk kde systemd"
+REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) systemd"
+
+CONFIG_CHECK="~CGROUPS
+ ~CGROUP_DEVICE
+ ~CGROUP_FREEZER
+ ~NAMESPACES
+ ~SQUASHFS
+ ~SQUASHFS_ZLIB
+ ~SQUASHFS_LZO
+ ~SQUASHFS_XZ
+ ~BLK_DEV_LOOP
+ ~SECCOMP
+ ~SECCOMP_FILTER"
+
+RDEPEND="
+ sys-libs/libseccomp:=
+ apparmor? (
+ sec-policy/apparmor-profiles
+ sys-apps/apparmor:=
+ )
+ dev-libs/glib
+ virtual/libudev
+ systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] )
+ sys-libs/libcap:=
+ sys-fs/squashfs-tools[lzma]"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ >=dev-lang/go-1.9
+ dev-python/docutils
+ sys-devel/gettext
+ sys-fs/xfsprogs"
+
+PDEPEND="sys-auth/polkit[gtk?,kde?]"
+
+README_GENTOO_SUFFIX=""
+
+pkg_setup() {
+ if use apparmor; then
+ CONFIG_CHECK+=" ~SECURITY_APPARMOR"
+ fi
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ default
+ # Update apparmor profile to allow libtinfow.so*
+ sed -i 's/libtinfo/libtinfo{,w}/' \
+ "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
+
+ if ! use forced-devmode; then
+ sed -e 's#return \(!apparmorFull || cgroupv2\)#//\1\n\tif !apparmorFull || cgroupv2 {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
+ -i "${MY_S}/sandbox/forcedevmode.go" || die
+ grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
+ fi
+
+ sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh" || die
+
+ pushd "${MY_S}" >/dev/null || die
+ ./mkversion.sh "${PV}"
+ popd >/dev/null || die
+ pushd "${MY_S}/cmd" >/dev/null || die
+ eautoreconf
+}
+
+src_configure() {
+ SNAPD_MAKEARGS=(
+ "BINDIR=${EPREFIX}/usr/bin"
+ "DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
+ "LIBEXECDIR=${EPREFIX}/usr/lib"
+ "SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
+ "SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
+ )
+ export CGO_ENABLED="1"
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+
+ pushd "${MY_S}/cmd" >/dev/null || die
+ econf --libdir="${EPREFIX}/usr/lib" \
+ --libexecdir="${EPREFIX}/usr/lib/snapd" \
+ $(use_enable apparmor) \
+ --enable-nvidia-biarch \
+ --with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
+}
+
+src_compile() {
+ export -n GOCACHE XDG_CACHE_HOME
+ export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}"
+
+ local file
+ for file in "${MY_S}/po/"*.po; do
+ msgfmt "${file}" -o "${file%.po}.mo" || die
+ done
+
+ emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}"
+
+ local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
+ local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
+
+ local cmd
+ for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
+ go build -o "${GOBIN}/${cmd}" "${flags[@]}" \
+ -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+ [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+ done
+ for cmd in snapctl snap-exec snap-update-ns; do
+ go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
+ -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+ [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+ done
+}
+
+src_install() {
+ emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+ emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+
+ if use apparmor; then
+ mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
+ keepdir /var/lib/snapd/apparmor/profiles
+ fi
+ keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
+ fperms 700 /var/lib/snapd/{cache,cookie}
+
+ dobin "${GOBIN}/"{snap,snapctl}
+ ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
+
+ exeinto /usr/lib/snapd
+ doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
+ "${MY_S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
+ "${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
+
+ dobashcomp "${MY_S}/data/completion/bash/snap"
+
+ insinto /usr/share/zsh/site-functions
+ doins "${MY_S}/data/completion/zsh/_snap"
+
+ insinto "/usr/share/polkit-1/actions"
+ doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy"
+
+ dodoc "${MY_S}/packaging/ubuntu-16.04/changelog"
+ domo "${MY_S}/po/"*.mo
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+ xdg_desktop_database_update
+
+ if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
+ $(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
+ apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
+ fi
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/snapd/
@ 2021-11-08 2:41 Zac Medico
0 siblings, 0 replies; 14+ messages in thread
From: Zac Medico @ 2021-11-08 2:41 UTC (permalink / raw
To: gentoo-commits
commit: 3373cca48e575bece69b1c76a3dc8482c29810ce
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 8 02:39:44 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Nov 8 02:40:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3373cca4
app-emulation/snapd: Rebase USE=-forced-devmode
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
app-emulation/snapd/snapd-2.53.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-emulation/snapd/snapd-2.53.1.ebuild b/app-emulation/snapd/snapd-2.53.1.ebuild
index c0a495cddeb..3eb5f935325 100644
--- a/app-emulation/snapd/snapd-2.53.1.ebuild
+++ b/app-emulation/snapd/snapd-2.53.1.ebuild
@@ -70,7 +70,7 @@ src_prepare() {
"${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
if ! use forced-devmode; then
- sed -e 's#return \(!apparmorFull || cgroupv2\)#//\1\n\tif !apparmorFull || cgroupv2 {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
+ sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
-i "${MY_S}/sandbox/forcedevmode.go" || die
grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
fi
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/snapd/
@ 2021-11-16 0:34 Zac Medico
0 siblings, 0 replies; 14+ messages in thread
From: Zac Medico @ 2021-11-16 0:34 UTC (permalink / raw
To: gentoo-commits
commit: ad9c0bc46b7beb519e18ed34eb035b8d17bf3916
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 16 00:32:32 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Nov 16 00:32:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad9c0bc4
app-emulation/snapd: Bump to version 2.53.2
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
app-emulation/snapd/Manifest | 1 +
app-emulation/snapd/snapd-2.53.2.ebuild | 180 ++++++++++++++++++++++++++++++++
2 files changed, 181 insertions(+)
diff --git a/app-emulation/snapd/Manifest b/app-emulation/snapd/Manifest
index d8355d6aaf6f..ea29a4494cb0 100644
--- a/app-emulation/snapd/Manifest
+++ b/app-emulation/snapd/Manifest
@@ -1,3 +1,4 @@
DIST snapd-2.52.1.tar.xz 4142764 BLAKE2B aaeebe91ef5d009deae37258cfcdbdcb415d5a2d5f954d01f277d6c4911449c80c49c486f6af71d4a2abc6a1d73f49f54d506dcb178adc33e1d685f1dc3c6b01 SHA512 ae829ff898708843e56688e2c1bd189c765cced11146a504ae8badd1acb1559536e13cec101e57ac4ffed2a3d1fa51323b87785b93290db7a1eec2e1579d1c6c
DIST snapd-2.52.tar.xz 4146496 BLAKE2B 49b952503c60b589fe7ddea9ded135139243da34b35b39d9e309df6854109fb3a99f52ca324737fa7f5773221d453f7093047dcdcb1114d0389e20ba24c3d2c3 SHA512 56d3a2c5048d2ffde5b34f63e6a99dc74a7c6e4637f36250f674a68863c4b997cf940689529eca9d3bf58b0148cc18a0b4033d93aa06375a5f12c552d40472da
DIST snapd-2.53.1.tar.xz 4713180 BLAKE2B 8c46c7257eeb7794d082833448ea30dbeee5ebec3b36dcec1e3d6c9e8b00121319829ceaf354c055a0edd9032f3d74b66823be0f640860b931c461e607b89485 SHA512 167c84fdf5df151c9d06774677649c365a6fd1fbbc68900c060c775fffaa51bf7bfee5a62900035fae3bd5ad1d637bb381fe15e8277a93acc6409028b36ef780
+DIST snapd-2.53.2.tar.xz 4714868 BLAKE2B 8ce0358a31c095e90c17b01a0229b665655949f91b4094b6b426f6df07794c1633497ee9edbb9d175aa920e7ac3b39316631a985b1e57f6cb15ef2fa56fd3321 SHA512 414f819b1590e6324c3f5141ccfa60141fd42f0e0160ad78d1937ad57bc2313de54af9b7718d956a9db9981954fcbe75e80556c6544bff99ac6da9db5142c014
diff --git a/app-emulation/snapd/snapd-2.53.2.ebuild b/app-emulation/snapd/snapd-2.53.2.ebuild
new file mode 100644
index 000000000000..3eb5f9353258
--- /dev/null
+++ b/app-emulation/snapd/snapd-2.53.2.ebuild
@@ -0,0 +1,180 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/snapcore/${PN}"
+inherit autotools bash-completion-r1 golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils
+
+DESCRIPTION="Service and tools for management of snap packages"
+HOMEPAGE="http://snapcraft.io/"
+
+MY_S="${S}/src/github.com/snapcore/${PN}"
+
+SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
+MY_PV=${PV}
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
+SLOT="0"
+IUSE="apparmor +cgroup-hybrid +forced-devmode gtk kde systemd"
+REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) systemd"
+
+CONFIG_CHECK="~CGROUPS
+ ~CGROUP_DEVICE
+ ~CGROUP_FREEZER
+ ~NAMESPACES
+ ~SQUASHFS
+ ~SQUASHFS_ZLIB
+ ~SQUASHFS_LZO
+ ~SQUASHFS_XZ
+ ~BLK_DEV_LOOP
+ ~SECCOMP
+ ~SECCOMP_FILTER"
+
+RDEPEND="
+ sys-libs/libseccomp:=
+ apparmor? (
+ sec-policy/apparmor-profiles
+ sys-apps/apparmor:=
+ )
+ dev-libs/glib
+ virtual/libudev
+ systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] )
+ sys-libs/libcap:=
+ sys-fs/squashfs-tools[lzma]"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ >=dev-lang/go-1.9
+ dev-python/docutils
+ sys-devel/gettext
+ sys-fs/xfsprogs"
+
+PDEPEND="sys-auth/polkit[gtk?,kde?]"
+
+README_GENTOO_SUFFIX=""
+
+pkg_setup() {
+ if use apparmor; then
+ CONFIG_CHECK+=" ~SECURITY_APPARMOR"
+ fi
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ default
+ # Update apparmor profile to allow libtinfow.so*
+ sed -i 's/libtinfo/libtinfo{,w}/' \
+ "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
+
+ if ! use forced-devmode; then
+ sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
+ -i "${MY_S}/sandbox/forcedevmode.go" || die
+ grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
+ fi
+
+ sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh" || die
+
+ pushd "${MY_S}" >/dev/null || die
+ ./mkversion.sh "${PV}"
+ popd >/dev/null || die
+ pushd "${MY_S}/cmd" >/dev/null || die
+ eautoreconf
+}
+
+src_configure() {
+ SNAPD_MAKEARGS=(
+ "BINDIR=${EPREFIX}/usr/bin"
+ "DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
+ "LIBEXECDIR=${EPREFIX}/usr/lib"
+ "SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
+ "SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
+ )
+ export CGO_ENABLED="1"
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+
+ pushd "${MY_S}/cmd" >/dev/null || die
+ econf --libdir="${EPREFIX}/usr/lib" \
+ --libexecdir="${EPREFIX}/usr/lib/snapd" \
+ $(use_enable apparmor) \
+ --enable-nvidia-biarch \
+ --with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
+}
+
+src_compile() {
+ export -n GOCACHE XDG_CACHE_HOME
+ export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}"
+
+ local file
+ for file in "${MY_S}/po/"*.po; do
+ msgfmt "${file}" -o "${file%.po}.mo" || die
+ done
+
+ emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}"
+
+ local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
+ local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
+
+ local cmd
+ for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
+ go build -o "${GOBIN}/${cmd}" "${flags[@]}" \
+ -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+ [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+ done
+ for cmd in snapctl snap-exec snap-update-ns; do
+ go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
+ -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+ [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+ done
+}
+
+src_install() {
+ emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+ emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+
+ if use apparmor; then
+ mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
+ keepdir /var/lib/snapd/apparmor/profiles
+ fi
+ keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
+ fperms 700 /var/lib/snapd/{cache,cookie}
+
+ dobin "${GOBIN}/"{snap,snapctl}
+ ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
+
+ exeinto /usr/lib/snapd
+ doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
+ "${MY_S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
+ "${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
+
+ dobashcomp "${MY_S}/data/completion/bash/snap"
+
+ insinto /usr/share/zsh/site-functions
+ doins "${MY_S}/data/completion/zsh/_snap"
+
+ insinto "/usr/share/polkit-1/actions"
+ doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy"
+
+ dodoc "${MY_S}/packaging/ubuntu-16.04/changelog"
+ domo "${MY_S}/po/"*.mo
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+ xdg_desktop_database_update
+
+ if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
+ $(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
+ apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
+ fi
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/snapd/
@ 2021-11-16 0:37 Zac Medico
0 siblings, 0 replies; 14+ messages in thread
From: Zac Medico @ 2021-11-16 0:37 UTC (permalink / raw
To: gentoo-commits
commit: 645e411e123532210c17b202d01b6fb47289bc22
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 16 00:37:22 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Nov 16 00:37:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=645e411e
app-emulation/snapd: Remove old
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
app-emulation/snapd/Manifest | 2 -
app-emulation/snapd/snapd-2.52.1.ebuild | 180 --------------------------------
app-emulation/snapd/snapd-2.52.ebuild | 180 --------------------------------
3 files changed, 362 deletions(-)
diff --git a/app-emulation/snapd/Manifest b/app-emulation/snapd/Manifest
index ea29a4494cb0..2849bd04771d 100644
--- a/app-emulation/snapd/Manifest
+++ b/app-emulation/snapd/Manifest
@@ -1,4 +1,2 @@
-DIST snapd-2.52.1.tar.xz 4142764 BLAKE2B aaeebe91ef5d009deae37258cfcdbdcb415d5a2d5f954d01f277d6c4911449c80c49c486f6af71d4a2abc6a1d73f49f54d506dcb178adc33e1d685f1dc3c6b01 SHA512 ae829ff898708843e56688e2c1bd189c765cced11146a504ae8badd1acb1559536e13cec101e57ac4ffed2a3d1fa51323b87785b93290db7a1eec2e1579d1c6c
-DIST snapd-2.52.tar.xz 4146496 BLAKE2B 49b952503c60b589fe7ddea9ded135139243da34b35b39d9e309df6854109fb3a99f52ca324737fa7f5773221d453f7093047dcdcb1114d0389e20ba24c3d2c3 SHA512 56d3a2c5048d2ffde5b34f63e6a99dc74a7c6e4637f36250f674a68863c4b997cf940689529eca9d3bf58b0148cc18a0b4033d93aa06375a5f12c552d40472da
DIST snapd-2.53.1.tar.xz 4713180 BLAKE2B 8c46c7257eeb7794d082833448ea30dbeee5ebec3b36dcec1e3d6c9e8b00121319829ceaf354c055a0edd9032f3d74b66823be0f640860b931c461e607b89485 SHA512 167c84fdf5df151c9d06774677649c365a6fd1fbbc68900c060c775fffaa51bf7bfee5a62900035fae3bd5ad1d637bb381fe15e8277a93acc6409028b36ef780
DIST snapd-2.53.2.tar.xz 4714868 BLAKE2B 8ce0358a31c095e90c17b01a0229b665655949f91b4094b6b426f6df07794c1633497ee9edbb9d175aa920e7ac3b39316631a985b1e57f6cb15ef2fa56fd3321 SHA512 414f819b1590e6324c3f5141ccfa60141fd42f0e0160ad78d1937ad57bc2313de54af9b7718d956a9db9981954fcbe75e80556c6544bff99ac6da9db5142c014
diff --git a/app-emulation/snapd/snapd-2.52.1.ebuild b/app-emulation/snapd/snapd-2.52.1.ebuild
deleted file mode 100644
index abc28376ab87..000000000000
--- a/app-emulation/snapd/snapd-2.52.1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/snapcore/${PN}"
-inherit autotools bash-completion-r1 golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils
-
-DESCRIPTION="Service and tools for management of snap packages"
-HOMEPAGE="http://snapcraft.io/"
-
-MY_S="${S}/src/github.com/snapcore/${PN}"
-
-SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
-MY_PV=${PV}
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
-SLOT="0"
-IUSE="apparmor +cgroup-hybrid +forced-devmode gtk kde systemd"
-REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) systemd"
-
-CONFIG_CHECK="~CGROUPS
- ~CGROUP_DEVICE
- ~CGROUP_FREEZER
- ~NAMESPACES
- ~SQUASHFS
- ~SQUASHFS_ZLIB
- ~SQUASHFS_LZO
- ~SQUASHFS_XZ
- ~BLK_DEV_LOOP
- ~SECCOMP
- ~SECCOMP_FILTER"
-
-RDEPEND="
- sys-libs/libseccomp:=
- apparmor? (
- sec-policy/apparmor-profiles
- sys-apps/apparmor:=
- )
- dev-libs/glib
- virtual/libudev
- systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] )
- sys-libs/libcap:=
- sys-fs/squashfs-tools[lzma]"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- >=dev-lang/go-1.9
- dev-python/docutils
- sys-devel/gettext
- sys-fs/xfsprogs"
-
-PDEPEND="sys-auth/polkit[gtk?,kde?]"
-
-README_GENTOO_SUFFIX=""
-
-pkg_setup() {
- if use apparmor; then
- CONFIG_CHECK+=" ~SECURITY_APPARMOR"
- fi
- linux-info_pkg_setup
-}
-
-src_prepare() {
- default
- # Update apparmor profile to allow libtinfow.so*
- sed -i 's/libtinfo/libtinfo{,w}/' \
- "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
-
- if ! use forced-devmode; then
- sed -e 's#return \(!apparmorFull || cgroupv2\)#//\1\n\tif !apparmorFull || cgroupv2 {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
- -i "${MY_S}/sandbox/forcedevmode.go" || die
- grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
- fi
-
- sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh" || die
-
- pushd "${MY_S}" >/dev/null || die
- ./mkversion.sh "${PV}"
- popd >/dev/null || die
- pushd "${MY_S}/cmd" >/dev/null || die
- eautoreconf
-}
-
-src_configure() {
- SNAPD_MAKEARGS=(
- "BINDIR=${EPREFIX}/usr/bin"
- "DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
- "LIBEXECDIR=${EPREFIX}/usr/lib"
- "SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
- "SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
- )
- export CGO_ENABLED="1"
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
-
- pushd "${MY_S}/cmd" >/dev/null || die
- econf --libdir="${EPREFIX}/usr/lib" \
- --libexecdir="${EPREFIX}/usr/lib/snapd" \
- $(use_enable apparmor) \
- --enable-nvidia-biarch \
- --with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
-}
-
-src_compile() {
- export -n GOCACHE XDG_CACHE_HOME
- export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}"
-
- local file
- for file in "${MY_S}/po/"*.po; do
- msgfmt "${file}" -o "${file%.po}.mo" || die
- done
-
- emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}"
-
- local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
- local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
-
- local cmd
- for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
- go build -o "${GOBIN}/${cmd}" "${flags[@]}" \
- -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
- [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
- done
- for cmd in snapctl snap-exec snap-update-ns; do
- go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
- -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
- [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
- done
-}
-
-src_install() {
- emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
- emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-
- if use apparmor; then
- mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
- keepdir /var/lib/snapd/apparmor/profiles
- fi
- keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
- fperms 700 /var/lib/snapd/{cache,cookie}
-
- dobin "${GOBIN}/"{snap,snapctl}
- ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
-
- exeinto /usr/lib/snapd
- doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
- "${MY_S}/"{cmd/snap-confine/snap-device-helper,cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
- "${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
-
- dobashcomp "${MY_S}/data/completion/bash/snap"
-
- insinto /usr/share/zsh/site-functions
- doins "${MY_S}/data/completion/zsh/_snap"
-
- insinto "/usr/share/polkit-1/actions"
- doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy"
-
- dodoc "${MY_S}/packaging/ubuntu-16.04/changelog"
- domo "${MY_S}/po/"*.mo
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
- xdg_desktop_database_update
-
- if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
- $(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
- apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-emulation/snapd/snapd-2.52.ebuild b/app-emulation/snapd/snapd-2.52.ebuild
deleted file mode 100644
index abc28376ab87..000000000000
--- a/app-emulation/snapd/snapd-2.52.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/snapcore/${PN}"
-inherit autotools bash-completion-r1 golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils
-
-DESCRIPTION="Service and tools for management of snap packages"
-HOMEPAGE="http://snapcraft.io/"
-
-MY_S="${S}/src/github.com/snapcore/${PN}"
-
-SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
-MY_PV=${PV}
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
-SLOT="0"
-IUSE="apparmor +cgroup-hybrid +forced-devmode gtk kde systemd"
-REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) systemd"
-
-CONFIG_CHECK="~CGROUPS
- ~CGROUP_DEVICE
- ~CGROUP_FREEZER
- ~NAMESPACES
- ~SQUASHFS
- ~SQUASHFS_ZLIB
- ~SQUASHFS_LZO
- ~SQUASHFS_XZ
- ~BLK_DEV_LOOP
- ~SECCOMP
- ~SECCOMP_FILTER"
-
-RDEPEND="
- sys-libs/libseccomp:=
- apparmor? (
- sec-policy/apparmor-profiles
- sys-apps/apparmor:=
- )
- dev-libs/glib
- virtual/libudev
- systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] )
- sys-libs/libcap:=
- sys-fs/squashfs-tools[lzma]"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- >=dev-lang/go-1.9
- dev-python/docutils
- sys-devel/gettext
- sys-fs/xfsprogs"
-
-PDEPEND="sys-auth/polkit[gtk?,kde?]"
-
-README_GENTOO_SUFFIX=""
-
-pkg_setup() {
- if use apparmor; then
- CONFIG_CHECK+=" ~SECURITY_APPARMOR"
- fi
- linux-info_pkg_setup
-}
-
-src_prepare() {
- default
- # Update apparmor profile to allow libtinfow.so*
- sed -i 's/libtinfo/libtinfo{,w}/' \
- "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
-
- if ! use forced-devmode; then
- sed -e 's#return \(!apparmorFull || cgroupv2\)#//\1\n\tif !apparmorFull || cgroupv2 {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
- -i "${MY_S}/sandbox/forcedevmode.go" || die
- grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
- fi
-
- sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh" || die
-
- pushd "${MY_S}" >/dev/null || die
- ./mkversion.sh "${PV}"
- popd >/dev/null || die
- pushd "${MY_S}/cmd" >/dev/null || die
- eautoreconf
-}
-
-src_configure() {
- SNAPD_MAKEARGS=(
- "BINDIR=${EPREFIX}/usr/bin"
- "DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
- "LIBEXECDIR=${EPREFIX}/usr/lib"
- "SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
- "SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
- )
- export CGO_ENABLED="1"
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
-
- pushd "${MY_S}/cmd" >/dev/null || die
- econf --libdir="${EPREFIX}/usr/lib" \
- --libexecdir="${EPREFIX}/usr/lib/snapd" \
- $(use_enable apparmor) \
- --enable-nvidia-biarch \
- --with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
-}
-
-src_compile() {
- export -n GOCACHE XDG_CACHE_HOME
- export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}"
-
- local file
- for file in "${MY_S}/po/"*.po; do
- msgfmt "${file}" -o "${file%.po}.mo" || die
- done
-
- emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}"
-
- local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
- local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
-
- local cmd
- for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
- go build -o "${GOBIN}/${cmd}" "${flags[@]}" \
- -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
- [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
- done
- for cmd in snapctl snap-exec snap-update-ns; do
- go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
- -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
- [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
- done
-}
-
-src_install() {
- emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
- emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-
- if use apparmor; then
- mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
- keepdir /var/lib/snapd/apparmor/profiles
- fi
- keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
- fperms 700 /var/lib/snapd/{cache,cookie}
-
- dobin "${GOBIN}/"{snap,snapctl}
- ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
-
- exeinto /usr/lib/snapd
- doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
- "${MY_S}/"{cmd/snap-confine/snap-device-helper,cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
- "${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
-
- dobashcomp "${MY_S}/data/completion/bash/snap"
-
- insinto /usr/share/zsh/site-functions
- doins "${MY_S}/data/completion/zsh/_snap"
-
- insinto "/usr/share/polkit-1/actions"
- doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy"
-
- dodoc "${MY_S}/packaging/ubuntu-16.04/changelog"
- domo "${MY_S}/po/"*.mo
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
- xdg_desktop_database_update
-
- if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
- $(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
- apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/snapd/
@ 2021-12-03 4:23 Zac Medico
0 siblings, 0 replies; 14+ messages in thread
From: Zac Medico @ 2021-12-03 4:23 UTC (permalink / raw
To: gentoo-commits
commit: 5a1b06774d39cab6890eb9e33bccc5c6154a4d38
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 3 04:21:57 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Dec 3 04:21:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a1b0677
app-emulation/snapd: Bump to version 2.53.4
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
app-emulation/snapd/Manifest | 1 +
app-emulation/snapd/snapd-2.53.4.ebuild | 180 ++++++++++++++++++++++++++++++++
2 files changed, 181 insertions(+)
diff --git a/app-emulation/snapd/Manifest b/app-emulation/snapd/Manifest
index 2849bd04771d..b364f6d00cdc 100644
--- a/app-emulation/snapd/Manifest
+++ b/app-emulation/snapd/Manifest
@@ -1,2 +1,3 @@
DIST snapd-2.53.1.tar.xz 4713180 BLAKE2B 8c46c7257eeb7794d082833448ea30dbeee5ebec3b36dcec1e3d6c9e8b00121319829ceaf354c055a0edd9032f3d74b66823be0f640860b931c461e607b89485 SHA512 167c84fdf5df151c9d06774677649c365a6fd1fbbc68900c060c775fffaa51bf7bfee5a62900035fae3bd5ad1d637bb381fe15e8277a93acc6409028b36ef780
DIST snapd-2.53.2.tar.xz 4714868 BLAKE2B 8ce0358a31c095e90c17b01a0229b665655949f91b4094b6b426f6df07794c1633497ee9edbb9d175aa920e7ac3b39316631a985b1e57f6cb15ef2fa56fd3321 SHA512 414f819b1590e6324c3f5141ccfa60141fd42f0e0160ad78d1937ad57bc2313de54af9b7718d956a9db9981954fcbe75e80556c6544bff99ac6da9db5142c014
+DIST snapd-2.53.4.tar.xz 4722696 BLAKE2B c4347db8d5a14b30f1e8811e9425dd7419dd2dcad02fc1cb6a51968cd7fa6a58da2b172c041de02202cbdba1072cb0a7a92d7f92def5c5dc1e253cbcbad86aae SHA512 0b4164d3c3c3ccc99b3fa1e25d9e7e3184a5f94deca5fd83bd6d4c7761b41d6ebd5fefd1e87432a5e18c716b3330b3991134f179e1b03326edd9511ebea4ef9a
diff --git a/app-emulation/snapd/snapd-2.53.4.ebuild b/app-emulation/snapd/snapd-2.53.4.ebuild
new file mode 100644
index 000000000000..3eb5f9353258
--- /dev/null
+++ b/app-emulation/snapd/snapd-2.53.4.ebuild
@@ -0,0 +1,180 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/snapcore/${PN}"
+inherit autotools bash-completion-r1 golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils
+
+DESCRIPTION="Service and tools for management of snap packages"
+HOMEPAGE="http://snapcraft.io/"
+
+MY_S="${S}/src/github.com/snapcore/${PN}"
+
+SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
+MY_PV=${PV}
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
+SLOT="0"
+IUSE="apparmor +cgroup-hybrid +forced-devmode gtk kde systemd"
+REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) systemd"
+
+CONFIG_CHECK="~CGROUPS
+ ~CGROUP_DEVICE
+ ~CGROUP_FREEZER
+ ~NAMESPACES
+ ~SQUASHFS
+ ~SQUASHFS_ZLIB
+ ~SQUASHFS_LZO
+ ~SQUASHFS_XZ
+ ~BLK_DEV_LOOP
+ ~SECCOMP
+ ~SECCOMP_FILTER"
+
+RDEPEND="
+ sys-libs/libseccomp:=
+ apparmor? (
+ sec-policy/apparmor-profiles
+ sys-apps/apparmor:=
+ )
+ dev-libs/glib
+ virtual/libudev
+ systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] )
+ sys-libs/libcap:=
+ sys-fs/squashfs-tools[lzma]"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ >=dev-lang/go-1.9
+ dev-python/docutils
+ sys-devel/gettext
+ sys-fs/xfsprogs"
+
+PDEPEND="sys-auth/polkit[gtk?,kde?]"
+
+README_GENTOO_SUFFIX=""
+
+pkg_setup() {
+ if use apparmor; then
+ CONFIG_CHECK+=" ~SECURITY_APPARMOR"
+ fi
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ default
+ # Update apparmor profile to allow libtinfow.so*
+ sed -i 's/libtinfo/libtinfo{,w}/' \
+ "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
+
+ if ! use forced-devmode; then
+ sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
+ -i "${MY_S}/sandbox/forcedevmode.go" || die
+ grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
+ fi
+
+ sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh" || die
+
+ pushd "${MY_S}" >/dev/null || die
+ ./mkversion.sh "${PV}"
+ popd >/dev/null || die
+ pushd "${MY_S}/cmd" >/dev/null || die
+ eautoreconf
+}
+
+src_configure() {
+ SNAPD_MAKEARGS=(
+ "BINDIR=${EPREFIX}/usr/bin"
+ "DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
+ "LIBEXECDIR=${EPREFIX}/usr/lib"
+ "SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
+ "SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
+ )
+ export CGO_ENABLED="1"
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+
+ pushd "${MY_S}/cmd" >/dev/null || die
+ econf --libdir="${EPREFIX}/usr/lib" \
+ --libexecdir="${EPREFIX}/usr/lib/snapd" \
+ $(use_enable apparmor) \
+ --enable-nvidia-biarch \
+ --with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
+}
+
+src_compile() {
+ export -n GOCACHE XDG_CACHE_HOME
+ export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}"
+
+ local file
+ for file in "${MY_S}/po/"*.po; do
+ msgfmt "${file}" -o "${file%.po}.mo" || die
+ done
+
+ emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}"
+
+ local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
+ local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
+
+ local cmd
+ for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
+ go build -o "${GOBIN}/${cmd}" "${flags[@]}" \
+ -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+ [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+ done
+ for cmd in snapctl snap-exec snap-update-ns; do
+ go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
+ -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+ [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+ done
+}
+
+src_install() {
+ emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+ emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+
+ if use apparmor; then
+ mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
+ keepdir /var/lib/snapd/apparmor/profiles
+ fi
+ keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
+ fperms 700 /var/lib/snapd/{cache,cookie}
+
+ dobin "${GOBIN}/"{snap,snapctl}
+ ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
+
+ exeinto /usr/lib/snapd
+ doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
+ "${MY_S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
+ "${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
+
+ dobashcomp "${MY_S}/data/completion/bash/snap"
+
+ insinto /usr/share/zsh/site-functions
+ doins "${MY_S}/data/completion/zsh/_snap"
+
+ insinto "/usr/share/polkit-1/actions"
+ doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy"
+
+ dodoc "${MY_S}/packaging/ubuntu-16.04/changelog"
+ domo "${MY_S}/po/"*.mo
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+ xdg_desktop_database_update
+
+ if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
+ $(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
+ apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
+ fi
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2021-12-03 4:23 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-10 11:41 [gentoo-commits] repo/gentoo:master commit in: app-emulation/snapd/ Zac Medico
-- strict thread matches above, loose matches on Subject: below --
2020-11-27 20:06 Zac Medico
2020-11-27 20:40 Zac Medico
2021-01-04 21:56 Zac Medico
2021-06-05 19:40 Zac Medico
2021-06-05 19:53 Zac Medico
2021-09-19 18:16 Zac Medico
2021-10-05 21:10 Zac Medico
2021-10-05 21:15 Zac Medico
2021-10-22 6:10 Zac Medico
2021-11-08 2:41 Zac Medico
2021-11-16 0:34 Zac Medico
2021-11-16 0:37 Zac Medico
2021-12-03 4:23 Zac Medico
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox