app-emulation/qemu-guest-agent: bump to 4.2.0.

Closes: https://bugs.gentoo.org/712596
Closes: https://github.com/gentoo/gentoo/pull/14959/files
Signed-off-by: Vjaceslavs Klimovs <vklimovs@gmail.com>
Signed-off-by: Matthias Maier <tamiko@gentoo.org>

diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index 7d3c358ed230949852bb27482dfe4383f5db805b..9730381ff014730e7b4de3d7aa1765c68850a18c 100644 (file)
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -1,2 +1,3 @@
 DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
 DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
+DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef SHA512 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56

diff --git a/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-sysmacros.patch b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-sysmacros.patch
new file mode 100644 (file)
index 0000000..94b6a2c
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.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
+@@ -118,6 +118,10 @@ extern int daemon(int, int);
+ #include <setjmp.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-4.2.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0.ebuild
new file mode 100644 (file)
index 0000000..27782cf
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit eutils systemd toolchain-funcs udev python-any-r1
+
+MY_PN="qemu"
+MY_P="${MY_PN}-${PV}"
+
+SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
+HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/glib"
+
+DEPEND="${RDEPEND}
+       ${PYTHON_DEPS}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-4.2.0-sysmacros.patch #580924
+)
+
+src_configure() {
+       tc-export AR LD OBJCOPY
+
+       local myconf=(
+               --prefix=/usr
+               --sysconfdir=/etc
+               --libdir="/usr/$(get_libdir)"
+               --localstatedir=/
+               --disable-bsd-user
+               --disable-linux-user
+               --disable-system
+               --disable-strip
+               --disable-tools
+               --disable-werror
+               --enable-guest-agent
+               --python="${PYTHON}"
+               --cc="$(tc-getCC)"
+               --cxx="$(tc-getCXX)"
+               --host-cc="$(tc-getBUILD_CC)"
+       )
+       echo "./configure ${myconf[*]}"
+       ./configure "${myconf[@]}" || die
+}
+
+src_compile() {
+       emake V=1 qemu-ga
+}
+
+src_install() {
+       dobin qemu-ga
+
+       # Normal init stuff
+       newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
+       newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
+
+       insinto /etc/logrotate.d
+       newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
+
+       # systemd stuff
+       udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
+
+       systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
+               qemu-guest-agent.service
+}
+
+pkg_postinst() {
+       elog "You should add 'qemu-guest-agent' to the default runlevel."
+       elog "e.g. rc-update add qemu-guest-agent default"
+}