mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 12:16:41 +02:00
Merge pull request #3641 from flatcar/buildbot/weekly-portage-stable-package-updates-2026-01-12
Weekly portage-stable package updates 2026-01-12
This commit is contained in:
Krzesimir Nowak
GitHub
commit
420c84fe2e
@ -3,6 +3,7 @@
|
||||
acct-group/adm
|
||||
acct-group/audio
|
||||
acct-group/cdrom
|
||||
acct-group/cuse
|
||||
acct-group/dialout
|
||||
acct-group/disk
|
||||
acct-group/dnsmasq
|
||||
@ -11,6 +12,7 @@ acct-group/floppy
|
||||
acct-group/incus
|
||||
acct-group/incus-admin
|
||||
acct-group/input
|
||||
acct-group/jobserver
|
||||
acct-group/kmem
|
||||
acct-group/kvm
|
||||
acct-group/lp
|
||||
@ -303,7 +305,6 @@ dev-libs/yajl
|
||||
|
||||
dev-perl/File-Slurper
|
||||
dev-perl/Parse-Yapp
|
||||
dev-perl/PerlIO-utf8_strict
|
||||
|
||||
dev-python/backports-tarfile
|
||||
dev-python/cachecontrol
|
||||
@ -392,6 +393,7 @@ dev-util/pkgcheck
|
||||
dev-util/pkgconf
|
||||
dev-util/re2c
|
||||
dev-util/xdelta
|
||||
dev-util/xxd
|
||||
|
||||
dev-vcs/git
|
||||
|
||||
@ -401,6 +403,7 @@ eclass/alternatives.eclass
|
||||
eclass/app-alternatives.eclass
|
||||
eclass/autotools.eclass
|
||||
eclass/bash-completion-r1.eclass
|
||||
eclass/branding.eclass
|
||||
eclass/cargo.eclass
|
||||
eclass/check-reqs.eclass
|
||||
eclass/cmake-multilib.eclass
|
||||
@ -750,7 +753,6 @@ virtual/perl-Carp
|
||||
virtual/perl-Encode
|
||||
virtual/perl-Exporter
|
||||
virtual/perl-ExtUtils-MakeMaker
|
||||
virtual/perl-XSLoader
|
||||
virtual/pkgconfig
|
||||
virtual/resolvconf
|
||||
virtual/service-manager
|
||||
|
||||
@ -28,13 +28,37 @@ build_target_toolchain() {
|
||||
local ROOT="/build/${board}"
|
||||
local SYSROOT="/usr/$(get_board_chost "${board}")"
|
||||
|
||||
mkdir -p "${ROOT}/usr"
|
||||
cp -at "${ROOT}" "${SYSROOT}"/lib*
|
||||
cp -at "${ROOT}"/usr "${SYSROOT}"/usr/include "${SYSROOT}"/usr/lib*
|
||||
function btt_emerge() {
|
||||
# --root is required because run_merge overrides ROOT=
|
||||
PORTAGE_CONFIGROOT="$ROOT" run_merge --root="$ROOT" --sysroot="$ROOT" "${@}"
|
||||
}
|
||||
|
||||
# --root is required because run_merge overrides ROOT=
|
||||
PORTAGE_CONFIGROOT="$ROOT" \
|
||||
run_merge -u --root="$ROOT" --sysroot="$ROOT" "${TOOLCHAIN_PKGS[@]}"
|
||||
# install baselayout first so we have the basic directory
|
||||
# structure for libraries and binaries copied from sysroot
|
||||
btt_emerge --oneshot --nodeps sys-apps/baselayout
|
||||
|
||||
# copy libraries, binaries and header files from sysroot to root -
|
||||
# sysroot may be using split-usr, whereas root does not, so take
|
||||
# this into account
|
||||
(
|
||||
shopt -s nullglob
|
||||
local d f
|
||||
local -a files
|
||||
for d in "${SYSROOT}"/{,usr/}{bin,sbin,lib*}; do
|
||||
if [[ ! -d ${d} ]]; then
|
||||
continue
|
||||
fi
|
||||
files=( "${d}"/* )
|
||||
if [[ ${#files[@]} -gt 0 ]]; then
|
||||
f=${d##*/}
|
||||
cp -at "${ROOT}/usr/${f}" "${files[@]}"
|
||||
fi
|
||||
done
|
||||
cp -at "${ROOT}"/usr "${SYSROOT}"/usr/include
|
||||
)
|
||||
|
||||
btt_emerge --update "${TOOLCHAIN_PKGS[@]}"
|
||||
unset -f btt_emerge
|
||||
}
|
||||
|
||||
configure_crossdev_overlay / /usr/local/portage/crossdev
|
||||
|
||||
@ -490,10 +490,14 @@ binutils_set_latest_profile() {
|
||||
# The extra flag can be blank, hardenednopie, and so on. See gcc-config -l
|
||||
# Usage: gcc_get_latest_profile chost [extra]
|
||||
gcc_get_latest_profile() {
|
||||
local prefix="${1}-"
|
||||
local suffix="${2+-$2}"
|
||||
local prefix=${1}
|
||||
local suffix=${2+-${2}}
|
||||
local status
|
||||
gcc-config -l | cut -d' ' -f3 | grep "^${prefix}[0-9\\.]*${suffix}$" | tail -n1
|
||||
gcc-config --list-profiles --nocolor | \
|
||||
sed -e 's/^\s*//' | \
|
||||
cut -d' ' -f2 | \
|
||||
grep "^${prefix}-[0-9\\.]*${suffix}$" | \
|
||||
tail -n1
|
||||
|
||||
# return 1 if anything in the above pipe failed
|
||||
for status in ${PIPESTATUS[@]}; do
|
||||
|
||||
@ -269,16 +269,18 @@ if [[ "${FLAGS_usepkgonly}" -eq "${FLAGS_FALSE}" ]]; then
|
||||
# systemd[cryptsetup] -> cryptsetup[udev] -> virtual/udev -> systemd
|
||||
# systemd[tpm] -> tpm2-tss -> util-linux[udev] -> virtual/udev -> systemd
|
||||
# curl[http2] -> nghttp2[systemd] -> systemd[curl] -> curl
|
||||
# sys-libs/pam[systemd] -> sys-apps/system[pam] -> sys-libs/pam
|
||||
# not dropping pam from sys-apps/systemd, otherwise we would need
|
||||
# to drop pam from sys-auth/pambase
|
||||
break_dep_loop sys-apps/util-linux udev,systemd,cryptsetup \
|
||||
# sys-libs/pam[systemd] -> sys-apps/systemd[pam] -> sys-libs/pam
|
||||
# dropping USE=pam from sys-apps/systemd requires dropping
|
||||
# USE=systemd from sys-auth/pambase
|
||||
# sys-auth/pambase[sssd] -> sys-auth/sssd -> sys-apps/shadow[pam] -> sys-auth/pambase
|
||||
break_dep_loop sys-apps/util-linux cryptsetup,systemd,udev \
|
||||
sys-fs/cryptsetup udev \
|
||||
sys-fs/lvm2 udev,systemd \
|
||||
sys-apps/systemd cryptsetup,tpm \
|
||||
sys-fs/lvm2 systemd,udev \
|
||||
sys-apps/systemd cryptsetup,pam,tpm \
|
||||
net-misc/curl http2 \
|
||||
net-libs/nghttp2 systemd \
|
||||
sys-libs/pam systemd
|
||||
sys-libs/pam systemd \
|
||||
sys-auth/pambase sssd,systemd
|
||||
fi
|
||||
|
||||
if [[ "${FLAGS_only_resolve_circular_deps}" -eq "${FLAGS_TRUE}" ]]; then
|
||||
|
||||
6
changelog/security/2026-02-20-weekly-updates.md
Normal file
6
changelog/security/2026-02-20-weekly-updates.md
Normal file
@ -0,0 +1,6 @@
|
||||
- bind ([CVE-2025-40778](https://www.cve.org/CVERecord?id=CVE-2025-40778), [CVE-2025-40780](https://www.cve.org/CVERecord?id=CVE-2025-40780), [CVE-2025-8677](https://www.cve.org/CVERecord?id=CVE-2025-8677))
|
||||
- gnutls ([CVE-2025-9820](https://www.cve.org/CVERecord?id=CVE-2025-9820))
|
||||
- go ([CVE-2025-61727](https://www.cve.org/CVERecord?id=CVE-2025-61727), [CVE-2025-61729](https://www.cve.org/CVERecord?id=CVE-2025-61729))
|
||||
- libarchive ([CVE-2025-60753](https://www.cve.org/CVERecord?id=CVE-2025-60753))
|
||||
- podman ([CVE-2025-9566](https://www.cve.org/CVERecord?id=CVE-2025-9566), [CVE-2025-52881](https://www.cve.org/CVERecord?id=CVE-2025-52881))
|
||||
- urllib3 ([CVE-2025-66418](https://www.cve.org/CVERecord?id=CVE-2025-66418), [CVE-2025-66471](https://www.cve.org/CVERecord?id=CVE-2025-66471))
|
||||
56
changelog/updates/2026-02-20-weekly-updates.md
Normal file
56
changelog/updates/2026-02-20-weekly-updates.md
Normal file
@ -0,0 +1,56 @@
|
||||
- SDK: cmake ([4.1.4](https://cmake.org/cmake/help/v4.1/release/4.1.html#updates))
|
||||
- SDK: crossdev ([20251214](https://gitweb.gentoo.org/proj/crossdev.git/log/?h=20251214))
|
||||
- SDK: go ([1.25.5](https://go.dev/doc/devel/release#go1.25.minor))
|
||||
- SDK: perl ([5.42.0](https://perldoc.perl.org/perl5420delta))
|
||||
- SDK: rust ([1.91.0](https://blog.rust-lang.org/2025/10/30/Rust-1.91.0/) (includes [1.90.0](https://blog.rust-lang.org/2025/09/18/Rust-1.90.0/)))
|
||||
- azure, dev, sysext-python: urllib3 ([2.6.3](https://raw.githubusercontent.com/urllib3/urllib3/refs/tags/2.6.3/CHANGES.rst))
|
||||
- base, dev: bash ([5.3_p9](https://cgit.git.savannah.gnu.org/cgit/bash.git/log/?id=637f5c8696a6adc9b4519f1cd74aa78492266b7f))
|
||||
- base, dev: bind ([9.18.42](https://bind9.readthedocs.io/en/v9.18.42/notes.html#notes-for-bind-9-18-42))
|
||||
- base, dev: binutils-config ([5.6](https://gitweb.gentoo.org/proj/binutils-config.git/log/?h=v5.6))
|
||||
- base, dev: btrfs-progs ([6.17.1](https://github.com/kdave/btrfs-progs/releases/tag/v6.17.1))
|
||||
- base, dev: coreutils ([9.9](https://lists.gnu.org/archive/html/coreutils-announce/2025-11/msg00000.html))
|
||||
- base, dev: cri-tools ([1.33.0](https://github.com/kubernetes-sigs/cri-tools/releases/tag/v1.33.0))
|
||||
- base, dev: curl ([8.17.0](https://curl.se/ch/8.17.0.html))
|
||||
- base, dev: elfutils ([0.194](https://inbox.sourceware.org/elfutils-devel/CAJDtP-S0rYAOZQeDZvMtPkQztgK9RboWtYwpqNLCNGNdaSGn-A@mail.gmail.com/T/#u))
|
||||
- base, dev: git ([2.52.0](https://raw.githubusercontent.com/git/git/refs/tags/v2.52.0/Documentation/RelNotes/2.52.0.adoc))
|
||||
- base, dev: gnutls ([3.8.11](https://lists.gnu.org/archive/html/info-gnu/2025-11/msg00003.html))
|
||||
- base, dev: kexec-tools ([2.0.32](https://github.com/horms/kexec-tools/commits/v2.0.32/))
|
||||
- base, dev: libarchive ([3.8.5](https://github.com/libarchive/libarchive/releases/tag/v3.8.5) (includes [3.8.4](https://github.com/libarchive/libarchive/releases/tag/v3.8.4), [3.8.3](https://github.com/libarchive/libarchive/releases/tag/v3.8.3), [3.8.2](https://github.com/libarchive/libarchive/releases/tag/v3.8.2)))
|
||||
- base, dev: libcap ([2.77](https://sites.google.com/site/fullycapable/release-notes-for-libcap#h.mr55t4z9vzea))
|
||||
- base, dev: libnftnl ([1.3.1](https://lwn.net/Articles/1049279/))
|
||||
- base, dev: libnl ([3.11.0](https://lists.infradead.org/pipermail/libnl/2024-October/002441.html))
|
||||
- base, dev: libnvme ([1.16.1](https://github.com/linux-nvme/libnvme/releases/tag/v1.16.1) (includes [1.16](https://github.com/linux-nvme/libnvme/releases/tag/v1.16)))
|
||||
- base, dev: libpcre2 ([10.47](https://github.com/PCRE2Project/pcre2/releases/tag/pcre2-10.47))
|
||||
- base, dev: libxml2 ([2.15.1](https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.15.1) (includes [2.15.0](https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.15.0)))
|
||||
- base, dev: nvme-cli ([2.16](https://github.com/linux-nvme/nvme-cli/releases/tag/v2.16))
|
||||
- base, dev: pambase ([20251104](https://gitweb.gentoo.org/proj/pambase.git/log/?h=pambase-20251104))
|
||||
- base, dev: readline ([8.3_p3](https://cgit.git.savannah.gnu.org/cgit/readline.git/log/?id=553d6bb272f26400d6d4d1cac7c1df84c447449b))
|
||||
- base, dev: selinux-base ([2.20250618](https://github.com/SELinuxProject/refpolicy/releases/tag/RELEASE_2_20250618))
|
||||
- base, dev: systemd ([257.10](https://github.com/systemd/systemd/commits/v257.10/))
|
||||
- base, dev: thin-provisioning-tools ([1.3.1](https://raw.githubusercontent.com/device-mapper-utils/thin-provisioning-tools/refs/tags/v1.3.1/CHANGES))
|
||||
- base, dev: usbutils ([019](https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/plain/NEWS?h=v019))
|
||||
- base, dev: userspace-rcu ([0.15.5](https://lwn.net/Articles/1046059/))
|
||||
- base, dev: xfsprogs ([6.17.0](https://web.git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/plain/doc/CHANGES?h=v6.17.0))
|
||||
- dev, sysext-incus: squashfs-tools ([4.7.4](https://github.com/plougher/squashfs-tools/releases?q=4.7.4))
|
||||
- dev: bash-completion ([2.17.0](https://github.com/scop/bash-completion/releases/tag/2.17.0))
|
||||
- dev: binutils ([2.45.1](https://sourceware.org/pipermail/binutils/2025-November/145592.html))
|
||||
- dev: cJSON ([1.7.19](https://github.com/DaveGamble/cJSON/releases/tag/v1.7.19))
|
||||
- dev: gcc-config ([2.12.2](https://gitweb.gentoo.org/proj/gcc-config.git/log/?h=v2.12.2))
|
||||
- dev: portage ([3.0.72](https://gitweb.gentoo.org/proj/portage.git/plain/NEWS?h=portage-3.0.72) (includes [3.0.71](https://gitweb.gentoo.org/proj/portage.git/plain/NEWS?h=portage-3.0.71), [3.0.70](https://gitweb.gentoo.org/proj/portage.git/plain/NEWS?h=portage-3.0.70)))
|
||||
- sysext-containerd: containerd ([2.2.0](https://github.com/containerd/containerd/releases/tag/v2.2.0))
|
||||
- sysext-containerd: runc ([1.4.0](https://github.com/opencontainers/runc/releases/tag/v1.4.0))
|
||||
- sysext-docker: docker ([28.2.2](https://github.com/moby/moby/releases/tag/v28.2.2) (includes [28.2.1](https://github.com/moby/moby/releases/tag/v28.2.1), [28.2.0](https://github.com/moby/moby/releases/tag/v28.2.0), [28.1.1](https://github.com/moby/moby/releases/tag/v28.1.1), [28.1.0](https://github.com/moby/moby/releases/tag/v28.1.0)))
|
||||
- sysext-docker: docker-cli ([28.4.0](https://github.com/moby/moby/releases/tag/v28.4.0) (includes [28.3.0](https://github.com/moby/moby/releases/tag/v28.3.0), [28.2.0](https://github.com/moby/moby/releases/tag/v28.2.0), [28.1.0](https://github.com/moby/moby/releases/tag/v28.1.0)))
|
||||
- sysext-incus: incus ([6.0.5](https://discuss.linuxcontainers.org/t/incus-6-0-5-lts-has-been-released/24445))
|
||||
- sysext-incus: lxc ([6.0.5](https://discuss.linuxcontainers.org/t/lxc-6-0-5-lts-has-been-released/24438))
|
||||
- sysext-incus: lxcfs ([6.0.5](https://discuss.linuxcontainers.org/t/lxcfs-6-0-5-lts-has-been-released/24437))
|
||||
- sysext-nvidia-drivers-570, sysext-nvidia-drivers-570-open: nvidia-drivers (570.207)
|
||||
- sysext-podman: containers-image ([5.35.0](https://github.com/containers/image/releases/tag/v5.35.0))
|
||||
- sysext-podman: podman ([5.7.0](https://github.com/containers/podman/releases/tag/v5.7.0) (includes [5.6.0](https://github.com/containers/podman/releases/tag/v5.6.0)))
|
||||
- sysext-python: charset-normalizer ([3.4.4](https://github.com/jawah/charset_normalizer/releases/tag/3.4.4))
|
||||
- sysext-python: idna ([3.11](https://github.com/kjd/idna/releases/tag/v3.11))
|
||||
- sysext-python: msgpack ([1.1.2](https://github.com/msgpack/msgpack-python/releases/tag/v1.1.2))
|
||||
- sysext-python: pip ([25.3](https://github.com/pypa/pip/blob/25.3/NEWS.rst))
|
||||
- sysext-python: setuptools-scm ([9.2.2](https://github.com/pypa/setuptools-scm/releases/tag/v9.2.2))
|
||||
- sysext-python: trove-classifiers ([2025.11.14.15](https://github.com/pypa/trove-classifiers/releases/tag/2025.11.14.15))
|
||||
- sysext-zfs: zfs ([2.3.4](https://github.com/openzfs/zfs/releases/tag/zfs-2.3.4))
|
||||
@ -1,3 +1,21 @@
|
||||
cros_pre_src_compile_pkgconfig() {
|
||||
export PKG_CONFIG="$(tc-getPKG_CONFIG)"
|
||||
# https://codeberg.org/gentoo/gentoo/pulls/36
|
||||
cros_post_src_compile_move_agent_binaries() {
|
||||
local bindir="_dist/bin"
|
||||
local host_arch=$(go-env_goarch "${CBUILD}")
|
||||
if [[ "${GOARCH}" = "${host_arch}" ]]; then
|
||||
# nothing to fix
|
||||
return 0
|
||||
fi
|
||||
local correct_bindir="_dist/bin/linux_${GOARCH}"
|
||||
mv '_dist/bin/incus-agent.'* "${correct_bindir}" || die
|
||||
}
|
||||
|
||||
# https://codeberg.org/gentoo/gentoo/pulls/36
|
||||
cros_post_src_install_move_agent_binaries() {
|
||||
if use amd64; then
|
||||
# nothing to fix
|
||||
return 0
|
||||
fi
|
||||
dodir '/usr/libexec/incus/agents'
|
||||
mv "${ED}/usr/libexec/incus/incus-agent."* "${ED}/usr/libexec/incus/agents" || die
|
||||
}
|
||||
|
||||
@ -0,0 +1,228 @@
|
||||
From 3d509bcd335b15cece69ebfa117681d2715df930 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Poulin?= <jeromepoulin@gmail.com>
|
||||
Date: Wed, 26 Nov 2025 18:28:26 -0500
|
||||
Subject: [PATCH 1/2] core/mount/manager: add tests for WithTemporary option
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Add tests for the WithTemporary mount activation used by `ctr images mount`.
|
||||
Covers bind mount and overlay scenarios to catch regressions like #12549.
|
||||
|
||||
Signed-off-by: Jérôme Poulin <jeromepoulin@gmail.com>
|
||||
---
|
||||
core/mount/manager/manager_linux_test.go | 157 ++++++++++++++++++++++-
|
||||
1 file changed, 156 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/core/mount/manager/manager_linux_test.go b/core/mount/manager/manager_linux_test.go
|
||||
index 06ab38c2b7b0..b62f3fdc8cf4 100644
|
||||
--- a/core/mount/manager/manager_linux_test.go
|
||||
+++ b/core/mount/manager/manager_linux_test.go
|
||||
@@ -314,6 +314,161 @@ func TestLoopbackOverlay(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
+// TestTemporaryMountActivation tests the WithTemporary option used by
|
||||
+// `ctr images mount`. This verifies the bind mount returned in info.System
|
||||
+// points to a valid, mounted directory.
|
||||
+func TestTemporaryMountActivation(t *testing.T) {
|
||||
+ testutil.RequiresRoot(t)
|
||||
+ ctx := logtest.WithT(context.Background(), t)
|
||||
+ ctx = namespaces.WithNamespace(ctx, "test")
|
||||
+ td := t.TempDir()
|
||||
+ metadb := filepath.Join(td, "mounts.db")
|
||||
+ targetdir := filepath.Join(td, "m")
|
||||
+ db, err := bolt.Open(metadb, 0600, nil)
|
||||
+ require.NoError(t, err)
|
||||
+ defer db.Close()
|
||||
+
|
||||
+ sourcedir := filepath.Join(td, "source")
|
||||
+ require.NoError(t, os.MkdirAll(sourcedir, 0755))
|
||||
+
|
||||
+ a := fstest.Apply(
|
||||
+ fstest.CreateFile("/testfile.txt", []byte("test content\n"), 0644),
|
||||
+ fstest.CreateDir("/testdir", 0755),
|
||||
+ )
|
||||
+ require.NoError(t, a.Apply(sourcedir))
|
||||
+
|
||||
+ mounts := []mount.Mount{
|
||||
+ {
|
||||
+ Type: "bind",
|
||||
+ Source: sourcedir,
|
||||
+ Options: []string{"rbind", "ro"},
|
||||
+ },
|
||||
+ }
|
||||
+
|
||||
+ m, err := NewManager(db, targetdir)
|
||||
+ require.NoError(t, err)
|
||||
+
|
||||
+ ainfo, err := m.Activate(ctx, "temp-mount-test", mounts, mount.WithTemporary)
|
||||
+ require.NoError(t, err)
|
||||
+ defer func() {
|
||||
+ assert.NoError(t, m.Deactivate(ctx, "temp-mount-test"))
|
||||
+ }()
|
||||
+
|
||||
+ require.NotEmpty(t, ainfo.System, "Expected system mounts to be returned")
|
||||
+
|
||||
+ require.Len(t, ainfo.System, 1, "Expected exactly one system mount")
|
||||
+ systemMount := ainfo.System[0]
|
||||
+ assert.Equal(t, "bind", systemMount.Type, "Expected bind mount type")
|
||||
+
|
||||
+ sourceInfo, err := os.Stat(systemMount.Source)
|
||||
+ require.NoError(t, err, "Bind mount source %q should exist", systemMount.Source)
|
||||
+ assert.True(t, sourceInfo.IsDir(), "Bind mount source should be a directory")
|
||||
+
|
||||
+ testFile := filepath.Join(systemMount.Source, "testfile.txt")
|
||||
+ content, err := os.ReadFile(testFile)
|
||||
+ require.NoError(t, err, "Should be able to read test file from bind mount source")
|
||||
+ assert.Equal(t, "test content\n", string(content), "Test file content should match")
|
||||
+
|
||||
+ targetMount := filepath.Join(td, "target")
|
||||
+ require.NoError(t, os.MkdirAll(targetMount, 0755))
|
||||
+
|
||||
+ err = mount.All(ainfo.System, targetMount)
|
||||
+ require.NoError(t, err, "Should be able to mount system mounts to target")
|
||||
+ defer testutil.Unmount(t, targetMount)
|
||||
+
|
||||
+ targetTestFile := filepath.Join(targetMount, "testfile.txt")
|
||||
+ targetContent, err := os.ReadFile(targetTestFile)
|
||||
+ require.NoError(t, err, "Should be able to read test file from target mount")
|
||||
+ assert.Equal(t, "test content\n", string(targetContent), "Target test file content should match")
|
||||
+}
|
||||
+
|
||||
+// TestTemporaryOverlayMountActivation tests WithTemporary with overlay mounts,
|
||||
+// which is the more common case for `ctr images mount` with overlay snapshotter.
|
||||
+func TestTemporaryOverlayMountActivation(t *testing.T) {
|
||||
+ testutil.RequiresRoot(t)
|
||||
+ ctx := logtest.WithT(context.Background(), t)
|
||||
+ ctx = namespaces.WithNamespace(ctx, "test")
|
||||
+ td := t.TempDir()
|
||||
+ metadb := filepath.Join(td, "mounts.db")
|
||||
+ targetdir := filepath.Join(td, "m")
|
||||
+ db, err := bolt.Open(metadb, 0600, nil)
|
||||
+ require.NoError(t, err)
|
||||
+ defer db.Close()
|
||||
+
|
||||
+ lower1 := filepath.Join(td, "lower1")
|
||||
+ lower2 := filepath.Join(td, "lower2")
|
||||
+ upper := filepath.Join(td, "upper")
|
||||
+ work := filepath.Join(td, "work")
|
||||
+
|
||||
+ require.NoError(t, os.MkdirAll(lower1, 0755))
|
||||
+ require.NoError(t, os.MkdirAll(lower2, 0755))
|
||||
+ require.NoError(t, os.MkdirAll(upper, 0755))
|
||||
+ require.NoError(t, os.MkdirAll(work, 0755))
|
||||
+
|
||||
+ require.NoError(t, os.WriteFile(filepath.Join(lower1, "file1.txt"), []byte("layer1\n"), 0644))
|
||||
+ require.NoError(t, os.WriteFile(filepath.Join(lower2, "file2.txt"), []byte("layer2\n"), 0644))
|
||||
+
|
||||
+ mounts := []mount.Mount{
|
||||
+ {
|
||||
+ Type: "overlay",
|
||||
+ Source: "overlay",
|
||||
+ Options: []string{
|
||||
+ fmt.Sprintf("lowerdir=%s:%s", lower2, lower1),
|
||||
+ fmt.Sprintf("upperdir=%s", upper),
|
||||
+ fmt.Sprintf("workdir=%s", work),
|
||||
+ },
|
||||
+ },
|
||||
+ }
|
||||
+
|
||||
+ m, err := NewManager(db, targetdir)
|
||||
+ require.NoError(t, err)
|
||||
+
|
||||
+ ainfo, err := m.Activate(ctx, "temp-overlay-test", mounts, mount.WithTemporary)
|
||||
+ require.NoError(t, err)
|
||||
+ defer func() {
|
||||
+ assert.NoError(t, m.Deactivate(ctx, "temp-overlay-test"))
|
||||
+ }()
|
||||
+
|
||||
+ require.NotEmpty(t, ainfo.System, "Expected system mounts to be returned")
|
||||
+
|
||||
+ require.Len(t, ainfo.System, 1, "Expected exactly one system mount")
|
||||
+ systemMount := ainfo.System[0]
|
||||
+ assert.Equal(t, "bind", systemMount.Type, "Expected bind mount type")
|
||||
+
|
||||
+ sourceInfo, err := os.Stat(systemMount.Source)
|
||||
+ require.NoError(t, err, "Bind mount source %q should exist", systemMount.Source)
|
||||
+ assert.True(t, sourceInfo.IsDir(), "Bind mount source should be a directory")
|
||||
+
|
||||
+ file1 := filepath.Join(systemMount.Source, "file1.txt")
|
||||
+ file2 := filepath.Join(systemMount.Source, "file2.txt")
|
||||
+
|
||||
+ content1, err := os.ReadFile(file1)
|
||||
+ require.NoError(t, err, "Should be able to read file1 from overlay via bind source")
|
||||
+ assert.Equal(t, "layer1\n", string(content1))
|
||||
+
|
||||
+ content2, err := os.ReadFile(file2)
|
||||
+ require.NoError(t, err, "Should be able to read file2 from overlay via bind source")
|
||||
+ assert.Equal(t, "layer2\n", string(content2))
|
||||
+
|
||||
+ targetMount := filepath.Join(td, "target")
|
||||
+ require.NoError(t, os.MkdirAll(targetMount, 0755))
|
||||
+
|
||||
+ err = mount.All(ainfo.System, targetMount)
|
||||
+ require.NoError(t, err, "Should be able to mount system mounts to target")
|
||||
+ defer testutil.Unmount(t, targetMount)
|
||||
+
|
||||
+ targetFile1 := filepath.Join(targetMount, "file1.txt")
|
||||
+ targetFile2 := filepath.Join(targetMount, "file2.txt")
|
||||
+
|
||||
+ targetContent1, err := os.ReadFile(targetFile1)
|
||||
+ require.NoError(t, err)
|
||||
+ assert.Equal(t, "layer1\n", string(targetContent1))
|
||||
+
|
||||
+ targetContent2, err := os.ReadFile(targetFile2)
|
||||
+ require.NoError(t, err)
|
||||
+ assert.Equal(t, "layer2\n", string(targetContent2))
|
||||
+}
|
||||
+
|
||||
func initalizeBlockDevice(td string, a fstest.Applier) (string, error) {
|
||||
file, err := os.CreateTemp(td, "fs-")
|
||||
if err != nil {
|
||||
@@ -342,7 +497,7 @@ func initalizeBlockDevice(td string, a fstest.Applier) (string, error) {
|
||||
|
||||
m := mount.Mount{
|
||||
Type: "ext4",
|
||||
- Source: dpath, // previous mount
|
||||
+ Source: dpath,
|
||||
Options: []string{"loop"},
|
||||
}
|
||||
target, err := os.MkdirTemp(td, "mount-")
|
||||
|
||||
From 1d79082735d46fe24ded00a55ea6e3a33954593e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Poulin?= <jeromepoulin@gmail.com>
|
||||
Date: Wed, 26 Nov 2025 18:29:31 -0500
|
||||
Subject: [PATCH 2/2] core/mount/manager: fix bind mount missing rbind option
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The bind mount created for temporary activations was missing the
|
||||
Options field, causing mount to fail with "no such device" because
|
||||
the MS_BIND flag wasn't being set.
|
||||
|
||||
Fixes #12549
|
||||
|
||||
Signed-off-by: Jérôme Poulin <jeromepoulin@gmail.com>
|
||||
---
|
||||
core/mount/manager/manager.go | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/core/mount/manager/manager.go b/core/mount/manager/manager.go
|
||||
index d43c1beb8e7c..5163c17dbcac 100644
|
||||
--- a/core/mount/manager/manager.go
|
||||
+++ b/core/mount/manager/manager.go
|
||||
@@ -430,9 +430,9 @@ func (mm *mountManager) Activate(ctx context.Context, name string, mounts []moun
|
||||
// TODO: Add config for whether to add the bind mount?
|
||||
if config.Temporary && firstSystemMount > 0 {
|
||||
mounts = append(mounts, mount.Mount{
|
||||
- Type: "bind",
|
||||
- Source: mounted[firstSystemMount-1].MountPoint,
|
||||
- // TODO : Configurable bind mount options?
|
||||
+ Type: "bind",
|
||||
+ Source: mounted[firstSystemMount-1].MountPoint,
|
||||
+ Options: []string{"rbind"},
|
||||
})
|
||||
}
|
||||
|
||||
@ -0,0 +1,3 @@
|
||||
The `0001-ctr-no-such-device-fix.patch` fixes a regression detected by
|
||||
our `cl.toolbox.dnf-install` test. It is merged into the 2.2 release
|
||||
branch in upstream, but no release with the fix happened yet.
|
||||
@ -0,0 +1,167 @@
|
||||
From 2bf2c2d7b6fecc43c70567054071134ab13ef0a6 Mon Sep 17 00:00:00 2001
|
||||
From: "mark.yang" <mark.yang@lge.com>
|
||||
Date: Wed, 16 Apr 2025 20:02:36 +0900
|
||||
Subject: [PATCH] Fix too many arguments error occurring in gcc-15
|
||||
|
||||
* See more details in http://errors.yoctoproject.org/Errors/Details/851803/
|
||||
../../git/src/nettest_bsd.c:4497:19: error: too many arguments to function 'alloc_sendfile_buf_ring'; expected 0, have 4
|
||||
4497 | send_ring = alloc_sendfile_buf_ring(send_width,
|
||||
| ^~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
|
||||
In file included from ../../git/src/nettest_bsd.c:175:
|
||||
../../git/src/netlib.h:690:26: note: declared here
|
||||
690 | extern struct ring_elt *alloc_sendfile_buf_ring();
|
||||
| ^~~~~~~~~~~~~~~~~~~~~~~
|
||||
In file included from ../../git/src/nettest_omni.c:184:
|
||||
../../git/src/hist.h:135:6: error: conflicting types for 'HIST_purge'; have 'void(struct histogram_struct *)'
|
||||
135 | void HIST_purge(HIST h);
|
||||
| ^~~~~~~~~~
|
||||
In file included from ../../git/src/nettest_omni.c:166:
|
||||
../../git/src/netlib.h:651:17: note: previous declaration of 'HIST_purge' with type 'void(void)'
|
||||
651 | extern void HIST_purge();
|
||||
| ^~~~~~~~~~
|
||||
../../git/src/nettest_bsd.c: In function 'recv_tcp_stream':
|
||||
../../git/src/nettest_bsd.c:5197:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
|
||||
5197 | recv_ring = allocate_buffer_ring(recv_width,
|
||||
| ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
|
||||
../../git/src/netlib.h:679:26: note: declared here
|
||||
679 | extern struct ring_elt *allocate_buffer_ring();
|
||||
| ^~~~~~~~~~~~~~~~~~~~
|
||||
../../git/src/nettest_bsd.c: In function 'recv_tcp_maerts':
|
||||
../../git/src/nettest_bsd.c:5617:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
|
||||
5617 | send_ring = allocate_buffer_ring(send_width,
|
||||
| ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
|
||||
../../git/src/netlib.h:679:26: note: declared here
|
||||
679 | extern struct ring_elt *allocate_buffer_ring();
|
||||
| ^~~~~~~~~~~~~~~~~~~~
|
||||
../../git/src/nettest_bsd.c: In function 'recv_udp_stream':
|
||||
../../git/src/nettest_bsd.c:7345:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
|
||||
7345 | recv_ring = allocate_buffer_ring(recv_width,
|
||||
| ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
|
||||
../../git/src/netlib.h:679:26: note: declared here
|
||||
679 | extern struct ring_elt *allocate_buffer_ring();
|
||||
| ^~~~~~~~~~~~~~~~~~~~
|
||||
../../git/src/nettest_bsd.c: In function 'recv_udp_rr':
|
||||
../../git/src/nettest_bsd.c:8360:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
|
||||
8360 | recv_ring = allocate_buffer_ring(recv_width,
|
||||
| ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
|
||||
../../git/src/netlib.h:679:26: note: declared here
|
||||
679 | extern struct ring_elt *allocate_buffer_ring();
|
||||
| ^~~~~~~~~~~~~~~~~~~~
|
||||
../../git/src/nettest_bsd.c:8365:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
|
||||
8365 | send_ring = allocate_buffer_ring(send_width,
|
||||
| ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
|
||||
../../git/src/netlib.h:679:26: note: declared here
|
||||
679 | extern struct ring_elt *allocate_buffer_ring();
|
||||
| ^~~~~~~~~~~~~~~~~~~~
|
||||
../../git/src/nettest_bsd.c: In function 'recv_tcp_rr':
|
||||
../../git/src/nettest_bsd.c:8677:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
|
||||
8677 | send_ring = allocate_buffer_ring(send_width,
|
||||
| ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
|
||||
../../git/src/netlib.h:679:26: note: declared here
|
||||
679 | extern struct ring_elt *allocate_buffer_ring();
|
||||
| ^~~~~~~~~~~~~~~~~~~~
|
||||
../../git/src/nettest_bsd.c:8682:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
|
||||
8682 | recv_ring = allocate_buffer_ring(recv_width,
|
||||
| ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
|
||||
../../git/src/netlib.h:679:26: note: declared here
|
||||
679 | extern struct ring_elt *allocate_buffer_ring();
|
||||
| ^~~~~~~~~~~~~~~~~~~~
|
||||
../../git/src/nettest_omni.c: In function 'send_omni_inner':
|
||||
../../git/src/nettest_omni.c:4044:21: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
|
||||
4044 | send_ring = allocate_buffer_ring(send_width,
|
||||
| ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
|
||||
../../git/src/netlib.h:679:26: note: declared here
|
||||
679 | extern struct ring_elt *allocate_buffer_ring();
|
||||
| ^~~~~~~~~~~~~~~~~~~~
|
||||
../../git/src/nettest_omni.c:4086:21: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
|
||||
4086 | recv_ring = allocate_buffer_ring(recv_width,
|
||||
| ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
|
||||
../../git/src/netlib.h:679:26: note: declared here
|
||||
679 | extern struct ring_elt *allocate_buffer_ring();
|
||||
| ^~~~~~~~~~~~~~~~~~~~
|
||||
../../git/src/nettest_omni.c:5050:5: error: too many arguments to function 'HIST_get_stats'; expected 0, have 5
|
||||
5050 | HIST_get_stats(time_hist,
|
||||
| ^~~~~~~~~~~~~~ ~~~~~~~~~
|
||||
../../git/src/netlib.h:650:17: note: declared here
|
||||
650 | extern void HIST_get_stats();
|
||||
| ^~~~~~~~~~~~~~
|
||||
../../git/src/nettest_omni.c:5055:19: error: too many arguments to function 'HIST_get_percentile'; expected 0, have 2
|
||||
5055 | p50_latency = HIST_get_percentile(time_hist, 0.50);
|
||||
| ^~~~~~~~~~~~~~~~~~~ ~~~~~~~~~
|
||||
../../git/src/netlib.h:649:17: note: declared here
|
||||
649 | extern int HIST_get_percentile();
|
||||
| ^~~~~~~~~~~~~~~~~~~
|
||||
../../git/src/nettest_omni.c:5056:19: error: too many arguments to function 'HIST_get_percentile'; expected 0, have 2
|
||||
5056 | p90_latency = HIST_get_percentile(time_hist, 0.90);
|
||||
| ^~~~~~~~~~~~~~~~~~~ ~~~~~~~~~
|
||||
../../git/src/netlib.h:649:17: note: declared here
|
||||
649 | extern int HIST_get_percentile();
|
||||
| ^~~~~~~~~~~~~~~~~~~
|
||||
../../git/src/nettest_omni.c:5057:19: error: too many arguments to function 'HIST_get_percentile'; expected 0, have 2
|
||||
5057 | p99_latency = HIST_get_percentile(time_hist, 0.99);
|
||||
| ^~~~~~~~~~~~~~~~~~~ ~~~~~~~~~
|
||||
../../git/src/netlib.h:649:17: note: declared here
|
||||
649 | extern int HIST_get_percentile();
|
||||
| ^~~~~~~~~~~~~~~~~~~
|
||||
../../git/src/nettest_omni.c: In function 'recv_omni':
|
||||
../../git/src/nettest_omni.c:5354:17: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
|
||||
5354 | send_ring = allocate_buffer_ring(send_width,
|
||||
| ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
|
||||
../../git/src/netlib.h:679:26: note: declared here
|
||||
679 | extern struct ring_elt *allocate_buffer_ring();
|
||||
| ^~~~~~~~~~~~~~~~~~~~
|
||||
../../git/src/nettest_omni.c:5396:17: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
|
||||
5396 | recv_ring = allocate_buffer_ring(recv_width,
|
||||
| ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
|
||||
../../git/src/netlib.h:679:26: note: declared here
|
||||
679 | extern struct ring_elt *allocate_buffer_ring();
|
||||
| ^~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Signed-off-by: mark.yang <mark.yang@lge.com>
|
||||
---
|
||||
src/netlib.h | 11 ++++++-----
|
||||
1 file changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/netlib.h b/src/netlib.h
|
||||
index b1f4199..8e1f6fe 100644
|
||||
--- a/src/netlib.h
|
||||
+++ b/src/netlib.h
|
||||
@@ -564,6 +564,7 @@ extern void demo_interval_final();
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#include "hist.h"
|
||||
extern void netlib_init();
|
||||
extern int netlib_get_page_size();
|
||||
extern void install_signal_catchers();
|
||||
@@ -646,9 +647,9 @@ extern char *find_interface_slot(char *interface_name);
|
||||
extern void find_interface_ids(char *interface_name, int *vendor, int *device, int *sub_vend, int *sub_dev);
|
||||
extern void find_driver_info(char *ifname, char *driver, char *version, char *firmware, char *bus, int len);
|
||||
extern void find_system_info(char **system_model, char **cpu_model, int *cpu_frequency);
|
||||
-extern int HIST_get_percentile();
|
||||
-extern void HIST_get_stats();
|
||||
-extern void HIST_purge();
|
||||
+extern int HIST_get_percentile(HIST h, const double percentile);
|
||||
+extern void HIST_get_stats(HIST h, int *min, int *max, double *mean, double *stddev);
|
||||
+extern void HIST_purge(HIST h);
|
||||
extern void find_security_info(int *enabled, int *type, char **specific);
|
||||
extern void demo_first_timestamp();
|
||||
extern void demo_reset();
|
||||
@@ -676,7 +677,7 @@ extern void catcher(int, siginfo_t *,void *);
|
||||
#else
|
||||
extern void catcher(int);
|
||||
#endif /* __hpux */
|
||||
-extern struct ring_elt *allocate_buffer_ring();
|
||||
+extern struct ring_elt *allocate_buffer_ring(int recv_width, int recv_size, int local_recv_align, int local_recv_offset);
|
||||
extern void access_buffer(char *buffer_ptr,
|
||||
int length,
|
||||
int dirty_count,
|
||||
@@ -687,7 +688,7 @@ extern struct ring_elt *allocate_exs_buffer_ring();
|
||||
#endif /* HAVE_ICSC_EXS */
|
||||
|
||||
#ifdef HAVE_SENDFILE
|
||||
-extern struct ring_elt *alloc_sendfile_buf_ring();
|
||||
+extern struct ring_elt *alloc_sendfile_buf_ring(int send_width, int send_size, int local_send_align, int local_send_offset);
|
||||
extern int netperf_sendfile(SOCKET send_socket, struct ring_elt *send_ring);
|
||||
#endif /* HAVE_SENDFILE */
|
||||
|
||||
@ -0,0 +1,4 @@
|
||||
The `0000-gcc15.patch` can be dropped when the PR below gets merged
|
||||
and we pull the updated ebuild:
|
||||
|
||||
https://codeberg.org/gentoo/gentoo/pulls/36
|
||||
@ -1,4 +1,4 @@
|
||||
From 9398464fe4d29cb3e9ad3c04c2c749747438fb65 Mon Sep 17 00:00:00 2001
|
||||
From 4028416511d3e2b1ea8172efe3546b7c1c104a28 Mon Sep 17 00:00:00 2001
|
||||
From: Krzesimir Nowak <knowak@microsoft.com>
|
||||
Date: Mon, 4 Dec 2023 12:17:25 +0100
|
||||
Subject: [PATCH] Flatcar modifications
|
||||
@ -13,14 +13,13 @@ Subject: [PATCH] Flatcar modifications
|
||||
policy/modules/services/container.te | 170 +++++++++++++++++++++++-
|
||||
policy/modules/system/init.te | 8 ++
|
||||
policy/modules/system/locallogin.te | 9 +-
|
||||
policy/modules/system/logging.te | 9 ++
|
||||
10 files changed, 427 insertions(+), 3 deletions(-)
|
||||
9 files changed, 418 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/refpolicy/policy/modules/admin/netutils.te b/refpolicy/policy/modules/admin/netutils.te
|
||||
index 63d2f9cb8..62dff5f94 100644
|
||||
index ac11d1c99..c5501c28f 100644
|
||||
--- a/refpolicy/policy/modules/admin/netutils.te
|
||||
+++ b/refpolicy/policy/modules/admin/netutils.te
|
||||
@@ -128,6 +128,16 @@ corenet_raw_sendrecv_generic_if(ping_t)
|
||||
@@ -133,6 +133,16 @@ corenet_raw_sendrecv_generic_if(ping_t)
|
||||
corenet_raw_sendrecv_generic_node(ping_t)
|
||||
corenet_tcp_sendrecv_generic_node(ping_t)
|
||||
corenet_raw_bind_generic_node(ping_t)
|
||||
@ -37,7 +36,7 @@ index 63d2f9cb8..62dff5f94 100644
|
||||
|
||||
dev_read_urand(ping_t)
|
||||
|
||||
@@ -213,6 +223,16 @@ corenet_udp_bind_traceroute_port(traceroute_t)
|
||||
@@ -218,6 +228,16 @@ corenet_udp_bind_traceroute_port(traceroute_t)
|
||||
corenet_tcp_connect_all_ports(traceroute_t)
|
||||
corenet_sendrecv_all_client_packets(traceroute_t)
|
||||
corenet_sendrecv_traceroute_server_packets(traceroute_t)
|
||||
@ -92,7 +91,7 @@ index 1f0ad3df4..6a1cdba0e 100644
|
||||
## <summary>
|
||||
## Bind TCP sockets to generic nodes.
|
||||
diff --git a/refpolicy/policy/modules/kernel/corenetwork.te.in b/refpolicy/policy/modules/kernel/corenetwork.te.in
|
||||
index b1649ec3a..ca612de44 100644
|
||||
index 6902c41f0..afb537ab7 100644
|
||||
--- a/refpolicy/policy/modules/kernel/corenetwork.te.in
|
||||
+++ b/refpolicy/policy/modules/kernel/corenetwork.te.in
|
||||
@@ -381,7 +381,17 @@ allow corenet_unconfined_type port_type:sctp_socket { name_connect };
|
||||
@ -115,10 +114,10 @@ index b1649ec3a..ca612de44 100644
|
||||
# Infiniband
|
||||
corenet_ib_access_all_pkeys(corenet_unconfined_type)
|
||||
diff --git a/refpolicy/policy/modules/kernel/files.if b/refpolicy/policy/modules/kernel/files.if
|
||||
index 709a1b71b..73b17285e 100644
|
||||
index fe81fd9a0..8f620c8f8 100644
|
||||
--- a/refpolicy/policy/modules/kernel/files.if
|
||||
+++ b/refpolicy/policy/modules/kernel/files.if
|
||||
@@ -8118,3 +8118,48 @@ interface(`files_relabel_all_pidfiles',`
|
||||
@@ -8246,3 +8246,48 @@ interface(`files_relabel_all_pidfiles',`
|
||||
relabel_files_pattern($1, pidfile, pidfile)
|
||||
relabel_lnk_files_pattern($1, pidfile, pidfile)
|
||||
')
|
||||
@ -168,10 +167,10 @@ index 709a1b71b..73b17285e 100644
|
||||
+ relabelfrom_chr_files_pattern($1, { file_type -policy_config_t $2 }, { file_type -policy_config_t $2 })
|
||||
+')
|
||||
diff --git a/refpolicy/policy/modules/kernel/kernel.te b/refpolicy/policy/modules/kernel/kernel.te
|
||||
index 6d8ec0f77..df620faef 100644
|
||||
index 3751b3082..e7f45a5e6 100644
|
||||
--- a/refpolicy/policy/modules/kernel/kernel.te
|
||||
+++ b/refpolicy/policy/modules/kernel/kernel.te
|
||||
@@ -374,6 +374,131 @@ files_mounton_default(kernel_t)
|
||||
@@ -375,6 +375,131 @@ files_mounton_default(kernel_t)
|
||||
|
||||
mcs_process_set_categories(kernel_t)
|
||||
|
||||
@ -304,10 +303,10 @@ index 6d8ec0f77..df620faef 100644
|
||||
mls_process_write_all_levels(kernel_t)
|
||||
mls_file_write_all_levels(kernel_t)
|
||||
diff --git a/refpolicy/policy/modules/services/container.fc b/refpolicy/policy/modules/services/container.fc
|
||||
index f98e68ba0..045b1b5b2 100644
|
||||
index 010387a3a..ba0619561 100644
|
||||
--- a/refpolicy/policy/modules/services/container.fc
|
||||
+++ b/refpolicy/policy/modules/services/container.fc
|
||||
@@ -38,6 +38,12 @@ HOME_DIR/\.docker(/.*)? gen_context(system_u:object_r:container_conf_home_t,s0)
|
||||
@@ -42,6 +42,12 @@ HOME_DIR/\.docker(/.*)? gen_context(system_u:object_r:container_conf_home_t,s0)
|
||||
/etc/cni(/.*)? gen_context(system_u:object_r:container_config_t,s0)
|
||||
/etc/docker(/.*)? gen_context(system_u:object_r:container_config_t,s0)
|
||||
/etc/containerd(/.*)? gen_context(system_u:object_r:container_config_t,s0)
|
||||
@ -321,10 +320,10 @@ index f98e68ba0..045b1b5b2 100644
|
||||
/run/containers(/.*)? gen_context(system_u:object_r:container_runtime_t,s0)
|
||||
/run/crun(/.*)? gen_context(system_u:object_r:container_runtime_t,s0)
|
||||
diff --git a/refpolicy/policy/modules/services/container.te b/refpolicy/policy/modules/services/container.te
|
||||
index c71ae54f4..a231f7664 100644
|
||||
index 4ff585bf6..859cff514 100644
|
||||
--- a/refpolicy/policy/modules/services/container.te
|
||||
+++ b/refpolicy/policy/modules/services/container.te
|
||||
@@ -58,6 +58,52 @@ gen_tunable(container_use_dri, false)
|
||||
@@ -84,6 +84,52 @@ gen_tunable(container_use_dri, false)
|
||||
## </desc>
|
||||
gen_tunable(container_use_ecryptfs, false)
|
||||
|
||||
@ -377,7 +376,7 @@ index c71ae54f4..a231f7664 100644
|
||||
## <desc>
|
||||
## <p>
|
||||
## Allow containers to use all capabilities in a
|
||||
@@ -65,7 +111,7 @@ gen_tunable(container_use_ecryptfs, false)
|
||||
@@ -91,7 +137,7 @@ gen_tunable(container_use_ecryptfs, false)
|
||||
## directly on the host.
|
||||
## </p>
|
||||
## </desc>
|
||||
@ -386,7 +385,7 @@ index c71ae54f4..a231f7664 100644
|
||||
|
||||
## <desc>
|
||||
## <p>
|
||||
@@ -1249,3 +1295,125 @@ optional_policy(`
|
||||
@@ -1431,3 +1477,125 @@ optional_policy(`
|
||||
unconfined_domain_noaudit(spc_user_t)
|
||||
domain_ptrace_all_domains(spc_user_t)
|
||||
')
|
||||
@ -513,10 +512,10 @@ index c71ae54f4..a231f7664 100644
|
||||
+#
|
||||
+allow container_t tmp_t:file { read };
|
||||
diff --git a/refpolicy/policy/modules/system/init.te b/refpolicy/policy/modules/system/init.te
|
||||
index 1320f7aae..61ead9795 100644
|
||||
index c2f33c2bd..4415fa6eb 100644
|
||||
--- a/refpolicy/policy/modules/system/init.te
|
||||
+++ b/refpolicy/policy/modules/system/init.te
|
||||
@@ -1728,3 +1728,11 @@ optional_policy(`
|
||||
@@ -1754,3 +1754,11 @@ optional_policy(`
|
||||
userdom_dontaudit_write_user_tmp_files(systemprocess)
|
||||
userdom_dontaudit_use_user_terminals(systemprocess)
|
||||
')
|
||||
@ -529,7 +528,7 @@ index 1320f7aae..61ead9795 100644
|
||||
+require { type unconfined_t; }
|
||||
+allow init_t unconfined_t:file exec_file_perms;
|
||||
diff --git a/refpolicy/policy/modules/system/locallogin.te b/refpolicy/policy/modules/system/locallogin.te
|
||||
index 995c80be2..933278d2f 100644
|
||||
index 89b852574..08b822fa4 100644
|
||||
--- a/refpolicy/policy/modules/system/locallogin.te
|
||||
+++ b/refpolicy/policy/modules/system/locallogin.te
|
||||
@@ -34,7 +34,14 @@ role system_r types sulogin_t;
|
||||
@ -548,26 +547,6 @@ index 995c80be2..933278d2f 100644
|
||||
allow local_login_t self:fd use;
|
||||
allow local_login_t self:fifo_file rw_fifo_file_perms;
|
||||
allow local_login_t self:sock_file read_sock_file_perms;
|
||||
diff --git a/refpolicy/policy/modules/system/logging.te b/refpolicy/policy/modules/system/logging.te
|
||||
index 14d3132be..ce40abc52 100644
|
||||
--- a/refpolicy/policy/modules/system/logging.te
|
||||
+++ b/refpolicy/policy/modules/system/logging.te
|
||||
@@ -507,6 +507,15 @@ userdom_dontaudit_search_user_home_dirs(syslogd_t)
|
||||
|
||||
ifdef(`init_systemd',`
|
||||
# for systemd-journal
|
||||
+
|
||||
+ #
|
||||
+ # FLATCAR:
|
||||
+ #
|
||||
+ # TODO: What AVC does this fix?
|
||||
+ #
|
||||
+ require { type kernel_t; }
|
||||
+ allow syslogd_t kernel_t:netlink_audit_socket getattr;
|
||||
+
|
||||
allow syslogd_t self:capability audit_control;
|
||||
allow syslogd_t self:netlink_audit_socket connected_socket_perms;
|
||||
allow syslogd_t self:capability2 audit_read;
|
||||
--
|
||||
2.49.1
|
||||
2.52.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 83043596b6cc74b6f049999fa660afd983dc493a Mon Sep 17 00:00:00 2001
|
||||
From 4f4420815e5b51a481245db012a70e0d872ae368 Mon Sep 17 00:00:00 2001
|
||||
From: David Michael <dm0@redhat.com>
|
||||
Date: Tue, 16 Apr 2019 02:44:51 +0000
|
||||
Subject: [PATCH 1/8] wait-online: set --any by default
|
||||
@ -28,5 +28,5 @@ index 6f5aef903a..0acb3e76b9 100644
|
||||
STATIC_DESTRUCTOR_REGISTER(arg_interfaces, hashmap_free_free_freep);
|
||||
STATIC_DESTRUCTOR_REGISTER(arg_ignore, strv_freep);
|
||||
--
|
||||
2.51.0
|
||||
2.52.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 3d6bfde35c8ce5c21ca55104852a319246a92bb8 Mon Sep 17 00:00:00 2001
|
||||
From 5097368cb45b455355165706876509272e49d538 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Crawford <alex.crawford@coreos.com>
|
||||
Date: Wed, 2 Mar 2016 10:46:33 -0800
|
||||
Subject: [PATCH 2/8] needs-update: don't require strictly newer usr
|
||||
@ -54,5 +54,5 @@ index 1a03fdbe37..8577c35fa0 100644
|
||||
|
||||
static bool in_first_boot(void) {
|
||||
--
|
||||
2.51.0
|
||||
2.52.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 6f691278df570cc87cb863a98fe320a1997c6dad Mon Sep 17 00:00:00 2001
|
||||
From 18ce110c4a4a5065ac9003ef67ccd58ada6d3c38 Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Vladu <avladu@cloudbasesolutions.com>
|
||||
Date: Fri, 16 Feb 2024 11:22:08 +0000
|
||||
Subject: [PATCH 3/8] core: use max for DefaultTasksMax
|
||||
@ -34,7 +34,7 @@ index f7b414da5c..9c07e235ab 100644
|
||||
Kernel has a default value for <varname>kernel.pid_max=</varname> and an algorithm of counting in case of more than 32 cores.
|
||||
For example, with the default <varname>kernel.pid_max=</varname>, <varname>DefaultTasksMax=</varname> defaults to 4915,
|
||||
diff --git a/src/core/manager.c b/src/core/manager.c
|
||||
index 4ccaba9054..3ab59c5bb3 100644
|
||||
index e9fa84079d..af8d3c7b41 100644
|
||||
--- a/src/core/manager.c
|
||||
+++ b/src/core/manager.c
|
||||
@@ -117,7 +117,7 @@
|
||||
@ -60,5 +60,5 @@ index 1c08aa4d22..2faea3605e 100644
|
||||
#DefaultLimitFSIZE=
|
||||
#DefaultLimitDATA=
|
||||
--
|
||||
2.51.0
|
||||
2.52.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 78b2d8b1a6df073003d64cffa532c3a320e96ad4 Mon Sep 17 00:00:00 2001
|
||||
From 1716754b1f3ea3d5d3f232d9fe50ba1df0c5eff7 Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Garrett <mjg59@coreos.com>
|
||||
Date: Tue, 20 Dec 2016 16:43:22 +0000
|
||||
Subject: [PATCH 4/8] systemd: Disable SELinux permissions checks
|
||||
@ -25,5 +25,5 @@ index a67a520a3b..3365b920eb 100644
|
||||
#include <errno.h>
|
||||
#include <selinux/avc.h>
|
||||
--
|
||||
2.51.0
|
||||
2.52.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 8064e1544a2b89f8389c0469ed4879a287a045a7 Mon Sep 17 00:00:00 2001
|
||||
From c3ff2dca5d6148a4d09237923aba7b4bd334cddb Mon Sep 17 00:00:00 2001
|
||||
From: Sayan Chowdhury <schowdhury@microsoft.com>
|
||||
Date: Fri, 16 Dec 2022 16:28:26 +0530
|
||||
Subject: [PATCH 5/8] Revert "getty: Pass tty to use by agetty via stdin"
|
||||
@ -91,5 +91,5 @@ index 20a5eb2754..ba4cbc0edb 100644
|
||||
TTYReset=yes
|
||||
TTYVHangup=yes
|
||||
--
|
||||
2.51.0
|
||||
2.52.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From c2924cc57c9e4aa836021ec2567c0fdbebecf944 Mon Sep 17 00:00:00 2001
|
||||
From 63fe9e7a742c070c83919be74c383f74420e6777 Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Vladu <avladu@cloudbasesolutions.com>
|
||||
Date: Fri, 16 Feb 2024 11:29:04 +0000
|
||||
Subject: [PATCH 6/8] units: Keep using old journal file format
|
||||
@ -38,5 +38,5 @@ index b705ce08ff..874701dac4 100644
|
||||
FileDescriptorStoreMax=4224
|
||||
Group=systemd-journal
|
||||
--
|
||||
2.51.0
|
||||
2.52.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 7ee314dc08ea65e6951c7007a5f872fd32f0399a Mon Sep 17 00:00:00 2001
|
||||
From a31573ecdeff40d109951750c7adf086c52c2869 Mon Sep 17 00:00:00 2001
|
||||
From: Krzesimir Nowak <knowak@microsoft.com>
|
||||
Date: Wed, 22 Oct 2025 10:39:42 +0200
|
||||
Subject: [PATCH 7/8] tmpfiles.d: Fix DNS issues with default k8s configuration
|
||||
@ -32,5 +32,5 @@ index be5edc98e0..bea686682a 100644
|
||||
-L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf
|
||||
+L! /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
|
||||
--
|
||||
2.51.0
|
||||
2.52.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From f0ab1c6c59056afe1650f749d1af6ecc6ee8f5ec Mon Sep 17 00:00:00 2001
|
||||
From 3d702165a3517eb23657d613bbbbb0ec45fd672e Mon Sep 17 00:00:00 2001
|
||||
From: Krzesimir Nowak <knowak@microsoft.com>
|
||||
Date: Fri, 24 Oct 2025 11:06:57 +0200
|
||||
Subject: [PATCH 8/8] units: Make multi-user.target the default target
|
||||
@ -31,5 +31,5 @@ index ef18dcae4a..887231840f 100644
|
||||
{ 'file' : 'network-online.target' },
|
||||
{ 'file' : 'network-pre.target' },
|
||||
--
|
||||
2.51.0
|
||||
2.52.0
|
||||
|
||||
|
||||
@ -0,0 +1,36 @@
|
||||
From 77582617c9cd7b3ac3bd36bb3bbfeee07d014406 Mon Sep 17 00:00:00 2001
|
||||
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
|
||||
Date: Tue, 17 Feb 2026 16:59:05 +0100
|
||||
Subject: [PATCH 1/3] Fix sssd login
|
||||
|
||||
Seems like sssd logins fail if they happen after faillock.
|
||||
|
||||
Related: https://github.com/flatcar/scripts/pull/3696
|
||||
|
||||
Signed-off-by: Krzesimir Nowak <knowak@microsoft.com>
|
||||
---
|
||||
templates/system-auth.tpl | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl
|
||||
index 905d04f..479bd77 100644
|
||||
--- a/templates/system-auth.tpl
|
||||
+++ b/templates/system-auth.tpl
|
||||
@@ -21,13 +21,11 @@ auth [success=2 default=ignore] pam_systemd_home.so
|
||||
|
||||
{% if sssd %}
|
||||
auth sufficient pam_unix.so {{ nullok }} {{ debug }}
|
||||
+auth sufficient pam_sss.so forward_pass {{ debug }}
|
||||
{% else %}
|
||||
auth [success=1 new_authtok_reqd=1 ignore=ignore default=bad] pam_unix.so {{ nullok }} {{ debug }} try_first_pass
|
||||
{% endif %}
|
||||
auth [default=die] pam_faillock.so authfail
|
||||
-{% if sssd %}
|
||||
-auth sufficient pam_sss.so forward_pass {{ debug }}
|
||||
-{% endif %}
|
||||
{% if caps %}
|
||||
auth optional pam_cap.so
|
||||
{% endif %}
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 7dce3aef1c67e5884aa7962c5c34a51d9760bd13 Mon Sep 17 00:00:00 2001
|
||||
From c5be94c717fc86bd055efdca8f9e828b3098f9aa Mon Sep 17 00:00:00 2001
|
||||
From: Krzesimir Nowak <knowak@microsoft.com>
|
||||
Date: Thu, 9 Oct 2025 17:32:38 +0200
|
||||
Subject: [PATCH 1/2] Reorganize the login sessions
|
||||
Subject: [PATCH 2/3] Reorganize the login sessions
|
||||
|
||||
- Move selinux parts from system-login to separate a system-selinux
|
||||
file. It is conditionally included by system-local-login and
|
||||
@ -37,13 +37,13 @@ pam_selinux.so lines would be absent.
|
||||
Signed-off-by: Krzesimir Nowak <knowak@microsoft.com>
|
||||
---
|
||||
pambase.py | 2 ++
|
||||
templates/system-local-login.tpl | 9 +++++++++
|
||||
templates/system-local-login.tpl | 8 ++++++++
|
||||
templates/system-login.tpl | 17 +++--------------
|
||||
templates/system-postlogin.tpl | 3 +++
|
||||
templates/system-remote-login.tpl | 7 +++++++
|
||||
templates/system-selinux.tpl | 2 ++
|
||||
templates/system-session.tpl | 1 +
|
||||
7 files changed, 27 insertions(+), 14 deletions(-)
|
||||
7 files changed, 26 insertions(+), 14 deletions(-)
|
||||
create mode 100644 templates/system-postlogin.tpl
|
||||
create mode 100644 templates/system-selinux.tpl
|
||||
|
||||
@ -61,10 +61,10 @@ index 4180cbb..0c7450d 100755
|
||||
]
|
||||
|
||||
diff --git a/templates/system-local-login.tpl b/templates/system-local-login.tpl
|
||||
index 5e01090..34d8459 100644
|
||||
index b1bd7e7..53f420a 100644
|
||||
--- a/templates/system-local-login.tpl
|
||||
+++ b/templates/system-local-login.tpl
|
||||
@@ -2,12 +2,21 @@ auth include system-login
|
||||
@@ -2,11 +2,16 @@ auth include system-login
|
||||
{% if gnome_keyring %}
|
||||
auth optional pam_gnome_keyring.so
|
||||
{% endif %}
|
||||
@ -75,14 +75,16 @@ index 5e01090..34d8459 100644
|
||||
{% if gnome_keyring %}
|
||||
password optional pam_gnome_keyring.so use_authtok
|
||||
{% endif %}
|
||||
+
|
||||
+{% if selinux %}
|
||||
+session include system-selinux
|
||||
+{% endif %}
|
||||
{% if gnome_keyring %}
|
||||
{% if gnome_keyring and openrc %}
|
||||
session optional pam_gnome_keyring.so auto_start
|
||||
{% endif %}
|
||||
@@ -14,3 +19,6 @@ session include system-login
|
||||
{% if gnome_keyring and not openrc %}
|
||||
session optional pam_gnome_keyring.so auto_start
|
||||
{% endif %}
|
||||
session include system-login
|
||||
+{% if not minimal %}
|
||||
+session include system-postlogin
|
||||
+{% endif %}
|
||||
@ -1,14 +1,14 @@
|
||||
From 41efbef049829f738d1e6ad172f4b1a8bc6a6e6d Mon Sep 17 00:00:00 2001
|
||||
From 94176f7d3a66c413d79acff22c8d576775698392 Mon Sep 17 00:00:00 2001
|
||||
From: Krzesimir Nowak <knowak@microsoft.com>
|
||||
Date: Fri, 10 Oct 2025 11:47:43 +0200
|
||||
Subject: [PATCH 2/2] Flatcar modifications
|
||||
Subject: [PATCH 3/3] Flatcar modifications
|
||||
|
||||
---
|
||||
templates/system-auth.tpl | 24 +++++++++++++++---------
|
||||
1 file changed, 15 insertions(+), 9 deletions(-)
|
||||
templates/system-auth.tpl | 20 ++++++++++++++------
|
||||
1 file changed, 14 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl
|
||||
index 905d04f..b211abb 100644
|
||||
index 479bd77..b211abb 100644
|
||||
--- a/templates/system-auth.tpl
|
||||
+++ b/templates/system-auth.tpl
|
||||
@@ -9,11 +9,15 @@ auth [default={{ 3 + homed + (sssd * 3) }}] pam_permit.so
|
||||
@ -30,22 +30,7 @@ index 905d04f..b211abb 100644
|
||||
|
||||
{% if homed %}
|
||||
auth [success=2 default=ignore] pam_systemd_home.so
|
||||
@@ -21,13 +25,11 @@ auth [success=2 default=ignore] pam_systemd_home.so
|
||||
|
||||
{% if sssd %}
|
||||
auth sufficient pam_unix.so {{ nullok }} {{ debug }}
|
||||
+auth sufficient pam_sss.so forward_pass {{ debug }}
|
||||
{% else %}
|
||||
auth [success=1 new_authtok_reqd=1 ignore=ignore default=bad] pam_unix.so {{ nullok }} {{ debug }} try_first_pass
|
||||
{% endif %}
|
||||
auth [default=die] pam_faillock.so authfail
|
||||
-{% if sssd %}
|
||||
-auth sufficient pam_sss.so forward_pass {{ debug }}
|
||||
-{% endif %}
|
||||
{% if caps %}
|
||||
auth optional pam_cap.so
|
||||
{% endif %}
|
||||
@@ -45,9 +47,13 @@ account [success={{ 2 if sssd else 1 }} default=ignore] pam_systemd_home.so
|
||||
@@ -43,9 +47,13 @@ account [success={{ 2 if sssd else 1 }} default=ignore] pam_systemd_home.so
|
||||
account required pam_unix.so {{ debug }}
|
||||
account required pam_faillock.so
|
||||
{% if sssd %}
|
||||
@ -1,6 +1,7 @@
|
||||
The `0001-Reorganize-the-login-sessions.patch` is something we could
|
||||
try to upstream if it is proven to work.
|
||||
The patches `0001-Fix-sssd-login.patch` and
|
||||
`0002-Reorganize-the-login-sessions.patch` are something we could try
|
||||
to upstream if it is proven to work.
|
||||
|
||||
The `0002-Flatcar-modifications.patch` is just some Flatcar-specific
|
||||
The `0003-Flatcar-modifications.patch` is just some Flatcar-specific
|
||||
changes. Not sure if all them are necessary, but it is trying to
|
||||
more-or-less match the config files from old baselayout.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From c5fbb32be0509e4368268a79e7aacc6b5e34d28e Mon Sep 17 00:00:00 2001
|
||||
From 557ce4b7dd9204696fb0992a47123721470a407a Mon Sep 17 00:00:00 2001
|
||||
From: Krzesimir Nowak <knowak@microsoft.com>
|
||||
Date: Thu, 20 Nov 2025 13:16:09 +0100
|
||||
Subject: [PATCH 1/2] [build] Simplify installation of symlinks and manpages
|
||||
@ -77,5 +77,5 @@ index b04937aa..44c99c99 100644
|
||||
|
||||
.PHONY: install
|
||||
--
|
||||
2.51.2
|
||||
2.52.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 74215dade7bbddbfc0a46e1903fc289a56df3915 Mon Sep 17 00:00:00 2001
|
||||
From ced04b3f4f96072d627210038aaa726e864419b6 Mon Sep 17 00:00:00 2001
|
||||
From: Krzesimir Nowak <knowak@microsoft.com>
|
||||
Date: Thu, 20 Nov 2025 13:17:36 +0100
|
||||
Subject: [PATCH 2/2] [all] Make thin_migrate tool optional
|
||||
@ -17,7 +17,7 @@ Signed-off-by: Krzesimir Nowak <knowak@microsoft.com>
|
||||
5 files changed, 24 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 8594c6ba..155285a8 100644
|
||||
index 39853af1..02d77483 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -18,7 +18,7 @@ clap = { version = "4.5", default-features = false, features = [
|
||||
@ -131,5 +131,5 @@ index 1ef0e1be..eeed031e 100644
|
||||
pub mod repair;
|
||||
pub mod restore;
|
||||
--
|
||||
2.51.2
|
||||
2.52.0
|
||||
|
||||
|
||||
@ -46,6 +46,7 @@ BOOTSTRAP_USE="${BOOTSTRAP_USE} xml"
|
||||
|
||||
# Set SELinux policy
|
||||
POLICY_TYPES="targeted mcs mls"
|
||||
SELINUX_POLICY_TYPES="targeted mcs mls"
|
||||
|
||||
# Disable packages or optional features with distribution issues.
|
||||
ACCEPT_RESTRICT="* -bindist"
|
||||
@ -133,3 +134,14 @@ MODULES_SIGN_CERT="/tmp/certs/modules.pub.pem"
|
||||
|
||||
# enable signing kernel modules from portage
|
||||
USE="${USE} modules-sign"
|
||||
|
||||
# Branding stuff
|
||||
BRANDING_OS_NAME="Flatcar Container Linux by Kinvolk"
|
||||
BRANDING_OS_ID="flatcar"
|
||||
BRANDING_OS_ID_LIKE="coreos"
|
||||
BRANDING_OS_HOME_URL="https://flatcar.org"
|
||||
BRANDING_OS_SUPPORT_URL="https://groups.google.com/forum/#!forum/flatcar-linux-user"
|
||||
BRANDING_OS_BUG_REPORT_URL="https://issues.flatcar.org"
|
||||
#BRANDING_OS_VERSION=
|
||||
#BRANDING_OS_VERSION_ID=
|
||||
#BRANDING_OS_PRETTY_NAME=
|
||||
|
||||
@ -7,13 +7,19 @@
|
||||
# Gentoo upstream package stabilisation
|
||||
# (the following packages are "unstable" upstream; we're stabilising these)
|
||||
|
||||
# Keep versions on both arches in sync.
|
||||
=app-containers/cri-tools-1.32.0 ~arm64
|
||||
=app-containers/incus-6.0.4-r1 ~arm64
|
||||
=app-containers/lxc-6.0.4-r1 ~arm64
|
||||
# To address CVE-2025-60753
|
||||
=app-arch/libarchive-3.8.5 ~amd64 ~arm64
|
||||
|
||||
# CVE-2025-6032
|
||||
=app-containers/podman-5.5.2 ~amd64 ~arm64
|
||||
# We always want the latest version available.
|
||||
=app-containers/containerd-2.2* ~amd64 ~arm64
|
||||
|
||||
# Keep versions on both arches in sync.
|
||||
=app-containers/cri-tools-1.33.0 ~arm64
|
||||
=app-containers/incus-6.0.5 ~arm64
|
||||
=app-containers/lxc-6.0.5 ~arm64
|
||||
|
||||
# We always want the latest version available.
|
||||
=app-containers/runc-1.4* ~amd64 ~arm64
|
||||
|
||||
# No stable keywords.
|
||||
=app-containers/syft-1.18.1 ~amd64 ~arm64
|
||||
@ -32,11 +38,13 @@ app-crypt/azure-keyvault-pkcs11
|
||||
# The only available ebuild (from GURU) has ~amd64 and no keyword for arm64 yet.
|
||||
=app-crypt/clevis-19-r1 **
|
||||
|
||||
# Keep versions on both arches in sync.
|
||||
=app-crypt/mit-krb5-1.21.3-r1 ~arm64
|
||||
|
||||
# No stable keywords yet because it's new.
|
||||
=app-emulation/open-vmdk-0.3.12 ~amd64
|
||||
|
||||
# Keep versions on both arches in sync.
|
||||
=app-emulation/qemu-10.0.5 ~arm64
|
||||
=app-emulation/qemu-guest-agent-9.2.0 ~arm64
|
||||
|
||||
# Packages are in Gentoo but not expected to be used outside Flatcar, so they
|
||||
@ -47,20 +55,31 @@ dev-cpp/azure-identity
|
||||
dev-cpp/azure-security-keyvault-certificates
|
||||
dev-cpp/azure-security-keyvault-keys
|
||||
|
||||
# Not stabilised for arm64 yet.
|
||||
dev-db/etcd amd64
|
||||
|
||||
# Keep versions on both arches in sync.
|
||||
=dev-lang/yasm-1.3.0-r1 ~arm64
|
||||
=dev-libs/cowsql-1.15.9 ~arm64
|
||||
=dev-libs/ding-libs-0.6.2-r1 ~arm64
|
||||
=dev-libs/elfutils-0.194 ~amd64
|
||||
|
||||
# The only available ebuild has ~amd64 and no keyword for arm64 yet.
|
||||
=dev-libs/jose-14 **
|
||||
|
||||
# Keep versions on both arches in sync.
|
||||
=dev-libs/libnl-3.11.0 ~amd64
|
||||
|
||||
# The only available ebuild (from GURU) has ~amd64 and no keyword for arm64 yet.
|
||||
=dev-libs/luksmeta-9-r1 **
|
||||
|
||||
# Keep versions on both arches in sync.
|
||||
=dev-libs/raft-0.22.1 ~arm64
|
||||
|
||||
# Used to be in sdk target profile, unversioned, so pinning it to a
|
||||
# version used at a time of the move. Needed for building signed
|
||||
# sysexts with systemd-repart
|
||||
=dev-libs/xxhash-0.8.3-r1
|
||||
|
||||
# No arm64 keyword in package.
|
||||
=dev-util/bsdiff-4.3-r4 **
|
||||
|
||||
@ -74,9 +93,6 @@ dev-cpp/azure-security-keyvault-keys
|
||||
=net-libs/libnetfilter_cthelper-1.0.1-r1 ~arm64
|
||||
=net-libs/libnetfilter_cttimeout-1.0.1 ~arm64
|
||||
|
||||
# CVE-2025-61984, CVE-2025-61985
|
||||
=net-misc/openssh-10.2_p1 ~amd64 ~arm64
|
||||
|
||||
# Packages are in Gentoo but not expected to be used outside Flatcar, so they
|
||||
# are generally never stabilised. Thus an unusual form is used to pick up the
|
||||
# latest version of the package with the unstable keywords.
|
||||
@ -86,24 +102,25 @@ sys-apps/azure-vm-utils
|
||||
=sys-apps/zram-generator-1.2.1 ~arm64
|
||||
=sys-auth/sssd-2.9.7 ~arm64
|
||||
|
||||
# So it builds with rust provided by SDK without pulling some older
|
||||
# version of rust-bin, that does not support aarch64 for some reason.
|
||||
=sys-block/thin-provisioning-tools-1.3.0 ~amd64 ~arm64
|
||||
|
||||
# Keep versions on both arches in sync.
|
||||
=sys-boot/mokutil-0.7.2 **
|
||||
|
||||
# Enable ipvsadm for arm64.
|
||||
=sys-cluster/ipvsadm-1.31-r1 ~arm64
|
||||
|
||||
# Used to be in sdk target profile, unversioned, so pinning it to a
|
||||
# version used at a time of the move. Needed for building signed
|
||||
# sysexts with systemd-repart
|
||||
=sys-fs/erofs-utils-1.8.10-r1
|
||||
|
||||
# Keep versions on both arches in sync.
|
||||
=sys-fs/lxcfs-6.0.4 ~arm64
|
||||
|
||||
=app-containers/containerd-2.1* ~amd64 ~arm64
|
||||
=app-containers/runc-1.3* ~amd64 ~arm64
|
||||
|
||||
# Not stabilised for arm64 yet.
|
||||
dev-db/etcd amd64
|
||||
=sys-fs/lxcfs-6.0.5 ~arm64
|
||||
=sys-fs/zfs-2.3.4 ~arm64
|
||||
=sys-fs/zfs-kmod-2.3.4 ~arm64
|
||||
|
||||
# Bump early for newer features.
|
||||
=sys-kernel/dracut-109* ~amd64 ~arm64
|
||||
|
||||
# Our own ebuild fixing issues in Gentoo, hopefully will be fixed
|
||||
# there too eventually.
|
||||
=sys-libs/libselinux-3.8.1-r3 ~amd64 ~arm64
|
||||
|
||||
@ -40,7 +40,7 @@ net-firewall/ipset -modules
|
||||
dev-libs/glib -mime
|
||||
|
||||
# keep grub build simple
|
||||
sys-boot/grub -multislot -themes -fonts -device-mapper
|
||||
sys-boot/grub -branding -multislot -themes -fonts -device-mapper
|
||||
|
||||
# disable "high performance ssh" patch, turn on kerberos
|
||||
net-misc/openssh -hpn kerberos
|
||||
@ -171,17 +171,11 @@ sys-apps/azure-vm-utils dracut
|
||||
# Enable SELinux for lxc
|
||||
app-containers/lxc selinux
|
||||
|
||||
# required by app-containers/incus-6.0.3-r1::portage-stable
|
||||
# required by incus (argument)
|
||||
# required by app-containers/incus
|
||||
dev-libs/raft lz4
|
||||
|
||||
# required by app-containers/incus-6.0.3-r1::portage-stable
|
||||
# required by incus (argument)
|
||||
dev-util/xdelta lzma
|
||||
|
||||
# required by app-containers/lxc-6.0.3::portage-stable[tools,caps]
|
||||
# required by app-containers/incus-6.0.3-r1::portage-stable
|
||||
# required by incus (argument)
|
||||
# required by app-containers/lxc[tools,caps] and app-containers/incus
|
||||
sys-libs/libcap static-libs
|
||||
|
||||
# do not force a dependency on llvm-core/llvm yet
|
||||
@ -200,3 +194,6 @@ dev-db/etcd -server
|
||||
|
||||
# We only need the non-Python-based tools.
|
||||
app-emulation/open-vmdk -python
|
||||
|
||||
# Avoid pulling extra perl packages
|
||||
dev-perl/File-Slurper minimal
|
||||
|
||||
@ -23,7 +23,7 @@ acct-user/named-0-r3
|
||||
sys-process/psmisc-23.7
|
||||
|
||||
# Pulled in by app-admin/sudo and net-fs/samba
|
||||
dev-lang/perl-5.40.2
|
||||
dev-lang/perl-5.42.0-r1
|
||||
|
||||
# Pulled in by net-fs/samba
|
||||
dev-libs/icu-76.1-r1
|
||||
|
||||
@ -1,5 +0,0 @@
|
||||
# Temporarily put the SDK version ahead for sd-json support in Dracut.
|
||||
|
||||
# Needed for building signed sysexts with systemd-repart
|
||||
dev-libs/xxhash
|
||||
sys-fs/erofs-utils
|
||||
@ -1,7 +1,7 @@
|
||||
From 72d823c414a1416dffc2276e5a0a17f03c5e4549 Mon Sep 17 00:00:00 2001
|
||||
From 765644b34e61a8455114067465537d9f0a31dd7d Mon Sep 17 00:00:00 2001
|
||||
From: James Le Cuirot <jlecuirot@microsoft.com>
|
||||
Date: Mon, 28 Jul 2025 12:16:50 +0100
|
||||
Subject: [PATCH 1/2] Patch Photon after fetching to fix cross issues
|
||||
Subject: [PATCH 1/3] Patch Photon after fetching to fix cross issues
|
||||
|
||||
Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
|
||||
---
|
||||
@ -21,5 +21,5 @@ index c905bd9..5507f66 100644
|
||||
|
||||
if(BUILD_TESTING)
|
||||
--
|
||||
2.51.0
|
||||
2.52.0
|
||||
|
||||
|
||||
@ -1,3 +1,30 @@
|
||||
From 8df6807f569ebca98678d6ca5370d3575f469181 Mon Sep 17 00:00:00 2001
|
||||
From: James Le Cuirot <jlecuirot@microsoft.com>
|
||||
Date: Thu, 19 Feb 2026 12:45:13 +0100
|
||||
Subject: [PATCH 2/3] overlaybd-offline-build
|
||||
|
||||
---
|
||||
CMake/{Findcurl.cmake => FindCURL.cmake} | 6 ++---
|
||||
.../{Findopenssl.cmake => FindOpenSSL.cmake} | 4 +---
|
||||
CMake/FindRapidJSON.cmake | 19 ++++++++++++++++
|
||||
CMake/Finde2fs.cmake | 4 +---
|
||||
CMake/Findphoton.cmake | 4 ++--
|
||||
CMake/Findrapidjson.cmake | 12 ----------
|
||||
CMakeLists.txt | 22 +++++++++++--------
|
||||
src/CMakeLists.txt | 10 ++++-----
|
||||
src/overlaybd/CMakeLists.txt | 5 ++++-
|
||||
.../cache/ocf_cache/test/CMakeLists.txt | 2 +-
|
||||
src/overlaybd/registryfs/CMakeLists.txt | 4 ++--
|
||||
src/overlaybd/stream_convertor/CMakeLists.txt | 2 +-
|
||||
src/overlaybd/tar/erofs/test/CMakeLists.txt | 4 ++--
|
||||
src/test/CMakeLists.txt | 6 ++---
|
||||
src/tools/CMakeLists.txt | 4 ++--
|
||||
15 files changed, 58 insertions(+), 50 deletions(-)
|
||||
rename CMake/{Findcurl.cmake => FindCURL.cmake} (95%)
|
||||
rename CMake/{Findopenssl.cmake => FindOpenSSL.cmake} (96%)
|
||||
create mode 100644 CMake/FindRapidJSON.cmake
|
||||
delete mode 100644 CMake/Findrapidjson.cmake
|
||||
|
||||
diff --git a/CMake/Findcurl.cmake b/CMake/FindCURL.cmake
|
||||
similarity index 95%
|
||||
rename from CMake/Findcurl.cmake
|
||||
@ -77,10 +104,10 @@ index 15c58fd..e5615a2 100644
|
||||
|
||||
add_custom_command(
|
||||
diff --git a/CMake/Findphoton.cmake b/CMake/Findphoton.cmake
|
||||
index c905bd9..cdc72d2 100644
|
||||
index 5507f66..e00b939 100644
|
||||
--- a/CMake/Findphoton.cmake
|
||||
+++ b/CMake/Findphoton.cmake
|
||||
@@ -17,8 +17,8 @@ else()
|
||||
@@ -18,8 +18,8 @@ else()
|
||||
endif()
|
||||
|
||||
if (BUILD_CURL_FROM_SOURCE)
|
||||
@ -181,10 +208,10 @@ index 4d0e696..69652f3 100644
|
||||
)
|
||||
target_link_libraries(overlaybd-tcmu
|
||||
diff --git a/src/overlaybd/CMakeLists.txt b/src/overlaybd/CMakeLists.txt
|
||||
index 1c5a912..af095b7 100644
|
||||
index fd57ee2..3328b43 100644
|
||||
--- a/src/overlaybd/CMakeLists.txt
|
||||
+++ b/src/overlaybd/CMakeLists.txt
|
||||
@@ -6,7 +6,10 @@ add_subdirectory(cache)
|
||||
@@ -5,7 +5,10 @@ add_subdirectory(cache)
|
||||
add_subdirectory(tar)
|
||||
add_subdirectory(gzip)
|
||||
add_subdirectory(gzindex)
|
||||
@ -310,3 +337,6 @@ index b551b84..ecf5c32 100644
|
||||
target_link_libraries(turboOCI-apply photon_static overlaybd_lib overlaybd_image_lib)
|
||||
set_target_properties(turboOCI-apply PROPERTIES INSTALL_RPATH "/opt/overlaybd/lib")
|
||||
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
From 2d718a67568588d6f98cb536142fa5c8be1c0475 Mon Sep 17 00:00:00 2001
|
||||
From: Krzesimir Nowak <knowak@microsoft.com>
|
||||
Date: Thu, 19 Feb 2026 12:46:14 +0100
|
||||
Subject: [PATCH 3/3] Fix build with gcc15
|
||||
|
||||
uint32_t stopped being brought in indirectly through some other header
|
||||
files in gcc 15.
|
||||
|
||||
Signed-off-by: Krzesimir Nowak <knowak@microsoft.com>
|
||||
---
|
||||
src/prefetch.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/prefetch.h b/src/prefetch.h
|
||||
index da778d5..3e91564 100644
|
||||
--- a/src/prefetch.h
|
||||
+++ b/src/prefetch.h
|
||||
@@ -16,6 +16,7 @@ limitations under the License.
|
||||
#pragma once
|
||||
|
||||
#include <cctype>
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <photon/fs/filesystem.h>
|
||||
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@ -88,3 +88,29 @@ Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
|
||||
--
|
||||
2.49.0
|
||||
|
||||
|
||||
From 9a4327f3dbb225fbce772fec18862f0b6884d9f5 Mon Sep 17 00:00:00 2001
|
||||
From: Krzesimir Nowak <knowak@microsoft.com>
|
||||
Date: Thu, 19 Feb 2026 10:07:08 +0100
|
||||
Subject: [PATCH] Add missing cstdint include
|
||||
|
||||
Signed-off-by: Krzesimir Nowak <knowak@microsoft.com>
|
||||
---
|
||||
fs/path.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/fs/path.h b/fs/path.h
|
||||
index fe5514e..13d653d 100644
|
||||
--- a/fs/path.h
|
||||
+++ b/fs/path.h
|
||||
@@ -20,6 +20,7 @@ limitations under the License.
|
||||
#include <stack>
|
||||
#include <memory>
|
||||
#include <climits>
|
||||
+#include <cstdint>
|
||||
#include <photon/fs/filesystem.h>
|
||||
#include <photon/common/string_view.h>
|
||||
|
||||
--
|
||||
2.52.0
|
||||
|
||||
|
||||
@ -60,7 +60,8 @@ BDEPEND="
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/0001-Patch-Photon-after-fetching-to-fix-cross-issues.patch
|
||||
"${FILESDIR}"/${PN}-offline-build.patch
|
||||
"${FILESDIR}"/0002-overlaybd-offline-build.patch
|
||||
"${FILESDIR}"/0003-Fix-build-with-gcc15.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
|
||||
9
sdk_container/src/third_party/portage-stable/acct-group/cuse/cuse-0.ebuild
vendored
Normal file
9
sdk_container/src/third_party/portage-stable/acct-group/cuse/cuse-0.ebuild
vendored
Normal file
@ -0,0 +1,9 @@
|
||||
# Copyright 2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit acct-group
|
||||
|
||||
ACCT_GROUP_ID=554
|
||||
DESCRIPTION="/dev/cuse access"
|
||||
11
sdk_container/src/third_party/portage-stable/acct-group/cuse/metadata.xml
vendored
Normal file
11
sdk_container/src/third_party/portage-stable/acct-group/cuse/metadata.xml
vendored
Normal file
@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>mgorny@gentoo.org</email>
|
||||
<name>Michał Górny</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>base-system@gentoo.org</email>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
9
sdk_container/src/third_party/portage-stable/acct-group/jobserver/jobserver-0.ebuild
vendored
Normal file
9
sdk_container/src/third_party/portage-stable/acct-group/jobserver/jobserver-0.ebuild
vendored
Normal file
@ -0,0 +1,9 @@
|
||||
# Copyright 2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit acct-group
|
||||
|
||||
ACCT_GROUP_ID=556
|
||||
DESCRIPTION="Access to system-wide jobservers"
|
||||
@ -1,9 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>perl@gentoo.org</email>
|
||||
<name>Gentoo Perl Project</name>
|
||||
<maintainer type="person">
|
||||
<email>mgorny@gentoo.org</email>
|
||||
<name>Michał Górny</name>
|
||||
</maintainer>
|
||||
<stabilize-allarches/>
|
||||
</pkgmetadata>
|
||||
12
sdk_container/src/third_party/portage-stable/acct-user/portage/portage-0-r4.ebuild
vendored
Normal file
12
sdk_container/src/third_party/portage-stable/acct-user/portage/portage-0-r4.ebuild
vendored
Normal file
@ -0,0 +1,12 @@
|
||||
# Copyright 2020-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit acct-user
|
||||
|
||||
ACCT_USER_ID=250
|
||||
ACCT_USER_HOME="/var/lib/portage/home"
|
||||
ACCT_USER_GROUPS=( portage jobserver )
|
||||
|
||||
acct-user_add_deps
|
||||
@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="doc emacs vim-syntax"
|
||||
|
||||
# coreutils for realpath
|
||||
|
||||
@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="doc emacs vim-syntax"
|
||||
|
||||
# coreutils for realpath
|
||||
|
||||
@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
|
||||
else
|
||||
SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
|
||||
@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
|
||||
else
|
||||
SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
|
||||
@ -13,7 +13,7 @@ ALTERNATIVES=(
|
||||
inherit app-alternatives eapi9-ver
|
||||
|
||||
DESCRIPTION="/bin/awk and /usr/bin/awk symlinks"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="split-usr"
|
||||
|
||||
RDEPEND="
|
||||
|
||||
@ -11,7 +11,7 @@ ALTERNATIVES=(
|
||||
inherit app-alternatives
|
||||
|
||||
DESCRIPTION="bc symlink"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
|
||||
RDEPEND="
|
||||
!<sys-devel/bc-1.07.1-r6
|
||||
|
||||
@ -12,7 +12,7 @@ ALTERNATIVES=(
|
||||
inherit app-alternatives
|
||||
|
||||
DESCRIPTION="bzip2 symlink"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="split-usr"
|
||||
|
||||
RDEPEND="
|
||||
|
||||
@ -11,7 +11,7 @@ ALTERNATIVES=(
|
||||
inherit app-alternatives
|
||||
|
||||
DESCRIPTION="CPIO symlink"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="split-usr"
|
||||
|
||||
RDEPEND="
|
||||
|
||||
@ -11,7 +11,7 @@ ALTERNATIVES=(
|
||||
inherit app-alternatives
|
||||
|
||||
DESCRIPTION="gzip symlinks"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="split-usr"
|
||||
|
||||
RDEPEND="
|
||||
|
||||
@ -11,7 +11,7 @@ ALTERNATIVES=(
|
||||
inherit app-alternatives
|
||||
|
||||
DESCRIPTION="gzip symlinks"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="split-usr"
|
||||
|
||||
RDEPEND="
|
||||
|
||||
@ -11,7 +11,7 @@ ALTERNATIVES=(
|
||||
inherit app-alternatives
|
||||
|
||||
DESCRIPTION="lex symlinks"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
|
||||
RDEPEND="
|
||||
!<sys-devel/flex-2.6.4-r5
|
||||
|
||||
@ -11,7 +11,7 @@ ALTERNATIVES=(
|
||||
inherit app-alternatives
|
||||
|
||||
DESCRIPTION="ninja symlinks"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
|
||||
RDEPEND="!<dev-build/ninja-1.11.1-r3"
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ ALTERNATIVES=(
|
||||
inherit app-alternatives
|
||||
|
||||
DESCRIPTION="/bin/sh (POSIX shell) symlink"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
|
||||
RDEPEND="
|
||||
!app-eselect/eselect-sh
|
||||
|
||||
@ -11,7 +11,7 @@ ALTERNATIVES=(
|
||||
inherit app-alternatives
|
||||
|
||||
DESCRIPTION="Tar symlink"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="split-usr"
|
||||
|
||||
RDEPEND="
|
||||
|
||||
@ -12,7 +12,7 @@ ALTERNATIVES=(
|
||||
inherit app-alternatives
|
||||
|
||||
DESCRIPTION="yacc symlinks"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
|
||||
RDEPEND="
|
||||
!<dev-util/yacc-1.9.1-r7
|
||||
|
||||
@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="nls"
|
||||
|
||||
PDEPEND="
|
||||
|
||||
@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="nls"
|
||||
|
||||
PDEPEND="
|
||||
|
||||
@ -31,7 +31,7 @@ fi
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
if [[ ${PV} != *_p* ]] ; then
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
IUSE="pic static"
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@ fi
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
if [[ ${PV} != *_p* ]] ; then
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
IUSE="pic static"
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/05/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
IUSE="debug static"
|
||||
|
||||
PATCHES=(
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
DIST libarchive-3.8.1.tar.xz 5950428 BLAKE2B 92ce11758ea050c7f5b3b2440566b71d29d4fe3ee90ee3455117585ef629eb7cfbe6f3c67bfb309c38d02118ef8f71c1c30ffe14466bfef7929c6d6134b11fc8 SHA512 c794d1c6e6a6dcf4072438dc4e8ce5b1530bbe9ad40afad18f4e6a444aa5d85e48c58cfbd8af41d4d25e93844956de3ce262cb1d68097d2e5f95bd87b5a982b7
|
||||
DIST libarchive-3.8.1.tar.xz.asc 659 BLAKE2B 0965437c5087b29c356280613fba546c0f08cbe3996c885957e1424304f3ea1cb4651168b34c3389ec6119bd5ab99160dc530dced31490cd2f6e8c3850e77223 SHA512 540ea8203920c1e8e6934f20c0f6b592a309c82f82561960d9adff3a3a09cf28c7a3d92070682b6b420ef82c6e30d6e9741d8c3e5473a78390da5137e61c05bd
|
||||
DIST libarchive-3.8.2.tar.xz 5853628 BLAKE2B 4f5ed9afbedccf0f754b38743259a62f45d8407ddea8955e301b79b8c9c7653e633b58998a43d7a4bf8cfd35488b20af76ea8f948267230be0557797513b71a6 SHA512 0a6796a8b9f66ebfb4ed0d03f9ef85519855fe5835c060bd9d17e3d5d70f565f74f94e7a570c4f6787557d15f1264fc55900d8a66b34b15892e2b6e4b3eecdf1
|
||||
DIST libarchive-3.8.2.tar.xz.asc 659 BLAKE2B dc7183efc8e96a13d519d250194a9044c390042e1abc2257c82bc5c43453ad9fdbc5872643b6c008e8f6762356ced64304ed90c60edab034a4ef1ce3d91d26e0 SHA512 e1705acf226f14d9143efbc0b1649fcd2e10706966d21bf0c54f702db7eb64332b9f3927a7fa6c8322cb1a929af81bc584c1e6111c4d3c6523aee8ed7a8b4e1e
|
||||
DIST libarchive-3.8.3.tar.xz 5990552 BLAKE2B 5be5f0e98f7582e2a34a43dd9217644defbd69532474fc07b3ac46ba7820c19dbd28cd691c1c798aed02643bbe68781cecd564127781c9b49323b9b54cebb32c SHA512 9eb6331da6cb96734a56166d2a507cb192967a57b041c8ea2e0eb295373abd72b4abaa8b0a3100d4b73ca00339569bb7b7789f882671619465f0a566750be920
|
||||
DIST libarchive-3.8.3.tar.xz.asc 833 BLAKE2B 583c3b6b7626dc3de8a2e23cce23ed34fcdcd2f854bab61d0ecdae41414ff021733ceedabb006b7f128462f12065af0e66f4215fe060dd1f720de11bccfa71c9 SHA512 239e6ebaaffefee1d12f185e4e033e333feb81d5a5b985d9bfc33f883f6cbb7e7d65d480286cfaa4313e6139252eb7f3a7a1e095c251477c3a49196312c6d9a7
|
||||
DIST libarchive-3.8.4.tar.xz 6065584 BLAKE2B c6cadc1dc97f79a379fa1f2fae4d791fade4513796066de8bfa32e40f8b5dc1efb4c46a9f0aefb62510c5ab428599f9cbda508e89b67cd932e160ee5377ee0e6 SHA512 088f3726de7f8e2f4b2ac6cc9c01338328493de19f5b0645157114ef3b7a0fa5213cb6d64123736cae83354a2137bba9e2187bb4208cb7848e2566c65b100489
|
||||
DIST libarchive-3.8.4.tar.xz.asc 833 BLAKE2B 2b4edd5f9d5d5ca9c0f7276b9891f95621def922ceea043520460fc731e588d1acf8cfc41aa8a4df8a10285ca196411a17b886ef64722de985c7012af8adc024 SHA512 1ec7e73a5b0c02d236567f77812003276af9a499e774d2d6d322ed823a5a98f662a4dc6053eb471dcaa1317b2980937910a528f9c83d23c115a310175a23ad61
|
||||
DIST libarchive-3.8.5.tar.xz 6009124 BLAKE2B d0fa6a49209a06240240cf578f95138eb72eebdc7179d034fdd9efc2e49820e34e9da41aa46cd11be2c2d46c380c8cc7e830d41271a6f3a7d9c39df138098cab SHA512 b050ca8488143503bdec38ffcab7a5010af61f1b93c1207a3fa006d72d643b84aa8c1ab267e890eb39966ccaedd6e18db8fe5b02f2789bbd1b318a3c4cf138f3
|
||||
DIST libarchive-3.8.5.tar.xz.asc 833 BLAKE2B bf3d85fad2f6e681c94ec341753dffc8ca658ffdc55641278dc28aa863209c3d6d42e32d0d33de9326314b6daa5486a758b6cce82f445b9f6568ccac4fc7b457 SHA512 80b155e86d9f93efd3f2e65655c1fe66fb0b9b937888fd5b24e65b26418f01ee6fbd66c649079b8591c15ae593980ece3de49778bb1215eaecd9af0f2823fb71
|
||||
|
||||
@ -16,7 +16,7 @@ SRC_URI="
|
||||
|
||||
LICENSE="BSD BSD-2 BSD-4 public-domain"
|
||||
SLOT="0/13"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="
|
||||
acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle
|
||||
static-libs test xattr +zstd
|
||||
@ -55,7 +55,7 @@ DEPEND="${RDEPEND}
|
||||
"
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20221209 )
|
||||
verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20251118 )
|
||||
elibc_musl? ( sys-libs/queue-standalone )
|
||||
"
|
||||
|
||||
@ -16,7 +16,7 @@ SRC_URI="
|
||||
|
||||
LICENSE="BSD BSD-2 BSD-4 public-domain"
|
||||
SLOT="0/13"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="
|
||||
acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle
|
||||
static-libs test xattr +zstd
|
||||
@ -55,7 +55,7 @@ DEPEND="${RDEPEND}
|
||||
"
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20221209 )
|
||||
verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20251118 )
|
||||
elibc_musl? ( sys-libs/queue-standalone )
|
||||
"
|
||||
|
||||
174
sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.8.5.ebuild
vendored
Normal file
174
sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.8.5.ebuild
vendored
Normal file
@ -0,0 +1,174 @@
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
inherit libtool multilib-minimal toolchain-funcs verify-sig
|
||||
|
||||
DESCRIPTION="Multi-format archive and compression library"
|
||||
HOMEPAGE="
|
||||
https://www.libarchive.org/
|
||||
https://github.com/libarchive/libarchive/
|
||||
"
|
||||
SRC_URI="
|
||||
https://www.libarchive.de/downloads/${P}.tar.xz
|
||||
verify-sig? ( https://www.libarchive.de/downloads/${P}.tar.xz.asc )
|
||||
"
|
||||
|
||||
LICENSE="BSD BSD-2 BSD-4 public-domain"
|
||||
SLOT="0/13"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="
|
||||
acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle
|
||||
static-libs test xattr +zstd
|
||||
"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
virtual/zlib:=[${MULTILIB_USEDEP}]
|
||||
acl? ( virtual/acl:=[${MULTILIB_USEDEP}] )
|
||||
blake2? ( app-crypt/libb2:=[${MULTILIB_USEDEP}] )
|
||||
bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
|
||||
expat? ( dev-libs/expat:=[${MULTILIB_USEDEP}] )
|
||||
!expat? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
|
||||
iconv? ( virtual/libiconv:=[${MULTILIB_USEDEP}] )
|
||||
dev-libs/openssl:=[${MULTILIB_USEDEP}]
|
||||
lz4? ( >=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}] )
|
||||
lzma? ( >=app-arch/xz-utils-5.2.5-r1:=[${MULTILIB_USEDEP}] )
|
||||
lzo? ( >=dev-libs/lzo-2:=[${MULTILIB_USEDEP}] )
|
||||
nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] )
|
||||
zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
kernel_linux? (
|
||||
virtual/os-headers
|
||||
e2fsprogs? ( sys-fs/e2fsprogs[${MULTILIB_USEDEP}] )
|
||||
)
|
||||
test? (
|
||||
app-arch/lrzip
|
||||
app-arch/lz4
|
||||
app-arch/lzip
|
||||
app-arch/lzop
|
||||
app-arch/xz-utils
|
||||
app-arch/zstd
|
||||
lzma? ( app-arch/xz-utils[extra-filters(+)] )
|
||||
)
|
||||
"
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20251118 )
|
||||
elibc_musl? ( sys-libs/queue-standalone )
|
||||
"
|
||||
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libarchive.org.asc
|
||||
|
||||
# false positives (checks for libc-defined hash functions)
|
||||
QA_CONFIG_IMPL_DECL_SKIP=(
|
||||
SHA256_Init SHA256_Update SHA256_Final
|
||||
SHA384_Init SHA384_Update SHA384_Final
|
||||
SHA512_Init SHA512_Update SHA512_Final
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
# https://github.com/libarchive/libarchive/issues/2069
|
||||
# (we can simply update the command since we don't support old lrzip)
|
||||
"${FILESDIR}/${PN}-3.7.2-lrzip.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Needed for flags to be respected w/ LTO
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
|
||||
|
||||
local myconf=(
|
||||
$(use_enable acl)
|
||||
$(use_enable static-libs static)
|
||||
$(use_enable xattr)
|
||||
$(use_with blake2 libb2)
|
||||
$(use_with bzip2 bz2lib)
|
||||
$(use_with expat)
|
||||
$(use_with !expat xml2)
|
||||
$(use_with iconv)
|
||||
$(use_with lz4)
|
||||
$(use_with lzma)
|
||||
$(use_with lzo lzo2)
|
||||
$(use_with nettle)
|
||||
--with-zlib
|
||||
$(use_with zstd)
|
||||
|
||||
# Windows-specific
|
||||
--without-cng
|
||||
)
|
||||
if multilib_is_native_abi ; then
|
||||
myconf+=(
|
||||
--enable-bsdcat="$(tc-is-static-only && echo static || echo shared)"
|
||||
--enable-bsdcpio="$(tc-is-static-only && echo static || echo shared)"
|
||||
--enable-bsdtar="$(tc-is-static-only && echo static || echo shared)"
|
||||
--enable-bsdunzip="$(tc-is-static-only && echo static || echo shared)"
|
||||
)
|
||||
else
|
||||
myconf+=(
|
||||
--disable-bsdcat
|
||||
--disable-bsdcpio
|
||||
--disable-bsdtar
|
||||
--disable-bsdunzip
|
||||
)
|
||||
fi
|
||||
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
if multilib_is_native_abi ; then
|
||||
emake
|
||||
else
|
||||
emake libarchive.la
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
mkdir -p "${T}"/bin || die
|
||||
# tests fail when lbzip2[symlink] is used in place of ref bunzip2
|
||||
ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
|
||||
# workaround lrzip broken on 32-bit arches with >= 10 threads
|
||||
# https://bugs.gentoo.org/927766
|
||||
cat > "${T}"/bin/lrzip <<-EOF || die
|
||||
#!/bin/sh
|
||||
exec "$(type -P lrzip)" -p1 "\${@}"
|
||||
EOF
|
||||
chmod +x "${T}/bin/lrzip" || die
|
||||
local -x PATH=${T}/bin:${PATH}
|
||||
multilib-minimal_src_test
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
# sandbox is breaking long symlink behavior
|
||||
local -x SANDBOX_ON=0
|
||||
local -x LD_PRELOAD=
|
||||
# some locales trigger different output that breaks tests
|
||||
local -x LC_ALL=C.UTF-8
|
||||
emake check
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
if multilib_is_native_abi ; then
|
||||
emake DESTDIR="${D}" install
|
||||
else
|
||||
local install_targets=(
|
||||
install-includeHEADERS
|
||||
install-libLTLIBRARIES
|
||||
install-pkgconfigDATA
|
||||
)
|
||||
emake DESTDIR="${D}" "${install_targets[@]}"
|
||||
fi
|
||||
|
||||
# Libs.private: should be used from libarchive.pc instead
|
||||
find "${ED}" -type f -name "*.la" -delete || die
|
||||
# https://github.com/libarchive/libarchive/issues/1766
|
||||
sed -e '/Requires\.private/s:iconv::' \
|
||||
-i "${ED}/usr/$(get_libdir)/pkgconfig/libarchive.pc" || die
|
||||
}
|
||||
@ -11,7 +11,7 @@ SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD-2 GPL-2"
|
||||
SLOT="0/1.10.0-meson"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="static-libs test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD-2 GPL-2"
|
||||
SLOT="0/1.10.0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="static-libs"
|
||||
|
||||
CMAKE_USE_DIR=${S}/build/cmake
|
||||
|
||||
@ -12,7 +12,7 @@ SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
LICENSE="BSD-2 GPL-2"
|
||||
# https://abi-laboratory.pro/tracker/timeline/lz4/
|
||||
SLOT="0/r132"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="static-libs"
|
||||
|
||||
CMAKE_USE_DIR=${S}/build/cmake
|
||||
|
||||
@ -9,7 +9,7 @@ SRC_URI="https://www.lzop.org/download/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
|
||||
RDEPEND=">=dev-libs/lzo-2"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
@ -11,7 +11,7 @@ SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="public-domain"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-5.0-c23.patch
|
||||
|
||||
@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
|
||||
|
||||
LICENSE="BZIP2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
IUSE="static"
|
||||
|
||||
LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
|
||||
|
||||
@ -15,7 +15,7 @@ SRC_URI="
|
||||
|
||||
LICENSE="ZLIB"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~ppc-macos"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
IUSE="static test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
|
||||
|
||||
LICENSE="BSD-1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
|
||||
@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
|
||||
IUSE="nls"
|
||||
|
||||
DEPEND="app-arch/xz-utils
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tar.asc
|
||||
inherit multiprocessing verify-sig
|
||||
inherit branding multiprocessing verify-sig
|
||||
|
||||
DESCRIPTION="Use this to make tarballs :)"
|
||||
HOMEPAGE="https://www.gnu.org/software/tar/"
|
||||
@ -20,7 +20,7 @@ SRC_URI="
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
if [[ -z "$(ver_cut 3)" || "$(ver_cut 3)" -lt 90 ]] ; then
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
IUSE="acl minimal nls selinux xattr"
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ SRC_URI="https://downloads.sourceforge.net/infozip/${MY_P}.tar.gz
|
||||
|
||||
LICENSE="Info-ZIP"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="bzip2 natspec unicode"
|
||||
|
||||
DEPEND="bzip2? ( app-arch/bzip2 )
|
||||
|
||||
@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
|
||||
|
||||
LICENSE="Info-ZIP"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="bzip2 natspec unicode"
|
||||
|
||||
DEPEND="
|
||||
|
||||
@ -2,5 +2,7 @@ DIST xz-5.6.4.tar.gz 2280985 BLAKE2B 3d27c143f4856589d501bc47ff5c86c1c49b1d0b8c8
|
||||
DIST xz-5.6.4.tar.gz.sig 566 BLAKE2B 475b576431f573b9ce390ae2c43fc4f307f00ef523a741ec6795f182f5ff2c30f2049b1b4d2a3a7e61769bb7dc568de0f5af89661cb09341a58bbcdcdda3c877 SHA512 1ece59b7a540f6d215206ced14759aa971f192433705f8803b6ad8db0857e246145300c853cb571d8750b8152483d13736c478a7c0abb40d7ed25305d80a841c
|
||||
DIST xz-5.8.1.tar.gz 2587189 BLAKE2B 430b14bc0f1382e7ba27ae1466ed2bc0c3e74c10b18db38fd899c9a7d315ffbbeb439d02b7b961de88ccba6064ae631c75f6d1cd03e3e58dac2e65a84b635f81 SHA512 151b2a47fdf00274c4fd71ceada8fb6c892bdac44070847ebf3259e602b97c95ee5ee88974e03d7aa821ab4f16d5c38e50dfb2baf660cf39c199878a666e19ad
|
||||
DIST xz-5.8.1.tar.gz.sig 566 BLAKE2B 66fdf664995781c111349b700918b030af9dacd0612d97b3426913c2d866b459a66bd25558c7ab8121b3f0b07daa46422ea1c4534cf2da7382a94f1553e911a1 SHA512 4a67ed623841d64a5826cef1d5e21f3567ba275ee8f725a1217f76ce2ba25a41c6e22e62f8c7cca74d0d6e8398e8ee8926eab722cc8c1b10c42e990c32765efd
|
||||
DIST xz-5.8.2.tar.gz 2693526 BLAKE2B 50bf4e9dcd1e4579c70aa06bbdd17636c38c87bce313c6e633932b640b2a92736fc15f1769f6a02f4fe45302ae0d26587ebd312825d4f84220b9780b10372117 SHA512 0b808fc8407e7c50da3a7b2db05be732c2fcd41850b92c7f5647181443483848ff359e176c816ce2038c115273f51575877c14f1356417cc9d53845841acb063
|
||||
DIST xz-5.8.2.tar.gz.sig 566 BLAKE2B f0a9bcc55b01e16827972052dc4d84ad47173ba7aa0ae1dad31606b329fb289fcd0061208133398b72591837a73092695f861e901f3b4f97dee9b2ac682f8939 SHA512 91c8d49d8ad0eb1e128203cf2c051fb200ec0e2b5eebea10a39945a998d24f11652a000faefa688d129327593043271314cbf115d78c21eeed738476dd2defb6
|
||||
DIST xz-cve-2025-31115.patch 11948 BLAKE2B a84c380aa6bdaa607d5bffe6370f7a2fb603945aa89f59f053d56e4be90a280b2c56d8e5fd6700a533fb24bd9ec54f047fed96364019f62eeea50adcf4e38657 SHA512 951622698f92844151f105821e1cf5bbe4fd71de5a2ac89a2310c6de80afe34528642c65d12dd4331085e1c23ba3887607bbd6185644c740cbf135c869881a33
|
||||
DIST xz-cve-2025-31115.patch.sig 566 BLAKE2B d6d4bad23ceaec55b6db04a4454885900f961dd6346c112cb97906e2403b718790e3f893d2502ba67ac1a08832478051ea480bdcf339bbf89d0edd13f40a47b4 SHA512 4002472637389c265fbe0f2ad7d80fe29a79bc4d8c1778af76e7cfd29b80d86c3be947ebf620a282494f45071f61534e385c5bed2192e6095ec2fc1338c31ccb
|
||||
|
||||
@ -37,7 +37,7 @@ else
|
||||
"
|
||||
|
||||
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
@ -35,7 +35,7 @@ else
|
||||
"
|
||||
|
||||
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
209
sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.8.2.ebuild
vendored
Normal file
209
sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.8.2.ebuild
vendored
Normal file
@ -0,0 +1,209 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
# Remember: we cannot leverage autotools in this ebuild in order
|
||||
# to avoid circular deps with autotools
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit dot-a flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
# Per tukaani.org, git.tukaani.org is a mirror of github and
|
||||
# may be behind.
|
||||
EGIT_REPO_URI="
|
||||
https://github.com/tukaani-project/xz
|
||||
https://git.tukaani.org/xz.git
|
||||
"
|
||||
inherit git-r3 autotools
|
||||
|
||||
# bug #272880 and bug #286068
|
||||
BDEPEND="sys-devel/gettext >=dev-build/libtool-2"
|
||||
else
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/lassecollin.asc
|
||||
inherit verify-sig
|
||||
|
||||
MY_P="${PN/-utils}-${PV/_}"
|
||||
SRC_URI="
|
||||
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz
|
||||
https://downloads.sourceforge.net/lzmautils/${MY_P}.tar.gz
|
||||
https://tukaani.org/xz/${MY_P}.tar.gz
|
||||
verify-sig? (
|
||||
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz.sig
|
||||
https://tukaani.org/xz/${MY_P}.tar.gz.sig
|
||||
)
|
||||
"
|
||||
|
||||
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Utils for managing LZMA compressed files"
|
||||
HOMEPAGE="https://tukaani.org/xz/"
|
||||
|
||||
# See top-level COPYING file as it outlines the various pieces and their licenses.
|
||||
LICENSE="0BSD LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )"
|
||||
SLOT="0"
|
||||
IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs"
|
||||
|
||||
if [[ ${PV} != 9999 ]] ; then
|
||||
BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20250313 )"
|
||||
fi
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
eautopoint
|
||||
eautoreconf
|
||||
else
|
||||
# Allow building shared libs on Solaris/x64
|
||||
elibtoolize
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use static-libs && lto-guarantee-fat
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf=(
|
||||
--enable-threads
|
||||
$(multilib_native_use_enable doc)
|
||||
$(use_enable nls)
|
||||
$(use_enable static-libs static)
|
||||
$(use_enable cpu_flags_arm_crc32 arm64-crc32)
|
||||
)
|
||||
|
||||
if ! multilib_is_native_abi ; then
|
||||
myconf+=(
|
||||
--disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}
|
||||
)
|
||||
fi
|
||||
|
||||
if ! use extra-filters ; then
|
||||
myconf+=(
|
||||
# LZMA1 + LZMA2 for standard .lzma & .xz files
|
||||
--enable-encoders=lzma1,lzma2
|
||||
--enable-decoders=lzma1,lzma2
|
||||
|
||||
# those are used by default, depending on preset
|
||||
--enable-match-finders=hc3,hc4,bt4
|
||||
|
||||
# CRC64 is used by default, though 7-Zip uses CRC32 by default.
|
||||
# Also, XZ Embedded in Linux doesn't support CRC64, so
|
||||
# kernel modules and friends are CRC32.
|
||||
--enable-checks=crc32,crc64
|
||||
)
|
||||
fi
|
||||
|
||||
if [[ ${CHOST} == *-solaris* ]] ; then
|
||||
export gl_cv_posix_shell="${EPREFIX}"/bin/sh
|
||||
|
||||
# Undo Solaris-based defaults pointing to /usr/xpg4/bin
|
||||
myconf+=( --disable-path-for-script )
|
||||
fi
|
||||
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
# -fprofile-partial-training because upstream note the test suite isn't super comprehensive
|
||||
# TODO: revisit that now we have the tar/xz loop below?
|
||||
# See https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
|
||||
local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic -fprofile-dir=${T}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)")
|
||||
local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/${ABI}-pgo -fprofile-dir=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)")
|
||||
|
||||
emake CFLAGS="${CFLAGS} ${pgo_generate_flags}"
|
||||
|
||||
if use pgo ; then
|
||||
emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check
|
||||
|
||||
local tar_pgo_args=()
|
||||
|
||||
if has_version -b "app-alternatives/tar[gnu]" ; then
|
||||
tar_pgo_args+=(
|
||||
--mtime=@2718281828
|
||||
--sort=name
|
||||
)
|
||||
fi
|
||||
|
||||
if multilib_is_native_abi ; then
|
||||
(
|
||||
shopt -s globstar
|
||||
|
||||
tar \
|
||||
"${tar_pgo_args[@]}" \
|
||||
-cf xz-pgo-test-01.tar \
|
||||
{"${S}","${BUILD_DIR}"}/**/*.[cho] \
|
||||
{"${S}","${BUILD_DIR}"}/**/.libs/* \
|
||||
{"${S}","${BUILD_DIR}"}/**/**.txt \
|
||||
{"${S}","${BUILD_DIR}"}/tests/files
|
||||
|
||||
stat --printf="xz-pgo-test-01.tar.tar size: %s\n" xz-pgo-test-01.tar || die
|
||||
md5sum xz-pgo-test-01.tar || die
|
||||
)
|
||||
|
||||
local test_variants=(
|
||||
# Borrowed from ALT Linux
|
||||
# https://packages.altlinux.org/en/sisyphus/srpms/xz/specfiles/#line-80
|
||||
'-0 -C none'
|
||||
'-2 -C crc32'
|
||||
"$(usev extra-filters '-6 --arm --lzma2 -C crc64')"
|
||||
"$(usev extra-filters '-6 --x86 --lzma2=lc=4 -C sha256')"
|
||||
'-7e --format=lzma'
|
||||
|
||||
# Our own variants
|
||||
''
|
||||
'-e'
|
||||
"$(usev extra-filters '--x86 --lzma2=preset=6e')"
|
||||
)
|
||||
local test_variant
|
||||
for test_variant in "${test_variants[@]}" ; do
|
||||
einfo "Testing '${test_variant}' variant"
|
||||
"${BUILD_DIR}"/src/xz/xz -c ${test_variant} xz-pgo-test-01.tar | "${BUILD_DIR}"/src/xz/xz -c -d - > /dev/null
|
||||
assert "Testing '${test_variant}' variant failed"
|
||||
done
|
||||
fi
|
||||
|
||||
if tc-is-clang; then
|
||||
llvm-profdata merge "${T}"/${ABI}-pgo --output="${T}"/${ABI}-pgo/default.profdata || die
|
||||
fi
|
||||
|
||||
emake clean
|
||||
emake CFLAGS="${CFLAGS} ${pgo_use_flags}"
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
default
|
||||
|
||||
# bug #934370 and bug #450436 (and bug #934515)
|
||||
if ! tc-is-static-only && [[ ! -f "${ED}/usr/$(get_libdir)/liblzma$(get_libname)" ]] ; then
|
||||
eerror "Sanity check for liblzma$(get_libname) failed."
|
||||
eerror "Shared library wasn't built, possible libtool bug"
|
||||
[[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && die "liblzma$(get_libname) not found in build, aborting"
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
strip-lto-bytecode
|
||||
|
||||
find "${ED}" -type f -name '*.la' -delete || die
|
||||
|
||||
if use doc ; then
|
||||
rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
|
||||
}
|
||||
@ -35,7 +35,7 @@ else
|
||||
"
|
||||
|
||||
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
|
||||
|
||||
LICENSE="Info-ZIP"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
IUSE="bzip2 crypt natspec unicode"
|
||||
|
||||
RDEPEND="bzip2? ( app-arch/bzip2 )
|
||||
|
||||
@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}/build/meson
|
||||
|
||||
LICENSE="|| ( BSD GPL-2 )"
|
||||
SLOT="0/1"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="+lzma lz4 static-libs test zlib"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}/build/meson
|
||||
|
||||
LICENSE="|| ( BSD GPL-2 )"
|
||||
SLOT="0/1"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="+lzma lz4 static-libs test zlib"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ S=${WORKDIR}/${P/_alpha[0-9][0-9]}
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
IUSE="acl caps nls unicode selinux"
|
||||
|
||||
BDEPEND="
|
||||
@ -33,9 +33,9 @@ DEPEND="
|
||||
"
|
||||
|
||||
FILECAPS=(
|
||||
-m u+s cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord --
|
||||
-m u+s cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav --
|
||||
-m u+s cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd
|
||||
-M u-s cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord --
|
||||
-M u-s cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav --
|
||||
-M u-s cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd
|
||||
)
|
||||
|
||||
cdrtools_os() {
|
||||
@ -278,8 +278,7 @@ src_install() {
|
||||
emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
|
||||
LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" install
|
||||
|
||||
# Let fcaps handle this
|
||||
fperms 0755 /usr/bin/{cdda2wav,cdrecord,readcd}
|
||||
fperms 4755 /usr/bin/{cdda2wav,cdrecord,readcd}
|
||||
|
||||
# These symlinks are for compat with cdrkit.
|
||||
dosym schily /usr/include/scsilib
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
DIST aardvark-dns-1.14.0.crate 58825 BLAKE2B 4c87b1986308aea5367042374fe5311f7a219bcd953a417526f0e67cda5b09ab9300ba9bcd9a40668be2267e7506c6c6ebc5f84d5eaf69101541065e40983ffc SHA512 c65258b2d3c2d9f0b507f1bdbddbd3235ac0745b3103631b16b99bd55473bed5eeb54e4d4b76610ec24f983846bfed1007f41b546135c9950bc7047ee588d389
|
||||
DIST aardvark-dns-1.15.0.crate 59884 BLAKE2B 6be0126b526359b1c402a6f10cfe9b28b9d351621b0f1e9556150fb2477a2c468938dbac1c11bde3eff6deb258ccfa6ed05e6f2a01206d3e08f1e88193016432 SHA512 963d68a662439ea920fbeec08eaa3b9fb486f5e61e46b702b0c9211241c3b1057ce573bac1f75ed558faa0cc99b0f36b7f5299c296e30b6ce6ed046a02cd9782
|
||||
DIST aardvark-dns-v1.14.0-vendor.tar.gz 7516081 BLAKE2B d11cc8bf1ae6c21b47bb56a92426494b99467f50e5058dce21956dfd399456ddaf235d5308c770fe71a8d17ce727acbc9c6670d01f165eed08a7a4c4865b66c3 SHA512 0d738d0a737bfc9b6b2fe728de343a6a91c6e197d888fd37c0859b831b05f8c92efce13c268fc8f31a09bb78d43f4330230a0454744523df5a4fa96498ca3dac
|
||||
DIST aardvark-dns-1.17.0.crate 62370 BLAKE2B 7105e4c96e973d6cbda48d7db957423a0743330c53fd694be14951b85ba162624ffa3d96d6737856d7e5d39910a26403a4ab11e912317d6449a85642c8c5d236 SHA512 f8cc4f39b9a16106a7fbe08c94558507e0519018709ceb80474696be24328626f76aedf9bdd12c853be0728f4e9c57e945b442e7f66c22042e25410a690b69e0
|
||||
DIST aardvark-dns-v1.15.0-vendor.tar.gz 9910590 BLAKE2B 876be4b719cf7d364dbd8ce04a3984d32b24dfba81ece1ce56d1f3e3f80f2607eefd77ff7dece2a678240b1f996cb498ae81f1be06c8f7eaa696eb6001090e4b SHA512 fbe6e77a2d412ed34bcf2c710db3aa8989a5887ab475988c393fb1c49584cac5b09a34b82e880eebe81c59af7817985af87391ffb8421da07abf080704cae5c0
|
||||
DIST aardvark-dns-v1.17.0-vendor.tar.gz 10267613 BLAKE2B 72b5da08584c5a35188d50646ec98b6463578b09520121224807e3770d6e911b12f61597ca5852be75a8e9de9ade02d507f490ff3a414e681fe31076930dde78 SHA512 b7ec2a2a34d5bb36dbcc55611dc9ec0ff2c1bed4469cc4b12d4eb0bd78bb7d6cae6f80a02ac32ade5c435fdd11e22ddd99646aa4de504c8369ee56cfa470e6a5
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
|
||||
EAPI=8
|
||||
|
||||
RUST_MIN_VER="1.87.0"
|
||||
[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}"
|
||||
inherit cargo
|
||||
|
||||
@ -15,7 +16,7 @@ if [[ ${PV} == 9999* ]]; then
|
||||
else
|
||||
SRC_URI="${CARGO_CRATE_URIS}"
|
||||
SRC_URI+="https://github.com/containers/aardvark-dns/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
|
||||
KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv"
|
||||
KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
|
||||
fi
|
||||
|
||||
# main
|
||||
@ -23,6 +24,7 @@ LICENSE="Apache-2.0"
|
||||
# deps
|
||||
LICENSE+=" 0BSD Apache-2.0-with-LLVM-exceptions MIT Unlicense Unicode-DFS-2016 ZLIB"
|
||||
SLOT="0"
|
||||
|
||||
QA_FLAGS_IGNORED="usr/libexec/podman/${PN}"
|
||||
QA_PRESTRIPPED="usr/libexec/podman/${PN}"
|
||||
ECARGO_VENDOR="${WORKDIR}/vendor"
|
||||
@ -42,6 +44,6 @@ src_prepare() {
|
||||
}
|
||||
|
||||
src_install() {
|
||||
export PREFIX="${EPREFIX}"/usr
|
||||
local -x PREFIX="${EPREFIX}"/usr
|
||||
default
|
||||
}
|
||||
@ -1,8 +1,9 @@
|
||||
# Copyright 2023-2024 Gentoo Authors
|
||||
# Copyright 2023-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
RUST_MIN_VER="1.87.0"
|
||||
[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}"
|
||||
inherit cargo
|
||||
|
||||
@ -23,6 +24,7 @@ LICENSE="Apache-2.0"
|
||||
# deps
|
||||
LICENSE+=" 0BSD Apache-2.0-with-LLVM-exceptions MIT Unlicense Unicode-DFS-2016 ZLIB"
|
||||
SLOT="0"
|
||||
|
||||
QA_FLAGS_IGNORED="usr/libexec/podman/${PN}"
|
||||
QA_PRESTRIPPED="usr/libexec/podman/${PN}"
|
||||
ECARGO_VENDOR="${WORKDIR}/vendor"
|
||||
@ -42,6 +44,6 @@ src_prepare() {
|
||||
}
|
||||
|
||||
src_install() {
|
||||
export PREFIX="${EPREFIX}"/usr
|
||||
local -x PREFIX="${EPREFIX}"/usr
|
||||
default
|
||||
}
|
||||
|
||||
@ -5,4 +5,4 @@ DIST containerd-2.0.5.tar.gz 10452563 BLAKE2B bf03316c9211eaa17a3b40b1fc9f9aca42
|
||||
DIST containerd-2.1.0.tar.gz 10610618 BLAKE2B 147c21b4650543af9b0e533e381a0505ba927d6e9270b9b03a09016eb3ccf29875db7fa274944fea2ff7b029b6a05a17d14c61e24b5f3426b31f320831eeb46a SHA512 e9bb128917bb6b2e21a8e05344af3fdcdda8620be20e54407bc2c73046278a88a77bcbed6ef7a59099c9ee3303283db46b90b71afdd45236d3c534749ba844e0
|
||||
DIST containerd-2.1.1.tar.gz 10610787 BLAKE2B acc2d769752c783643795d228c0d267b0802e09166dc783e84087da0029a822a64688f5e59c047c47b25f50ca2a1ccb7f5b6216ad6beeb4489df308e525e9716 SHA512 542f7cae61e1ef2e1b529b0bea66d7ad9016d4605de73de9c9c8a738e50ec6f470b939d1546482320515b77424bffe1cf24b721173ac0c0ecd0100c92817cfb1
|
||||
DIST containerd-2.1.4.tar.gz 10614131 BLAKE2B b8f4007b4bb368a1fa04c913d606f65d2ea4a17a6419ce12f2b6112eee2574d7a09fb8e2500d1c2f21bef8792dc047df4d63446211ae006662e616facda91f24 SHA512 a9f84784e917621ee5ea38ad20b8106e642fbf463a00d319b73a1a8e4d1fdd5be2fba0789b6a5d31107ef239d3713eced99ce979d4b2764714271a63c0936c15
|
||||
DIST containerd-2.1.5.tar.gz 10622156 BLAKE2B b612e9606554d492f59d4665dcbd85b0fdfa3316ecff3a2122357f8d8ef68991a2b77c367e3a7143efb768e9a78ee82ace9ffdc0832a9eb4ec37e98b0f827840 SHA512 6376228edf615b1ff3d40287622d4f72793be091d59d5d7e97f7bdc4f265aa4412f4a5dd1937ef795e54aa5ee8a87d785e859d7c6525a25fa86631b878cefc59
|
||||
DIST containerd-2.2.0.tar.gz 11475770 BLAKE2B 154d7d547d52925ff46431cea20db38dc72ec87ef90fd112472cb3ec7f2ebd8cfb121f98a3bc3870f8452473b35c3e1c84671b9fc31347f98259b34a70e740f9 SHA512 3121a1e0401e0283ff9d8454e945b427bcb0214e7e67271815117cb82dee1488c4d963c2193eb9c0ab5d395dd2e2705975ac31ce3e400264933d05d62fd0faac
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
EAPI=8
|
||||
inherit go-env go-module systemd toolchain-funcs
|
||||
GIT_REVISION=fcd43222d6b07379a4be9786bda52438f0dd16a1
|
||||
GIT_REVISION=1c4457e00facac03ce1d75f7b6777a7a851e5c41
|
||||
|
||||
DESCRIPTION="A daemon to control runC"
|
||||
HOMEPAGE="https://containerd.io/"
|
||||
@ -26,7 +26,7 @@ ${COMMON_DEPEND}
|
||||
# recommended minimum version of runc is found in script/setup/runc-version
|
||||
RDEPEND="
|
||||
${COMMON_DEPEND}
|
||||
>=app-containers/runc-1.3.3[apparmor?,seccomp?]
|
||||
>=app-containers/runc-1.3.0[apparmor?,seccomp?]
|
||||
"
|
||||
|
||||
BDEPEND="
|
||||
@ -1 +1,2 @@
|
||||
DIST containers-common-0.63.0.tar.gz 13516320 BLAKE2B f9d57d11210041065f2d5479d68d0318d5d49c634038f7db8601becc1c6bb801314a5aaacb6392f3f802ed8acde60284d78d49351ea8a8f9eaa3a3c449ba5727 SHA512 5d09a5d5fda8a3bafc2b1954b8b82cbc73747e9a088f220090d790cca203f330d0dbe45148a6ea2808448705506f4ff13ca05c85a2c2643cceff41cbe0f5ce9f
|
||||
DIST containers-common-0.64.2.tar.gz 13131015 BLAKE2B a4dc8484d9f1002c9e94a38396a767771df2260a15e371d20981db98d6ded7f563b4e25a2ff8f6912789264bfd4586826dd1821df2807f9c1d16baeab9601b8d SHA512 658044746d338de46b41577d7ae929b45b6de639dc33e671b2901527d9c069354fe586a7595ba514938fcedd9400c0ce47b10a3af92c4dc6aa29443d89a83ef5
|
||||
|
||||
@ -0,0 +1,83 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit readme.gentoo-r1
|
||||
|
||||
DESCRIPTION="Common config files and docs for Containers stack"
|
||||
HOMEPAGE="https://github.com/containers/common"
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/containers/common.git"
|
||||
else
|
||||
SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/${P#containers-}"
|
||||
KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
RESTRICT="test"
|
||||
RDEPEND="
|
||||
>=app-containers/aardvark-dns-1.12.0
|
||||
>=app-containers/crun-1.17
|
||||
>=app-containers/containers-image-5.32.0
|
||||
>=app-containers/containers-storage-1.55.0
|
||||
app-containers/containers-shortnames
|
||||
>=app-containers/netavark-1.12.0
|
||||
net-firewall/nftables
|
||||
net-firewall/iptables[nftables]
|
||||
>=net-misc/passt-2024.09.06
|
||||
>=sys-fs/fuse-overlayfs-1.14
|
||||
"
|
||||
|
||||
BDEPEND="
|
||||
>=dev-go/go-md2man-2.0.3
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/examplify-mounts-conf.patch"
|
||||
)
|
||||
|
||||
DOC_CONTENTS="\n
|
||||
For rootless operations, one needs to configure subuid(5) and subgid(5)\n
|
||||
See /etc/sub{uid,gid} to check whether rootless user is already configured\n
|
||||
If not, quickly configure it with:\n
|
||||
usermod --add-subuids 1065536-1131071 <rootless user>\n
|
||||
usermod --add-subgids 1065536-1131071 <rootless user>\n
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
[[ -f docs/Makefile && -f Makefile ]] || die
|
||||
sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake docs
|
||||
touch {images,layers}.lock || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${ED}" install
|
||||
readme.gentoo_create_doc
|
||||
|
||||
insinto /usr/share/containers
|
||||
doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf
|
||||
|
||||
keepdir /etc/containers/{certs.d,oci/hooks.d,networks,systemd} /var/lib/containers/sigstore \
|
||||
/usr/lib/containers/storage
|
||||
diropts -m0700
|
||||
dodir /usr/lib/containers/storage/overlay-{images,layers}
|
||||
for i in images layers; do
|
||||
insinto /usr/lib/containers/storage/overlay-"${i}"
|
||||
doins "${i}".lock
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
readme.gentoo_print_elog
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST containers-image-5.34.2.tar.gz 766227 BLAKE2B 27593e4d0035aee9eabc1011a837f16369d7985558ae1275e6726ff1b859d09ab036f150dc978ab0290cee7ba2b0878c50edcb131a2eb63ff947567fa1f10c2a SHA512 7e7cc5bfd2e8d71c332f08aab34c1b1cccadcf9f313d9519a294e9dfc370fd48d18f1e00dd0d74a19edf40ac511a544033fc27cf9537dcbb9458f721d88d564d
|
||||
DIST containers-image-5.35.0.tar.gz 766486 BLAKE2B c1708dd15eb9e8fdff739425542b5ead5f1e782e62b609b0d81fe4b5ad7ed5c61fe99bb4d9e29ea6d772bb9f093a286ed13c354cab48ad2681e111a073d124d6 SHA512 0acd064451184aa91d331bf113b934de10bf2e9225236b907c86006aed51cf4a8604cc57c73a2ae80848bc090b661548a7127b8b5112143f57c030ef5820333e
|
||||
DIST containers-image-5.36.2.tar.gz 764570 BLAKE2B eefd4dbdbc8e4ccf0123e641bf38287667e7b0999672349739f8d589609652254a6a93be5ee471d43a0f7433548d7a2bea304dc2868e180f663f5354706f521d SHA512 14355b1e97d5f1f778442758c5547e0892e1c6919fd33ff604ec2065198addb89e504a29fac447816e0d8479bba9a06364887cd854db475a4a28d8562cce0777
|
||||
|
||||
@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
|
||||
else
|
||||
SRC_URI="https://github.com/containers/image/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/${P#containers-}"
|
||||
KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
|
||||
KEYWORDS="amd64 arm64 ~loong ~riscv"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
|
||||
@ -0,0 +1,38 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DESCRIPTION="Default config and docs related to Containers' images"
|
||||
HOMEPAGE="https://github.com/containers/image"
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/containers/image.git"
|
||||
else
|
||||
SRC_URI="https://github.com/containers/image/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/${P#containers-}"
|
||||
KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
|
||||
# https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
|
||||
RESTRICT='test'
|
||||
BDEPEND=">=dev-go/go-md2man-2.0.3"
|
||||
RDEPEND="!<=app-containers/containers-common-0.57.0"
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/remove-go-as-bdepend-5.34.2.patch
|
||||
)
|
||||
|
||||
src_compile() {
|
||||
emake docs
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${ED}" install
|
||||
|
||||
insinto /etc/containers
|
||||
doins registries.conf
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST containers-storage-1.55.1.tar.gz 4197824 BLAKE2B 5859e2267096541449aeff8576ad1dc00a72993d123ec5571e775f0081a6bc9cfc588bfd522bf7742bd417314e3a699d51e57127f66c152abb7cf805ffe61464 SHA512 3ba244d28e25c6a88f01a73ff26a4a0747c71124a6191d086d8521e1622f36740cfa0b1cbac56f7699a5af9a7001382e71c32fd0644960a53a97c00fd09a754e
|
||||
DIST containers-storage-1.57.2.tar.gz 4258308 BLAKE2B 1d068aaeb984060d1934c55e71824520963f32fe00c19b978e317032408c555c7f0ac028c9900e840a4ba7d1369892669cca15acb4f2d4ce9bdae77e3c29c636 SHA512 f092df52d2b8512d453ca4964304363481ef6bda3d05998654a2e3269fc9494af3a9c7c98f2a6895f6595c43733a4e9ebd39e3b62e1575a036134a8547dc3081
|
||||
DIST containers-storage-1.59.1.tar.gz 4606021 BLAKE2B a9814a21fa8937af0fcbc9f08d7ac7ee926be91014edfae4ab39df8417d0fbf6eefa910136451e23f5d8873fadcd4f92a451999bdba5bc41d3ade4715a9a0f50 SHA512 966dfec3cbf2210a07ebbfed481d7f546fb1bd649cfe4166238986dc92772b93748b8c9083dd8b8f6c303fac15c82e369337404d5d0dd5c4caa0b670b4f59298
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DESCRIPTION="Default config and docs related to Containers' storage"
|
||||
HOMEPAGE="https://github.com/containers/storage"
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/containers/storage.git"
|
||||
else
|
||||
SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/${P#containers-}"
|
||||
KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
|
||||
BDEPEND=">=dev-go/go-md2man-2.0.2"
|
||||
|
||||
src_compile() {
|
||||
emake -C docs GOMD2MAN=go-md2man containers-storage.conf.5
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${ED}" -C docs install
|
||||
|
||||
insinto /usr/share/containers
|
||||
doins storage.conf
|
||||
}
|
||||
@ -11,7 +11,7 @@ SRC_URI="https://github.com/kubernetes-sigs/cri-tools/archive/v${PV}.tar.gz -> $
|
||||
|
||||
LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64"
|
||||
KEYWORDS="amd64 ~arm64"
|
||||
RESTRICT="test"
|
||||
|
||||
DOCS=( docs {README,RELEASE,CHANGELOG,CONTRIBUTING}.md )
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user