- updated to 2.4.0

diff --git a/qemu-system-libcacard.patch b/qemu-system-libcacard.patch
index e629fa827c5100de07718d81f9cfd63cf48a4aad..b5d9c066c6b093f7dad086f031825b04048207ea 100644 (file)
--- a/qemu-system-libcacard.patch
+++ b/qemu-system-libcacard.patch
@@ -1,6 +1,7 @@
---- qemu-1.7.0/configure.orig  2013-12-15 08:38:07.584329114 +0100
-+++ qemu-1.7.0/configure       2013-12-15 08:54:19.730954984 +0100
-@@ -3543,9 +3543,11 @@
+diff -urNp qemu-2.4.0.orig/configure qemu-2.4.0/configure
+--- qemu-2.4.0.orig/configure  2015-08-25 06:46:52.000000000 +0000
++++ qemu-2.4.0/configure       2015-08-25 06:52:47.586593251 +0000
+@@ -3765,9 +3765,11 @@ if test "$smartcard_nss" != "no"; then
  int main(void) { PK11_FreeSlot(0); return 0; }
  EOF
      # FIXME: do not include $glib_* in here
@@ -13,7 +14,7 @@
      # The header files in nss < 3.13.3 have a bug which causes them to
      # emit a warning. If we're going to compile QEMU with -Werror, then
      # test that the headers don't have this bug. Otherwise we would pass
-@@ -3557,6 +3559,8 @@
+@@ -3779,6 +3781,8 @@ EOF
         $pkg_config --atleast-version=3.12.8 nss && \
        compile_prog "$test_cflags" "$nss_libs"; then
          smartcard_nss="yes"
@@ -21,8 +22,8 @@
 +        libs_softmmu="$libcacard_libs $nss_libs $libs_softmmu"
      else
          if test "$smartcard_nss" = "yes"; then
-             feature_not_found "nss"
-@@ -4574,6 +4578,8 @@
+             feature_not_found "nss" "Install nss devel >= 3.12.8"
+@@ -4933,6 +4937,8 @@ fi
  
  if test "$smartcard_nss" = "yes" ; then
    echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak
@@ -31,37 +32,40 @@
    echo "NSS_LIBS=$nss_libs" >> $config_host_mak
    echo "NSS_CFLAGS=$nss_cflags" >> $config_host_mak
  fi
---- qemu-1.3.0/Makefile.orig   2012-12-03 20:37:05.000000000 +0100
-+++ qemu-1.3.0/Makefile        2012-12-16 11:08:58.001201236 +0100
-@@ -111,9 +111,6 @@
- include $(SRC_PATH)/Makefile.objs
+diff -urNp qemu-2.4.0.orig/hw/usb/ccid-card-passthru.c qemu-2.4.0/hw/usb/ccid-card-passthru.c
+--- qemu-2.4.0.orig/hw/usb/ccid-card-passthru.c        2015-08-11 19:11:07.000000000 +0000
++++ qemu-2.4.0/hw/usb/ccid-card-passthru.c     2015-08-25 06:52:53.709593251 +0000
+@@ -12,7 +12,7 @@
+ #include "qemu/error-report.h"
+ #include "qemu/sockets.h"
+ #include "ccid.h"
+-#include "libcacard/vscard_common.h"
++#include <cacard/vscard_common.h>
+ 
+ #define DPRINTF(card, lvl, fmt, ...)                    \
+ do {                                                    \
+diff -urNp qemu-2.4.0.orig/Makefile qemu-2.4.0/Makefile
+--- qemu-2.4.0.orig/Makefile   2015-08-11 19:11:05.000000000 +0000
++++ qemu-2.4.0/Makefile        2015-08-25 06:52:47.588593251 +0000
+@@ -157,9 +157,6 @@ dummy := $(call unnest-vars,, \
+ ifneq ($(wildcard config-host.mak),)
  include $(SRC_PATH)/tests/Makefile
  endif
 -ifeq ($(CONFIG_SMARTCARD_NSS),y)
 -include $(SRC_PATH)/libcacard/Makefile
 -endif
  
- all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all
+ all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules
  
---- qemu-1.5.0/Makefile.objs.orig      2013-05-20 17:34:39.000000000 +0200
-+++ qemu-1.5.0/Makefile.objs   2013-05-26 17:46:51.190865264 +0200
-@@ -74,8 +74,6 @@
+diff -urNp qemu-2.4.0.orig/Makefile.objs qemu-2.4.0/Makefile.objs
+--- qemu-2.4.0.orig/Makefile.objs      2015-08-11 19:11:05.000000000 +0000
++++ qemu-2.4.0/Makefile.objs   2015-08-25 06:54:03.092593251 +0000
+@@ -75,8 +75,6 @@ common-obj-y += backends/
  
  common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
  
 -common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y)
 -
- ######################################################################
- # qapi
+ common-obj-$(CONFIG_FDT) += device_tree.o
  
---- qemu-1.5.0/hw/usb/ccid-card-passthru.c.orig        2013-05-20 17:34:39.000000000 +0200
-+++ qemu-1.5.0/hw/usb/ccid-card-passthru.c     2013-05-26 17:58:20.660836330 +0200
-@@ -12,7 +12,7 @@
- #include "qemu/sockets.h"
- #include "monitor/monitor.h"
- #include "ccid.h"
--#include "libcacard/vscard_common.h"
-+#include <cacard/vscard_common.h>
- 
- #define DPRINTF(card, lvl, fmt, ...)                    \
- do {                                                    \
+ ######################################################################

diff --git a/qemu.spec b/qemu.spec
index 0f313e882eb32707d83f532c4660484bd662af95..171f56577604de7a694e19ec13d3f1c2b8a2b007 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -32,12 +32,12 @@
 Summary:       QEMU CPU Emulator
 Summary(pl.UTF-8):     QEMU - emulator procesora
 Name:          qemu
-Version:       2.3.0
-Release:       4
+Version:       2.4.0
+Release:       1
 License:       GPL v2
 Group:         Applications/Emulators
 Source0:       http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 2fab3ea4460de9b57192e5b8b311f221
+# Source0-md5: 186ee8194140a484a455f8e3c74589f4
 # Loads kvm kernel modules at boot
 Source3:       kvm-modules-load.conf
 # Creates /dev/kvm
@@ -53,7 +53,6 @@ Patch2:               %{name}-whitelist.patch
 Patch3:                %{name}-system-libcacard.patch
 Patch4:                %{name}-xattr.patch
 Patch5:                libjpeg-boolean.patch
-Patch6:                CVE-2015-3456.patch
 # Proof of concept, for reference, do not remove
 Patch400:      %{name}-kde_virtual_workspaces_hack.patch
 URL:           http://www.qemu-project.org/
@@ -662,6 +661,18 @@ Requires:  %{name}-common = %{version}-%{release}
 %description module-block-curl -l pl.UTF-8
 Moduł QEMU dla urządeń blokowych typu 'curl'.
 
+%package module-block-dmg
+Summary:       QEMU module for 'dmg' block devices
+Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'dmg'
+Group:         Development/Tools
+Requires:      %{name}-common = %{version}-%{release}
+
+%description module-block-dmg
+'dmg' block device support for QEMU.
+
+%description module-block-dmg -l pl.UTF-8
+Moduł QEMU dla urządeń blokowych typu 'dmg'.
+
 %package module-block-gluster
 Summary:       QEMU module for 'gluster' block devices
 Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'gluster'
@@ -720,7 +731,6 @@ Moduł QEMU dla urządeń blokowych typu 'ssh'.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %{__mv} libcacard libcacard-use-system-lib
 
@@ -773,7 +783,6 @@ ln -s ../error.h qapi/error.h
        %{__enable_disable libnfs} \
        --enable-lzo \
        %{__enable_disable snappy} \
-       --enable-quorum \
        --audio-drv-list="alsa%{?with_iss:,oss}%{?with_sdl:,sdl}%{?with_esd:,esd}%{?with_pulseaudio:,pa}" \
        --interp-prefix=%{_libdir}/qemu/lib-%%M \
 %if %{without gtk2} && %{without gtk3}
@@ -869,11 +878,9 @@ fi
 %defattr(644,root,root,755)
 %doc LICENSE README qemu-doc.html qemu-tech.html qmp-commands.txt
 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/qemu-ifup
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/qemu/target-*.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/ksmtuned.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/sasl/qemu.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ksm
-%dir %{_sysconfdir}/qemu
 %attr(755,root,root) %{_bindir}/virtfs-proxy-helper
 %attr(755,root,root) %{_bindir}/qemu-nbd
 %attr(755,root,root) %{_libdir}/qemu-bridge-helper
@@ -920,11 +927,12 @@ fi
 %{_datadir}/%{name}/sgabios.bin
 %{_datadir}/%{name}/slof.bin
 %{_datadir}/%{name}/spapr-rtas.bin
+%{_datadir}/%{name}/vgabios.bin
 %{_datadir}/%{name}/vgabios-cirrus.bin
 %{_datadir}/%{name}/vgabios-qxl.bin
 %{_datadir}/%{name}/vgabios-stdvga.bin
+%{_datadir}/%{name}/vgabios-virtio.bin
 %{_datadir}/%{name}/vgabios-vmware.bin
-%{_datadir}/%{name}/vgabios.bin
 
 %dir %{_libdir}/%{name}
 
@@ -1013,7 +1021,6 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-ppc
 %attr(755,root,root) %{_bindir}/qemu-system-ppc64
-#%attr(755,root,root) %{_bindir}/qemu-system-ppc64le
 %attr(755,root,root) %{_bindir}/qemu-system-ppcemb
 %{_datadir}/%{name}/u-boot.e500
 
@@ -1066,6 +1073,10 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/block-curl.so
 
+%files module-block-dmg
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/block-dmg.so
+
 %if %{with glusterfs}
 %files module-block-gluster
 %defattr(644,root,root,755)