.spice-streaming-agent.metadata

@@ -1 +1 @@
-d052d0abd8ad77b61a4db72e6de701de165b4999 SOURCES/spice-streaming-agent-0.3.tar.xz
+3a5e519b574e5ad6d6d821e72246c84e166e6f07  SOURCES/spice-streaming-agent-0.3.tar.xz

SOURCES/0100-gst-plugin-make-VP8-the-default-codec-downstream.patch

@@ -1,26 +0,0 @@
-From aaf2a1c4c276e7e5dd4f7bc570e9053a9accac85 Mon Sep 17 00:00:00 2001
-From: Uri Lublin <uril@redhat.com>
-Date: Thu, 28 Nov 2019 14:48:10 +0200
-Subject: [spice-streaming-agent patch 100/101] gst-plugin: make VP8 the default codec (downstream)
-
-Signed-off-by: Uri Lublin <uril@redhat.com>
----
- src/gst-plugin.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gst-plugin.cpp b/src/gst-plugin.cpp
-index 922b90d..b270e54 100644
---- a/src/gst-plugin.cpp
-+++ b/src/gst-plugin.cpp
-@@ -33,7 +33,7 @@ namespace gstreamer_plugin {
- struct GstreamerEncoderSettings
- {
-     int fps = 25;
--    SpiceVideoCodecType codec = SPICE_VIDEO_CODEC_TYPE_H264;
-+    SpiceVideoCodecType codec = SPICE_VIDEO_CODEC_TYPE_VP8;
-     std::string encoder;
-     std::vector<std::pair<std::string, std::string>> prop_pairs;
- };
--- 
-2.23.0
-

SOURCES/0101-gst-plugin-remove-H264-and-H265-downstream.patch

@@ -1,57 +0,0 @@
-From 5b38408d515ad76b31e096204e69f77880b41f6b Mon Sep 17 00:00:00 2001
-From: Uri Lublin <uril@redhat.com>
-Date: Thu, 28 Nov 2019 14:51:00 +0200
-Subject: [spice-streaming-agent patch 101/101] gst-plugin: remove H264 and H265 (downstream)
-
-Signed-off-by: Uri Lublin <uril@redhat.com>
----
- src/gst-plugin.cpp | 14 +-------------
- 1 file changed, 1 insertion(+), 13 deletions(-)
-
-diff --git a/src/gst-plugin.cpp b/src/gst-plugin.cpp
-index b270e54..8841b88 100644
---- a/src/gst-plugin.cpp
-+++ b/src/gst-plugin.cpp
-@@ -118,11 +118,6 @@ GstElement *GstreamerFrameCapture::get_encoder_plugin(const GstreamerEncoderSett
-     GstElementFactory *factory = nullptr;
- 
-     switch (settings.codec) {
--    case SPICE_VIDEO_CODEC_TYPE_H264:
--        sink_caps.reset(gst_caps_new_simple("video/x-h264",
--                                            "stream-format", G_TYPE_STRING, "byte-stream",
--                                            nullptr));
--        break;
-     case SPICE_VIDEO_CODEC_TYPE_MJPEG:
-         sink_caps.reset(gst_caps_new_empty_simple("image/jpeg"));
-         break;
-@@ -132,9 +127,6 @@ GstElement *GstreamerFrameCapture::get_encoder_plugin(const GstreamerEncoderSett
-     case SPICE_VIDEO_CODEC_TYPE_VP9:
-         sink_caps.reset(gst_caps_new_empty_simple("video/x-vp9"));
-         break;
--    case SPICE_VIDEO_CODEC_TYPE_H265:
--        sink_caps.reset(gst_caps_new_empty_simple("video/x-h265"));
--        break;
-     default : /* Should not happen - just to avoid compiler's complaint */
-         throw std::logic_error("Unknown codec");
-     }
-@@ -433,16 +425,12 @@ void GstreamerPlugin::ParseOptions(const ConfigureOption *options)
-                 throw std::runtime_error("Invalid value '" + value + "' for option 'framerate'.");
-             }
-         } else if (name == "gst.codec") {
--            if (value == "h264") {
--                settings.codec = SPICE_VIDEO_CODEC_TYPE_H264;
--            } else if (value == "vp9") {
-+            if (value == "vp9") {
-                 settings.codec = SPICE_VIDEO_CODEC_TYPE_VP9;
-             } else if (value == "vp8") {
-                 settings.codec = SPICE_VIDEO_CODEC_TYPE_VP8;
-             } else if (value == "mjpeg") {
-                 settings.codec = SPICE_VIDEO_CODEC_TYPE_MJPEG;
--            } else if (value == "h265") {
--                settings.codec = SPICE_VIDEO_CODEC_TYPE_H265;
-             } else {
-                 throw std::runtime_error("Invalid value '" + value + "' for option 'gst.codec'.");
-             }
--- 
-2.23.0
-

SOURCES/spice-streaming-agent-0.3-sslv3.patch

@@ -0,0 +1,12 @@
+diff -uri spice-streaming-agent-0.3/subprojects/spice-common/common/ssl_verify.c spice-streaming-agent-0.3-sslv3/subprojects/spice-common/common/ssl_verify.c
+--- spice-streaming-agent-0.3/subprojects/spice-common/common/ssl_verify.c	2020-04-05 09:23:33.000000000 +0200
++++ spice-streaming-agent-0.3-sslv3/subprojects/spice-common/common/ssl_verify.c	2023-04-26 22:15:07.448176124 +0200
+@@ -72,7 +72,7 @@
+         goto finish;
+     }
+ 
+-    ret = EVP_PKEY_cmp(orig_pubkey, cert_pubkey);
++    ret = EVP_PKEY_eq(orig_pubkey, cert_pubkey);
+ 
+     if (ret == 1) {
+         spice_debug("public keys match");

SPECS/spice-streaming-agent.spec

@@ -1,11 +1,13 @@
 Name:           spice-streaming-agent
 Version:        0.3
-Release:        2%{?dist}
+Release:        202004050723.sslv3%{?dist}
 Summary:        SPICE streaming agent
 Group:          Applications/System
 License:        ASL 2.0
 URL:            https://www.redhat.com
 Source0:        %{name}-%{version}.tar.xz
+Patch0:         %{name}-%{version}-sslv3.patch
+
 BuildRequires:  spice-protocol >= 0.12.16
 BuildRequires:  libX11-devel libXfixes-devel
 BuildRequires:  libjpeg-turbo-devel
@@ -15,18 +17,27 @@ BuildRequires:  libdrm-devel
 BuildRequires:  libXrandr-devel
 BuildRequires:  gcc-c++
 BuildRequires:  diffutils
-BuildRequires:  gstreamer1-devel gstreamer1-plugins-base-devel
+BuildRequires:  meson >= 0.49
+BuildRequires:  gstreamer1-devel
+BuildRequires:  gstreamer1-plugins-base-devel
+BuildRequires:  pixman-devel
+BuildRequires:  glib2-devel
+BuildRequires:  opus-devel
+BuildRequires:  openssl-devel
+%if 0%{?rhel} && 0%{?rhel} <= 7
+BuildRequires:  python36
+BuildRequires:  python36-six
+BuildRequires:  python36-pyparsing
+%else
+BuildRequires:  python3
+BuildRequires:  python3-six
+BuildRequires:  python3-pyparsing
+%endif
 # we need /usr/sbin/semanage program which is available on different
 # packages depending on distribution
 Requires(post): /usr/sbin/semanage
 Requires(postun): /usr/sbin/semanage
 
-ExclusiveArch: x86_64
-
-# Downstream: remove H264 and set VP8 as the default codec
-Patch0100: 0100-gst-plugin-make-VP8-the-default-codec-downstream.patch
-Patch0101: 0101-gst-plugin-remove-H264-and-H265-downstream.patch
-
 %description
 An agent, running on a guest, sending video streams of the X display to a
 remote client (over SPICE).
@@ -43,21 +54,17 @@ agent plugins.
 
 %prep
 %setup -q
-%patch100 -p1
+%autopatch -p1
-%patch101 -p1
 
 %build
-%configure --enable-tests --with-udevrulesdir=%{_udevrulesdir} --enable-gst-plugin=yes
+%meson -Dunittests=enabled -Dudevrulesdir=%{_udevrulesdir}
-make %{?_smp_mflags} V=1
+%meson_build
 
 %check
-make check
+%meson_test
 
 %install
-make install DESTDIR=%{buildroot} V=1
+%meson_install
-if test -d "%{buildroot}/%{_libdir}/%{name}/plugins"; then
-    find %{buildroot}/%{_libdir}/%{name}/plugins -name '*.la' -delete
-fi
 
 %post
 semanage fcontext -a -t xserver_exec_t %{_bindir}/spice-streaming-agent 2>/dev/null || :
@@ -76,8 +83,7 @@ fi
 %{_sysconfdir}/xdg/autostart/spice-streaming.desktop
 %{_datadir}/gdm/greeter/autostart/spice-streaming.desktop
 %{_mandir}/man1/spice-streaming-agent.1.gz
-%{_libdir}/%{name}/plugins/*.so
+%{_libdir}/%{name}/plugins/gst-plugin.so
-
 
 %files devel
 %defattr(-,root,root,-)
@@ -85,14 +91,20 @@ fi
 %{_libdir}/pkgconfig
 
 %changelog
-* Thu Dec 12 2019 Uri Lublin <uril@redhat.com> - 0.3-2
+* Fri Aug 23 2024 Dmitriy Samoylik <samoylikdv@msvsphere-os.ru> - 0.3-202004050723.sslv3
+- Rebuilt for MSVSphere 9.4
+
+* Wed Apr 26 2023 Jean-Marc Liger <ligenix@iscp.fr> - 0.3-202004050723.sslv3
+- Fix SSLv3
+
+* Sun Apr 05 2020 Latest Spice <latest@spice> - 0.3-202004050723.spice.latest
+- Update to spice latest
+
+* Thu Sep 19 2019 Uri Lublin <uril@redhat.com> - 0.3-1
 - Update to 0.3 release
-- Resolves: rhbz#1774123
-- Resolves: rhbz#1774129
 
-* Wed Aug  1 2018 Uri Lublin <uril@redhat.com> - 0.2-3
+* Thu May 31 2018 Uri Lublin <uril@redhat.com> - 0.2-1
-- Rebuild for rhel-8
+- First release
-  Related: rhbz#1614485
 
 * Wed Aug 16 2017 Frediano Ziglio <fziglio@redhat.com> - 0.1-1
 - Initial package (pre-release)