From 23191cd52a495198c6dca001e0b5afa4d6a3a3ea Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 6 Aug 2020 18:45:54 +0000 Subject: Thu Aug 6 18:45:54 UTC 2020 n/links-2.21-x86_64-1.txz: Upgraded. x/libX11-1.6.11-x86_64-1.txz: Upgraded. x/mesa-20.1.5-x86_64-1.txz: Upgraded. --- source/x/x11/build/libX11 | 2 +- source/x/x11/patch/libX11.patch | 1 - source/x/x11/patch/libX11/libX11.fix_size.diff | 20 -------------------- 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 source/x/x11/patch/libX11.patch delete mode 100644 source/x/x11/patch/libX11/libX11.fix_size.diff (limited to 'source/x') diff --git a/source/x/x11/build/libX11 b/source/x/x11/build/libX11 index 0cfbf0888..d00491fd7 100644 --- a/source/x/x11/build/libX11 +++ b/source/x/x11/build/libX11 @@ -1 +1 @@ -2 +1 diff --git a/source/x/x11/patch/libX11.patch b/source/x/x11/patch/libX11.patch deleted file mode 100644 index c69e0e2da..000000000 --- a/source/x/x11/patch/libX11.patch +++ /dev/null @@ -1 +0,0 @@ -zcat $CWD/patch/libX11/libX11.fix_size.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/libX11/libX11.fix_size.diff b/source/x/x11/patch/libX11/libX11.fix_size.diff deleted file mode 100644 index ab2a0cf77..000000000 --- a/source/x/x11/patch/libX11/libX11.fix_size.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- ./modules/im/ximcp/imRmAttr.c.orig 2020-07-31 08:46:40.000000000 -0500 -+++ ./modules/im/ximcp/imRmAttr.c 2020-08-02 13:07:15.343940851 -0500 -@@ -265,7 +265,7 @@ - - if (num > (USHRT_MAX / sizeof(XIMStyle))) - return False; -- if ((sizeof(num) + (num * sizeof(XIMStyle))) > data_len) -+ if ((2 * sizeof(CARD16) + (num * sizeof(CARD32))) > data_len) - return False; - alloc_len = sizeof(XIMStyles) + sizeof(XIMStyle) * num; - if (alloc_len < sizeof(XIMStyles)) -@@ -379,7 +379,7 @@ - - if (num > (UINT_MAX / sizeof(XIMHotKeyTrigger))) - return False; -- if ((sizeof(num) + (num * sizeof(XIMHotKeyTrigger))) > data_len) -+ if ((2 * sizeof(CARD16) + (num * 3 * sizeof(CARD32))) > data_len) - return False; - alloc_len = sizeof(XIMHotKeyTriggers) - + sizeof(XIMHotKeyTrigger) * num; -- cgit v1.2.3