diff options
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/Manifest.gz | bin | 15125 -> 15128 bytes | |||
| -rw-r--r-- | app-emulation/qemu-guest-agent/Manifest | 3 | ||||
| -rw-r--r-- | app-emulation/qemu-guest-agent/files/qemu-guest-agent-7.1.0-configure-Avoid-using-strings-binary.patch | 85 | ||||
| -rw-r--r-- | app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild | 4 | ||||
| -rw-r--r-- | app-emulation/qemu/Manifest | 2 | ||||
| -rw-r--r-- | app-emulation/qemu/qemu-9999.ebuild | 5 |
6 files changed, 94 insertions, 5 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz Binary files differindex e6d3fa4725e2..68fe33ecc3ff 100644 --- a/app-emulation/Manifest.gz +++ b/app-emulation/Manifest.gz diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest index 30df5d52f83a..2cc9c3a50d83 100644 --- a/app-emulation/qemu-guest-agent/Manifest +++ b/app-emulation/qemu-guest-agent/Manifest @@ -3,8 +3,9 @@ AUX qemu-ga-systemd.udev 130 BLAKE2B 3bd450476eb4e7b31e3c21a231b83219def32481110 AUX qemu-ga.conf-r1 452 BLAKE2B 546799fefad91644acc0cee1e5c3f4adfb3f12cf48831a6138bf23aaf9a7b36604a651107236f9cb08fb44b3a055b5bc01b34243dadd6dc6dde8c0478bdaa38f SHA512 c339ddad3e94e1cd009d9f6819b7fbaddda0c8d5ad7736704cdf8efd0f802df9b905c3529ecd2a1e5831bc8e9e6e7be94ac816097f97c92deb6a3816328dba39 AUX qemu-ga.init-r1 624 BLAKE2B 79416a272a89349e4174a4238fc7763fc1f116c7c4a2e7c4d41ba2bb8d0a41a2db1abb2053e307a257519af3163e3d603280d45f20e259ec1a1a9b090a9891fd SHA512 820ae4b04b9eeb2c8ac6128544f764af67b4462cc98377ceb37708130a5cae118bd3ed892a945fb25234a8d73fb98e60dbf5da3a44861fc56f97b66a3f12532e AUX qemu-ga.logrotate 128 BLAKE2B 99035fefeccc6334c0cd5ae16e8550a07cfe4256d2374a0679a90805919aa4b7afac4f1d0c3bac72fcc5c7c0e0d87b227be8b1697338b827c890c56be77b07db SHA512 0fb39dd7ee528b36d8e837fbc53ba69476ba83947a4df10a9df03a02861a37d21f53865adbd3050c24aad72ec8a8bee1fb33f7382213d855884aff109f3c3789 +AUX qemu-guest-agent-7.1.0-configure-Avoid-using-strings-binary.patch 2707 BLAKE2B 56a98b8375bdc1ad636044e894a126c1704c27986a74b9088e14fa0e4c672c70d593a265da4efc0e43055d65b447e6adc2b1f03f6186a68ec03ad4b1fe747547 SHA512 6efe0228988bf5d23ad7a60531815b9f5c77886fc26ff65bccf33a0f19b9d6d6993b63327de2630fa802abb0c824b30646871d4cc25d48ee3c492d8b4992f42f DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418 SHA512 ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4 DIST qemu-7.1.0.tar.xz 121833004 BLAKE2B e05f91ce4993c7591a2df08b5fb017f8b8ec2141ab7bfd55d14730ea6b793ac1091de539992058392a5522d4e58beee92a87752707be58e3619b8213ef9f35bf SHA512 c60c5ff8ec99b7552e485768908920658fdd8035ff7a6fa370fb6881957dc8b7e5f18ff1a8f49bd6aa22909ede2a7c084986d8244f12074ccd33ebe40a0c411f EBUILD qemu-guest-agent-6.0.0.ebuild 1674 BLAKE2B bfbdf0f1fcd5b88cef51dfe7a5535c18a8c32aea4c2b1f69a435b96210fd335b385dee9f7c34f078dbd47ca41f3b154e917f9f576f84067033e208c0ce7dde60 SHA512 eec616aac8cd544fa9a57fbbba0887bde037d74152ca1919623d5cdb2498e4122a8494772c7520ddd7844232d5fd9e2e6bc6024c6982e7ae0ad75f0120897d06 -EBUILD qemu-guest-agent-7.1.0.ebuild 1642 BLAKE2B 6aef76dc38bd5bec5e140130fb602c59b6eb793c1e028f5a1fef147326b1d7bbdb5fe0a18287f4000de541136156eadb36c06664faa0af606de0c6173ebdc8fd SHA512 84b201c15c63ab6ba92a58222dd944980ec49761b51a5aecc13e59cf5eb99bc792b72b118a9f36068a6e546237253eda844f246fe089bfa797b475f557fde940 +EBUILD qemu-guest-agent-7.1.0.ebuild 1725 BLAKE2B 5c2afd0c0a09e9e70f46f8c0b69abf4de33cc133ee09e8dd7567388ea62b777bd5eec7a408ddf05530f867f767e86ee58bf4b2c2431dee38def2e5b4ea638dc7 SHA512 a8ac266f9cb0d849227bfff4670db3c0087b39203b219428a96bcc8272318b45b6eece95e9b2dc51bdfdae691316eeacfd51a811bbc257f01baf9c17a071500b MISC metadata.xml 696 BLAKE2B 3d5f68defa6dc2b19e1e590edf70849bd20e6d23aa3038be3e482485c7848d61f4c45987416daddaa945f5beb4ba3e89e209e28bc04a7495fb5bbe3f2c82533e SHA512 e1b4844ab6d6b4f2e1dcd3c3fca0bc23218819952a3645f874d55cd63d60cbc35216956431aed09708f257d159b70c6813a400460dfc0e64576f2bdcdb6ef1a9 diff --git a/app-emulation/qemu-guest-agent/files/qemu-guest-agent-7.1.0-configure-Avoid-using-strings-binary.patch b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-7.1.0-configure-Avoid-using-strings-binary.patch new file mode 100644 index 000000000000..dff62304a5c7 --- /dev/null +++ b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-7.1.0-configure-Avoid-using-strings-binary.patch @@ -0,0 +1,85 @@ +From 33ab5f24913db8d5590fe4155829bd38e7902506 Mon Sep 17 00:00:00 2001 +Message-Id: <33ab5f24913db8d5590fe4155829bd38e7902506.1666164897.git.mprivozn@redhat.com> +From: Michal Privoznik <mprivozn@redhat.com> +Date: Fri, 14 Oct 2022 09:30:15 +0200 +Subject: [PATCH] configure: Avoid using strings binary + +When determining the endiandness of the target architecture we're +building for a small program is compiled, which in an obfuscated +way declares two strings. Then, we look which string is in +correct order (using strings binary) and deduct the endiandness. +But using the strings binary is problematic, because it's part of +toolchain (strings is just a symlink to +x86_64-pc-linux-gnu-strings or llvm-strings). And when +(cross-)compiling, it requires users to set the symlink to the +correct toolchain. + +Fortunately, we have a better alternative anyways. We can mimic +what compiler.h is already doing: comparing __BYTE_ORDER__ +against values for little/big endiandness. + +Bug: https://bugs.gentoo.org/876933 +Signed-off-by: Michal Privoznik <mprivozn@redhat.com> +Message-Id: <d6d9c7043cfe6d976d96694f2b4ecf85cf3206f1.1665732504.git.mprivozn@redhat.com> +Cc: qemu-stable@nongnu.org +Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> +--- + configure | 35 ++++++++++++++++++----------------- + 1 file changed, 18 insertions(+), 17 deletions(-) + +diff --git a/configure b/configure +index f9ec050bf8..81561be7c1 100755 +--- a/configure ++++ b/configure +@@ -1423,30 +1423,31 @@ if test "$tcg" = "enabled"; then + git_submodules="$git_submodules tests/fp/berkeley-softfloat-3" + fi + +-# --- ++########################################## + # big/little endian test + cat > $TMPC << EOF +-#include <stdio.h> +-short big_endian[] = { 0x4269, 0x4765, 0x4e64, 0x4961, 0x4e00, 0, }; +-short little_endian[] = { 0x694c, 0x7454, 0x654c, 0x6e45, 0x6944, 0x6e41, 0, }; +-int main(int argc, char *argv[]) +-{ +- return printf("%s %s\n", (char *)big_endian, (char *)little_endian); +-} ++#if defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ ++# error LITTLE ++#endif ++int main(void) { return 0; } + EOF + +-if compile_prog ; then +- if strings -a $TMPE | grep -q BiGeNdIaN ; then +- bigendian="yes" +- elif strings -a $TMPE | grep -q LiTtLeEnDiAn ; then +- bigendian="no" +- else +- echo big/little test failed +- exit 1 +- fi ++if ! compile_prog ; then ++ bigendian="no" + else ++ cat > $TMPC << EOF ++#if defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ ++# error BIG ++#endif ++int main(void) { return 0; } ++EOF ++ ++ if ! compile_prog ; then ++ bigendian="yes" ++ else + echo big/little test failed + exit 1 ++ fi + fi + + ########################################## +-- +2.37.3 + diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild index 0f2019bc9f7e..87c4dbf69d23 100644 --- a/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild +++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild @@ -24,6 +24,10 @@ BDEPEND="${PYTHON_DEPS}" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${PN}-7.1.0-configure-Avoid-using-strings-binary.patch +) + src_configure() { tc-export AR LD OBJCOPY RANLIB diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index 5b02c7cac677..2427ac9e6f67 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -20,5 +20,5 @@ DIST qemu-7.1.0-docs.tar.xz 2016780 BLAKE2B 1b84361fe58d504ab740a0b805a25d02f497 DIST qemu-7.1.0.tar.xz 121833004 BLAKE2B e05f91ce4993c7591a2df08b5fb017f8b8ec2141ab7bfd55d14730ea6b793ac1091de539992058392a5522d4e58beee92a87752707be58e3619b8213ef9f35bf SHA512 c60c5ff8ec99b7552e485768908920658fdd8035ff7a6fa370fb6881957dc8b7e5f18ff1a8f49bd6aa22909ede2a7c084986d8244f12074ccd33ebe40a0c411f EBUILD qemu-7.0.0-r3.ebuild 27290 BLAKE2B 985947dc90817bed2c5e0878158604577b6ac3f7f605fd6372aa5b480851a6c94ea44e73aa301b7c1a5b8fa59f2281e57f99a84e5b10bc07beff0a3096b48a22 SHA512 8cc6ae4e2bde1b458d1682624fb46a56c1837592545638e63907c4067e67c39a609e85941381a33a80013d5e82c202644c6a9c5202091e344eabe3f8f6eb0c5b EBUILD qemu-7.1.0.ebuild 28397 BLAKE2B d9348f01501bd60b1dd11a87ec52214a29c2e0fac5e815b3820f12a97390434509537b850646fe62c002aa259d9fa5c802659be430df2e556998b658dd05117c SHA512 a7113edecc8c9fd0d46faff044bb498deb700c1eb8da9b8d38cfcc742fcb9e04e35f5db8b89234cedf93560bd2c5b40229f09440c544f21547caf7931c875ea7 -EBUILD qemu-9999.ebuild 28120 BLAKE2B 4df729698bd0468af07072a051297df247211c4593919c0fc8590633eab862e7d07d1dbf39191b221d03a04921ad5d93bc70a3763766bc04316900dcc179428b SHA512 888fb99037d0a5965428d1e04f643e04374cf078839a2918cda3b2a43b5f41115ccefbc2bc8d12d44e5291daff76bb8ba0ae7feb4ba21a7dc84c36df8dfebd65 +EBUILD qemu-9999.ebuild 28060 BLAKE2B 14535cb78c758a130e8148b941bdccd552cee354f652504f4f8c641c7cd8c8fc3e3b847801c6caf315ac090d910135a0a04d091ffb7d43ed2e89b520aa20f211 SHA512 5f495ca835ec867a5b6e7891038c3e93292b0ee321857f8524b89edc6e64d1c8d7fdbc5b1cc202aa620ec3c7fb0efa4a843f1caa1c1b37bd3e251a2ed18c4940 MISC metadata.xml 4672 BLAKE2B ea2319ecc6717e4f10667f70928eac2b59eb27bb117957c266984a4d5bdf84604128086956a651c1880d314efde56ce81a67c364f7944f5342b6a322b5e3e73e SHA512 27f357299abc6a82112dab17c81b825459ce4c7afd96381b4cba13d79861f80e7d452d574795cab240e7ca56154128a2597ac9957aa24ef81d7dc9092312ac79 diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 4d1ead785bc1..c3489c029294 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -308,7 +308,6 @@ PATCHES=( "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch "${FILESDIR}"/${PN}-6.0.0-make.patch "${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch - "${FILESDIR}"/${PN}-7.1.0-strings.patch ) QA_PREBUILT=" @@ -454,7 +453,7 @@ src_prepare() { sed -i -e 's/-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2//' configure || die # Remove bundled modules - rm -r dtc meson roms/*/ slirp || die + rm -r dtc meson roms/*/ || die } ## @@ -581,7 +580,7 @@ qemu_src_configure() { $(conf_notuser sdl) $(conf_softmmu sdl-image) $(conf_notuser seccomp) - $(conf_notuser slirp slirp system) + $(conf_notuser slirp) $(conf_notuser smartcard) $(conf_notuser snappy) $(conf_notuser spice) |