commit: 5bdb1cd0a5fd960f4610f1991ad67bd4dddfa909
Author: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
AuthorDate: Tue Jun 11 22:52:07 2024 +0000
Commit: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
CommitDate: Tue Jun 11 22:52:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=5bdb1cd0
Correct seccomp patch for podman release 5.1.1.
Signed-off-by: Samuel Bernardo <samuelbernardo.mail <AT> gmail.com>
app-containers/podman/Manifest | 5 +++--
app-containers/podman/files/seccomp-toggle-5.1.1.patch | 18 ++++++++++++++++++
app-containers/podman/podman-5.1.1.ebuild | 2 +-
app-containers/podman/podman-9999.ebuild | 2 +-
4 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index dc29368..4591f22 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -7,7 +7,8 @@ AUX podman-restart-5.0.0_rc4.confd 284 BLAKE2B
e2e5394428d95e9fa480f32ef3efcddc8
AUX podman-restart-5.0.0_rc4.initd 641 BLAKE2B
c62aa18fe0da2d00032f09bc2e23debfc916c12a9ebdd22666c000c09242140b592fb08f1e961cf2dc66eb9eeb6ddaf7336713574fb2708620588904168ded51
SHA512
b947c3f6e3dc4d58008c16c7bc77306877b7375334eeb96a714541c8534bcb4ca25d85e2204af96a3d14471b966c0b59542694777b907dddeff15f8995889a2c
AUX podman.logrotated 85 BLAKE2B
730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e
SHA512
0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
AUX seccomp-toggle-4.7.0.patch 400 BLAKE2B
9f02e58c06b507a294207c66bd5ea218f87803a9b9f0ddafc86a8b21df912589357adf054302e5a69d300155bdf8dcd8b77c18c1ddf8a4042ae1f05de5faf46d
SHA512
e507e3a52d2f5f48b65fdb77ceaa095f13fda3e834dafc976bcd291cb35755da879c9c99b7950b2905399dedf4ac3370bd70462343648613a7c6aedc141d7ef7
+AUX seccomp-toggle-5.1.1.patch 584 BLAKE2B
24c53db225185ab26b5b2a0c1fabf3d38c434639b010dbb67a1978483c8ad11721b27503e1c7b209e0c8f5c01fa04780f874ddff0daa2860b7b15ac80986206d
SHA512
efae7eeae1fb3b2198b3f2fbbdb05ab26132d170b6d963b52f67d81375391e6b1a7d5f938dfb5d38b2f4313bd9be1b8a18039a291460e843a22eae3c539ffb17
DIST podman-5.1.1.tar.gz 23794366 BLAKE2B
0612a148972c96f532e96a8eb1ab388d80b32fe2ca7c5626e615748ef269a853407aeb39f34686d9eb75de239882e524cf5ee7c97152caccf5f77eb6ecfd54d8
SHA512
e896ee97980da4a522eb865d2eacb6876dd8bc5be1488aed8bd81a81af95faa1383b176b5d236d4af0f76bc30ddad5230df3e11c59ffc6f86e5b4cf3876ff184
-EBUILD podman-5.1.1.ebuild 3581 BLAKE2B
9e0e9beb556ac2cb7ccfc3ecb8f41d5fdd44945dc53b65ce55c06dd02aacddec7b6921b703d2da59a0f01c90a21c5f2c1c5a32bcebd1ddb0964ecae1c43b8617
SHA512
b613ceab57b3ff1c4d1b84e1dbaaaed4b70cddaf5e71338416f8c4d300fb1b95e1e7f5d23efb51cc90511f208dccbc4d00bf0c45e98f215411bb13bfd5f61284
-EBUILD podman-9999.ebuild 3581 BLAKE2B
9e0e9beb556ac2cb7ccfc3ecb8f41d5fdd44945dc53b65ce55c06dd02aacddec7b6921b703d2da59a0f01c90a21c5f2c1c5a32bcebd1ddb0964ecae1c43b8617
SHA512
b613ceab57b3ff1c4d1b84e1dbaaaed4b70cddaf5e71338416f8c4d300fb1b95e1e7f5d23efb51cc90511f208dccbc4d00bf0c45e98f215411bb13bfd5f61284
+EBUILD podman-5.1.1.ebuild 3581 BLAKE2B
43a32309c23de8738fb9c4e88b74ef97d6319dab1a819dba2c8b321c26a7fa752514062d81f464f9c1e1c6d35d2d9ef8cc5ca6f3679557325de3e8610f0199fb
SHA512
d4e36167ca59bf0f665565d184ff4de960c7b9db498fe0fae6ea253272c30be59bbe399cee9708b4beffbcf7a95caf2141b57e120b7ceb92e437daccf424b983
+EBUILD podman-9999.ebuild 3581 BLAKE2B
43a32309c23de8738fb9c4e88b74ef97d6319dab1a819dba2c8b321c26a7fa752514062d81f464f9c1e1c6d35d2d9ef8cc5ca6f3679557325de3e8610f0199fb
SHA512
d4e36167ca59bf0f665565d184ff4de960c7b9db498fe0fae6ea253272c30be59bbe399cee9708b4beffbcf7a95caf2141b57e120b7ceb92e437daccf424b983
MISC metadata.xml 1709 BLAKE2B
0138cd1f7fec54f2b15f8a8af7a29ee0202b0c824371ed6f45726c06e84c5a0c78e6446f817ee2b81c44320203b50c54072757b9cd271080cd07a072141760ce
SHA512
65fdac8344812dd71fcf7018da7320a055870f48af6c4f623a9c65f5375e69eee142409ff3451c5e046eef648e0ac00bf96550a7dfc37be5b7aa3aff1a51d42b
diff --git a/app-containers/podman/files/seccomp-toggle-5.1.1.patch
b/app-containers/podman/files/seccomp-toggle-5.1.1.patch
new file mode 100644
index 0000000..02adc9c
--- /dev/null
+++ b/app-containers/podman/files/seccomp-toggle-5.1.1.patch
@@ -0,0 +1,18 @@
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile 2024-06-11 23:40:49.548321758 +0100
++++ b/Makefile 2024-06-11 23:42:32.662691391 +0100
+@@ -55,8 +55,12 @@
+ $(shell hack/btrfs_tag.sh) \
+ $(shell hack/systemd_tag.sh) \
+ $(shell hack/libsubid_tag.sh) \
+- exclude_graphdriver_devicemapper \
+- seccomp
++ exclude_graphdriver_devicemapper
++
++BUILD_SECCOMP ?= yes
++ifeq ($(BUILD_SECCOMP),yes)
++BUILDTAGS += seccomp
++endif
+ # allow downstreams to easily add build tags while keeping our defaults
+ BUILDTAGS += ${EXTRA_BUILDTAGS}
+ # N/B: This value is managed by Renovate, manual changes are
diff --git a/app-containers/podman/podman-5.1.1.ebuild
b/app-containers/podman/podman-5.1.1.ebuild
index 738613b..5e9adcf 100644
--- a/app-containers/podman/podman-5.1.1.ebuild
+++ b/app-containers/podman/podman-5.1.1.ebuild
@@ -51,7 +51,7 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/seccomp-toggle-4.7.0.patch"
+ "${FILESDIR}/seccomp-toggle-5.1.1.patch"
)
CONFIG_CHECK="
diff --git a/app-containers/podman/podman-9999.ebuild
b/app-containers/podman/podman-9999.ebuild
index 738613b..5e9adcf 100644
--- a/app-containers/podman/podman-9999.ebuild
+++ b/app-containers/podman/podman-9999.ebuild
@@ -51,7 +51,7 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/seccomp-toggle-4.7.0.patch"
+ "${FILESDIR}/seccomp-toggle-5.1.1.patch"
)
CONFIG_CHECK="
