[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu-guest-agent/, app-emulation/qemu-guest-agent/files/

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu-guest-agent/, app-emulation/qemu-guest-agent/files/

[Mike Frysinger]

commit:     badbaf41c17db1029b4b7628b1ec38611a66d261
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 17:20:23 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 17:20:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=badbaf41

app-emulation/qemu-guest-agent: fix build w/newer glibc #580924

 .../files/qemu-guest-agent-2.5.0-sysmacros.patch        | 17 +++++++++++++++++
 .../qemu-guest-agent/qemu-guest-agent-2.5.0.ebuild      |  1 +
 2 files changed, 18 insertions(+)

diff --git a/app-emulation/qemu-guest-agent/files/qemu-guest-agent-2.5.0-sysmacros.patch b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-2.5.0-sysmacros.patch
new file mode 100644
index 0000000..4d5690c
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-2.5.0-sysmacros.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/580924
+
+Linux C libs are moving away from implicit header pollution with sys/types.h
+
+--- a/include/qemu/osdep.h
++++ b/include/qemu/osdep.h
+@@ -78,6 +78,10 @@ extern int daemon(int, int);
+ #include <assert.h>
+ #include <signal.h>
+ 
++#ifdef __linux__
++#include <sys/sysmacros.h>
++#endif
++
+ #ifdef __OpenBSD__
+ #include <sys/signal.h>
+ #endif

diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.5.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.5.0.ebuild
index 55893ad..0031ca9 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.5.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.5.0.ebuild
@@ -35,6 +35,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch #580924
 	epatch_user
 }
 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu-guest-agent/, app-emulation/qemu-guest-agent/files/

[Matthias Maier]

commit:     8b8e82850dc8818b97f8bafc3ccc7982142f1cea
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 18 19:28:23 2020 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 19:28:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b8e8285

app-emulation/qemu-guest-agent: fix shutdown command

Closes: https://bugs.gentoo.org/681874
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 .../files/qemu-guest-agent-4.2.0-fix-shutdown.patch           | 11 +++++++++++
 ...st-agent-4.2.0.ebuild => qemu-guest-agent-4.2.0-r1.ebuild} |  1 +
 2 files changed, 12 insertions(+)

diff --git a/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-fix-shutdown.patch b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-fix-shutdown.patch
new file mode 100644
index 00000000000..f69781694f1
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-fix-shutdown.patch
@@ -0,0 +1,11 @@
+--- qemu-4.2.0/qga/commands-posix.c.orig	2020-03-23 11:15:05.972610989 +0300
++++ qemu-4.2.0/qga/commands-posix.c	2020-03-23 11:15:39.676015087 +0300
+@@ -108,7 +108,7 @@
+         reopen_fd_to_null(1);
+         reopen_fd_to_null(2);
+ 
+-        execle("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0",
++        execle("/sbin/shutdown", "shutdown", "-h", "now", shutdown_flag, "+0",
+                "hypervisor initiated shutdown", (char*)NULL, environ);
+         _exit(EXIT_FAILURE);
+     } else if (pid < 0) {

diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild
similarity index 96%
rename from app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0.ebuild
rename to app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild
index 27782cf6ca5..c290b1251ca 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild
@@ -29,6 +29,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.0-sysmacros.patch #580924
+	"${FILESDIR}"/${PN}-4.2.0-fix-shutdown.patch #681874
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu-guest-agent/, app-emulation/qemu-guest-agent/files/

[John Helmert III]

commit:     69629171b283b4e0d29eb0d18d812b469af49ca1
Author:     Michal Privoznik <michal.privoznik <AT> gmail <DOT> com>
AuthorDate: Wed Oct 19 07:43:54 2022 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Wed Oct 19 14:14:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69629171

app-emulation/qemu-guest-agent: Avoid using strings binary

The qemu's configure script (from which qemu-guest-agent is
built) calls strings binary directly. This does not fly with
cross compilation and was fixed upstream. Backport the fix.

Bug: https://bugs.gentoo.org/876933
Signed-off-by: Michal Privoznik <michal.privoznik <AT> gmail.com>
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 ....1.0-configure-Avoid-using-strings-binary.patch | 85 ++++++++++++++++++++++
 .../qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild |  4 +
 2 files changed, 89 insertions(+)

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
 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu-guest-agent/, app-emulation/qemu-guest-agent/files/

[Sam James]

commit:     5d1b5f7e2e1098e8eb7ee935baa9fe90e3d129ba
Author:     V3n3RiX <venerix <AT> koprulu <DOT> sector>
AuthorDate: Fri Feb  2 07:51:26 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  2 08:01:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d1b5f7e

app-emulation/qemu-guest-agent: find sphinx

Closes: https://bugs.gentoo.org/923573
Signed-off-by: Ghiunhan Mamut <venerix <AT> redcorelinux.org>
Closes: https://github.com/gentoo/gentoo/pull/35143
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../qemu-guest-agent/files/qemu-8.1.0-find-sphinx.patch        | 10 ++++++++++
 app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild   |  1 +
 2 files changed, 11 insertions(+)

diff --git a/app-emulation/qemu-guest-agent/files/qemu-8.1.0-find-sphinx.patch b/app-emulation/qemu-guest-agent/files/qemu-8.1.0-find-sphinx.patch
new file mode 100644
index 000000000000..b6ef6214af55
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/files/qemu-8.1.0-find-sphinx.patch
@@ -0,0 +1,10 @@
+This gets confused by python-any-r1 and tries to find sphinx-build in ${T}.
+--- a/docs/meson.build
++++ b/docs/meson.build
+@@ -1,5 +1,4 @@
+-sphinx_build = find_program(fs.parent(python.full_path()) / 'sphinx-build',
+-                            required: get_option('docs'))
++sphinx_build = find_program('sphinx-build', required: get_option('docs'))
+ 
+ # Check if tools are available to build documentation.
+ build_docs = false

diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
index ab7a0c145b03..46f8a50f74d1 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
@@ -27,6 +27,7 @@ BDEPEND="${PYTHON_DEPS}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
+	"${FILESDIR}"/qemu-8.1.0-find-sphinx.patch
 )
 
 src_configure() {