freerdp2: Update to 2.1.0

# 2020-05-05  Version 2.1.0

Important notes:

* fix multiple CVEs: CVE-2020-11039, CVE-2020-11038, CVE-2020-11043, CVE-2020-11040, CVE-2020-11041,
  CVE-2020-11019, CVE-2020-11017, CVE-2020-11018
* fix multiple leak and crash issues (#6129, #6128, #6127, #6110, #6081, #6077)

Noteworthy features and improvements:
* Fixed sound issues (#6043)
* New expert command line options /tune and /tune-list to modify all client
  settings in a generic way.
* Fixes for smartcard cache, this improves compatibility of smartcard devices
  with newer smartcard channel.
* Shadow server can now be instructed to listen to multiple interfaces.
* Improved server certificate support (#6052)
* Various fixes for wayland client (fullscreen, mouse wheel, ...)
* Fixed large mouse pointer support, now mouse pointers > 96x96 pixel are visible.
* USB redirection command line improvements (filter options)
* Various translation improvements for android and ios clients

For a complete and detailed change log since the last release candidate run:
git log 2.0.0..2.1.0


# 2020-04-09  Version 2.0.0

Important notes:

* fix multiple CVEs: CVE-2020-11521 CVE-2020-11522 CVE-2020-11523 CVE-2020-11524 CVE-2020-11525 CVE-2020-11526
* fix multiple other security related issues (#6005, #6006, #6007, #6008, #6009, #6010, #6011, #6012, #6013)
* sha256 is now used instead of sha1 to fingerprint certificates. This will
  invalidate all hosts in FreeRDP known_hosts2 file and causes a prompt if a
  new connection is established after the update

Noteworthy features and improvements:

* First version of the RDP proxy was added (#5372) - thanks to @kubistika
* Smartcard received some refactoring. Missing functions were added and input
  validation was improved (#5884)
* A new option /cert that unifies all certificate related options (#5880)
  The old options (cert-ignore, cert-deny, cert-name, cert-tofu) are still
  available but marked as deprecated
* Support for Remote Assistance Protocol Version 2 [MS-RA]
* The DirectFB client was removed because it was unmaintained
* Unified initialization of OrderSupport
* Fix for licensing against Windows Server 2003
* Font smoothing is now enabled per default
* Flatpack support was added
* Smart scaling for Wayland using libcairo was added (#5215)
* Unified update->BeginPaint and update->EndPaint
* An image scaling API for software drawing was added
* Rail was updated to the latest spec version 28.0
* Support for H.264 in the shadow server is now detected at runtime
* Add mask=<value> option for /gfx and /gfx-h264  (#5771)
* Code reformatting (#5667)
* A new option /timeout was added to adjust the TCP ACK timeout (#5987)

For a complete and detailed change log since the last release candidate run:
git log 2.0.0-rc4..2.0.0

3 files changed, 26 insertions, 18 deletions

diff --git a/net/freerdp2/Makefile b/net/freerdp2/Makefile
index 7073a113a2a..416ecef2cc1 100644
--- a/net/freerdp2/Makefile
+++ b/net/freerdp2/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2020/03/10 22:10:44 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2020/05/19 12:31:39 nia Exp $
 
-DISTNAME=	freerdp-2.0.0rc4
+DISTNAME=	freerdp-2.1.0
 PKGNAME=	${DISTNAME:S/freerdp-/freerdp2-/1}
-PKGREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=FreeRDP/}
 GITHUB_PROJECT=	FreeRDP
-GITHUB_TAG=	2.0.0-rc4
+GITHUB_TAG=	${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.freerdp.com/
@@ -59,6 +58,7 @@ post-install:
 		${DESTDIR}${PREFIX}/bin/xfreerdp2 || ${TRUE}
 
 .include "options.mk"
+.include "../../devel/libusb1/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/net/freerdp2/PLIST b/net/freerdp2/PLIST
index 7b876ed09b2..abd211c7b35 100644
--- a/net/freerdp2/PLIST
+++ b/net/freerdp2/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2019/09/15 12:55:14 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/05/19 12:31:39 nia Exp $
+bin/freerdp-proxy
 bin/freerdp-shadow-cli
 bin/winpr-hash
 bin/winpr-makecert
@@ -20,6 +21,7 @@ include/freerdp2/freerdp/cache/pointer.h
 include/freerdp2/freerdp/channels/audin.h
 include/freerdp2/freerdp/channels/channels.h
 include/freerdp2/freerdp/channels/cliprdr.h
+include/freerdp2/freerdp/channels/disp.h
 include/freerdp2/freerdp/channels/encomsp.h
 include/freerdp2/freerdp/channels/geometry.h
 include/freerdp2/freerdp/channels/log.h
@@ -30,6 +32,7 @@ include/freerdp2/freerdp/channels/rdpgfx.h
 include/freerdp2/freerdp/channels/rdpsnd.h
 include/freerdp2/freerdp/channels/remdesk.h
 include/freerdp2/freerdp/channels/tsmf.h
+include/freerdp2/freerdp/channels/urbdrc.h
 include/freerdp2/freerdp/channels/video.h
 include/freerdp2/freerdp/channels/wtsvc.h
 include/freerdp2/freerdp/client.h
@@ -42,6 +45,7 @@ include/freerdp2/freerdp/client/drdynvc.h
 include/freerdp2/freerdp/client/encomsp.h
 include/freerdp2/freerdp/client/file.h
 include/freerdp2/freerdp/client/geometry.h
+include/freerdp2/freerdp/client/printer.h
 include/freerdp2/freerdp/client/rail.h
 include/freerdp2/freerdp/client/rdpei.h
 include/freerdp2/freerdp/client/rdpgfx.h
@@ -78,6 +82,7 @@ include/freerdp2/freerdp/crypto/der.h
 include/freerdp2/freerdp/crypto/er.h
 include/freerdp2/freerdp/crypto/per.h
 include/freerdp2/freerdp/crypto/tls.h
+include/freerdp2/freerdp/display.h
 include/freerdp2/freerdp/dvc.h
 include/freerdp2/freerdp/error.h
 include/freerdp2/freerdp/event.h
@@ -93,6 +98,7 @@ include/freerdp2/freerdp/gdi/shape.h
 include/freerdp2/freerdp/gdi/video.h
 include/freerdp2/freerdp/graphics.h
 include/freerdp2/freerdp/input.h
+include/freerdp2/freerdp/license.h
 include/freerdp2/freerdp/listener.h
 include/freerdp2/freerdp/locale/keyboard.h
 include/freerdp2/freerdp/locale/locale.h
@@ -109,9 +115,11 @@ include/freerdp2/freerdp/secondary.h
 include/freerdp2/freerdp/server/audin.h
 include/freerdp2/freerdp/server/channels.h
 include/freerdp2/freerdp/server/cliprdr.h
+include/freerdp2/freerdp/server/disp.h
 include/freerdp2/freerdp/server/drdynvc.h
 include/freerdp2/freerdp/server/echo.h
 include/freerdp2/freerdp/server/encomsp.h
+include/freerdp2/freerdp/server/rail.h
 include/freerdp2/freerdp/server/rdpdr.h
 include/freerdp2/freerdp/server/rdpei.h
 include/freerdp2/freerdp/server/rdpgfx.h
@@ -124,7 +132,6 @@ include/freerdp2/freerdp/settings.h
 include/freerdp2/freerdp/svc.h
 include/freerdp2/freerdp/types.h
 include/freerdp2/freerdp/update.h
-include/freerdp2/freerdp/utils/msusb.h
 include/freerdp2/freerdp/utils/passphrase.h
 include/freerdp2/freerdp/utils/pcap.h
 include/freerdp2/freerdp/utils/profiler.h
@@ -223,25 +230,25 @@ lib/cmake/WinPR2/WinPRTargets-release.cmake
 lib/cmake/WinPR2/WinPRTargets.cmake
 lib/libfreerdp-client2.so
 lib/libfreerdp-client2.so.2
-lib/libfreerdp-client2.so.2.0.0
+lib/libfreerdp-client2.so.${PKGVERSION}
 lib/libfreerdp-server2.so
 lib/libfreerdp-server2.so.2
-lib/libfreerdp-server2.so.2.0.0
+lib/libfreerdp-server2.so.${PKGVERSION}
 lib/libfreerdp-shadow-subsystem2.so
 lib/libfreerdp-shadow-subsystem2.so.2
-lib/libfreerdp-shadow-subsystem2.so.2.0.0
+lib/libfreerdp-shadow-subsystem2.so.${PKGVERSION}
 lib/libfreerdp-shadow2.so
 lib/libfreerdp-shadow2.so.2
-lib/libfreerdp-shadow2.so.2.0.0
+lib/libfreerdp-shadow2.so.${PKGVERSION}
 lib/libfreerdp2.so
 lib/libfreerdp2.so.2
-lib/libfreerdp2.so.2.0.0
+lib/libfreerdp2.so.${PKGVERSION}
 lib/libwinpr-tools2.so
 lib/libwinpr-tools2.so.2
-lib/libwinpr-tools2.so.2.0.0
+lib/libwinpr-tools2.so.${PKGVERSION}
 lib/libwinpr2.so
 lib/libwinpr2.so.2
-lib/libwinpr2.so.2.0.0
+lib/libwinpr2.so.${PKGVERSION}
 lib/pkgconfig/freerdp-client2.pc
 lib/pkgconfig/freerdp-server2.pc
 lib/pkgconfig/freerdp-shadow2.pc
diff --git a/net/freerdp2/distinfo b/net/freerdp2/distinfo
index 8b834186a7a..8d8a6d84c4e 100644
--- a/net/freerdp2/distinfo
+++ b/net/freerdp2/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2019/09/15 12:55:14 nia Exp $
+$NetBSD: distinfo,v 1.2 2020/05/19 12:31:39 nia Exp $
 
-SHA1 (freerdp-2.0.0rc4.tar.gz) = bd50ce9d8807499e14884a3019e9f42b40f3480b
-RMD160 (freerdp-2.0.0rc4.tar.gz) = 45a49be0aafda484aa3b44e5c32ceaeed23fb2b1
-SHA512 (freerdp-2.0.0rc4.tar.gz) = b4a4d4a58d09010bc45fb90cca148dc4421a4cf0cd5caf288aa702212ef081f14fc418b91f1b79ec8631f582c9ebcdd3031d3333b6a892adb29c402492abb649
-Size (freerdp-2.0.0rc4.tar.gz) = 6615213 bytes
+SHA1 (freerdp-2.1.0.tar.gz) = f524701228b1c1aefd5750344718eba2f4a6e688
+RMD160 (freerdp-2.1.0.tar.gz) = 143b44375017a7354bb5bc2b08c727efd1da377a
+SHA512 (freerdp-2.1.0.tar.gz) = afed8893128067b688bf5ba87e7d28296ece3b4848d84653ab0ad0c3723b6a8bc36733aca9649fb29a0d4a53b39fdd49d56d17e9b4eac8bf7b06fa4b27e66b14
+Size (freerdp-2.1.0.tar.gz) = 6825453 bytes
+SHA1 (patch-channels_rdpdr_client_rdpdr__main.c) = 4358d4cd4b9293a27f3edafb94e7759e133ecd5f
 SHA1 (patch-winpr_libwinpr_sysinfo_sysinfo.c) = 858cfba03a902e1e6900a2d1ee2bcf7429227d3d