diff options
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/Manifest.gz | bin | 15490 -> 15494 bytes | |||
| -rw-r--r-- | app-emulation/cloud-init/Manifest | 5 | ||||
| -rw-r--r-- | app-emulation/cloud-init/cloud-init-24.4-r3.ebuild (renamed from app-emulation/cloud-init/cloud-init-24.4.ebuild) | 2 | ||||
| -rw-r--r-- | app-emulation/cloud-init/cloud-init-9999.ebuild | 1 | ||||
| -rw-r--r-- | app-emulation/cloud-init/files/cloud-init-24.4-netcat.patch | 68 |
5 files changed, 74 insertions, 2 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz Binary files differindex bdf1e168d76b..6e130041393e 100644 --- a/app-emulation/Manifest.gz +++ b/app-emulation/Manifest.gz diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest index cf23abe192db..2b8bdb20b558 100644 --- a/app-emulation/cloud-init/Manifest +++ b/app-emulation/cloud-init/Manifest @@ -1,10 +1,11 @@ AUX cloud-init-24.2-systemd.patch 6036 BLAKE2B 410cf02f66d19adfa11ff7359bd539fad860dd8a37412b1023ce11017cd4921782c3aa279d16182012af9ce5b5776273de0b05c83e850104768b5968435221ab SHA512 4f82ffe1a4f78487c65cbf52920f2ae4720ad02a148cdd4dea02b3d9cc96209cbd978559b0964f25d832ce700e47bb3082fe8b180a783251e36cef941238331f +AUX cloud-init-24.4-netcat.patch 3606 BLAKE2B 8fbe9919b99eef3212b0ae6f6e8c4ebaf492a706f0232e31de301a84d7f0ccff72f842694bb7d4faaeced9f48f09bb997e1b38115b8de6612e5c2575a36752a2 SHA512 450d66f1aa2e85e7e532d2104547b640426bdf0a32a734f25c2a2d94a76b0a68b5a05770f5899f6ba65624e90c1b731165972d3cc5133e55460f0e6aafd48acd DIST cloud-init-23.4.tar.gz 1648908 BLAKE2B 0acec9c437c7a5a86ed9cd8718830a7311c257ae9f223a68959b8d1eccc693b35f6a716de5c04112d848c1e2e54f6461a3919fd733debba18989145f6669d359 SHA512 34966b173571764bf83779bef0e89a86971310ff0fa62feceef4fbe17c9fa6d1b69f11f57caaa32cc4ae4a74f598f157dfb3ce356221044666401230cfb1ad13 DIST cloud-init-24.2.tar.gz 1786275 BLAKE2B 21f5209a77ef401d12271f6ea695d84065b22f40b7273dd8709dee5fadc7038a0f59a9a3dd53b73812a44a603b5cdc7fb36b71fcdb1f2d4295d87d2cc6069fcd SHA512 72de351b3e978e01a4695b58987d942cc1b2faee749ac0df2024a839e0e1539c9b1f0a9e5cf1930e33c36344d152b7580cfe2dd55f95ad4f669df9b4dda4648d DIST cloud-init-24.4.tar.gz 1871271 BLAKE2B 438d1296a637211d7a43c9969de6d432b1ab787beab7f617426cdeab67d1c1df28e1adfa610af4dad44c7f46850954ad3d1856bfff143648da0f87fbc4ebdefc SHA512 1c6901497848d8be29ffb0a7bcbbd2df89d0a2b35a65c33f3db9562a544d9e832308f448dcc24a555791b40f00aca32e5d25b8ad3ccb5e90dda6268e5a125f9c EBUILD cloud-init-23.4.ebuild 2362 BLAKE2B 0ad4cd3a7ff10f1eb4c8ba8a904f8b1c26a65019c01419a8154a3e15069ae7d52e0228246a13d26d134f359fac0b72b7205b17042a20e43a410fa1a6c2d94713 SHA512 a9aaddc3e11e999e4be33c312d42bd117f2ac99883695959e58dec174c3dfec435c5e722e5384c48d1baf6934dbecb498f142adc9404c7d482aa4c9c111dc1db EBUILD cloud-init-24.2-r1.ebuild 2558 BLAKE2B 90422320e92fbaacfc8a74c4353f0b3b4326cdc958544d8160fe4f2da934b2efef38b1896ee1e84d014a8e64cac8d68c2476f4780511dc7dc1889e06f8e6e289 SHA512 cb4fa4fe176182b9def0ef994d63c701a31290076f4d06d46c0dc68965ce938cab451ed6f215f7eb22e0621a26fd95bdcc66e19d0d56de981a2da4660a27c0e3 EBUILD cloud-init-24.2.ebuild 2501 BLAKE2B f54a3b02b334e2470ca858065c0ec484c69845db2361e888523e3d45685d3999f4f2e682f9e1eb9f5efe1b666ba813e949ac07aacf08a78442090fc0ae4f8b8f SHA512 bcecb78eefe8e70b93f2915501306a5f98129d43a7550ed15378bf0243e378ebbf72bbb6fcdd6b98d1c5d3fc675c5b417d9bdbf4e00bfa07c387343f3afddb22 -EBUILD cloud-init-24.4.ebuild 2558 BLAKE2B 90422320e92fbaacfc8a74c4353f0b3b4326cdc958544d8160fe4f2da934b2efef38b1896ee1e84d014a8e64cac8d68c2476f4780511dc7dc1889e06f8e6e289 SHA512 cb4fa4fe176182b9def0ef994d63c701a31290076f4d06d46c0dc68965ce938cab451ed6f215f7eb22e0621a26fd95bdcc66e19d0d56de981a2da4660a27c0e3 -EBUILD cloud-init-9999.ebuild 2505 BLAKE2B e375f990cd74e143a0189a8d07bf872e730d1cd70d2ccf0c39a049a61457c15f05a9f820dc413d92ebf94634cf99b7e1d826fdfe832d1c9c0c6bed063437cb46 SHA512 41d723eea3539e1428b33571b0b9b7c88779a87f8614f0c8bd303cc240e19d12032dcbbcbaa576f6cf7a60d7b668f2aec556435d7a282e258691a2e9e86df6f1 +EBUILD cloud-init-24.4-r3.ebuild 2626 BLAKE2B ece8fc554b7da53e0d350f247877226db1da56924b4e1c57b5492f8f79af6f52a0d4f05afa75dfd20d7ee00c2950f8b2c26ca0c599ca5619437c0daac164113d SHA512 c8066d6562aa3497f576b8f21e37b2022d3ce201e8591f928fa1009d466f51e8b5629fff89bd9731b7833e828b3afea824c158d3e67a9a607996dc4616f5bcb9 +EBUILD cloud-init-9999.ebuild 2534 BLAKE2B 84d307da57bc653641d69e94c7efd4d15426a1bf5a37ff5bf251dc53984b4089da624d338ceae4ae0fb6aac461bfcfcb5344eba42c571869bcda7bc851ffc61f SHA512 abbc02fdf84b0a102ea142c322084723ba6e2354b35dfe78184dcff4967cfd3ad31613fbfc7836ff9a46b15038d0380256b9de686597bafef655eda164ceede4 MISC metadata.xml 714 BLAKE2B 22888016216cea9e471f7cef63e94022c344961263a3319508d5b23db64eeaaeb34a470fc51482bf7a0a4cb658dd814f5655393ee4498a7212ccec28caee5256 SHA512 3bd7be60f29d5a1e4a830577c0afc8c5925123f1258a78b82dbc36c8f76f096149db8bcebfaf3b6db5feeab0bc82ccb65d7d71ec12feb4f56027f05eeb930401 diff --git a/app-emulation/cloud-init/cloud-init-24.4.ebuild b/app-emulation/cloud-init/cloud-init-24.4-r3.ebuild index 8c137fe19521..953aeaac7af3 100644 --- a/app-emulation/cloud-init/cloud-init-24.4.ebuild +++ b/app-emulation/cloud-init/cloud-init-24.4-r3.ebuild @@ -49,6 +49,7 @@ BDEPEND=" RDEPEND=" ${CDEPEND} net-analyzer/macchanger + net-analyzer/openbsd-netcat sys-apps/iproute2 sys-fs/growpart virtual/logger @@ -63,6 +64,7 @@ EPYTEST_IGNORE=( PATCHES=( "${FILESDIR}/${PN}-24.2-systemd.patch" + "${FILESDIR}/${PN}-24.4-netcat.patch" ) distutils_enable_tests pytest diff --git a/app-emulation/cloud-init/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-9999.ebuild index b03da2ebc190..128407ca66ec 100644 --- a/app-emulation/cloud-init/cloud-init-9999.ebuild +++ b/app-emulation/cloud-init/cloud-init-9999.ebuild @@ -49,6 +49,7 @@ BDEPEND=" RDEPEND=" ${CDEPEND} net-analyzer/macchanger + net-analyzer/openbsd-netcat sys-apps/iproute2 sys-fs/growpart virtual/logger diff --git a/app-emulation/cloud-init/files/cloud-init-24.4-netcat.patch b/app-emulation/cloud-init/files/cloud-init-24.4-netcat.patch new file mode 100644 index 000000000000..745ce4eaef20 --- /dev/null +++ b/app-emulation/cloud-init/files/cloud-init-24.4-netcat.patch @@ -0,0 +1,68 @@ +From 50932590203101f5d8217afc02d8c2b4cecabbd4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> +Date: Sun, 15 Dec 2024 15:12:40 +0100 +Subject: [PATCH] fix: use program name of netcat as installed by upstream, + "nc" + +--- + systemd/cloud-config.service | 2 +- + systemd/cloud-final.service | 2 +- + systemd/cloud-init-local.service.tmpl | 2 +- + systemd/cloud-init-network.service.tmpl | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/systemd/cloud-config.service b/systemd/cloud-config.service +index 54599b346..68f80d2b3 100644 +--- a/systemd/cloud-config.service ++++ b/systemd/cloud-config.service +@@ -16,7 +16,7 @@ Type=oneshot + # process has completed this stage. The output from the return socket is piped + # into a shell so that the process can send a completion message (defaults to + # "done", otherwise includes an error message) and an exit code to systemd. +-ExecStart=sh -c 'echo "start" | netcat -Uu -W1 /run/cloud-init/share/config.sock -s /run/cloud-init/share/config-return.sock | sh' ++ExecStart=sh -c 'echo "start" | nc -Uu -W1 /run/cloud-init/share/config.sock -s /run/cloud-init/share/config-return.sock | sh' + RemainAfterExit=yes + TimeoutSec=0 + +diff --git a/systemd/cloud-final.service b/systemd/cloud-final.service +index c48f95c4f..fb74a47c8 100644 +--- a/systemd/cloud-final.service ++++ b/systemd/cloud-final.service +@@ -19,7 +19,7 @@ Type=oneshot + # process has completed this stage. The output from the return socket is piped + # into a shell so that the process can send a completion message (defaults to + # "done", otherwise includes an error message) and an exit code to systemd. +-ExecStart=sh -c 'echo "start" | netcat -Uu -W1 /run/cloud-init/share/final.sock -s /run/cloud-init/share/final-return.sock | sh' ++ExecStart=sh -c 'echo "start" | nc -Uu -W1 /run/cloud-init/share/final.sock -s /run/cloud-init/share/final-return.sock | sh' + RemainAfterExit=yes + TimeoutSec=0 + TasksMax=infinity +diff --git a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl +index e6a300fd4..b123193a1 100644 +--- a/systemd/cloud-init-local.service.tmpl ++++ b/systemd/cloud-init-local.service.tmpl +@@ -32,7 +32,7 @@ ExecStartPre=/sbin/restorecon /run/cloud-init + # process has completed this stage. The output from the return socket is piped + # into a shell so that the process can send a completion message (defaults to + # "done", otherwise includes an error message) and an exit code to systemd. +-ExecStart=sh -c 'echo "start" | netcat -Uu -W1 /run/cloud-init/share/local.sock -s /run/cloud-init/share/local-return.sock | sh' ++ExecStart=sh -c 'echo "start" | nc -Uu -W1 /run/cloud-init/share/local.sock -s /run/cloud-init/share/local-return.sock | sh' + RemainAfterExit=yes + TimeoutSec=0 + +diff --git a/systemd/cloud-init-network.service.tmpl b/systemd/cloud-init-network.service.tmpl +index af09fff35..bdc7c8f83 100644 +--- a/systemd/cloud-init-network.service.tmpl ++++ b/systemd/cloud-init-network.service.tmpl +@@ -53,7 +53,7 @@ Type=oneshot + # process has completed this stage. The output from the return socket is piped + # into a shell so that the process can send a completion message (defaults to + # "done", otherwise includes an error message) and an exit code to systemd. +-ExecStart=sh -c 'echo "start" | netcat -Uu -W1 /run/cloud-init/share/network.sock -s /run/cloud-init/share/network-return.sock | sh' ++ExecStart=sh -c 'echo "start" | nc -Uu -W1 /run/cloud-init/share/network.sock -s /run/cloud-init/share/network-return.sock | sh' + RemainAfterExit=yes + TimeoutSec=0 + +-- +2.45.2 + |