From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- app-emulation/snapd/Manifest | 4 +- app-emulation/snapd/snapd-2.47.1-r1.ebuild | 185 ----------------------------- app-emulation/snapd/snapd-2.51.ebuild | 180 ++++++++++++++++++++++++++++ 3 files changed, 182 insertions(+), 187 deletions(-) delete mode 100644 app-emulation/snapd/snapd-2.47.1-r1.ebuild create mode 100644 app-emulation/snapd/snapd-2.51.ebuild (limited to 'app-emulation/snapd') diff --git a/app-emulation/snapd/Manifest b/app-emulation/snapd/Manifest index 6e4355bbc19b..f7ea8d393dc0 100644 --- a/app-emulation/snapd/Manifest +++ b/app-emulation/snapd/Manifest @@ -1,6 +1,6 @@ AUX README.gentoo 1941 BLAKE2B dd25269f2aaaea693701d74511d632bc45f2c99954ae683cb81d4df41c4c1f8007bb6c337234e46bfc5973aa7e8356cd12ac510e9109eca09890cbc42bd184bb SHA512 5b522e6c29bdad84a71245fa1f0289e9cfed0501d936b433829f66ef9d655f3cc13d6bca29beeae2c00e1b68f9fa30058608b9c4cde86ba66eab67bd011c9d00 -DIST snapd-2.47.1.tar.xz 3664756 BLAKE2B 90cb117ea385890c38c6efdecd3652c115158ad769858ebe1a5035d37c9543da5b2a8768ce4f56cfcee053701d308f826bf7993d9b5f9d5313f2840ca829ab23 SHA512 e08dd7057b85b970a1177996c483d3f663b1424cdbf6643a69923a7012d38fc13109b449ce3a2c5c8d65e5836f93a36567f2f641a62caea6e9989a458f7f2892 DIST snapd-2.48.tar.xz 3757292 BLAKE2B 4d1fd4b9ff3bd7cf05ebf0e27db4bcc87b5de689be470b4c62758e411e9d99a541ae084c7b1afe4ede44ad6dce19a53b337dcddc18d0b82957ef537f466e720a SHA512 27e1924d86296a969cd18980d6100c8e41be66f2ad0214ac2857580a2686b1e7ef01e2561c6ed532106eadb1ac2d5fd070ef9eb05e5fabfb8fa9a98456259b89 -EBUILD snapd-2.47.1-r1.ebuild 5572 BLAKE2B ae6c639cdda970dd44a23025b735ca370d976279f7a311892eeb8c802e52c2ae6c4c611c3160ca933d9409aab5b31a4e046d4614a79d5aeb2e80f29e80a73157 SHA512 d09ab7989bff32bf1f257573c12a7c50c490e154580c87f852ff935a6990901d5f0f7b90bf2a8c49c51ffbeb5ba2e342808fd543f0d9141ed066b8d125091cbd +DIST snapd-2.51.tar.xz 4036884 BLAKE2B debdfe51407306451ecdb7851e3768be5aa5b9714b2861cb17e9989194dfbf441b1569955c6440a7d44f1d36996b398bcf60b903a76116e14dcc3173625e105c SHA512 959cceb8fcb326a14557347cecfb931763084e00639b828dc539646d2988cdeb3c9276ab8b770c6bbe37c7a05fb6548f609f490c55f7ee28713a4eb80cf3da15 EBUILD snapd-2.48.ebuild 5366 BLAKE2B 1dd5ce2d317e9be68f85edae48806f53fd8e79f7479c08af66b0dd329273f80fc9d8fded1550af67210e751ae276a4848fb3e51f13c172376cd865d47bff9ea0 SHA512 2f237c6514e5319eb4d99578f7b1ad2c4a9f506bf29e7f3d5212a41eb56c0a9158f19b11f4a0385653e146691890427f2b07eaf5dbd4c743a95aba1339c13ad1 +EBUILD snapd-2.51.ebuild 5372 BLAKE2B af735d3f690eb176b37611bc16770bfd92c311bbe8578254b9859b57df1ccb9e650358f40b24770934198a7edd74df758848f70b79503869da11dcc388a04381 SHA512 41d520a0c0a03d47e00b01dd67db1336599c42af377e6b8213c257ff751ec6fb1593c250b37b0c6668b515f30bb16a4fd7d459fe3d1376dcaa39d16e19555ce8 MISC metadata.xml 635 BLAKE2B b3ed2d2b0fa24d4f06a0ff8a01391856432c6cb97eca89d49bafccbd1f5421073f4d5366484b784e8683d288e26908306a5abbe3e1766e784c1effd2f29ee3fd SHA512 e9319595c1e6b96c2907010873d5793b981c88b34bc1df2f3f6e34ef48ba7bb9b98d32419372688a48ec4d8310083055a6be735e9bcc6e59df2ed162e311ea1e 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 863784f7b24c..000000000000 --- 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 -} diff --git a/app-emulation/snapd/snapd-2.51.ebuild b/app-emulation/snapd/snapd-2.51.ebuild new file mode 100644 index 000000000000..abc28376ab87 --- /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 +} -- cgit v1.2.3