X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fqemu;h=015837a59422684f7a24d4cdae3a15876e77ec64;hp=26c2f24ec1f869cae70ac6624422c866d1e63cd4;hb=41b7369f8078d5dc4998483fa005b2f8e3b89624;hpb=8bbcfa1152f87e8092c91284e25184ae52914e6d

diff --git a/lfs/qemu b/lfs/qemu
index 26c2f24ec1..015837a594 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.8.0
+VER        = 2.11.0
 
 THISAPP    = qemu-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = i586 x86_64
 PROG       = qemu
-PAK_VER    = 22
+PAK_VER    = 23
 
 DEPS       = "libusbredir sdl spice"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 17940dce063b6ce450a12e719a6c9c43
+$(DL_FILE)_MD5 = 335994a755bc655e88a87aeb36bfc0b9
 
 install : $(TARGET)
 
@@ -78,8 +78,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-2.11.0-memfd-collision.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
-		--enable-kvm --disable-bluez --disable-attr \
+		--localstatedir=/var --enable-kvm --disable-bluez --disable-attr \
 		--target-list="i386-linux-user x86_64-linux-user arm-linux-user i386-softmmu x86_64-softmmu arm-softmmu" \
 		--extra-cflags="$(CFLAGS)" --enable-spice --enable-usb-redir
 	cd $(DIR_APP) && make $(MAKETUNING)
@@ -88,13 +89,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# install wrapper for old kvm parameter handling
 	install -m 755 $(DIR_SRC)/config/qemu/qemu /usr/bin/qemu
 
-	# disable PaX MPROTECT and RANDMMAP
-	paxctl -m -r /usr/bin/qemu-system-arm
-	paxctl -m -r /usr/bin/qemu-system-i386
-	paxctl -m -r /usr/bin/qemu-system-x86_64
-	paxctl -m -r /usr/bin/qemu-arm
-	paxctl -m -r /usr/bin/qemu-i386
-	paxctl -m -r /usr/bin/qemu-x86_64
 	# install an udev script to set the permissions of /dev/kvm
 	cp -avf $(DIR_SRC)/config/qemu/65-kvm.rules /lib/udev/rules.d/65-kvm.rules