core132: Ship updated apache configuration

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

diff --git a/lfs/qemu b/lfs/qemu
index be5d7193d5e3c08443e1644c981427e4969c8bf4..d18b49cb358bbd457b00c0593deb5d198db93c20 100644 (file)
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -33,9 +33,9 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = i586 x86_64
 PROG       = qemu
-PAK_VER    = 23
+PAK_VER    = 24
 
-DEPS       = "libusbredir sdl spice"
+DEPS       = "libusbredir sdl spice libseccomp"
 
 ###############################################################################
 # Top-level Rules
@@ -82,21 +82,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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" \
-               --extra-cflags="$(CFLAGS)" --enable-spice --enable-usb-redir
+               --extra-cflags="$(CFLAGS)" --enable-spice --enable-usb-redir --enable-seccomp
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
        # 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