zabbix_agentd: Bugfix for /etc/sudoers.d/zabbix.user

[ipfire-2.x.git] / lfs / qemu

diff --git a/lfs/qemu b/lfs/qemu
index 4a83b86db2f3bee72dccdf40d7e47893fdcb0a3a..015837a59422684f7a24d4cdae3a15876e77ec64 100644 (file)
--- 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        #
@@ -78,6 +78,7 @@ $(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 \
                --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" \
@@ -88,14 +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 -cmr /usr/bin/qemu-system-arm
-       paxctl -cmr /usr/bin/qemu-system-i386
-       paxctl -cmr /usr/bin/qemu-system-x86_64
-       paxctl -cmr /usr/bin/qemu-arm
-       paxctl -cmr /usr/bin/qemu-i386
-       paxctl -cmr /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