Hello community,
here is the log from the commit of package qemu for openSUSE:Factory checked in at 2014-09-01 07:59:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qemu (Old)
and /work/SRC/openSUSE:Factory/.qemu.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu"
Changes:
--------
New Changes file:
--- /dev/null 2014-07-24 01:57:42.080040256 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/libcacard.changes 2014-09-01 07:59:20.000000000 +0200
@@ -0,0 +1,1789 @@
+-------------------------------------------------------------------
+Fri Aug 22 10:37:23 UTC 2014 - agraf@suse.com
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+* Patches added:
+ 0039-linux-user-Cast-validity-checks-on-.patch
+ 0040-linux-user-Convert-blkpg-to-use-a-s.patch
+
+-------------------------------------------------------------------
+Thu Aug 21 16:14:37 UTC 2014 - afaerber@suse.de
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+- Sort BuildRequires alphabetically to avoid changing back and forth
+- Sync'ed deletion of .a and .la to libcacard.spec.in
+- Revert use of %{version} in Source line as it breaks update_git.sh
+
+-------------------------------------------------------------------
+Wed Aug 6 17:29:30 UTC 2014 - coolo@suse.com
+
+- update to v2.1.0: http://wiki.qemu-project.org/ChangeLog/2.1
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+* Patches dropped:
+ 0039-fix-full-frame-updates-for-VNC-clie.patch
+ 0040-vnc-update-fix.patch
+
+-------------------------------------------------------------------
+Thu Jul 31 12:59:39 UTC 2014 - dimstar@opensuse.org
+
+- Rename rpmlintrc to %{name}-rpmlintrc.
+ Follow the packaging guidelines.
+
+-------------------------------------------------------------------
+Fri Jul 25 14:44:43 UTC 2014 - afaerber@suse.de
+
+- Backported VNC fixes for openQA (bnc#888142):
+* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+* Patches added:
+ 0039-fix-full-frame-updates-for-VNC-clie.patch
+ 0040-vnc-update-fix.patch
+
+-------------------------------------------------------------------
+Wed Jul 23 12:36:37 UTC 2014 - afaerber@suse.de
+
+- Update to v2.1.0-rc3: http://wiki.qemu-project.org/ChangeLog/2.1
+* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+* Patches dropped:
+ 0039-module-Simplify-module_load.patch
+ 0040-module-Don-t-complain-when-a-module.patch
+* Updated update_git.sh script accordingly
+
+-------------------------------------------------------------------
+Wed Jul 16 17:31:54 UTC 2014 - afaerber@suse.de
+
+- Update to v2.1.0-rc2: http://wiki.qemu-project.org/ChangeLog/2.1
+* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+* Patches dropped:
+ 0041-tests-Fix-unterminated-string-outpu.patch
+ 0042-libqos-Fix-PC-PCI-endianness-glitch.patch
+ 0043-qtest-fix-vhost-user-test-compilati.patch
+* Updated update_git.sh accordingly
+* Extended update_git.sh to add generated patch names to change log
+
+-------------------------------------------------------------------
+Wed Jul 9 17:34:55 UTC 2014 - afaerber@suse.de
+
+- Update to v2.1.0-rc0: http://wiki.qemu-project.org/ChangeLog/2.1
+* xen_disk discard support now upstream
+ 0037-xen_disk-add-discard-support.patch dropped
+* PowerPC ELF v2 support now upstream
+ 0045-tcg-ppc64-Support-the-ELFv2-ABI.patch dropped
+* Patches renamed during rebase:
+ 0015-linux-user-arm-no-tb_flush-on-reset.patch -> 0015-target-arm-linux-user-no-tb_flush-o.patch
+* Patches reordered due to rebase:
+ 0038-tests-Don-t-run-qom-test-twice.patch -> 0037-tests-Don-t-run-qom-test-twice.patch
+ 0041-qtest-Increase-socket-timeout.patch -> 0038-qtest-Increase-socket-timeout.patch
+ 0071-module-Simplify-module_load.patch -> 0039-module-Simplify-module_load.patch
+ 0072-module-Don-t-complain-when-a-module.patch -> 0040-module-Don-t-complain-when-a-module.patch
+* Patches automatically dropped on rebase:
+ 0039-qtest-Assure-that-init_socket-s-lis.patch
+ 0040-qtest-Add-error-reporting-to-socket.patch
+ 0042-qtest-Be-paranoid-about-accept-addr.patch
+ 0043-arm-translate.c-Fix-smlald-Instruct.patch
+ 0044-target-arm-A64-fix-unallocated-test.patch
+ 0046-vmstate-add-VMS_MUST_EXIST.patch
+ 0047-vmstate-add-VMSTATE_VALIDATE.patch
+ 0048-virtio-net-fix-buffer-overflow-on-i.patch
+ 0049-virtio-net-out-of-bounds-buffer-wri.patch
+ 0050-virtio-out-of-bounds-buffer-write-o.patch
+ 0051-ahci-fix-buffer-overrun-on-invalid-.patch
+ 0052-hpet-fix-buffer-overrun-on-invalid-.patch
+ 0053-hw-pci-pcie_aer.c-fix-buffer-overru.patch
+ 0054-pl022-fix-buffer-overun-on-invalid-.patch
+ 0055-vmstate-fix-buffer-overflow-in-targ.patch
+ 0056-virtio-avoid-buffer-overrun-on-inco.patch
+ 0057-virtio-validate-num_sg-when-mapping.patch
+ 0058-pxa2xx-avoid-buffer-overrun-on-inco.patch
+ 0059-ssd0323-fix-buffer-overun-on-invali.patch
+ 0060-tsc210x-fix-buffer-overrun-on-inval.patch
+ 0061-zaurus-fix-buffer-overrun-on-invali.patch
+ 0062-virtio-scsi-fix-buffer-overrun-on-i.patch
+ 0063-vmstate-s-VMSTATE_INT32_LE-VMSTATE_.patch
+ 0064-usb-sanity-check-setup_index-setup_.patch
+ 0065-savevm-Ignore-minimum_version_id_ol.patch
+ 0066-ssi-sd-fix-buffer-overrun-on-invali.patch
+ 0067-openpic-avoid-buffer-overrun-on-inc.patch
+ 0068-virtio-net-out-of-bounds-buffer-wri.patch
+ 0069-virtio-validate-config_len-on-load.patch
+ 0070-virtio-allow-mapping-up-to-max-queu.patch
+* iPXE fixes now included
+ ipxe-build-Work-around-bug-in-gcc-4.8.patch dropped
+ ipxe-build-Avoid-strict-aliasing-warning.patch dropped
+ ipxe-zbin-Fix-size-used-for-memset-in-al.patch dropped
+* SeaVGABIOS fix now included
+ vgabios-Make-sure-stdvga_list_modes-doesn-t-overrun-.patch dropped
+* Modified update_git.sh accordingly
+
+- Update to v2.1.0-rc1: http://wiki.qemu-project.org/ChangeLog/2.1
+* 0041-tests-Fix-unterminated-string-outpu.patch: Test fix
+* 0042-libqos-Fix-PC-PCI-endianness-glitch.patch: Test fix for ppc
+* 0043-qtest-fix-vhost-user-test-compilati.patch: Test fix for SP3
+* Modified update_git.sh accordingly
+
+-------------------------------------------------------------------
+Wed Jun 23 21:42:31 UTC 2014 - afaerber@suse.de
+
+- Move block-curl.so to new qemu-block-curl package, avoiding a
+ dependency of qemu-tools on qemu for Xen (bnc#882008)
+* Avoid the reported error message about missing modules
+ 0071-module-Simplify-module_load.patch
+ 0072-module-Don-t-complain-when-a-module.patch
+- Improve update_git.sh performance (backport from SLE12)
+
+-------------------------------------------------------------------
+Mon Jun 2 13:26:13 UTC 2014 - brogers@suse.com
+
+- only build the x86 firmware on x86, ensuring consistent binaries
+- remove un-needed pmtools BuildRequires
+- Fix vga related problem doing direct kernel boot for SLES 10 and
+ SLES 11 guests (bnc#880625)
+ vgabios-Make-sure-stdvga_list_modes-doesn-t-overrun-.patch
+- Probe vhost-net module on SLE11 (copied from SP3 package)
+
+-------------------------------------------------------------------
+Sat May 24 10:01:36 UTC 2014 - afaerber@suse.de
+
+- Fix CVE-2013-4148 (bnc#864812)
+ 0048-virtio-net-fix-buffer-overflow-on-i.patch
+- Fix CVE-2013-4149 (bnc#864649)
+ 0068-virtio-net-out-of-bounds-buffer-wri.patch
+- Fix CVE-2013-4150 (bnc#864650)
+ 0049-virtio-net-out-of-bounds-buffer-wri.patch
+- Fix CVE-2013-4151 (bnc#864653)
+ 0050-virtio-out-of-bounds-buffer-write-o.patch
+- Fix CVE-2013-4526 (bnc#864671)
+ 0051-ahci-fix-buffer-overrun-on-invalid-.patch
+- Fix CVE-2013-4527 (bnc#864673)
+ 0052-hpet-fix-buffer-overrun-on-invalid-.patch
+- Fix CVE-2013-4529 (bnc#864678)
+ 0053-hw-pci-pcie_aer.c-fix-buffer-overru.patch
+- Fix CVE-2013-4530 (bnc#864682)
+ 0054-pl022-fix-buffer-overun-on-invalid-.patch
+- Fix CVE-2013-4531 (bnc#864796)
+ 0055-vmstate-fix-buffer-overflow-in-targ.patch
+- Fix CVE-2013-4533 (bnc#864655)
+ 0058-pxa2xx-avoid-buffer-overrun-on-inco.patch
+- Fix CVE-2013-4534 (bnc#864811)
+ 0067-openpic-avoid-buffer-overrun-on-inc.patch
+- Fix CVE-2013-4535 / CVE-2013-4536 (bnc#864665)
+ 0057-virtio-validate-num_sg-when-mapping.patch
+- Fix CVE-2013-4537 (bnc#864391)
+ 0066-ssi-sd-fix-buffer-overrun-on-invali.patch
+- Fix CVE-2013-4538 (bnc#864769)
+ 0059-ssd0323-fix-buffer-overun-on-invali.patch
+- Fix CVE-2013-4539 (bnc#864805)
+ 0060-tsc210x-fix-buffer-overrun-on-inval.patch
+- Fix CVE-2013-4540 (bnc#864801)
+ 0061-zaurus-fix-buffer-overrun-on-invali.patch
+- Fix CVE-2013-4541 (bnc#864802)
+ 0064-usb-sanity-check-setup_index-setup_.patch
+- Fix CVE-2013-4542 (bnc#864804)
+ 0062-virtio-scsi-fix-buffer-overrun-on-i.patch
+- Fix CVE-2013-6399 (bnc#864814)
+ 0067-virtio-avoid-buffer-overrun-on-inco.patch
+- Fix CVE-2014-0182 (bnc#874788)
+ 0069-virtio-validate-config_len-on-load.patch
+- Backported patch from stable branch (brogers):
+ 0070-virtio-allow-mapping-up-to-max-queu.patch
+
+-------------------------------------------------------------------
+Wed May 14 13:44:38 UTC 2014 - afaerber@suse.de
+
+- Fix conflict with libcacard 0.1.2 from project security
+* Adopt description and group for libcacard-devel from there
+- Drop libcacard.{a,la} from libcacard-devel
+ If needed, libcacard.a should go into a libcacard-devel-static.
+- Change qemu-extra to explicitly list qemu-system-* binaries
+
++++ 1592 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:Factory/.qemu.new/libcacard.changes
--- /work/SRC/openSUSE:Factory/qemu/qemu-linux-user.changes 2014-08-03 15:36:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/qemu-linux-user.changes 2014-09-01 07:59:23.000000000 +0200
@@ -1,0 +2,24 @@
+Fri Aug 22 10:37:03 UTC 2014 - agraf@suse.com
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+* Patches added:
+ 0039-linux-user-Cast-validity-checks-on-.patch
+ 0040-linux-user-Convert-blkpg-to-use-a-s.patch
+- Implement missing ioctl to fix parted properly
+
+-------------------------------------------------------------------
+Thu Aug 21 16:14:37 UTC 2014 - afaerber@suse.de
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+- Revert use of %{version} in Source line as it breaks update_git.sh
+
+-------------------------------------------------------------------
+Wed Aug 6 17:29:09 UTC 2014 - coolo@suse.com
+
+- update to v2.1.0: http://wiki.qemu-project.org/ChangeLog/2.1
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+* Patches dropped:
+ 0039-fix-full-frame-updates-for-VNC-clie.patch
+ 0040-vnc-update-fix.patch
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2014-08-03 15:36:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/qemu.changes 2014-09-01 07:59:23.000000000 +0200
@@ -1,0 +2,29 @@
+Fri Aug 22 10:37:00 UTC 2014 - agraf@suse.com
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+* Patches added:
+ 0039-linux-user-Cast-validity-checks-on-.patch
+ 0040-linux-user-Convert-blkpg-to-use-a-s.patch
+
+-------------------------------------------------------------------
+Thu Aug 21 16:14:37 UTC 2014 - afaerber@suse.de
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+- Revert use of %{version} in Source line as it breaks update_git.sh
+
+-------------------------------------------------------------------
+Thu Aug 7 11:12:48 UTC 2014 - coolo@suse.com
+
+- build libcaca from a different spec file to avoid cycles with
+ spice
+
+-------------------------------------------------------------------
+Wed Aug 6 17:29:30 UTC 2014 - coolo@suse.com
+
+- update to v2.1.0: http://wiki.qemu-project.org/ChangeLog/2.1
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+* Patches dropped:
+ 0039-fix-full-frame-updates-for-VNC-clie.patch
+ 0040-vnc-update-fix.patch
+
+-------------------------------------------------------------------
Old:
----
0039-fix-full-frame-updates-for-VNC-clie.patch
0040-vnc-update-fix.patch
qemu-2.1.0-rc3.tar.bz2
New:
----
0039-linux-user-Cast-validity-checks-on-.patch
0040-linux-user-Convert-blkpg-to-use-a-s.patch
libcacard.changes
libcacard.spec
libcacard.spec.in
qemu-2.1.0.tar.bz2
qemu-2.1.0.tar.bz2.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcacard.spec ++++++
#
# spec file for package libcacard
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: libcacard
Url: http://www.qemu.org/
Summary: Universal CPU emulator
License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
Version: 2.1.0
Release: 0
Source: http://wiki.qemu.org/download/qemu-2.1.0.tar.bz2
# This patch queue is auto-generated from https://github.com/openSUSE/qemu
Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patch
Patch0002: 0002-XXX-work-around-SA_RESTART-race-wit.patch
Patch0003: 0003-qemu-0.9.0.cvs-binfmt.patch
Patch0004: 0004-qemu-cvs-alsa_bitfield.patch
Patch0005: 0005-qemu-cvs-alsa_ioctl.patch
Patch0006: 0006-qemu-cvs-alsa_mmap.patch
Patch0007: 0007-qemu-cvs-gettimeofday.patch
Patch0008: 0008-qemu-cvs-ioctl_debug.patch
Patch0009: 0009-qemu-cvs-ioctl_nodirection.patch
Patch0010: 0010-block-vmdk-Support-creation-of-SCSI.patch
Patch0011: 0011-linux-user-add-binfmt-wrapper-for-a.patch
Patch0012: 0012-PPC-KVM-Disable-mmu-notifier-check.patch
Patch0013: 0013-linux-user-fix-segfault-deadlock.patch
Patch0014: 0014-linux-user-binfmt-support-host-bina.patch
Patch0015: 0015-target-arm-linux-user-no-tb_flush-o.patch
Patch0016: 0016-linux-user-Ignore-broken-loop-ioctl.patch
Patch0017: 0017-linux-user-lock-tcg.patch
Patch0018: 0018-linux-user-Run-multi-threaded-code-.patch
Patch0019: 0019-linux-user-lock-tb-flushing-too.patch
Patch0020: 0020-linux-user-Fake-proc-cpuinfo.patch
Patch0021: 0021-linux-user-implement-FS_IOC_GETFLAG.patch
Patch0022: 0022-linux-user-implement-FS_IOC_SETFLAG.patch
Patch0023: 0023-linux-user-XXX-disable-fiemap.patch
Patch0024: 0024-slirp-nooutgoing.patch
Patch0025: 0025-vnc-password-file-and-incoming-conn.patch
Patch0026: 0026-linux-user-add-more-blk-ioctls.patch
Patch0027: 0027-linux-user-use-target_ulong.patch
Patch0028: 0028-block-Add-support-for-DictZip-enabl.patch
Patch0029: 0029-block-Add-tar-container-format.patch
Patch0030: 0030-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
Patch0031: 0031-Legacy-Patch-kvm-qemu-preXX-report-.patch
Patch0032: 0032-console-add-question-mark-escape-op.patch
Patch0033: 0033-Make-char-muxer-more-robust-wrt-sma.patch
Patch0034: 0034-linux-user-lseek-explicitly-cast-no.patch
Patch0035: 0035-virtfs-proxy-helper-Provide-__u64-f.patch
Patch0036: 0036-configure-Enable-PIE-for-ppc-and-pp.patch
Patch0037: 0037-tests-Don-t-run-qom-test-twice.patch
Patch0038: 0038-qtest-Increase-socket-timeout.patch
Patch0039: 0039-linux-user-Cast-validity-checks-on-.patch
Patch0040: 0040-linux-user-Convert-blkpg-to-use-a-s.patch
# Please do not add patches manually here, run update_git.sh.
# this is to make lint happy
Source300: qemu-rpmlintrc
Source400: update_git.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: e2fsprogs-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: libattr-devel
BuildRequires: libtool
BuildRequires: mozilla-nss-devel
BuildRequires: ncurses-devel
BuildRequires: python
BuildRequires: zlib-devel
%description
QEMU is an extremely well-performing CPU emulator that allows you to
choose between simulating an entire system and running userspace
binaries for different architectures under your native operating
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
as PC and PowerMac systems.
This sub-package contains statically linked binaries for running linux-user
emulations. This can be used together with the OBS build script to
run cross-architecture builds.
%package -n libcacard0
Summary: Common Access Card (CAC) emulation
Group: System/Emulators/PC
%description -n libcacard0
This emulator is designed to provide emulation of actual smart cards to a
virtual card reader running in a guest virtual machine. The emulated smart
cards can be representations of real smart cards, where the necessary functions
such as signing, card removal/insertion, etc. are mapped to real, physical
cards which are shared with the client machine the emulator is running on, or
the cards could be pure software constructs.
%package -n libcacard-devel
Summary: Common Access Card (CAC) emulation -- Development files
Group: Development/Languages/C and C++
Requires: glib2-devel
Requires: libcacard0 = %version
Requires: mozilla-nspr
Requires: mozilla-nss
%description -n libcacard-devel
This emulator is designed to provide emulation of actual smart cards to a
virtual card reader running in a guest virtual machine. The emulated smart
cards can be representations of real smart cards, where the necessary functions
such as signing, card removal/insertion, etc. are mapped to real, physical
cards which are shared with the client machine the emulator is running on, or
the cards could be pure software constructs.
This sub-package contains development files for the Smartcard library.
%prep
%setup -q -n qemu-%{version}
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
%patch0004 -p1
%patch0005 -p1
%patch0006 -p1
%patch0007 -p1
%patch0008 -p1
%patch0009 -p1
%patch0010 -p1
%patch0011 -p1
%patch0012 -p1
%patch0013 -p1
%patch0014 -p1
%patch0015 -p1
%patch0016 -p1
%patch0017 -p1
%patch0018 -p1
%patch0019 -p1
%patch0020 -p1
%patch0021 -p1
%patch0022 -p1
%patch0023 -p1
%patch0024 -p1
%patch0025 -p1
%patch0026 -p1
%patch0027 -p1
%patch0028 -p1
%patch0029 -p1
%patch0030 -p1
%patch0031 -p1
%patch0032 -p1
%patch0033 -p1
%patch0034 -p1
%patch0035 -p1
%patch0036 -p1
%patch0037 -p1
%patch0038 -p1
%patch0039 -p1
%patch0040 -p1
%build
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
--libdir=%_libdir \
--libexecdir=%_libexecdir \
--disable-strip \
--enable-smartcard-nss \
--extra-cflags="$QEMU_OPT_FLAGS"
make %{?_smp_mflags} V=1 libcacard.la
%install
make install-libcacard DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.a
rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.la
%post -n libcacard0 -p /sbin/ldconfig
%postun -n libcacard0 -p /sbin/ldconfig
%files -n libcacard0
%defattr(-, root, root)
%_libdir/libcacard.so.0*
%files -n libcacard-devel
%defattr(-, root, root)
%dir %_includedir/cacard
%_includedir/cacard/*.h
%_libdir/libcacard.so
%_libdir/pkgconfig/libcacard.pc
%changelog
++++++ qemu-linux-user.spec ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -21,9 +21,9 @@
Summary: Universal CPU emulator
License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
-Version: 2.0.93
+Version: 2.1.0
Release: 0
-Source: qemu-2.1.0-rc3.tar.bz2
+Source: http://wiki.qemu.org/download/qemu-2.1.0.tar.bz2
# This patch queue is auto-generated from https://github.com/openSUSE/qemu
Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patch
Patch0002: 0002-XXX-work-around-SA_RESTART-race-wit.patch
@@ -63,8 +63,8 @@
Patch0036: 0036-configure-Enable-PIE-for-ppc-and-pp.patch
Patch0037: 0037-tests-Don-t-run-qom-test-twice.patch
Patch0038: 0038-qtest-Increase-socket-timeout.patch
-Patch0039: 0039-fix-full-frame-updates-for-VNC-clie.patch
-Patch0040: 0040-vnc-update-fix.patch
+Patch0039: 0039-linux-user-Cast-validity-checks-on-.patch
+Patch0040: 0040-linux-user-Convert-blkpg-to-use-a-s.patch
# Please do not add patches manually here, run update_git.sh.
# this is to make lint happy
Source300: qemu-rpmlintrc
@@ -117,7 +117,7 @@
run cross-architecture builds.
%prep
-%setup -q -n qemu-2.1.0-rc3
+%setup -q -n qemu-2.1.0
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
++++++ qemu.spec ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -43,9 +43,10 @@
Summary: Universal CPU emulator
License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
-Version: 2.0.93
+Version: 2.1.0
Release: 0
-Source: %name-2.1.0-rc3.tar.bz2
+Source: http://wiki.qemu.org/download/%name-2.1.0.tar.bz2
+Source99: http://wiki.qemu.org/download/%name-2.1.0.tar.bz2.sig
Source1: 80-kvm.rules
Source2: qemu-ifup
Source3: kvm_stat
@@ -92,8 +93,8 @@
Patch0036: 0036-configure-Enable-PIE-for-ppc-and-pp.patch
Patch0037: 0037-tests-Don-t-run-qom-test-twice.patch
Patch0038: 0038-qtest-Increase-socket-timeout.patch
-Patch0039: 0039-fix-full-frame-updates-for-VNC-clie.patch
-Patch0040: 0040-vnc-update-fix.patch
+Patch0039: 0039-linux-user-Cast-validity-checks-on-.patch
+Patch0040: 0040-linux-user-Convert-blkpg-to-use-a-s.patch
# Please do not add patches manually here, run update_git.sh.
# this is to make lint happy
@@ -370,36 +371,6 @@
This sub-package contains various tools, including a bridge helper.
-%package -n libcacard0
-Summary: Common Access Card (CAC) emulation
-Group: System/Emulators/PC
-
-%description -n libcacard0
-This emulator is designed to provide emulation of actual smart cards to a
-virtual card reader running in a guest virtual machine. The emulated smart
-cards can be representations of real smart cards, where the necessary functions
-such as signing, card removal/insertion, etc. are mapped to real, physical
-cards which are shared with the client machine the emulator is running on, or
-the cards could be pure software constructs.
-
-%package -n libcacard-devel
-Summary: Common Access Card (CAC) emulation -- Development files
-Group: Development/Languages/C and C++
-Requires: glib2-devel
-Requires: libcacard0 = %version
-Requires: mozilla-nspr
-Requires: mozilla-nss
-
-%description -n libcacard-devel
-This emulator is designed to provide emulation of actual smart cards to a
-virtual card reader running in a guest virtual machine. The emulated smart
-cards can be representations of real smart cards, where the necessary functions
-such as signing, card removal/insertion, etc. are mapped to real, physical
-cards which are shared with the client machine the emulator is running on, or
-the cards could be pure software constructs.
-
-This sub-package contains development files for the Smartcard library.
-
%package guest-agent
Summary: Universal CPU emulator -- Guest agent
Group: System/Emulators/PC
@@ -487,7 +458,7 @@
%endif
%prep
-%setup -q -n %name-2.1.0-rc3
+%setup -q -n %name-2.1.0
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@@ -610,8 +581,9 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
rm -fr $RPM_BUILD_ROOT/%_datadir/doc
-rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.a
-rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.la
+rm $RPM_BUILD_ROOT/%_libdir/libcacard*
+rm $RPM_BUILD_ROOT/%_libdir/pkgconfig/libcacard.pc
+rm -fr $RPM_BUILD_ROOT/%_prefix/include/cacard
install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
%find_lang %name
%if %{legacy_qemu_kvm}
@@ -643,9 +615,6 @@
install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service
%fdupes -s $RPM_BUILD_ROOT
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
%pre
%{_bindir}/getent group kvm >/dev/null || %{_sbindir}/groupadd -r kvm 2>/dev/null
%{_bindir}/getent group qemu >/dev/null || %{_sbindir}/groupadd -r qemu 2>/dev/null
@@ -669,10 +638,6 @@
%verify_permissions %_libexecdir/qemu-bridge-helper
%endif
-%post -n libcacard0 -p /sbin/ldconfig
-
-%postun -n libcacard0 -p /sbin/ldconfig
-
%if 0%{?with_systemd}
%pre ksm
%service_add_pre ksm.service
@@ -871,17 +836,6 @@
%dir %_sysconfdir/%name
%config %_sysconfdir/%name/bridge.conf
-%files -n libcacard0
-%defattr(-, root, root)
-%_libdir/libcacard.so.0*
-
-%files -n libcacard-devel
-%defattr(-, root, root)
-%dir %_includedir/cacard
-%_includedir/cacard/*.h
-%_libdir/libcacard.so
-%_libdir/pkgconfig/libcacard.pc
-
%files guest-agent
%defattr(-, root, root)
%attr(755,root,kvm) %_bindir/qemu-ga
++++++ 0001-XXX-dont-dump-core-on-sigabort.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 9d12fa380ea51761fa5ebbbdc0d0f35857386b1f Mon Sep 17 00:00:00 2001
+From cd92cadeac41448d9da05993dc36837fb18774d0 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Mon, 21 Nov 2011 23:50:36 +0100
Subject: [PATCH] XXX dont dump core on sigabort
++++++ 0002-XXX-work-around-SA_RESTART-race-wit.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 22405b72847554fc6b6bdbd638c268ace80d7ce6 Mon Sep 17 00:00:00 2001
+From 251831808a392ee0c9dbe4fc0930c8a776a00eb0 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Thu, 1 Dec 2011 19:00:01 +0100
Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only)
++++++ 0003-qemu-0.9.0.cvs-binfmt.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 1e506ce87e3b551204e7c8556744cf8cfa92cb85 Mon Sep 17 00:00:00 2001
+From 9def5a721b4ba27bff7ae6acebf01a1e12a2d5d3 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht
Date: Tue, 14 Apr 2009 16:18:44 +0200
Subject: [PATCH] qemu-0.9.0.cvs-binfmt
++++++ 0004-qemu-cvs-alsa_bitfield.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From a04ffd68a5b5b199ea541c9da5fc3859d93c3818 Mon Sep 17 00:00:00 2001
+From c82f7e1ea51d8b07c0b4d3b911dde45bcbd02560 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Tue, 14 Apr 2009 16:20:50 +0200
Subject: [PATCH] qemu-cvs-alsa_bitfield
++++++ 0005-qemu-cvs-alsa_ioctl.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From a378ff5370f6042713599a80a9abf60911c3b663 Mon Sep 17 00:00:00 2001
+From a3e7d59e61520032f4426310195915e71622631c Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Tue, 14 Apr 2009 16:23:27 +0200
Subject: [PATCH] qemu-cvs-alsa_ioctl
++++++ 0006-qemu-cvs-alsa_mmap.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 9054622c8f9f227773bc32403859e0072a1630a1 Mon Sep 17 00:00:00 2001
+From 7d78b3ff3cca24f85abe0ae6f7889d802d8a4cd0 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Tue, 14 Apr 2009 16:24:15 +0200
Subject: [PATCH] qemu-cvs-alsa_mmap
++++++ 0007-qemu-cvs-gettimeofday.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 6433c7791241a69fb875e9612f8ebd181ad1b2a8 Mon Sep 17 00:00:00 2001
+From 5b7a59579eb7851d28eae98a3b621fc06ff2e091 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht
Date: Tue, 14 Apr 2009 16:25:41 +0200
Subject: [PATCH] qemu-cvs-gettimeofday
++++++ 0008-qemu-cvs-ioctl_debug.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 2cfde90a43d75901198213a1620c44b62b915a48 Mon Sep 17 00:00:00 2001
+From 0cfec315dbe8f6c8350315c22ddc83f705b65407 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Tue, 14 Apr 2009 16:26:33 +0200
Subject: [PATCH] qemu-cvs-ioctl_debug
++++++ 0009-qemu-cvs-ioctl_nodirection.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 5d65a63a5305e42187bb61595bd34ce67916e00b Mon Sep 17 00:00:00 2001
+From 7e3bec5f8e91e36623521aef6a2952d1a0079c3f Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Tue, 14 Apr 2009 16:27:36 +0200
Subject: [PATCH] qemu-cvs-ioctl_nodirection
++++++ 0010-block-vmdk-Support-creation-of-SCSI.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From a11d2097bce7374843220a31c94186a73b1aa969 Mon Sep 17 00:00:00 2001
+From b990b06fedf9acb38da0e8a5921b203e1572859e Mon Sep 17 00:00:00 2001
From: Ulrich Hecht
Date: Tue, 14 Apr 2009 16:37:42 +0200
Subject: [PATCH] block/vmdk: Support creation of SCSI VMDK images in qemu-img
++++++ 0011-linux-user-add-binfmt-wrapper-for-a.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 7e3816a7a96dc7fa2f699b1929a027f9587b110d Mon Sep 17 00:00:00 2001
+From fe047f7a640629933a20b35c742172d60b198738 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Fri, 30 Sep 2011 19:40:36 +0200
Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling
++++++ 0012-PPC-KVM-Disable-mmu-notifier-check.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 62b7da9ebf01803de3768e425ec4742269c0e0ee Mon Sep 17 00:00:00 2001
+From 00558f88ef659515a59debcbd19e304d8a884a5f Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Fri, 6 Jan 2012 01:05:55 +0100
Subject: [PATCH] PPC: KVM: Disable mmu notifier check
++++++ 0013-linux-user-fix-segfault-deadlock.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From d4fd71138a97db96f423d44144633637f62f298a Mon Sep 17 00:00:00 2001
+From 222ee94ba6e46ef89a6cc0de6f03b25310af02a7 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Fri, 13 Jan 2012 17:05:41 +0100
Subject: [PATCH] linux-user: fix segfault deadlock
++++++ 0014-linux-user-binfmt-support-host-bina.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 2dba4056236a9f41b0de729713ba11f9a428d26c Mon Sep 17 00:00:00 2001
+From 5d5c84486c1a16916376b8d0b757eab4a2c45ddd Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Thu, 2 Feb 2012 18:02:33 +0100
Subject: [PATCH] linux-user: binfmt: support host binaries
@@ -8,11 +8,11 @@
Signed-off-by: Alexander Graf
---
- linux-user/binfmt.c | 25 +++++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
+ linux-user/binfmt.c | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
diff --git a/linux-user/binfmt.c b/linux-user/binfmt.c
-index cd1f513..87dc4c6 100644
+index cd1f513..c755edc 100644
--- a/linux-user/binfmt.c
+++ b/linux-user/binfmt.c
@@ -5,6 +5,9 @@
@@ -25,7 +25,7 @@
int main(int argc, char **argv, char **envp)
{
-@@ -28,6 +31,28 @@ int main(int argc, char **argv, char **envp)
+@@ -28,6 +31,29 @@ int main(int argc, char **argv, char **envp)
binfmt[0] = '\0';
/* Now argv[0] is the real qemu binary name */
@@ -33,14 +33,15 @@
+ {
+ char *hostbin;
+ char *guestarch;
++ int r;
+
+ guestarch = strrchr(argv[0], '-') ;
+ if (!guestarch) {
+ goto skip;
+ }
+ guestarch++;
-+ asprintf(&hostbin, "/emul/" ARCH_NAME "-for-%s/%s", guestarch, argv[1]);
-+ if (!access(hostbin, X_OK)) {
++ r = asprintf(&hostbin, "/emul/" ARCH_NAME "-for-%s/%s", guestarch, argv[1]);
++ if (!access(hostbin, X_OK) && (r > 0)) {
+ /*
+ * We found a host binary replacement for the non-host binary. Let's
+ * use that instead!
++++++ 0015-target-arm-linux-user-no-tb_flush-o.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 56191c08ebab2895ce7362517901ddbdceff3e78 Mon Sep 17 00:00:00 2001
+From cbdee3c89ee3a9eb92e4950331a4467ef3b631f7 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Tue, 29 May 2012 15:30:01 +0200
Subject: [PATCH] target-arm: linux-user: no tb_flush on reset
++++++ 0016-linux-user-Ignore-broken-loop-ioctl.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From dfb36bf2a5654aed53311fe79be72f236bd5e821 Mon Sep 17 00:00:00 2001
+From 01b4a4a0570ebb8808233a33fb1e19b247e1bef5 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Tue, 12 Jun 2012 04:41:10 +0200
Subject: [PATCH] linux-user: Ignore broken loop ioctl
++++++ 0017-linux-user-lock-tcg.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 3c7976dbd6b551d7c0c503f54f6056515159d48d Mon Sep 17 00:00:00 2001
+From 097619e159ed8c4c0209aacf93e9a3a64f853aef Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Thu, 5 Jul 2012 17:31:39 +0200
Subject: [PATCH] linux-user: lock tcg
++++++ 0018-linux-user-Run-multi-threaded-code-.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 6e6f95d867e2722f952fe4b7cd4e6fcdc5e2f3cf Mon Sep 17 00:00:00 2001
+From d708c8ddc376dab7cf20421553d2f066ff0e4c67 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Tue, 10 Jul 2012 20:40:55 +0200
Subject: [PATCH] linux-user: Run multi-threaded code on a single core
++++++ 0019-linux-user-lock-tb-flushing-too.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From cbbf0779a6cf50f973982760792f357b77d91835 Mon Sep 17 00:00:00 2001
+From 5c92fd785687b31d2af90d9a67dfac7763f58ed0 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Wed, 11 Jul 2012 16:47:42 +0200
Subject: [PATCH] linux-user: lock tb flushing too
++++++ 0020-linux-user-Fake-proc-cpuinfo.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 0ce92834dd3a55e232de8097245f5e51f03af497 Mon Sep 17 00:00:00 2001
+From 99d290456ff1103918e341ceac7535bc3b4b6f49 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Mon, 23 Jul 2012 10:24:14 +0200
Subject: [PATCH] linux-user: Fake /proc/cpuinfo
++++++ 0021-linux-user-implement-FS_IOC_GETFLAG.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From ec0dc12708f5cd1a1880ebe165c8e4b2a0876d86 Mon Sep 17 00:00:00 2001
+From cc0c9cec3fd3bcf86f7ddca8d6ba6a292c127cef Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Mon, 20 Aug 2012 00:02:52 +0200
Subject: [PATCH] linux-user: implement FS_IOC_GETFLAGS ioctl
++++++ 0022-linux-user-implement-FS_IOC_SETFLAG.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 549adde44ee4762253aab35c4b72bf3fb9b9eb94 Mon Sep 17 00:00:00 2001
+From e822cfa8fea3cddc331664ce2e7df20ed630d37b Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Mon, 20 Aug 2012 00:07:13 +0200
Subject: [PATCH] linux-user: implement FS_IOC_SETFLAGS ioctl
++++++ 0023-linux-user-XXX-disable-fiemap.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 6d699789b883d02ca2b5cf762a1a496cb1d294fa Mon Sep 17 00:00:00 2001
+From 691935bb8dcfdbb9c64af96d8ba7421000b7d648 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Tue, 21 Aug 2012 14:20:40 +0200
Subject: [PATCH] linux-user: XXX disable fiemap
++++++ 0024-slirp-nooutgoing.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 2386ed38a5203b175f5d225d7693f9f3019b1b2f Mon Sep 17 00:00:00 2001
+From c4a739a0fdfae2c61b78ccfc3893298dc79e4f6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?=
Date: Wed, 29 Aug 2012 18:42:56 +0200
Subject: [PATCH] slirp: -nooutgoing
@@ -12,7 +12,7 @@
4 files changed, 40 insertions(+)
diff --git a/qemu-options.hx b/qemu-options.hx
-index 9e54686..0a7247d 100644
+index 1549625..c0f9022 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2795,6 +2795,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU
++++++ 0025-vnc-password-file-and-incoming-conn.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 568c674a7dcedee67b067a79ca4a680dd5d8dffd Mon Sep 17 00:00:00 2001
+From d9fd5bb9acd60d2dd7f46eecf49899ae196bb199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?=
Date: Wed, 29 Aug 2012 20:06:01 +0200
Subject: [PATCH] vnc: password-file= and incoming-connections=
@@ -9,7 +9,7 @@
1 file changed, 71 insertions(+)
diff --git a/ui/vnc.c b/ui/vnc.c
-index 548588a..ab03ee3 100644
+index f8d9b7d..48e6591 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -47,6 +47,7 @@ static const struct timeval VNC_REFRESH_LOSSY = { 2, 0 };
@@ -20,7 +20,7 @@
static int vnc_cursor_define(VncState *vs);
static void vnc_release_modifiers(VncState *vs);
-@@ -1037,6 +1038,7 @@ static void vnc_disconnect_start(VncState *vs)
+@@ -1039,6 +1040,7 @@ static void vnc_disconnect_start(VncState *vs)
void vnc_disconnect_finish(VncState *vs)
{
int i;
@@ -28,7 +28,7 @@
vnc_jobs_join(vs); /* Wait encoding jobs */
-@@ -1085,6 +1087,13 @@ void vnc_disconnect_finish(VncState *vs)
+@@ -1087,6 +1089,13 @@ void vnc_disconnect_finish(VncState *vs)
}
g_free(vs->lossy_rect);
g_free(vs);
@@ -42,7 +42,7 @@
}
int vnc_client_io_error(VncState *vs, int ret, int last_errno)
-@@ -3036,6 +3045,39 @@ char *vnc_display_local_addr(DisplayState *ds)
+@@ -3039,6 +3048,39 @@ char *vnc_display_local_addr(DisplayState *ds)
return vnc_socket_local_addr("%s:%s", vs->lsock);
}
@@ -82,7 +82,7 @@
void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
{
VncDisplay *vs = vnc_display;
-@@ -3069,6 +3111,9 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
+@@ -3072,6 +3114,9 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
while ((options = strchr(options, ','))) {
options++;
if (strncmp(options, "password", 8) == 0) {
@@ -92,7 +92,7 @@
if (fips_get_state()) {
error_setg(errp,
"VNC password auth disabled due to FIPS mode, "
-@@ -3077,6 +3122,32 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
+@@ -3080,6 +3125,32 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
goto fail;
}
password = 1; /* Require password auth */
++++++ 0026-linux-user-add-more-blk-ioctls.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 9c4aad2cda60ee3d0ca7a4fabdf3decc3392b2ae Mon Sep 17 00:00:00 2001
+From 45ebd4980cc8f842caa9d4e68ced2b4f134caaac Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Wed, 10 Oct 2012 10:21:20 +0200
Subject: [PATCH] linux-user: add more blk ioctls
++++++ 0027-linux-user-use-target_ulong.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 5710d6cf91f323779e6f80432b5e383eb3bb96f0 Mon Sep 17 00:00:00 2001
+From 1529d998a6e9858db8548628d16cff3ddbe2a080 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Tue, 9 Oct 2012 09:06:49 +0200
Subject: [PATCH] linux-user: use target_ulong
++++++ 0028-block-Add-support-for-DictZip-enabl.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 3b259aafe15356db62e11ffd28bb49e608fc9f25 Mon Sep 17 00:00:00 2001
+From 0a3476a6138ce132a75f84c994c1b6ffdcc87354 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Wed, 5 Aug 2009 09:49:37 +0200
Subject: [PATCH] block: Add support for DictZip enabled gzip files
++++++ 0029-block-Add-tar-container-format.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 7ae392839701cf9de9d232b030de5de78b399b11 Mon Sep 17 00:00:00 2001
+From 0fdc9a7f05acb99c3c21f747a4d25419f03c80dd Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Wed, 5 Aug 2009 17:28:38 +0200
Subject: [PATCH] block: Add tar container format
++++++ 0030-Legacy-Patch-kvm-qemu-preXX-dictzip.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From d73a78b03f5a2ecdd9324691f54802988c448eb2 Mon Sep 17 00:00:00 2001
+From eee446e6a362ab72bc97c90225ba6123f6d0ab3c Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Wed, 12 Dec 2012 19:11:30 +0100
Subject: [PATCH] Legacy Patch kvm-qemu-preXX-dictzip3.patch
++++++ 0031-Legacy-Patch-kvm-qemu-preXX-report-.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 066ff7b47f0d6ed60c5cc2314a6cdb3b46e701fe Mon Sep 17 00:00:00 2001
+From c20addda112a82af598960724a0968904c1735fb Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Wed, 12 Dec 2012 19:11:31 +0100
Subject: [PATCH] Legacy Patch kvm-qemu-preXX-report-default-mac-used.patch
++++++ 0032-console-add-question-mark-escape-op.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From d50517d9fe72cbd9e9a26615c0ef288763003be4 Mon Sep 17 00:00:00 2001
+From e54695d614849c8760f8ccb0ed467a74fca7f741 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Mon, 6 Jun 2011 06:53:52 +0200
Subject: [PATCH] console: add question-mark escape operator
++++++ 0033-Make-char-muxer-more-robust-wrt-sma.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 4f764327a74213eb54b0a9fe7019644df95a6d5a Mon Sep 17 00:00:00 2001
+From fae838b94d08af3b2230d2cafcacbc3d2ac780e5 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Thu, 1 Apr 2010 17:36:23 +0200
Subject: [PATCH] Make char muxer more robust wrt small FIFOs
@@ -22,7 +22,7 @@
1 file changed, 16 insertions(+)
diff --git a/qemu-char.c b/qemu-char.c
-index 7acc03f..c0ab288 100644
+index 956be49..d578c23 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -311,6 +311,9 @@ typedef struct {
++++++ 0034-linux-user-lseek-explicitly-cast-no.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 9de42598d5f5117d1fb2a13f36da01e946b0f43f Mon Sep 17 00:00:00 2001
+From cc47aef37004096cfe5788ce51d930543f614bbf Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Thu, 13 Dec 2012 14:29:22 +0100
Subject: [PATCH] linux-user: lseek: explicitly cast non-set offsets to signed
++++++ 0035-virtfs-proxy-helper-Provide-__u64-f.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 393ae753b3a72824994b6e58e38437b41baa56c7 Mon Sep 17 00:00:00 2001
+From ce5ea9682c42819ea21be30172208718ad890969 Mon Sep 17 00:00:00 2001
From: Bruce Rogers
Date: Thu, 16 May 2013 12:39:10 +0200
Subject: [PATCH] virtfs-proxy-helper: Provide __u64 for broken
++++++ 0036-configure-Enable-PIE-for-ppc-and-pp.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 5d53831a6dd2c69e284319860212fb6f3bf7af15 Mon Sep 17 00:00:00 2001
+From 2ad523fe3a4a65ef306e1f4ebbcd8d23bab9f75e Mon Sep 17 00:00:00 2001
From: Dinar Valeev
Date: Wed, 2 Oct 2013 17:56:03 +0200
Subject: [PATCH] configure: Enable PIE for ppc and ppc64 hosts
++++++ 0037-tests-Don-t-run-qom-test-twice.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 6bcc0297f33189667a882fa2db3a7c7f064fe52b Mon Sep 17 00:00:00 2001
+From 3d053835529bbdbdc9e05f9f4d6d6de87238f4e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?=
Date: Mon, 7 Apr 2014 16:03:08 +0200
Subject: [PATCH] tests: Don't run qom-test twice
++++++ 0038-qtest-Increase-socket-timeout.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 0cf035b2443562953c3e731b9feed4365553d1f2 Mon Sep 17 00:00:00 2001
+From d3c34d8f618b8914920e0f7d3979912c335f5fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?=
Date: Thu, 17 Apr 2014 18:39:10 +0200
Subject: [PATCH] qtest: Increase socket timeout
++++++ 0039-linux-user-Cast-validity-checks-on-.patch ++++++
From d9fc1799803a3783e0f764b0c9b7a336c8d3b893 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Fri, 22 Aug 2014 11:28:52 +0200
Subject: [PATCH] linux-user: Cast validity checks on g_posix_timers range
We check whether the passed in counter value is negative on all calls
that involve g_posix_timers. However, we also check check for negativity
of that value after casting it - at which point it couldn't possibly be
negative anymore.
Cast the check to int16_t. Maybe this is correct. Maybe the check should
get removed completely.
Signed-off-by: Alexander Graf
---
linux-user/syscall.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 0b4668d..660095b 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -9602,7 +9602,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
/* args: timer_t timerid, int flags, const struct itimerspec *new_value,
* struct itimerspec * old_value */
arg1 &= 0xffff;
- if (arg3 == 0 || arg1 < 0 || arg1 >= ARRAY_SIZE(g_posix_timers)) {
+ if (arg3 == 0 || (int16_t)arg1 < 0 || arg1 >= ARRAY_SIZE(g_posix_timers)) {
ret = -TARGET_EINVAL;
} else {
timer_t htimer = g_posix_timers[arg1];
@@ -9624,7 +9624,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
arg1 &= 0xffff;
if (!arg2) {
return -TARGET_EFAULT;
- } else if (arg1 < 0 || arg1 >= ARRAY_SIZE(g_posix_timers)) {
+ } else if ((int16_t)arg1 < 0 || arg1 >= ARRAY_SIZE(g_posix_timers)) {
ret = -TARGET_EINVAL;
} else {
timer_t htimer = g_posix_timers[arg1];
@@ -9644,7 +9644,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
{
/* args: timer_t timerid */
arg1 &= 0xffff;
- if (arg1 < 0 || arg1 >= ARRAY_SIZE(g_posix_timers)) {
+ if ((int16_t)arg1 < 0 || arg1 >= ARRAY_SIZE(g_posix_timers)) {
ret = -TARGET_EINVAL;
} else {
timer_t htimer = g_posix_timers[arg1];
@@ -9659,7 +9659,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
{
/* args: timer_t timerid */
arg1 &= 0xffff;
- if (arg1 < 0 || arg1 >= ARRAY_SIZE(g_posix_timers)) {
+ if ((int16_t)arg1 < 0 || arg1 >= ARRAY_SIZE(g_posix_timers)) {
ret = -TARGET_EINVAL;
} else {
timer_t htimer = g_posix_timers[arg1];
++++++ 0040-linux-user-Convert-blkpg-to-use-a-s.patch ++++++
From 4b0131e7b071bb06802a99fcf9a3717215b2362b Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Fri, 22 Aug 2014 12:22:28 +0200
Subject: [PATCH] linux-user: Convert blkpg to use a special subop handler
The blkpg ioctl can take different payloads depending on the opcode in
its payload structure. Create a new special ioctl handler that can only
deal with partition style ones for now.
Signed-off-by: Alexander Graf
---
Andreas, if you like feel free to squash this into your patch and submit
it upstream.
---
linux-user/ioctls.h | 3 ++-
linux-user/syscall.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++
linux-user/syscall_types.h | 2 +-
3 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index 9b6cacb..8eb4446 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
@@ -96,7 +96,8 @@
IOCTL(BLKRAGET, IOC_R, MK_PTR(TYPE_LONG))
IOCTL(BLKSSZGET, IOC_R, MK_PTR(TYPE_LONG))
IOCTL(BLKBSZGET, IOC_R, MK_PTR(TYPE_INT))
- IOCTL(BLKPG, IOC_W, MK_PTR(MK_STRUCT(STRUCT_blkpg_ioctl_arg)))
+ IOCTL_SPECIAL(BLKPG, IOC_W, do_ioctl_blkpg,
+ MK_PTR(MK_STRUCT(STRUCT_blkpg_ioctl_arg)))
#ifdef FIBMAP
IOCTL(FIBMAP, IOC_W | IOC_R, MK_PTR(TYPE_LONG))
#endif
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 660095b..04b5119 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3657,6 +3657,59 @@ out:
return ret;
}
+static abi_long do_ioctl_blkpg(const IOCTLEntry *ie, uint8_t *buf_temp, int fd,
+ abi_long cmd, abi_long arg)
+{
+ void *argptr;
+ int target_size;
+ const argtype *arg_type = ie->arg_type;
+ const argtype part_arg_type[] = { MK_STRUCT(STRUCT_blkpg_partition) };
+ abi_long ret;
+
+ struct blkpg_ioctl_arg *host_blkpg = (void*)buf_temp;
+ struct blkpg_partition host_part;
+
+ /* Read and convert blkpg */
+ arg_type++;
+ target_size = thunk_type_size(arg_type, 0);
+ argptr = lock_user(VERIFY_READ, arg, target_size, 1);
+ if (!argptr) {
+ ret = -TARGET_EFAULT;
+ goto out;
+ }
+ thunk_convert(buf_temp, argptr, arg_type, THUNK_HOST);
+ unlock_user(argptr, arg, 0);
+
+ switch (host_blkpg->op) {
+ case BLKPG_ADD_PARTITION:
+ case BLKPG_DEL_PARTITION:
+ /* payload is struct blkpg_partition */
+ break;
+ default:
+ /* Unknown opcode */
+ ret = -TARGET_EINVAL;
+ goto out;
+ }
+
+ /* Read and convert blkpg->data */
+ arg = (abi_long)(uintptr_t)host_blkpg->data;
+ target_size = thunk_type_size(part_arg_type, 0);
+ argptr = lock_user(VERIFY_READ, arg, target_size, 1);
+ if (!argptr) {
+ ret = -TARGET_EFAULT;
+ goto out;
+ }
+ thunk_convert(&host_part, argptr, part_arg_type, THUNK_HOST);
+ unlock_user(argptr, arg, 0);
+
+ /* Swizzle the data pointer to our local copy and call! */
+ host_blkpg->data = &host_part;
+ ret = get_errno(ioctl(fd, ie->host_cmd, host_blkpg));
+
+out:
+ return ret;
+}
+
static abi_long do_ioctl_rt(const IOCTLEntry *ie, uint8_t *buf_temp,
int fd, abi_long cmd, abi_long arg)
{
diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h
index 56e344c..a730c87 100644
--- a/linux-user/syscall_types.h
+++ b/linux-user/syscall_types.h
@@ -260,4 +260,4 @@ STRUCT(blkpg_ioctl_arg,
TYPE_INT, /* op */
TYPE_INT, /* flags */
TYPE_INT, /* datalen */
- MK_PTR(MK_STRUCT(STRUCT_blkpg_partition))) /* data */
+ TYPE_PTRVOID) /* data */
++++++ libcacard.spec.in ++++++
#
# spec file for package libcacard
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: libcacard
Url: http://www.qemu.org/
Summary: Universal CPU emulator
License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
QEMU_VERSION
Release: 0
Source: http://wiki.qemu.org/download/qemu-2.1.0.tar.bz2
# This patch queue is auto-generated from https://github.com/openSUSE/qemu
PATCH_FILES
# Please do not add patches manually here, run update_git.sh.
# this is to make lint happy
Source300: qemu-rpmlintrc
Source400: update_git.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: e2fsprogs-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: libattr-devel
BuildRequires: libtool
BuildRequires: mozilla-nss-devel
BuildRequires: ncurses-devel
BuildRequires: python
BuildRequires: zlib-devel
%description
QEMU is an extremely well-performing CPU emulator that allows you to
choose between simulating an entire system and running userspace
binaries for different architectures under your native operating
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
as PC and PowerMac systems.
This sub-package contains statically linked binaries for running linux-user
emulations. This can be used together with the OBS build script to
run cross-architecture builds.
%package -n libcacard0
Summary: Common Access Card (CAC) emulation
Group: System/Emulators/PC
%description -n libcacard0
This emulator is designed to provide emulation of actual smart cards to a
virtual card reader running in a guest virtual machine. The emulated smart
cards can be representations of real smart cards, where the necessary functions
such as signing, card removal/insertion, etc. are mapped to real, physical
cards which are shared with the client machine the emulator is running on, or
the cards could be pure software constructs.
%package -n libcacard-devel
Summary: Common Access Card (CAC) emulation -- Development files
Group: Development/Languages/C and C++
Requires: glib2-devel
Requires: libcacard0 = %version
Requires: mozilla-nspr
Requires: mozilla-nss
%description -n libcacard-devel
This emulator is designed to provide emulation of actual smart cards to a
virtual card reader running in a guest virtual machine. The emulated smart
cards can be representations of real smart cards, where the necessary functions
such as signing, card removal/insertion, etc. are mapped to real, physical
cards which are shared with the client machine the emulator is running on, or
the cards could be pure software constructs.
This sub-package contains development files for the Smartcard library.
%prep
%setup -q -n qemu-%{version}
PATCH_EXEC
%build
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
--libdir=%_libdir \
--libexecdir=%_libexecdir \
--disable-strip \
--enable-smartcard-nss \
--extra-cflags="$QEMU_OPT_FLAGS"
make %{?_smp_mflags} V=1 libcacard.la
%install
make install-libcacard DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.a
rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.la
%post -n libcacard0 -p /sbin/ldconfig
%postun -n libcacard0 -p /sbin/ldconfig
%files -n libcacard0
%defattr(-, root, root)
%_libdir/libcacard.so.0*
%files -n libcacard-devel
%defattr(-, root, root)
%dir %_includedir/cacard
%_includedir/cacard/*.h
%_libdir/libcacard.so
%_libdir/pkgconfig/libcacard.pc
%changelog
++++++ qemu-2.1.0-rc3.tar.bz2 -> qemu-2.1.0.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/qemu/qemu-2.1.0-rc3.tar.bz2 /work/SRC/openSUSE:Factory/.qemu.new/qemu-2.1.0.tar.bz2 differ: char 11, line 1
++++++ qemu-linux-user.spec.in ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -23,7 +23,7 @@
Group: System/Emulators/PC
QEMU_VERSION
Release: 0
-Source: qemu-2.1.0-rc3.tar.bz2
+Source: http://wiki.qemu.org/download/qemu-2.1.0.tar.bz2
# This patch queue is auto-generated from https://github.com/openSUSE/qemu
PATCH_FILES
# Please do not add patches manually here, run update_git.sh.
@@ -78,7 +78,7 @@
run cross-architecture builds.
%prep
-%setup -q -n qemu-2.1.0-rc3
+%setup -q -n qemu-2.1.0
PATCH_EXEC
%build
++++++ qemu.spec.in ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -45,7 +45,8 @@
Group: System/Emulators/PC
QEMU_VERSION
Release: 0
-Source: %name-2.1.0-rc3.tar.bz2
+Source: http://wiki.qemu.org/download/%name-2.1.0.tar.bz2
+Source99: http://wiki.qemu.org/download/%name-2.1.0.tar.bz2.sig
Source1: 80-kvm.rules
Source2: qemu-ifup
Source3: kvm_stat
@@ -331,36 +332,6 @@
This sub-package contains various tools, including a bridge helper.
-%package -n libcacard0
-Summary: Common Access Card (CAC) emulation
-Group: System/Emulators/PC
-
-%description -n libcacard0
-This emulator is designed to provide emulation of actual smart cards to a
-virtual card reader running in a guest virtual machine. The emulated smart
-cards can be representations of real smart cards, where the necessary functions
-such as signing, card removal/insertion, etc. are mapped to real, physical
-cards which are shared with the client machine the emulator is running on, or
-the cards could be pure software constructs.
-
-%package -n libcacard-devel
-Summary: Common Access Card (CAC) emulation -- Development files
-Group: Development/Languages/C and C++
-Requires: glib2-devel
-Requires: libcacard0 = %version
-Requires: mozilla-nspr
-Requires: mozilla-nss
-
-%description -n libcacard-devel
-This emulator is designed to provide emulation of actual smart cards to a
-virtual card reader running in a guest virtual machine. The emulated smart
-cards can be representations of real smart cards, where the necessary functions
-such as signing, card removal/insertion, etc. are mapped to real, physical
-cards which are shared with the client machine the emulator is running on, or
-the cards could be pure software constructs.
-
-This sub-package contains development files for the Smartcard library.
-
%package guest-agent
Summary: Universal CPU emulator -- Guest agent
Group: System/Emulators/PC
@@ -448,7 +419,7 @@
%endif
%prep
-%setup -q -n %name-2.1.0-rc3
+%setup -q -n %name-2.1.0
PATCH_EXEC
%if %{build_x86_fw_from_source}
@@ -532,8 +503,9 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
rm -fr $RPM_BUILD_ROOT/%_datadir/doc
-rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.a
-rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.la
+rm $RPM_BUILD_ROOT/%_libdir/libcacard*
+rm $RPM_BUILD_ROOT/%_libdir/pkgconfig/libcacard.pc
+rm -fr $RPM_BUILD_ROOT/%_prefix/include/cacard
install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
%find_lang %name
%if %{legacy_qemu_kvm}
@@ -565,9 +537,6 @@
install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service
%fdupes -s $RPM_BUILD_ROOT
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
%pre
%{_bindir}/getent group kvm >/dev/null || %{_sbindir}/groupadd -r kvm 2>/dev/null
%{_bindir}/getent group qemu >/dev/null || %{_sbindir}/groupadd -r qemu 2>/dev/null
@@ -591,10 +560,6 @@
%verify_permissions %_libexecdir/qemu-bridge-helper
%endif
-%post -n libcacard0 -p /sbin/ldconfig
-
-%postun -n libcacard0 -p /sbin/ldconfig
-
%if 0%{?with_systemd}
%pre ksm
%service_add_pre ksm.service
@@ -793,17 +758,6 @@
%dir %_sysconfdir/%name
%config %_sysconfdir/%name/bridge.conf
-%files -n libcacard0
-%defattr(-, root, root)
-%_libdir/libcacard.so.0*
-
-%files -n libcacard-devel
-%defattr(-, root, root)
-%dir %_includedir/cacard
-%_includedir/cacard/*.h
-%_libdir/libcacard.so
-%_libdir/pkgconfig/libcacard.pc
-
%files guest-agent
%defattr(-, root, root)
%attr(755,root,kvm) %_bindir/qemu-ga
++++++ update_git.sh ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -12,7 +12,7 @@
GIT_TREE=git://github.com/openSUSE/qemu.git
GIT_LOCAL_TREE=~/git/qemu-opensuse
GIT_BRANCH=opensuse-2.1
-GIT_UPSTREAM_TAG=v2.1.0-rc3
+GIT_UPSTREAM_TAG=v2.1.0
GIT_DIR=/dev/shm/qemu-factory-git-dir
CMP_DIR=/dev/shm/qemu-factory-cmp-dir
@@ -87,7 +87,7 @@
echo " ${i##*/}" >> qemu.changes.added
done
- for package in qemu qemu-linux-user; do
+ for package in qemu qemu-linux-user libcacard; do
while IFS= read -r line; do
if [ "$line" = "PATCH_FILES" ]; then
for i in 0???-*.patch; do
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org