diff options
Diffstat (limited to 'app-containers/snapd')
-rw-r--r-- | app-containers/snapd/Manifest | 10 | ||||
-rw-r--r-- | app-containers/snapd/snapd-2.54.1.ebuild | 180 | ||||
-rw-r--r-- | app-containers/snapd/snapd-2.54.3.ebuild (renamed from app-containers/snapd/snapd-2.54.2.ebuild) | 5 | ||||
-rw-r--r-- | app-containers/snapd/snapd-2.54.4.ebuild (renamed from app-containers/snapd/snapd-2.53.4.ebuild) | 7 |
4 files changed, 13 insertions, 189 deletions
diff --git a/app-containers/snapd/Manifest b/app-containers/snapd/Manifest index 53b8b992e548..5251dc654bdb 100644 --- a/app-containers/snapd/Manifest +++ b/app-containers/snapd/Manifest @@ -1,8 +1,6 @@ AUX README.gentoo 1941 BLAKE2B dd25269f2aaaea693701d74511d632bc45f2c99954ae683cb81d4df41c4c1f8007bb6c337234e46bfc5973aa7e8356cd12ac510e9109eca09890cbc42bd184bb SHA512 5b522e6c29bdad84a71245fa1f0289e9cfed0501d936b433829f66ef9d655f3cc13d6bca29beeae2c00e1b68f9fa30058608b9c4cde86ba66eab67bd011c9d00 -DIST snapd-2.53.4.tar.xz 4722696 BLAKE2B c4347db8d5a14b30f1e8811e9425dd7419dd2dcad02fc1cb6a51968cd7fa6a58da2b172c041de02202cbdba1072cb0a7a92d7f92def5c5dc1e253cbcbad86aae SHA512 0b4164d3c3c3ccc99b3fa1e25d9e7e3184a5f94deca5fd83bd6d4c7761b41d6ebd5fefd1e87432a5e18c716b3330b3991134f179e1b03326edd9511ebea4ef9a -DIST snapd-2.54.1.tar.xz 4818344 BLAKE2B 654d4d6a8f08dabeb6c10ea3639e1fc31b68720953bd1456695eb6c1275f260e2793e49c39c80571727fb74c954583b1a2188c461b415803210be59c57775292 SHA512 65e14c85ab62d601fa46a271ba4322531a72e7d8880833cd74daac682188808ebd8c730c1fa62dea07d8f20ba76d314f84f89b3e565eaf3ae509a569f3ee7305 -DIST snapd-2.54.2.tar.xz 4824508 BLAKE2B b893a08a61e7db059f0a7ccdf7de01a8b8e4de65fb93fd44c23cec7fd557db692421da09a8ba705e9a8e734606267419291abe5d4e7a12883a68270f66d5b833 SHA512 9aec3c126d82f5e4e17c69af922dfe4e4f17950bf308217fece5fd3816f083b26e42d672052a6e6573d7c7064ea75f168fe7771840c68a3eb85184d6a17df3bd -EBUILD snapd-2.53.4.ebuild 5300 BLAKE2B c20d73ebfd851536266c09e26c23c5cb4233f54a274ed0a3959ef75291380de5d2a6e90ab21eb1b460d12fc5f3830d7dd9653fde273b3f586cba6ddead47c5fb SHA512 b39ff479ae149f38a972dd752b76a87f676ea328815dd035e1ebb9c3e3e1c9d1c1a4a10f22fda1fb672be8f0f6b0a16592b6c01acda8b950b598d1384bf5085b -EBUILD snapd-2.54.1.ebuild 5300 BLAKE2B c20d73ebfd851536266c09e26c23c5cb4233f54a274ed0a3959ef75291380de5d2a6e90ab21eb1b460d12fc5f3830d7dd9653fde273b3f586cba6ddead47c5fb SHA512 b39ff479ae149f38a972dd752b76a87f676ea328815dd035e1ebb9c3e3e1c9d1c1a4a10f22fda1fb672be8f0f6b0a16592b6c01acda8b950b598d1384bf5085b -EBUILD snapd-2.54.2.ebuild 5300 BLAKE2B 4c60dd51e762eb225999b6091f7f50ddc3ff54d270810b55499a13c6ec4a9f537649edec064dfc83a7af78f34a4c260630979fd5ef8ef41de233b163086ded03 SHA512 fa3be9b200a83de428bff013e8d3feba0d54886dfd9df4beb5c03cef8c04fd2ca8718613124416703c180f761bf2ce2903dea861cd50b381188cd23fc742daba +DIST snapd-2.54.3.tar.xz 4831376 BLAKE2B c74540e326e690ecced2e5dcab7246581e9f87412b2ba2fe16721fef5ec66eb20a915207e7c7d20579741929b0840760c336ebd75e4be77bc3f6d01e5909dad0 SHA512 ee89d7e02522ab9a50e17dbe34be19eeda10bf3518110e5c6b23987d618aaa324f762e745badb4e9d99e0b138788d1dc591802dd6c59e2ffc2ebec3eb384498f +DIST snapd-2.54.4.tar.xz 4831036 BLAKE2B b45ac9aacb0b023ab1cc79541dd97bda2d9f9a5987e9aa1a07b49b30667aa87fc38d74d24009f0ec6257cc8d764e2080cb4605cd5945bfc008f76008a1d29e0e SHA512 267c9e4dab73990f2d2ebc9c035e02856ec04be9f96a7fa6994a1827b2bbe9f5fd3ba7e0fcc84a1fe1f04480ca8785a163ee42bbca05cde80ff197aa63eaad19 +EBUILD snapd-2.54.3.ebuild 5394 BLAKE2B 4e5d7e06db2566dd3e8855227fa27fb1b1772795911cb59af7718fa9b4d8c7faf1d486e90e95ab81f74e779ad389c1e3f168357d4ffd794b684994d05d9d9319 SHA512 35d4233673190500348eab10733c92c351e861bb92c532ea6c452b9bb5bc9e837a069ee589ccccbef863ec19111dc0ba600497937277cf5d67a98d5807c4b3b4 +EBUILD snapd-2.54.4.ebuild 5394 BLAKE2B 4e5d7e06db2566dd3e8855227fa27fb1b1772795911cb59af7718fa9b4d8c7faf1d486e90e95ab81f74e779ad389c1e3f168357d4ffd794b684994d05d9d9319 SHA512 35d4233673190500348eab10733c92c351e861bb92c532ea6c452b9bb5bc9e837a069ee589ccccbef863ec19111dc0ba600497937277cf5d67a98d5807c4b3b4 MISC metadata.xml 636 BLAKE2B 4a281c549f4279097b8cb1739e557eabe36f97e8c43e1736c68385bb4f0fe46d6952991b0e0ca531552ec27fd9f3c990324c2f35d44cf6030a4957f6eaf4f441 SHA512 6cb86bb37aa587be9744e8a45f80bc8c78df644f97f7cfbd8c7e0228d26ea7a1d834ef8e1542bed099e1b80f7c91797871e4b447102c4bfbf2f46489b59dc244 diff --git a/app-containers/snapd/snapd-2.54.1.ebuild b/app-containers/snapd/snapd-2.54.1.ebuild deleted file mode 100644 index 3eb5f9353258..000000000000 --- a/app-containers/snapd/snapd-2.54.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#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 -} diff --git a/app-containers/snapd/snapd-2.54.2.ebuild b/app-containers/snapd/snapd-2.54.3.ebuild index 6366a2d391fc..bf6b2a0a243e 100644 --- a/app-containers/snapd/snapd-2.54.2.ebuild +++ b/app-containers/snapd/snapd-2.54.3.ebuild @@ -4,7 +4,7 @@ EAPI=7 EGO_PN="github.com/snapcore/${PN}" -inherit autotools bash-completion-r1 golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils +inherit autotools bash-completion-r1 flag-o-matic golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils DESCRIPTION="Service and tools for management of snap packages" HOMEPAGE="http://snapcraft.io/" @@ -61,6 +61,9 @@ pkg_setup() { CONFIG_CHECK+=" ~SECURITY_APPARMOR" fi linux-info_pkg_setup + + # Seems to have issues building with -O3, switch to -O2 + replace-flags -O3 -O2 } src_prepare() { diff --git a/app-containers/snapd/snapd-2.53.4.ebuild b/app-containers/snapd/snapd-2.54.4.ebuild index 3eb5f9353258..bf6b2a0a243e 100644 --- a/app-containers/snapd/snapd-2.53.4.ebuild +++ b/app-containers/snapd/snapd-2.54.4.ebuild @@ -1,10 +1,10 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2022 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 +inherit autotools bash-completion-r1 flag-o-matic golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils DESCRIPTION="Service and tools for management of snap packages" HOMEPAGE="http://snapcraft.io/" @@ -61,6 +61,9 @@ pkg_setup() { CONFIG_CHECK+=" ~SECURITY_APPARMOR" fi linux-info_pkg_setup + + # Seems to have issues building with -O3, switch to -O2 + replace-flags -O3 -O2 } src_prepare() { |