rdesktop: update to 1.9.0.

Provided by Matthias Petermann in PR 54857.

Additionally, remove ssl option per 1.9.0 changelog.

rdesktop (1.9.0)
  * Use GnuTLS and nettle instead of OpenSSL
  * Improved certificate handling
  * Add support for dynamic resize of sessions
  * Add support for alpha cursors
  * Add PulseAudio support
  * Add Kerberos support on macOS
  * Kerberos support no longer requires libgssglue
  * Remove support for rdesktop's custom microphone extension
  * Several fixes to improve compatibility with modern desktops
  * macOS compatibility fixes
  * Improved handling of redirections
  * Many smart card bug fixes
  * Many disk redirection bug fixes
  * Improved logging
  * Lots of other small bug fixes

  -- Pierre Ossman <ossman@cendio.se> 2019-09-18

rdesktop (1.8.6)
  * Fix protocol code handling new licenses

  -- Pierre Ossman <ossman@cendio.se> 2019-05-16

rdesktop (1.8.5)
  * Add bounds checking to protocol handling in order to fix many
    security problems when communicating with a malicious server.

  -- Pierre Ossman <ossman@cendio.se> 2019-05-08

3 files changed, 21 insertions, 63 deletions

diff --git a/net/rdesktop/patches/patch-aa b/net/rdesktop/patches/patch-Makefile.in
index 421f1bdce73..4090b85b25d 100644
--- a/net/rdesktop/patches/patch-aa
+++ b/net/rdesktop/patches/patch-Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.12 2012/04/26 14:54:29 abs Exp $
+$NetBSD: patch-Makefile.in,v 1.1 2020/01/15 15:31:28 wiz Exp $
 
 Use BSD_INSTALL_foo
 
---- Makefile.in.orig	2006-04-09 20:27:50.000000000 +0200
+--- Makefile.in.orig	2019-06-13 12:10:15.000000000 +0000
 +++ Makefile.in
-@@ -55,25 +55,21 @@ install: installbin installkeymaps insta
+@@ -39,25 +39,21 @@ install: installbin installkeymaps insta
  
  .PHONY: installbin
  installbin: rdesktop
@@ -28,7 +28,7 @@ Use BSD_INSTALL_foo
 -	mkdir -p $(DESTDIR)$(KEYMAP_PATH)
 +	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(KEYMAP_PATH)
  # Prevent copying the CVS directory
--	cp keymaps/?? keymaps/??-?? $(DESTDIR)$(KEYMAP_PATH)
+-	cp keymaps/?? keymaps/??-?? keymaps/??-??-???? $(DESTDIR)$(KEYMAP_PATH)
 -	cp keymaps/common $(DESTDIR)$(KEYMAP_PATH)
 -	cp keymaps/modifiers $(DESTDIR)$(KEYMAP_PATH)
 -	chmod 644 $(DESTDIR)$(KEYMAP_PATH)/*
@@ -36,5 +36,5 @@ Use BSD_INSTALL_foo
 +	$(BSD_INSTALL_DATA) keymaps/common $(DESTDIR)$(KEYMAP_PATH)
 +	$(BSD_INSTALL_DATA) keymaps/modifiers $(DESTDIR)$(KEYMAP_PATH)
  
- .PHONY: proto
- proto:
+ .PHONY: clean
+ clean:
diff --git a/net/rdesktop/patches/patch-ssl.c b/net/rdesktop/patches/patch-ssl.c
deleted file mode 100644
index 7ae8187b1fe..00000000000
--- a/net/rdesktop/patches/patch-ssl.c
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-ssl.c,v 1.1 2019/03/25 19:56:08 markd Exp $
-
-Workaround for key caching in OpenSSL > 1.1.0 ( fixes #118)
-commit bba4cd2cf0269ec933cb2ccf92743bbcebf3c2da
-
---- ssl.c.orig	2019-01-02 13:50:34.000000000 +0000
-+++ ssl.c
-@@ -143,6 +143,11 @@ rdssl_cert_to_rkey(RDSSL_CERT * cert, ui
- 	int nid;
- 	int ret;
- 
-+	const unsigned char *p;
-+	int pklen;
-+
-+	RSA *rsa = NULL;
-+
- 	/* By some reason, Microsoft sets the OID of the Public RSA key to
- 	   the oid for "MD5 with RSA Encryption" instead of "RSA Encryption"
- 
-@@ -170,9 +175,28 @@ rdssl_cert_to_rkey(RDSSL_CERT * cert, ui
- 
- 	if ((nid == NID_md5WithRSAEncryption) || (nid == NID_shaWithRSAEncryption))
- 	{
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		DEBUG_RDP5(("Re-setting algorithm type to RSA in server certificate\n"));
- 		X509_PUBKEY_set0_param(key, OBJ_nid2obj(NID_rsaEncryption),
- 				       0, NULL, NULL, 0);
-+#else
-+		if (!X509_PUBKEY_get0_param(NULL, &p, &pklen, NULL, key)) {
-+			error("failed to get algorithm used for public key");
-+
-+			return NULL;
-+		}
-+
-+		if (!(rsa = d2i_RSAPublicKey(NULL, &p, pklen))) {
-+			error("failed to extract public key from certificate");
-+
-+			return NULL;
-+		}
-+
-+		lkey = RSAPublicKey_dup(rsa);
-+		*key_len = RSA_size(lkey);
-+		return lkey;
-+#endif
-+
- 	}
- 	epk = X509_get_pubkey(cert);
- 	if (NULL == epk)
-@@ -229,7 +255,7 @@ rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey
- 	e = rkey->e;
- 	n = rkey->n;
- #else
--	RSA_get0_key(rkey, &e, &n, NULL);
-+	RSA_get0_key(rkey, &n, &e, NULL);
- #endif
- 
- 	if ((BN_num_bytes(e) > (int) max_exp_len) ||
diff --git a/net/rdesktop/patches/patch-xwin.c b/net/rdesktop/patches/patch-xwin.c
new file mode 100644
index 00000000000..ff9ff4a491f
--- /dev/null
+++ b/net/rdesktop/patches/patch-xwin.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-xwin.c,v 1.1 2020/01/15 15:31:28 wiz Exp $
+
+Workaround for undefined HOST_NAME_MAX on BSD systems
+
+--- xwin.c.orig	2019-06-13 12:10:15.000000000 +0000
++++ xwin.c
+@@ -1887,7 +1887,7 @@ static void
+ set_wm_client_machine(Display * dpy, Window win)
+ {
+ 	XTextProperty tp;
+-	char hostname[HOST_NAME_MAX];
++	char hostname[sysconf(_SC_HOST_NAME_MAX)];
+ 
+ 	if (gethostname(hostname, sizeof(hostname)) != 0)
+ 		return;