diff --git a/.gitignore b/.gitignore index 7062ded..a30c0a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/spice-protocol-0.12.14.tar.bz2 +SOURCES/spice-protocol-0.14.0.tar.bz2 +SOURCES/victortoso-E37A484F.keyring diff --git a/.spice-protocol.metadata b/.spice-protocol.metadata index bdb6c56..5e41b01 100644 --- a/.spice-protocol.metadata +++ b/.spice-protocol.metadata @@ -1 +1,2 @@ -7c28a17a11d5c4ccd93fcae959a5f7ef2ee19ba7 SOURCES/spice-protocol-0.12.14.tar.bz2 +8958c5eb11c67ac213cc6d55a736e9aa51526137 SOURCES/spice-protocol-0.14.0.tar.bz2 +da7a529db1ea28a1540c5892ea9836abeb378c3e SOURCES/victortoso-E37A484F.keyring diff --git a/SOURCES/0001-qxl_dev-Align-QXLRam-to-4-bytes.patch b/SOURCES/0001-qxl_dev-Align-QXLRam-to-4-bytes.patch deleted file mode 100644 index c1d3253..0000000 --- a/SOURCES/0001-qxl_dev-Align-QXLRam-to-4-bytes.patch +++ /dev/null @@ -1,75 +0,0 @@ -From beda5ec7a6848be20c0cac2a9a8ef2a41e8069c1 Mon Sep 17 00:00:00 2001 -From: Frediano Ziglio -Date: Thu, 28 Jun 2018 21:30:21 +0100 -Subject: [PATCH] qxl_dev: Align QXLRam to 4 bytes - -This avoids compilers detect misaligned access which can lead to -warnings. -In QEMU the structure is allocated at the beginning of a 4Kb page, -in Xspice is allocated with a calloc, so the structure will end up 4 -bytes aligned as well with these users. We are not aware of other users -of QXLRam, but if there was, it's likely the struct would be at least -naturally aligned, so this change should not impact anyone. -Aligning to 4 bytes maintains the size of the structure unchanged -avoiding possible ABI changes. -clang currently generates an invalid function call if a misaligned -4 byte atomic operation is detected. - -This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1565766 - -Signed-off-by: Frediano Ziglio -Acked-by: Christophe Fergeau ---- - spice/end-packed.h | 1 + - spice/qxl_dev.h | 2 +- - spice/start-packed.h | 2 ++ - 3 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/spice/end-packed.h b/spice/end-packed.h -index 1acea18..0efd588 100644 ---- a/spice/end-packed.h -+++ b/spice/end-packed.h -@@ -32,6 +32,7 @@ - /* See start-packed.h for details */ - - #undef SPICE_ATTR_PACKED -+#undef SPICE_ATTR_ALIGNED - - #if defined(__MINGW32__) || !defined(__GNUC__) - #pragma pack(pop) -diff --git a/spice/qxl_dev.h b/spice/qxl_dev.h -index 9e753c4..a9cc4f4 100644 ---- a/spice/qxl_dev.h -+++ b/spice/qxl_dev.h -@@ -253,7 +253,7 @@ SPICE_RING_DECLARE(QXLReleaseRing, uint64_t, QXL_RELEASE_RING_SIZE); - #define QXL_INTERRUPT_CLIENT_MONITORS_CONFIG (1 << 5) - - /* qxl-1 compat: append only */ --typedef struct SPICE_ATTR_PACKED QXLRam { -+typedef struct SPICE_ATTR_ALIGNED(4) SPICE_ATTR_PACKED QXLRam { - uint32_t magic; - uint32_t int_pending; - uint32_t int_mask; -diff --git a/spice/start-packed.h b/spice/start-packed.h -index ab3fa98..de0c595 100644 ---- a/spice/start-packed.h -+++ b/spice/start-packed.h -@@ -48,6 +48,7 @@ - #ifdef __GNUC__ - - #define SPICE_ATTR_PACKED __attribute__ ((__packed__)) -+#define SPICE_ATTR_ALIGNED(n) __attribute__ ((__aligned__ (n))) - - #ifdef __MINGW32__ - #pragma pack(push,1) -@@ -58,6 +59,7 @@ - #pragma pack(push) - #pragma pack(1) - #define SPICE_ATTR_PACKED -+#define SPICE_ATTR_ALIGNED(n) __declspec (align (n)) - #pragma warning(disable:4200) - #pragma warning(disable:4103) - --- -2.17.1 - diff --git a/SOURCES/spice-protocol-0.14.0.tar.bz2.sig b/SOURCES/spice-protocol-0.14.0.tar.bz2.sig new file mode 100644 index 0000000..03db15f Binary files /dev/null and b/SOURCES/spice-protocol-0.14.0.tar.bz2.sig differ diff --git a/SPECS/spice-protocol.spec b/SPECS/spice-protocol.spec index 10a9ef4..f0933b3 100644 --- a/SPECS/spice-protocol.spec +++ b/SPECS/spice-protocol.spec @@ -1,16 +1,18 @@ Name: spice-protocol -Version: 0.12.14 +Version: 0.14.0 Release: 1%{?dist} Summary: Spice protocol header files Group: Development/Libraries # Main headers are BSD, controller / foreign menu are LGPL License: BSD and LGPLv2+ -URL: http://www.spice-space.org/ -Source0: http://www.spice-space.org/download/releases/%{name}-%{version}.tar.bz2 -Patch0001: 0001-qxl_dev-Align-QXLRam-to-4-bytes.patch +URL: https://www.spice-space.org/ +Source0: https://www.spice-space.org/download/releases/%{name}-%{version}.tar.bz2 +Source1: https://www.spice-space.org/download/releases/%{name}-%{version}.tar.bz2.sig +Source2: victortoso-E37A484F.keyring BuildArch: noarch BuildRequires: git-core +BuildRequires: gnupg2 %description Header files describing the spice protocol @@ -18,6 +20,7 @@ and the para-virtual graphics card QXL. %prep +gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %autosetup -S git_am %build @@ -29,12 +32,17 @@ make DESTDIR=%{buildroot} install %files -%doc COPYING NEWS +%doc COPYING README.md %{_includedir}/spice-1 %{_datadir}/pkgconfig/spice-protocol.pc %changelog +* Fri May 17 2019 Victor Toso - 0.14.0-1 +- Update to 0.14.0 + Resolves: rhbz#1711253 +- Add signature check to release + * Mon Jul 30 2018 Victor Toso - 0.12.14-1 - Update to 0.12.14 - Fix misaligned warnings - Resolves: rhbz#1565766