From cc88d6cf468f321052e696da1e3821c5a6577982 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Thu, 17 Mar 2022 22:45:36 +1100 Subject: [PATCH] Remove unused patches. --- xrdp-0.9.18-cve-2022-23613.patch | 47 -------------------------------- xrdp-0.9.18-imlib2.patch | 22 --------------- 2 files changed, 69 deletions(-) delete mode 100644 xrdp-0.9.18-cve-2022-23613.patch delete mode 100644 xrdp-0.9.18-imlib2.patch diff --git a/xrdp-0.9.18-cve-2022-23613.patch b/xrdp-0.9.18-cve-2022-23613.patch deleted file mode 100644 index 3dd3d3f..0000000 --- a/xrdp-0.9.18-cve-2022-23613.patch +++ /dev/null @@ -1,47 +0,0 @@ -From eb4a8e342dcf848ca716792763ca1904e913ca9d Mon Sep 17 00:00:00 2001 -From: matt335672 <30179339+matt335672@users.noreply.github.com> -Date: Wed, 2 Feb 2022 10:39:50 +0000 -Subject: [PATCH] Add lower bound to sesman data input size check - ---- - sesman/sesman.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/sesman/sesman.c b/sesman/sesman.c -index a85769053..e2b057e6a 100644 ---- a/sesman/sesman.c -+++ b/sesman/sesman.c -@@ -276,6 +276,7 @@ sesman_close_all(void) - static int - sesman_data_in(struct trans *self) - { -+#define HEADER_SIZE 8 - int version; - int size; - -@@ -283,9 +284,9 @@ sesman_data_in(struct trans *self) - { - in_uint32_be(self->in_s, version); - in_uint32_be(self->in_s, size); -- if (size > self->in_s->size) -+ if (size < HEADER_SIZE || size > self->in_s->size) - { -- LOG(LOG_LEVEL_ERROR, "sesman_data_in: bad message size"); -+ LOG(LOG_LEVEL_ERROR, "sesman_data_in: bad message size %d", size); - return 1; - } - self->header_size = size; -@@ -302,11 +303,12 @@ sesman_data_in(struct trans *self) - return 1; - } - /* reset for next message */ -- self->header_size = 8; -+ self->header_size = HEADER_SIZE; - self->extra_flags = 0; - init_stream(self->in_s, 0); /* Reset input stream pointers */ - } - return 0; -+#undef HEADER_SIZE - } - - /******************************************************************************/ diff --git a/xrdp-0.9.18-imlib2.patch b/xrdp-0.9.18-imlib2.patch deleted file mode 100644 index 3fbdcfa..0000000 --- a/xrdp-0.9.18-imlib2.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 3de1e966b4c4113fd901f9ecd00cf59a3759e745 Mon Sep 17 00:00:00 2001 -From: matt335672 <30179339+matt335672@users.noreply.github.com> -Date: Wed, 12 Jan 2022 11:41:26 +0000 -Subject: [PATCH] Support imlib2 on RHEL 7 - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 44ac95a60..a7a10bf6e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -224,7 +224,7 @@ case "$with_imlib2" in - use_imlib2=no - ;; - yes) -- PKG_CHECK_MODULES([IMLIB2], [imlib2 >= 1.4.10], -+ PKG_CHECK_MODULES([IMLIB2], [imlib2 >= 1.4.5], - [use_imlib2=yes], - [AC_MSG_ERROR([please install libimlib2-dev or imlib2-devel])]) - ;;