aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan P. Stanić <mps@arvanta.net>2020-05-28 19:23:44 +0200
committerAriadne Conill <ariadne@dereferenced.org>2020-05-28 18:41:32 +0000
commit6c885cfb750137fd1bc76cbbe30cc3596fa1228f (patch)
tree8d8669fde8f6a863148f3d717cddac388ad3c285
parent7e087b0ff4f895d26de320a8751674ea5a08737e (diff)
downloadaports-6c885cfb750137fd1bc76cbbe30cc3596fa1228f.tar.gz
aports-6c885cfb750137fd1bc76cbbe30cc3596fa1228f.tar.bz2
aports-6c885cfb750137fd1bc76cbbe30cc3596fa1228f.tar.xz
community/qemu: upgrade to 5.0.0
remove 0001-elfload-load-PIE-executables-to-right-address.patch, it doesn't apply and looks like it is not needed with this version add system-rx
-rw-r--r--community/qemu/0001-elfload-load-PIE-executables-to-right-address.patch89
-rw-r--r--community/qemu/APKBUILD9
2 files changed, 4 insertions, 94 deletions
diff --git a/community/qemu/0001-elfload-load-PIE-executables-to-right-address.patch b/community/qemu/0001-elfload-load-PIE-executables-to-right-address.patch
deleted file mode 100644
index 1cf0c2bd1b..0000000000
--- a/community/qemu/0001-elfload-load-PIE-executables-to-right-address.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 6818f32f74981d9bccec8afbab37c42b50ab58be Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Thu, 4 Jul 2013 15:50:36 +0300
-Subject: [RFC PATCH] elfload: load PIE executables to right address
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-PIE images are ET_DYN images. Check first for pinterp_name to make
-sure the main executable always is loaded to correct place.
-
-See below for current behaviour of PIE executables:
-
-Reserved 0x7f000000 bytes of guest address space
-host mmap_min_addr=0x1000
-guest_base 0x7f7cb41d5000
-start end size prot
-0037f400-003fe400 0007f000 r-x
-003fe400-003ff400 00001000 ---
-003ff400-003fe400 fffff000 rw-
-003fe400-003ff400 00001000 ---
-003ff400-003ffc00 00000800 rw-
-003ffc00-003fec00 fffff000 r-x
-003fec00-003ffc00 00001000 ---
-003ffc00-0007f000 ffc7f400 rw-
-start_brk 0x00000000
-end_code 0x7eff7ac0
-start_code 0x7eff7000
-start_data 0x7efffac0
-end_data 0x7efffc18
-start_stack 0x7eff6dc8
-brk 0x7efffc34
-entry 0x7e799b30
-00000000-00005000 ---p 00000000 00:00 0
-00005000-00015000 rw-p 00000000 00:00 0
-00015000-7e77d000 ---p 00000000 00:00 0
-7e77d000-7e7ec000 r-xp 00000000 68:03 14326298 /lib/libc.so
-7e7ec000-7e7f3000 ---p 00000000 00:00 0
-7e7f3000-7e7f4000 rw-p 0006e000 68:03 14326298 /lib/libc.so
-7e7f4000-7e7f6000 rw-p 00000000 00:00 0
-7e7f6000-7e7f7000 ---p 00000000 00:00 0
-7e7f7000-7eff7000 rw-p 00000000 00:00 0
-7eff7000-7eff8000 r-xp 00000000 68:03 9731305 /usr/bin/brk
-7eff8000-7efff000 ---p 00000000 00:00 0
-7e7f7000-7eff7000 rw-p 00000000 00:00 0 [stack]
-
-Showing how the main binary got loaded to wrong place.
-
-Signed-off-by: Timo Teräs <timo.teras@iki.fi>
----
-I assume pinterp_name is only ever set for the main executable.
-Quick grep would indicate that this is indeed the case.
-
- linux-user/elfload.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/linux-user/elfload.c b/linux-user/elfload.c
-index ddef23e..d6e00cd 100644
---- a/linux-user/elfload.c
-+++ b/linux-user/elfload.c
-@@ -1660,7 +1660,12 @@ static void load_elf_image(const char *image_name, int image_fd,
- }
-
- load_addr = loaddr;
-- if (ehdr->e_type == ET_DYN) {
-+ if (pinterp_name != NULL) {
-+ /* This is the main executable. Make sure that the low
-+ address does not conflict with MMAP_MIN_ADDR or the
-+ QEMU application itself. */
-+ probe_guest_base(image_name, loaddr, hiaddr);
-+ } else if (ehdr->e_type == ET_DYN) {
- /* The image indicates that it can be loaded anywhere. Find a
- location that can hold the memory space required. If the
- image is pre-linked, LOADDR will be non-zero. Since we do
-@@ -1672,11 +1677,6 @@ static void load_elf_image(const char *image_name, int image_fd,
- if (load_addr == -1) {
- goto exit_perror;
- }
-- } else if (pinterp_name != NULL) {
-- /* This is the main executable. Make sure that the low
-- address does not conflict with MMAP_MIN_ADDR or the
-- QEMU application itself. */
-- probe_guest_base(image_name, loaddr, hiaddr);
- }
- load_bias = load_addr - loaddr;
-
---
-1.8.3.2
-
diff --git a/community/qemu/APKBUILD b/community/qemu/APKBUILD
index f21270c88e..3bd20d0fc3 100644
--- a/community/qemu/APKBUILD
+++ b/community/qemu/APKBUILD
@@ -3,8 +3,8 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=qemu
-pkgver=4.2.0
-pkgrel=2
+pkgver=5.0.0
+pkgrel=0
pkgdesc="QEMU is a generic machine emulator and virtualizer"
url="https://qemu.org/"
arch="all"
@@ -111,6 +111,7 @@ _subsystems="
system-ppc64
system-riscv32
system-riscv64
+ system-rx
system-s390x
system-sh4
system-sh4eb
@@ -152,7 +153,6 @@ subpackages="$subpackages qemu-modules:_all_modules"
subpackages="$subpackages $pkgname-img" # -img must be declared the last
source="https://wiki.qemu-project.org/download/qemu-$pkgver.tar.xz
- 0001-elfload-load-PIE-executables-to-right-address.patch
0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
0001-linux-user-fix-build-with-musl-on-aarch64.patch
musl-F_SHLCK-and-F_EXLCK.patch
@@ -389,8 +389,7 @@ _all_modules() {
mkdir -p "$subpkgdir"
}
-sha512sums="2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56 qemu-4.2.0.tar.xz
-405008589cad1c8b609eca004d520bf944366e8525f85a19fc6e283c95b84b6c2429822ba064675823ab69f1406a57377266a65021623d1cd581e7db000134fd 0001-elfload-load-PIE-executables-to-right-address.patch
+sha512sums="21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf qemu-5.0.0.tar.xz
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