libusbredir: Update to version 0.13.0

- Update from version 0.8.0 to 0.13.0
- Update of rootfile
- bz2 version no longer supplied only xz version
- Build changed from autotyools to meson/ninja
- Changelog
	# usbredir-0.13.0 - 01 Aug 2022
		- !61 Fix regression on unserialize data
		- !59 Removes usbredirserver
		- !58 Improved header length checks when unserialising data
		- !62 Fix usage of command line argument in usbredirect
		- !57 Fix small memory leak on usbredirect
	# usbredir-0.12.0 - 12 Nov 2021
		- !47 Implement dropping packets from isochronous devices
		  when buffer is owned by usbredirparser library
		- !50 Use packet size limit on deserialization
		- !54 Fix possible bad state in deserialization logic
		- !48 Fix possible memory leak in serialization logic
		- !45 Fix (un)serialization with empty write buffers
		- !42 !46 !52 Improvements to usbredirparserfuzz
	# usbredir-0.11.0 - 10 Aug 2021
		- !40 Fixes use-after-free on usbredirparser serialization
		- !25 Fixes memory leak in usbredirparser
		- !32 Fixes build in MacOS related to visibility of exported symbols
		- !36 Adds usbredirfilter_free function
		- !29 Adds Fuzzing for Filters
		- !34 Improvements to usbredirfilter_string_to_rules()
	# usbredir-0.10.0 - 27 May 2021
		- !23 Fixes 0.9.0 regression in bulk transfer message size
		- !20 Drops autotools, only meson is supported now
		- !15, !16, !18, !21 Improves fuzzing code base and meson builds
		- !17 Fixes libusbredirhost.pc when generated by meson
	# usbredir-0.9.0 - 02 Apr 2021
		-  !2 Add usbredirect tool with feature parity with usbredirserver
		-  !6 Add fuzzer for usbredirparser
		- !12 Add MSI installer for usbredirect tool
		- !11 Add meson build: autotool will be removed in a future release
		-  !5 Limit packet's length to 65 kB
		-  !4 Fix wrong up-cast when checking for package's length
		- Require LLVM's compiler-rt (optional: for fuzzer)
		- Require glib2 >= 2.44 (optional: for usbredirect)
		- Deprecate usbredirserver in favor of usbredirect

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>

diff --git a/config/rootfiles/packages/libusbredir b/config/rootfiles/packages/libusbredir
index d5f8817f28ac13effd58305982a84540d6e83b1b..cc8f5dc8e2a1fc2bd2ec3ee4b8b2b7bdd43a9490 100644 (file)
--- a/config/rootfiles/packages/libusbredir
+++ b/config/rootfiles/packages/libusbredir
@@ -1,18 +1,14 @@
+#usr/bin/usbredirect
 #usr/include/usbredirfilter.h
 #usr/include/usbredirhost.h
 #usr/include/usbredirparser.h
 #usr/include/usbredirproto.h
-#usr/lib/libusbredirhost.a
-#usr/lib/libusbredirhost.la
 usr/lib/libusbredirhost.so
 usr/lib/libusbredirhost.so.1
-usr/lib/libusbredirhost.so.1.0.1
-#usr/lib/libusbredirparser.a
-#usr/lib/libusbredirparser.la
+usr/lib/libusbredirhost.so.1.0.3
 usr/lib/libusbredirparser.so
 usr/lib/libusbredirparser.so.1
-usr/lib/libusbredirparser.so.1.0.1
+usr/lib/libusbredirparser.so.1.2.1
 #usr/lib/pkgconfig/libusbredirhost.pc
 #usr/lib/pkgconfig/libusbredirparser-0.5.pc
-#usr/sbin/usbredirserver
-#usr/share/man/man1/usbredirserver.1
+#usr/share/man/man1/usbredirect.1

diff --git a/lfs/libusbredir b/lfs/libusbredir
index e1df9c4a83dd41acd57e5c96ed86589c61134417..531420ea45b6f34972d2190c9fa0777a429ccc00 100644 (file)
--- a/lfs/libusbredir
+++ b/lfs/libusbredir
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,15 +26,15 @@ include Config
 
 SUMMARY    = USB Network Redirection protocol
 
-VER        = 0.8.0
+VER        = 0.13.0
 
 THISAPP    = usbredir-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libusbredir
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       =
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 0190b4ab35cd554c13b65d30756b7b018e7ce82c72e7dddbaf05b8a704bd8a25724c4ac4759e1b86dfadb64ad7ade75c05365ab9ae3152f8fa60e909bc5e183b
+$(DL_FILE)_BLAKE2 = 20a1e28be290d59d3ef25f432d6bbd4b50b40f5df434efb9013a39df77ce1aa563e7dec1cdf6abbfa703bb9c4b32dd05258011b5ce8e79812e89203f51f41f8f
 
 install : $(TARGET)
 
@@ -80,9 +80,9 @@ $(subst %,%_BLAKE2,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr
-       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && meson --prefix=/usr builddir/
+       cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING)
+       cd $(DIR_APP) && ninja -C builddir/ install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)