diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-10-22 08:47:57 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-10-22 08:48:31 +0000 |
| commit | 014320aa0d815f7dba7c35ad368beafe1f75fcc9 (patch) | |
| tree | 917fa3d58954a64f30ba8b19020cd9989342b690 | |
| parent | e8f4925723291782bb63697c3d4fa3ec2af6c46d (diff) | |
| download | aports-014320aa0d815f7dba7c35ad368beafe1f75fcc9.tar.bz2 aports-014320aa0d815f7dba7c35ad368beafe1f75fcc9.tar.xz | |
main/qemu: upgrade to 4.1.0
| -rw-r--r-- | main/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch | 16 | ||||
| -rw-r--r-- | main/qemu/APKBUILD | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/main/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch b/main/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch index d5dc673e67..528b5d5d8b 100644 --- a/main/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch +++ b/main/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch @@ -1,7 +1,7 @@ -From 3e231fa7a2dc66e2ef06ac44f4f719b08fc0c67e Mon Sep 17 00:00:00 2001 +From 8fbb4e6797ed67310b74cbaaa061269db45a5b71 Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> Date: Tue, 29 Apr 2014 15:51:31 +0200 -Subject: [PATCH 6/6] linux-user/signal.c: define __SIGRTMIN/MAX for non-GNU +Subject: [PATCH] linux-user/signal.c: define __SIGRTMIN/MAX for non-GNU platforms The __SIGRTMIN and __SIGRTMAX are glibc internals and are not available @@ -15,10 +15,10 @@ Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> 1 file changed, 7 insertions(+) diff --git a/linux-user/signal.c b/linux-user/signal.c -index 7d6246f..6019dbb 100644 +index 5ca6d62b15..e917c16d91 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c -@@ -26,6 +26,13 @@ +@@ -25,6 +25,13 @@ #include "trace.h" #include "signal-common.h" @@ -29,9 +29,9 @@ index 7d6246f..6019dbb 100644 +#define __SIGRTMAX (NSIG-1) +#endif + - struct target_sigaltstack target_sigaltstack_used = { - .ss_sp = 0, - .ss_size = 0, + static struct target_sigaction sigact_table[TARGET_NSIG]; + + static void host_signal_handler(int host_signum, siginfo_t *info, -- -1.9.2 +2.23.0 diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD index fc25c09df9..596431dd89 100644 --- a/main/qemu/APKBUILD +++ b/main/qemu/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qemu -pkgver=4.0.0 -pkgrel=4 +pkgver=4.1.0 +pkgrel=0 pkgdesc="QEMU is a generic machine emulator and virtualizer" url="http://qemu.org/" arch="all" @@ -25,7 +25,7 @@ makedepends=" libnfs-dev libpng-dev libseccomp-dev - libssh2-dev + libssh-dev libusb-dev libxml2-dev linux-headers @@ -260,7 +260,7 @@ build() { --enable-gtk \ --enable-guest-agent \ --enable-libnfs \ - --enable-libssh2 \ + --enable-libssh \ --enable-linux-aio \ --enable-lzo \ --enable-modules \ @@ -386,9 +386,9 @@ _all_modules() { mkdir -p "$subpkgdir" } -sha512sums="952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13 qemu-4.0.0.tar.xz +sha512sums="82fd51702a7b9b1b00b2f1bd3b4a832b80249018dbba1add0b0a73e7d4bee452afd45574b4d8df7ce4477d8711f3bda4ca072a1a6de25895c93eb21cf78fc4b2 qemu-4.1.0.tar.xz 405008589cad1c8b609eca004d520bf944366e8525f85a19fc6e283c95b84b6c2429822ba064675823ab69f1406a57377266a65021623d1cd581e7db000134fd 0001-elfload-load-PIE-executables-to-right-address.patch -f52d9b3ccaa0e7613496ef3a6b820f4870d67fb89ad22c7aa3ffd6cb7c79c07f6206f060fe4e9b5b9b356b3dfee1fe2e19288497e7b8865411021eda31ca9f25 0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch +98db5e23397cfad4a7210f9f7e1c5fa5c48f065785439521c5b39325c429f2dc367c40925adff6aa8677b3192a1a98a30e93d5b9c879df523deb019c40edd9d9 0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch 1ac043312864309e19f839a699ab2485bca51bbf3d5fdb39f1a87b87e3cbdd8cbda1a56e6b5c9ffccd65a8ac2f600da9ceb8713f4dbba26f245bc52bcd8a1c56 0001-linux-user-fix-build-with-musl-on-aarch64.patch 224f5b44da749921e8a821359478c5238d8b6e24a9c0b4c5738c34e82f3062ec4639d495b8b5883d304af4a0d567e38aa6623aac1aa3a7164a5757c036528ac0 musl-F_SHLCK-and-F_EXLCK.patch 5da8114b9bd2e62f0f1f0f73f393fdbd738c5dea827ea60cedffd6f6edd0f5a97489c7148d37a8ec5a148d4e65d75cbefe9353714ee6b6f51a600200133fc914 fix-sigevent-and-sigval_t.patch |