main/qemu: upgrade to 2.5.0

remove unused patches
made simple & clean init script for guest-agent

1 files changed, 30 insertions, 33 deletions

diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD
index e3263e663b..63e3585490 100644
--- a/main/qemu/APKBUILD
+++ b/main/qemu/APKBUILD
@@ -1,7 +1,8 @@
+# Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=qemu
-pkgver=2.4.1
-pkgrel=3
+pkgver=2.5.0
+pkgrel=0
 pkgdesc="QEMU is a generic machine emulator and virtualizer"
 url="http://qemu.org/"
 arch="all"
@@ -35,7 +36,7 @@ makedepends="
 	zlib-dev
 	"
 depends=
-install="qemu.pre-install"
+install="$pkgname.pre-install"
 subpackages="
 $pkgname-aarch64:aarch64
 $pkgname-alpha:alpha
@@ -112,19 +113,19 @@ esac
 
 subpackages="$subpackages $pkgname-img"
 
-source="http://wiki.qemu-project.org/download/qemu-$pkgver.tar.bz2
+source="http://wiki.qemu-project.org/download/$pkgname-$pkgver.tar.bz2
 	0001-elfload-load-PIE-executables-to-right-address.patch
 	0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
-
 	musl-F_SHLCK-and-F_EXLCK.patch
 	fix-sigevent-and-sigval_t.patch
-
-	qemu-guest-agent.confd
-	qemu-guest-agent.initd
+	$pkgname-guest-agent.confd
+	$pkgname-guest-agent.initd
 	80-kvm.rules"
 
+_builddir="$srcdir"/$pkgname-$pkgver
+
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
@@ -164,7 +165,6 @@ _compile() {
 		--disable-debug-info \
 		--disable-bsd-user \
 		--disable-werror \
-		--disable-smartcard-nss \
 		--disable-sdl \
 		--disable-xen \
 		--cc="${CC:-gcc}" \
@@ -174,14 +174,14 @@ _compile() {
 }
 
 build() {
-	mkdir -p "$srcdir"/qemu-$pkgver/build "$srcdir"/qem \
-		"$srcdir"/qemu-$pkgver/build-gtk
-	cd "$srcdir"/qemu-$pkgver/build
+	mkdir -p "$_builddir"/build \
+		"$_builddir"/build-gtk
+	cd "$_builddir"/build
 
 	_compile \
 		--enable-vnc \
 		--enable-vnc-png \
-		--enable-vnc-tls \
+		--enable-vnc-jpeg \
 		--enable-spice \
 		--enable-linux-user \
 		--enable-guest-agent \
@@ -193,11 +193,9 @@ build() {
 # http://web.archiveorange.com/archive/v/21oVv8wOfpQGkyy8EK0N
 #	make check || return 1
 
-	if [ -z "$_arch" ]; then
-		return 0
-	fi
+	[ -z "$_arch" ] && return 0
 
-	cd "$srcdir"/qemu-$pkgver/build-gtk
+	cd "$_builddir"/build-gtk
 	_compile \
 		--enable-gtk \
 		--with-gtkabi=3.0 \
@@ -210,16 +208,15 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/qemu-$pkgver/build
+	cd "$_builddir"/build
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 "$srcdir"/80-kvm.rules \
 		"$pkgdir"/lib/udev/rules.d/80-kvm.rules || return 1
 	paxmark -m "$pkgdir"/usr/bin/qemu-system-* || return 1
 
-	if [ -z "$_arch" ]; then
-		return 0
-	fi
-	cd "$srcdir"/qemu-$pkgver/build-gtk
+	[ -z "$_arch" ] && return 0
+
+	cd "$_builddir"/build-gtk
 	install $_arch-softmmu/qemu-system-$_arch \
 		"$pkgdir"/usr/bin/qemu-system-$_arch-gtk
 }
@@ -314,33 +311,33 @@ guest() {
 	pkgdesc="QEMU guest agent"
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/qemu-ga "$subpkgdir"/usr/bin/
-	install -Dm755 "$srcdir"/qemu-guest-agent.initd \
-		"$subpkgdir"/etc/init.d/qemu-guest-agent || return 1
-	install -Dm644 "$srcdir"/qemu-guest-agent.confd \
-		"$subpkgdir"/etc/conf.d/qemu-guest-agent || return 1
+	install -Dm755 "$srcdir"/$pkgname-guest-agent.initd \
+		"$subpkgdir"/etc/init.d/$pkgname-guest-agent || return 1
+	install -Dm644 "$srcdir"/$pkgname-guest-agent.confd \
+		"$subpkgdir"/etc/conf.d/$pkgname-guest-agent || return 1
 }
 
-md5sums="a895e93ec1dafc34bc64ed676f0d55a6  qemu-2.4.1.tar.bz2
+md5sums="f469f2330bbe76e3e39db10e9ac4f8db  qemu-2.5.0.tar.bz2
 672727bb1d8c8ab7b5def65dd1793c33  0001-elfload-load-PIE-executables-to-right-address.patch
 d364208c4847ad2baeb237900befecd1  0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
 bc5f2e41ed3b6d6d30b672adab82e3e1  musl-F_SHLCK-and-F_EXLCK.patch
 9afbd6c9586229ce64275f012d665e2a  fix-sigevent-and-sigval_t.patch
 1663bc6977f6886a58394155b1bf3676  qemu-guest-agent.confd
-4cb15a1c3de2691dd65842f2325dfe22  qemu-guest-agent.initd
+ea972f2fc5505488f68320bf386106bb  qemu-guest-agent.initd
 66660f143235201249dc0648b39b86ee  80-kvm.rules"
-sha256sums="e3d5cf4c8b1f9129c9c797329a515bfb6b3b1ded0ab8b394c8a316490fe3a177  qemu-2.4.1.tar.bz2
+sha256sums="3443887401619fe33bfa5d900a4f2d6a79425ae2b7e43d5b8c36eb7a683772d4  qemu-2.5.0.tar.bz2
 af35304b165622a53f7557b59ffd8da5030f5fd444e669c862f9410131f3b987  0001-elfload-load-PIE-executables-to-right-address.patch
 6af6cf9044997710a6d0fbdba30a35c8d775e30d30c032ec97db672f75ec88ac  0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
 eefd597197223899d3b12d8274af493153e270fd06ea8622e33d6eaeae063d40  musl-F_SHLCK-and-F_EXLCK.patch
 9abdf3410dea742cac3552363950c8a7fbcec8dd2bfd68e3c417a284f4e702f5  fix-sigevent-and-sigval_t.patch
 d84e53a94584f37f3bd1b21f44077b5de0d07094c6729f26ae20ab1f7b9cc298  qemu-guest-agent.confd
-91f5ba66b56bb9a3e0d134de3ea756794d5f09fe8a14a4b0d3d95f69a9245c60  qemu-guest-agent.initd
+5bef90ccab2e743868fd562eee9a3ded35c8d3e01fa387367ed55a0da95570d5  qemu-guest-agent.initd
 37f666f1cdb7d8a62171de69b531681dcb0fba74236729dac8b6c019232eba84  80-kvm.rules"
-sha512sums="fde32b71a50d888c1055e61f4e6dfc45bb97e8e9ebee490c545965fbdcbd5ffd859fbf20648abed1f4fa9fcc5635e9b22e1829bbe802fc8aaf989d6013235917  qemu-2.4.1.tar.bz2
+sha512sums="12153f94cc7f834fd6a85f25690c36f2331d88d414426fb8b9ac20a34e6f9222b1eda30b727674af583580fae90dfd6d0614a905dce1567d94cd049d426b9dd3  qemu-2.5.0.tar.bz2
 405008589cad1c8b609eca004d520bf944366e8525f85a19fc6e283c95b84b6c2429822ba064675823ab69f1406a57377266a65021623d1cd581e7db000134fd  0001-elfload-load-PIE-executables-to-right-address.patch
 ec84b27648c01c6e58781295dcd0c2ff8e5a635f9836ef50c1da5d0ed125db1afc4cb5b01cb97606d6dd8f417acba93e1560d9a32ca29161a4bb730b302440ea  0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
 5de10f7e8abae16d1d7521e5ca1bfb62a8f295b324bea84f122f882b7b9354c21e5a00b20a1c5484c1b737b937e53c4ca6979e55705522f0779a5669725369f5  musl-F_SHLCK-and-F_EXLCK.patch
 e3f006c28318669356cd5b778f26774f06b0a40a4ac852573379df63efcc8276869958faec16797a38bf96c6061dfc040309e462d8559984f67eaf4af701ca1a  fix-sigevent-and-sigval_t.patch
 d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f  qemu-guest-agent.confd
-69457d757909b990f4fdfaef621696e5a5d287b42bc58e553cb52d85191788a269e91c0475bfb7223d3a9120c19cdf4d749b4d54013a644f33d0551517cdf094  qemu-guest-agent.initd
+316b40d97587fea717821852859d81039cfdcb276a658bb6e6fb554e321d5856a833ebb3778149c4732cea625bac320b1008d374c88a9aae35c0fb67977c01b7  qemu-guest-agent.initd
 9b7a89b20fcf737832cb7b4d5dc7d8301dd88169cbe5339eda69fbb51c2e537d8cb9ec7cf37600899e734209e63410d50d0821bce97e401421db39c294d97be2  80-kvm.rules"