main/qemu: replace patches with the ones sent upstream

Patches sent upstream:
http://lists.nongnu.org/archive/html/qemu-devel/2014-04/msg04773.html

1 files changed, 31 insertions, 28 deletions

diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD
index e444ff8a86..81f688fd02 100644
--- a/main/qemu/APKBUILD
+++ b/main/qemu/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=qemu
 pkgver=2.0.0
-pkgrel=0
+pkgrel=1
 pkgdesc="QEMU is a generic machine emulator and virtualizer"
 url="http://qemu.org/"
 arch="all"
@@ -73,11 +73,14 @@ $pkgname-guest-agent:guest
 "
 source="http://wiki.qemu-project.org/download/qemu-$pkgver.tar.bz2
 	0001-elfload-load-PIE-executables-to-right-address.patch
-	qemu-170-ffsl.patch
-	qemu-170-ffsll.patch
-	qemu-170-openpty.patch
-	qemu-170-sigset_t.patch
-	sigev_pad.patch
+	0001-linux-user-avoid-using-glibc-internals-in-_syscall5-.patch
+	0002-util-qemu-openpty-fix-build-with-musl-libc-by-includ.patch
+	0003-xen-replace-ffsl-with-ctzl.patch
+	0004-vhost-replace-ffsl-with-ctzl.patch
+	0005-exec-replace-ffsl-with-ctzl.patch
+	0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
+
+	musl-F_SHLCK-and-F_EXLCK.patch
 
 	qemu-guest-agent.confd
 	qemu-guest-agent.initd
@@ -104,13 +107,6 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	if [ "x$CLIBC" = "xmusl" ]; then
-		CFLAGS="$CFLAGS -D_GNU_SOURCE -Dflock64=flock"
-		CFLAGS="$CFLAGS -DF_EXLCK=4 -DF_SHLCK=8"
-		CFLAGS="$CFLAGS -D__SIGRTMIN=32 -D__SIGRTMAX=\(NSIG-1\)"
-	else
-		CFLAGS="$CFLAGS -DHAVE_FFSLL -DHAVE_FFSL"
-	fi
 	./configure \
 		--prefix=/usr \
 		--localstatedir=/var \
@@ -130,6 +126,7 @@ build() {
 		--disable-bsd-user \
 		--enable-linux-user \
 		--disable-werror \
+		--disable-smartcard-nss \
 		--cc="${CC:-gcc}" \
 		|| return 1
 
@@ -242,31 +239,37 @@ guest() {
 
 md5sums="2790f44fd76da5de5024b4aafeb594c2  qemu-2.0.0.tar.bz2
 672727bb1d8c8ab7b5def65dd1793c33  0001-elfload-load-PIE-executables-to-right-address.patch
-a51a526312535019de143f2e6a54e3ce  qemu-170-ffsl.patch
-78f4d1b13ddee47887b6d59378e8e44e  qemu-170-ffsll.patch
-6589d3ba6975d245feefa0ad436eed76  qemu-170-openpty.patch
-f5e8ee9c5cd1ebc37194f3c151f420a8  qemu-170-sigset_t.patch
-3fed185b1f49f9da4fd1011cba8122fb  sigev_pad.patch
+9e13b70bb154e4bba9b7bc55565bd671  0001-linux-user-avoid-using-glibc-internals-in-_syscall5-.patch
+d5bee57e71a84b3b1d34a7a6877c710a  0002-util-qemu-openpty-fix-build-with-musl-libc-by-includ.patch
+a5b3f6d9f1b12d548fec1c0f26656d2a  0003-xen-replace-ffsl-with-ctzl.patch
+61de41ce733bc63c4ebb05b0475c9b3f  0004-vhost-replace-ffsl-with-ctzl.patch
+3d5271c1ead506b10dfd25a1ea08be39  0005-exec-replace-ffsl-with-ctzl.patch
+d364208c4847ad2baeb237900befecd1  0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
+bc5f2e41ed3b6d6d30b672adab82e3e1  musl-F_SHLCK-and-F_EXLCK.patch
 1663bc6977f6886a58394155b1bf3676  qemu-guest-agent.confd
 2035cd781ea810e94bda250c609d8d90  qemu-guest-agent.initd
 66660f143235201249dc0648b39b86ee  80-kvm.rules"
 sha256sums="60cc1aa0cad39cec891f970bed60ca8a484f071adad4943123599ac223543a3b  qemu-2.0.0.tar.bz2
 af35304b165622a53f7557b59ffd8da5030f5fd444e669c862f9410131f3b987  0001-elfload-load-PIE-executables-to-right-address.patch
-63adefe8f34a6859e5f7a1e2de49538267c93955231ef0c4c2bfd6de919711e0  qemu-170-ffsl.patch
-373ca5c783913645c6fc6c4c3b7740b0cc011aeed30bc8b848d5b26cf5d81070  qemu-170-ffsll.patch
-6cffdccc3e270e7ab65701cc4e68692b577540f02763b14c66bf2225edb20f8b  qemu-170-openpty.patch
-fbc907e09c04110992a75bd4cc2f74fbc33e5b4a1cf0ebaa51c2a1dc4512ce5c  qemu-170-sigset_t.patch
-35f082690682229166641640d1abeaabfe67ad61b829ab62d94ccb3ef0aaea81  sigev_pad.patch
+710d2060e8faa3025f8bca608d7e28cbe498ef7ce3735bf005f763f3a97aa623  0001-linux-user-avoid-using-glibc-internals-in-_syscall5-.patch
+797ccc6c7fcc01c66ce13c2f32f0fa0dd7ff4deb4e0b6518fda39fb0bb3a9a46  0002-util-qemu-openpty-fix-build-with-musl-libc-by-includ.patch
+58879543cdc595409f07e588faf05d8526b9d40d3fbc71f2633714f48bf544a9  0003-xen-replace-ffsl-with-ctzl.patch
+1347fd3aa48aa46a51cc01781cbfe0169fd198845304e80eb4a2285792a0f516  0004-vhost-replace-ffsl-with-ctzl.patch
+03fb8cd1b7576ccb9f606ec5a3fcd1c94a9e983ba342a18e648e4bf404e1d993  0005-exec-replace-ffsl-with-ctzl.patch
+6af6cf9044997710a6d0fbdba30a35c8d775e30d30c032ec97db672f75ec88ac  0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
+eefd597197223899d3b12d8274af493153e270fd06ea8622e33d6eaeae063d40  musl-F_SHLCK-and-F_EXLCK.patch
 d84e53a94584f37f3bd1b21f44077b5de0d07094c6729f26ae20ab1f7b9cc298  qemu-guest-agent.confd
 982fa8ba67c728405305e4cf5a36a41a780b3d1f388ebd6377e7964c271a1c92  qemu-guest-agent.initd
 37f666f1cdb7d8a62171de69b531681dcb0fba74236729dac8b6c019232eba84  80-kvm.rules"
 sha512sums="8fe2e8faa66251aaea7d6017ee71675d5b05f93f92be7e2ad3e1d02af185b3d6c4069bd83a13fb1e35a3e8947aff76f22446b395f97ac18b6f7a99744202e3fa  qemu-2.0.0.tar.bz2
 405008589cad1c8b609eca004d520bf944366e8525f85a19fc6e283c95b84b6c2429822ba064675823ab69f1406a57377266a65021623d1cd581e7db000134fd  0001-elfload-load-PIE-executables-to-right-address.patch
-13ac2ba2835764ad97d55dc62313a4626a4e4e12a5f932d26b8579101bd875411faf9ffd5642c94e7b8da7d41b5ca48507c3a08ce4d087b8306110e23206877e  qemu-170-ffsl.patch
-80168f5eadb518dbae8277cc2ff78cc494783e2180dfbf78d7b5c068c3efecd0bbb3d61dfb0079e365c632c1a80b82d6955de9718ff0b8e8613a52407bd5a2af  qemu-170-ffsll.patch
-b2cbb121c8ac85ee0aff835ecff59e2b4e886ddb9c5084286eaf735b5a3868043dad36e5e2289b6e6505bca4cfe971c9a35109a3638357d4b5b10168f921c984  qemu-170-openpty.patch
-d867db00b0ac83c8dabd45c9ef0f07559f1f2045f3a4b7fd507a1ee276325e693f772b22511e2d5e1fce866de0ef4cd9da057119cfc39b905471a8995b36619e  qemu-170-sigset_t.patch
-51e66ac6eb649a165e5633c00d295740dc11f73ffa7567931b7d416f210154c2a51eb4b967c6d849ad9f6b19581c8e452b32da55f05982de37de7b8ce3c1edae  sigev_pad.patch
+8c6a4b7aee138566d6a47df4a58f85a657099c7ec101fac825f81aa264e275bf2e00d264d55f0f91ff3be2da78e7e306aaa031a0997728381bafb6f4b79c674a  0001-linux-user-avoid-using-glibc-internals-in-_syscall5-.patch
+c9c91116e30868180fab2780e947de72ab338ef5173b86457e6e0ffcc20eda30743867a2fcb7dae788aa36d3bdf5c4058d06332e3adc611ab30d1b5bc4dff081  0002-util-qemu-openpty-fix-build-with-musl-libc-by-includ.patch
+b9a4e0012f574491debb9c1428240402a223ff772ceff662826fbc821c9cbfe3db368b8a12b8742cfda98b536c6130e289f63cfcf8deff933e9b7bb3ad54ecdc  0003-xen-replace-ffsl-with-ctzl.patch
+49078967718b338adc1c445921012d5363af83fddee317a23b8c121a73b127ef7f8014cca1cfdc91c927ffa02f7091712753a19314c6ef28462b77f494025cb1  0004-vhost-replace-ffsl-with-ctzl.patch
+9504cc6afa84e5cc687baac2e7f1e4c2dbeee0f67dd8963686c89d0dc9e96eef0228a2390722b813f14dc359ab746227e8494192f5effbe9e8353c991dcbdcc3  0005-exec-replace-ffsl-with-ctzl.patch
+ec84b27648c01c6e58781295dcd0c2ff8e5a635f9836ef50c1da5d0ed125db1afc4cb5b01cb97606d6dd8f417acba93e1560d9a32ca29161a4bb730b302440ea  0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
+5de10f7e8abae16d1d7521e5ca1bfb62a8f295b324bea84f122f882b7b9354c21e5a00b20a1c5484c1b737b937e53c4ca6979e55705522f0779a5669725369f5  musl-F_SHLCK-and-F_EXLCK.patch
 d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f  qemu-guest-agent.confd
 761b4e2397569dae45ae3bb9e46e28746275297f629af9e9065525497fd26a48b65d8abcf4282727afd35309e338967acf6a1b14c3169577bdc16c1f42e618b3  qemu-guest-agent.initd
 9b7a89b20fcf737832cb7b4d5dc7d8301dd88169cbe5339eda69fbb51c2e537d8cb9ec7cf37600899e734209e63410d50d0821bce97e401421db39c294d97be2  80-kvm.rules"