Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

Signed-off-by: Victor Toso <victortoso@redhat.com>

.gitignore

@@ -22,3 +22,7 @@
 /usbredir-0.11.0.tar.xz.sig
 /usbredir-0.12.0.tar.xz
 /usbredir-0.12.0.tar.xz.sig
+/usbredir-0.13.0.tar.xz
+/usbredir-0.13.0.tar.xz.sig
+/usbredir-0.15.0.tar.xz
+/usbredir-0.15.0.tar.xz.sig

0001-usbredirparser-Fix-unserialize-on-pristine-check.patch

@@ -1,193 +0,0 @@
-From 6bf41a231b445ac5190c32e281b698b1ee5379b4 Mon Sep 17 00:00:00 2001
-From: Victor Toso <victortoso@redhat.com>
-Date: Fri, 24 Jun 2022 23:29:08 +0200
-Subject: [PATCH 1/2] usbredirparser: Fix unserialize on pristine check
-Content-type: text/plain
-
-As mentioned in the bug below, the user is trying to migrate QEMU and
-it is failing on the unserialization of usbredirparser at the target
-host. The user does not have USB attached to the VM at all.
-
-I've added a test that shows that serialization is currently broken.
-It fails at the 'pristine' check in usbredirparser_unserialize().
-
-This check was added with e37d86c "Skip empty write buffers when
-unserializing parser" and restricted further with 186c4c7 "Avoid
-memory leak from ill-formatted serialization data"
-
-The issue here is that usbredirparser's initialization sets some
-fields and thus it isn't guaranteed to be pristine.
-
-The parser's basic data is:
-
-  | write_buf_count ... : 1
-  | write_buf  ........ : 0xbc03e0
-  | write_buf_total_size: 80
-  | data  ............. : (nil)
-  | header_read: ...... : 0
-  | type_header_read .. : 0
-  | data_read: ........ : 0
-
-The current fix is to to ignore write_buf checks as, again, they are
-not guaranteed to be pristine. usbredirparser library should properly
-overwrite them when unserializing the data and if there were pending
-buffers, they should be freed.
-
-Related: https://bugzilla.redhat.com/show_bug.cgi?id=2096008
-
-Signed-off-by: Victor Toso <victortoso@redhat.com>
----
- tests/meson.build               |   1 +
- tests/serializer.c              | 113 ++++++++++++++++++++++++++++++++
- usbredirparser/usbredirparser.c |   4 +-
- 3 files changed, 115 insertions(+), 3 deletions(-)
- create mode 100644 tests/serializer.c
-
-diff --git a/tests/meson.build b/tests/meson.build
-index 0d4397b..2a179c9 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -1,5 +1,6 @@
- tests = [
-     'filter',
-+    'serializer',
- ]
- 
- deps = dependency('glib-2.0')
-diff --git a/tests/serializer.c b/tests/serializer.c
-new file mode 100644
-index 0000000..4bd669e
---- /dev/null
-+++ b/tests/serializer.c
-@@ -0,0 +1,113 @@
-+/*
-+ * Copyright 2022 Red Hat, Inc.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
-+*/
-+#include "config.h"
-+
-+#define G_LOG_DOMAIN "serializer"
-+#define G_LOG_USE_STRUCTURED
-+
-+#include "usbredirparser.h"
-+
-+#include <errno.h>
-+#include <locale.h>
-+#include <glib.h>
-+#include <stdlib.h>
-+
-+
-+static void
-+log_cb(void *priv, int level, const char *msg)
-+{
-+    GLogLevelFlags glog_level;
-+
-+    switch(level) {
-+    case usbredirparser_error:
-+        glog_level = G_LOG_LEVEL_ERROR;
-+        break;
-+    case usbredirparser_warning:
-+        glog_level = G_LOG_LEVEL_WARNING;
-+        break;
-+    case usbredirparser_info:
-+        glog_level = G_LOG_LEVEL_INFO;
-+        break;
-+    case usbredirparser_debug:
-+    case usbredirparser_debug_data:
-+        glog_level = G_LOG_LEVEL_DEBUG;
-+        break;
-+    default:
-+        g_warn_if_reached();
-+        return;
-+    }
-+    g_log_structured(G_LOG_DOMAIN, glog_level, "MESSAGE", msg);
-+}
-+
-+static struct usbredirparser *
-+get_usbredirparser(void)
-+{
-+    struct usbredirparser *parser = usbredirparser_create();
-+    g_assert_nonnull(parser);
-+
-+    uint32_t caps[USB_REDIR_CAPS_SIZE] = { 0, };
-+    /* Typical caps set by usbredirhost */
-+    usbredirparser_caps_set_cap(caps, usb_redir_cap_connect_device_version);
-+    usbredirparser_caps_set_cap(caps, usb_redir_cap_filter);
-+    usbredirparser_caps_set_cap(caps, usb_redir_cap_device_disconnect_ack);
-+    usbredirparser_caps_set_cap(caps, usb_redir_cap_ep_info_max_packet_size);
-+    usbredirparser_caps_set_cap(caps, usb_redir_cap_64bits_ids);
-+    usbredirparser_caps_set_cap(caps, usb_redir_cap_32bits_bulk_length);
-+    usbredirparser_caps_set_cap(caps, usb_redir_cap_bulk_receiving);
-+#if LIBUSBX_API_VERSION >= 0x01000103
-+    usbredirparser_caps_set_cap(caps, usb_redir_cap_bulk_streams);
-+#endif
-+    int parser_flags = usbredirparser_fl_usb_host;
-+
-+    parser->log_func = log_cb;
-+    usbredirparser_init(parser,
-+                        PACKAGE_STRING,
-+                        caps,
-+                        USB_REDIR_CAPS_SIZE,
-+                        parser_flags);
-+    return parser;
-+}
-+
-+static void
-+simple (gconstpointer user_data)
-+{
-+    uint8_t *state = NULL;
-+    int ret, len = -1;
-+
-+    struct usbredirparser *source = get_usbredirparser();
-+    ret = usbredirparser_serialize(source, &state, &len);
-+    g_assert_cmpint(ret, ==, 0);
-+
-+    struct usbredirparser *target = get_usbredirparser();
-+    ret = usbredirparser_unserialize(target, state, len);
-+    g_assert_cmpint(ret, ==, 0);
-+
-+    g_clear_pointer(&state, free);
-+    usbredirparser_destroy(source);
-+    usbredirparser_destroy(target);
-+}
-+
-+int
-+main(int argc, char **argv)
-+{
-+    setlocale(LC_ALL, "");
-+    g_test_init(&argc, &argv, NULL);
-+
-+    g_test_add_data_func("/serializer/serialize-and-unserialize", NULL, simple);
-+
-+    return g_test_run();
-+}
-diff --git a/usbredirparser/usbredirparser.c b/usbredirparser/usbredirparser.c
-index cd1136b..a5dd0e7 100644
---- a/usbredirparser/usbredirparser.c
-+++ b/usbredirparser/usbredirparser.c
-@@ -1816,9 +1816,7 @@ int usbredirparser_unserialize(struct usbredirparser *parser_pub,
-         return -1;
-     }
- 
--    if (!(parser->write_buf_count == 0 && parser->write_buf == NULL &&
--          parser->write_buf_total_size == 0 &&
--          parser->data == NULL && parser->header_read == 0 &&
-+    if (!(parser->data == NULL && parser->header_read == 0 &&
-           parser->type_header_read == 0 && parser->data_read == 0)) {
-         ERROR("unserialization must use a pristine parser");
-         usbredirparser_assert_invariants(parser);
--- 
-2.37.1
-

0002-usbredirparser-reset-parser-s-fields-on-unserialize.patch

@@ -1,63 +0,0 @@
-From b93c4cae1aebda786a478677d6364308e4579ade Mon Sep 17 00:00:00 2001
-From: Victor Toso <victortoso@redhat.com>
-Date: Sat, 25 Jun 2022 00:29:12 +0200
-Subject: [PATCH 2/2] usbredirparser: reset parser's fields on unserialize
-Content-type: text/plain
-
-This is a followup from previous commit and fixes the following leak.
-
- | 104 (24 direct, 80 indirect) bytes in 1 blocks are definitely lost in loss record 15 of 19
- |    at 0x484A464: calloc (vg_replace_malloc.c:1328)
- |    by 0x485A238: usbredirparser_queue (usbredirparser.c:1235)
- |    by 0x485A571: usbredirparser_init (usbredirparser.c:227)
- |    by 0x40130B: get_usbredirparser (serializer.c:77)
- |    by 0x401379: simple (serializer.c:95)
- |    by 0x48FA3DD: ??? (in /usr/lib64/libglib-2.0.so.0.7200.2)
- |    by 0x48FA144: ??? (in /usr/lib64/libglib-2.0.so.0.7200.2)
- |    by 0x48FA8E1: g_test_run_suite (in /usr/lib64/libglib-2.0.so.0.7200.2)
- |    by 0x48FA94C: g_test_run (in /usr/lib64/libglib-2.0.so.0.7200.2)
- |    by 0x401161: main (serializer.c:112)
- |
- | LEAK SUMMARY:
- |    definitely lost: 24 bytes in 1 blocks
- |    indirectly lost: 80 bytes in 1 blocks
- |      possibly lost: 0 bytes in 0 blocks
- |    still reachable: 25,500 bytes in 17 blocks
- |         suppressed: 0 bytes in 0 blocks
- | Reachable blocks (those to which a pointer was found) are not shown.
- | To see them, rerun with: --leak-check=full --show-leak-kinds=all
-
-Signed-off-by: Victor Toso <victortoso@redhat.com>
----
- usbredirparser/usbredirparser.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/usbredirparser/usbredirparser.c b/usbredirparser/usbredirparser.c
-index a5dd0e7..9bfc27c 100644
---- a/usbredirparser/usbredirparser.c
-+++ b/usbredirparser/usbredirparser.c
-@@ -1823,6 +1823,21 @@ int usbredirparser_unserialize(struct usbredirparser *parser_pub,
-         return -1;
-     }
- 
-+    {
-+        /* We need to reset parser's state to receive unserialized
-+         * data. */
-+        struct usbredirparser_buf *wbuf = parser->write_buf;
-+        while (wbuf) {
-+            struct usbredirparser_buf *next_wbuf = wbuf->next;
-+            free(wbuf->buf);
-+            free(wbuf);
-+            wbuf = next_wbuf;
-+        }
-+        parser->write_buf = NULL;
-+        parser->write_buf_count = 0;
-+        parser->write_buf_total_size = 0;
-+    }
-+
-     if (unserialize_int(parser, &state, &remain, &i, "length")) {
-         usbredirparser_assert_invariants(parser);
-         return -1;
--- 
-2.37.1
-

sources

@@ -1,3 +1,3 @@
-SHA512 (usbredir-0.12.0.tar.xz) = f509a6b5d410fec53efbdc186b80376d6b7f5b34c6c33f2037a83bf105743667c5a18a6d1ef33d6b3c57c1ed6a52b94536369ca768eddb70fda7b436d35fe6ab
-SHA512 (usbredir-0.12.0.tar.xz.sig) = e8fae716ad611d16aeaad496b61011364c72eb682d498d2d7d23e4ef8e52b71acb7c7f9506c36e5f5afd7f4e1388241457fbfed1060601bbe64790e0baf99d22
+SHA512 (usbredir-0.15.0.tar.xz) = 21e99fa419f35fabf7eb3f066a36d5b43a81fef818ceda42dc637566ff1c53ef02f9a81ad8ab32af3039e248c82eb708ae5de80f18b662d156d53221fc1d63fc
+SHA512 (usbredir-0.15.0.tar.xz.sig) = 5b85fc2c98837759f9ba57227c65ce20d457f5d346309e2127a4fc142ba8ea24441949edf2a9f230c2abfff999022dcdea17197fec2bb53288f628d554265172
 SHA512 (victortoso-E37A484F.keyring) = 091755da8a358c8c8ebd3b5443b4b5eb3c260afed943454c085d48c973de6a42763547c321c64e4da5c1b2983ad0c5146aaeddeb1d54ef414f7e6a530a3bf14a

usbredir.spec

@@ -1,14 +1,12 @@
 Name:           usbredir
-Version:        0.12.0
-Release:        3%{?dist}
+Version:        0.15.0
+Release:        4%{?dist}
 Summary:        USB network redirection protocol libraries
-License:        LGPLv2+
+License:        LGPL-2.1-or-later
 URL:            https://www.spice-space.org/usbredir.html
 Source0:        http://spice-space.org/download/%{name}/%{name}-%{version}.tar.xz
 Source1:        http://spice-space.org/download/%{name}/%{name}-%{version}.tar.xz.sig
 Source2:        victortoso-E37A484F.keyring
-Patch0001:      0001-usbredirparser-Fix-unserialize-on-pristine-check.patch
-Patch0002:      0002-usbredirparser-reset-parser-s-fields-on-unserialize.patch
 BuildRequires:  gnupg2
 BuildRequires:  gcc g++
 BuildRequires:  glib2-devel
@@ -40,14 +38,15 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 
-%package        server
-Summary:        Simple USB host TCP server
-License:        GPLv2+
+%package        tools
+Summary:        usbredir utility tools
+# Automatically converted from old format: GPLv2+ - review is highly recommended.
+License:        GPL-2.0-or-later
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-%description    server
-A simple USB host TCP server, using libusbredirhost.
-
+%description    tools
+Includes usbredirect that uses libusbredirhost to export an USB device for use
+in another (virtual) machine
 
 %prep
 gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
@@ -81,20 +80,57 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %{_libdir}/libusbredir*.so
 %{_libdir}/pkgconfig/libusbredir*.pc
 
-%files server
+%files tools
 %{!?_licensedir:%global license %%doc}
 %license COPYING
 %{_bindir}/usbredirect
-%{_sbindir}/usbredirserver
 %{_mandir}/man1/usbredirect.1*
-%{_mandir}/man1/usbredirserver.1*
 
 
 %changelog
-* Wed Jul 27 2022 Victor Toso <victortoso@redhat.com> - 0.12.0-3
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Mon Jan 27 2025 Victor Toso <victortoso@redhat.com> - 0.15.0-1
+- Update to 0.15.0
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 0.13.0-6
+- convert license to SPDX
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Aug 03 2022 Victor Toso <victortoso@redhat.com> - 0.13.0-1
+- Update to 0.13.0
+  Release 0.13.0 drops usbredirserver binary so we now have renamed
+  usbredir-server pacakge to usbredir-tools which is more befitting what it
+  contains
+
+* Wed Jul 27 2022 Victor Toso <victortoso@redhat.com> - 0.12.0-4
 - Fixes unserialization (migration bug)
   Resolves: rhbz#2096008
 
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild