gentoo resync : 15.06.2021

4 files changed, 12 insertions, 130 deletions

diff --git a/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch b/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch
deleted file mode 100644
index b2f492b10716..000000000000
--- a/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- rdesktop.orig/configure.ac	2009-06-30 10:35:14.000000000 +0200
-+++ rdesktop/configure.ac		2009-06-30 11:35:10.000000000 +0200
-@@ -228,7 +228,11 @@
- if test -n "$PKG_CONFIG"; then
-     PKG_CHECK_MODULES(LIBAO, ao, [HAVE_LIBAO=1], [HAVE_LIBAO=0])
-     PKG_CHECK_MODULES(ALSA, alsa, [HAVE_ALSA=1], [HAVE_ALSA=0])
--    PKG_CHECK_MODULES(LIBSAMPLERATE, samplerate, [HAVE_LIBSAMPLERATE=1], [HAVE_LIBSAMPLERATE=0])
-+    AC_ARG_WITH(libsamplerate,
-+        [  --without-libsamplerate disable libsamplerate support])
-+    if test "x$with_libsamplerate" != "xno"; then
-+        PKG_CHECK_MODULES(LIBSAMPLERATE, samplerate, [HAVE_LIBSAMPLERATE=1], [HAVE_LIBSAMPLERATE=0])
-+    fi
-     if test x"$HAVE_LIBSAMPLERATE" = "x1"; then
-         AC_DEFINE(HAVE_LIBSAMPLERATE)
-         if test x"$static_libsamplerate" = "xyes"; then
diff --git a/net-misc/rdesktop/files/rdesktop-1.8.5-use_standard_gssapi.patch b/net-misc/rdesktop/files/rdesktop-1.8.5-use_standard_gssapi.patch
deleted file mode 100644
index a5e14c3aff0c..000000000000
--- a/net-misc/rdesktop/files/rdesktop-1.8.5-use_standard_gssapi.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -Naur rdesktop-1.8.5.orig/configure.ac rdesktop-1.8.5/configure.ac
---- rdesktop-1.8.5.orig/configure.ac	2019-05-08 11:24:50.000000000 +0200
-+++ rdesktop-1.8.5/configure.ac	2019-05-14 18:33:49.479354354 +0200
-@@ -122,27 +122,20 @@
- 
- dnl CredSSP feature
- AC_ARG_ENABLE([credssp], AS_HELP_STRING([--disable-credssp], [disable support for CredSSP]))
--AC_ARG_ENABLE([static-gssglue], AS_HELP_STRING([--enable-static-gssglue]), 
--	      [static_gssglue=yes], [static_gssglue=no])
- AS_IF([test "x$enable_credssp" != "xno"], [
- 	  if test -n "$PKG_CONFIG"; then
--	    PKG_CHECK_MODULES(GSSGLUE, libgssglue, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
-+	    PKG_CHECK_MODULES(GSSAPI, krb5-gssapi, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
- 	  fi
- 
- 	  if test x"$WITH_CREDSSP" = "x1"; then
- 	      CREDSSPOBJ="cssp.o"
--	      CFLAGS="$CFLAGS $GSSGLUE_CFLAGS"
--
--	      AS_IF([test "x$static_gssglue" != "xno"], [
--	          LIBS="$LIBS -Wl,-Bstatic -lgssglue -Wl,-Bdynamic"
--	      ], [
--	          LIBS="$LIBS -lgssglue"
--	      ])
-+	      CFLAGS="$CFLAGS $GSSAPI_CFLAGS"
-+	      LIBS="$LIBS $GSSAPI_LIBS"
- 
- 	      AC_DEFINE(WITH_CREDSSP)
- 	  else
- 		echo
--		echo "CredSSP support requires libgssglue, install the dependency"
-+		echo "CredSSP support requires GSSAPI, install the dependency"
- 		echo "or disable the feature using --disable-credssp."
- 		echo
- 		exit 1
-diff -Naur rdesktop-1.8.5.orig/cssp.c rdesktop-1.8.5/cssp.c
---- rdesktop-1.8.5.orig/cssp.c	2019-05-08 11:22:39.000000000 +0200
-+++ rdesktop-1.8.5/cssp.c	2019-05-14 18:34:49.559368755 +0200
-@@ -140,7 +140,7 @@
- }
- 
- static STREAM
--cssp_gss_wrap(gss_ctx_id_t * ctx, STREAM in)
-+cssp_gss_wrap(gss_ctx_id_t ctx, STREAM in)
- {
- 	int conf_state;
- 	OM_uint32 major_status;
-@@ -181,7 +181,7 @@
- }
- 
- static STREAM
--cssp_gss_unwrap(gss_ctx_id_t * ctx, STREAM in)
-+cssp_gss_unwrap(gss_ctx_id_t ctx, STREAM in)
- {
- 	OM_uint32 major_status;
- 	OM_uint32 minor_status;
diff --git a/net-misc/rdesktop/files/rdesktop-1.8.6-sec_decrypt.patch b/net-misc/rdesktop/files/rdesktop-1.8.6-sec_decrypt.patch
deleted file mode 100644
index dbb0d0e9baf7..000000000000
--- a/net-misc/rdesktop/files/rdesktop-1.8.6-sec_decrypt.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 7841030279c5300d5073b2348b58f3f41e136f82 Mon Sep 17 00:00:00 2001
-From: Markus Beth <markus.beth@web.de>
-Date: Tue, 11 Jun 2019 22:57:31 +0200
-Subject: [PATCH] sec_decrypt() the correct amount of data
-
-Save the correct amount of data to sec_decrypt() because after
-inout_uint8p() the macro s_remaining(s) will find nothing left.
----
- secure.c | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/secure.c b/secure.c
-index 8f65b3aa..9b301e1f 100644
---- a/secure.c
-+++ b/secure.c
-@@ -813,6 +813,7 @@ sec_recv(uint8 * rdpver)
- 	STREAM s;
- 	struct stream packet;
- 	size_t data_offset;
-+	size_t remaining;
- 	unsigned char *data;
- 
- 	while ((s = mcs_recv(&channel, rdpver)) != NULL)
-@@ -832,8 +833,9 @@ sec_recv(uint8 * rdpver)
- 
- 					data_offset = s_tell(s);
- 
--					inout_uint8p(s, data, s_remaining(s));
--					sec_decrypt(data, s_remaining(s));
-+					remaining = s_remaining(s);
-+					inout_uint8p(s, data, remaining);
-+					sec_decrypt(data, remaining);
- 
- 					s_seek(s, data_offset);
- 				}
-@@ -860,8 +862,9 @@ sec_recv(uint8 * rdpver)
- 
- 					data_offset = s_tell(s);
- 
--					inout_uint8p(s, data, s_remaining(s));
--					sec_decrypt(data, s_remaining(s));
-+					remaining = s_remaining(s);
-+					inout_uint8p(s, data, remaining);
-+					sec_decrypt(data, remaining);
- 				}
- 
- 				if (sec_flags & SEC_LICENCE_NEG)
-@@ -883,8 +886,9 @@ sec_recv(uint8 * rdpver)
- 
- 					data_offset = s_tell(s);
- 
--					inout_uint8p(s, data, s_remaining(s));
--					sec_decrypt(data, s_remaining(s));
-+					remaining = s_remaining(s);
-+					inout_uint8p(s, data, remaining);
-+					sec_decrypt(data, remaining);
- 
- 					/* Check for a redirect packet, starts with 00 04 */
- 					if (data[0] == 0 && data[1] == 4)
diff --git a/net-misc/rdesktop/files/rdesktop-1.9.0-gssapi-check.patch b/net-misc/rdesktop/files/rdesktop-1.9.0-gssapi-check.patch
new file mode 100644
index 000000000000..71ada7703996
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.9.0-gssapi-check.patch
@@ -0,0 +1,12 @@
+--- rdesktop-1.9.0/configure.ac.orig	2021-05-22 14:38:14.854099405 +0300
++++ rdesktop-1.9.0/configure.ac	2021-05-22 14:43:41.476323564 +0300
+@@ -84,6 +84,9 @@
+ 				fi
+ 				;;
+ 			*)
++				if test -n "$PKG_CONFIG"; then
++					PKG_CHECK_MODULES(GSSAPI, krb5-gssapi, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
++				fi
+ 				;;
+ 			esac
+ 		else