summaryrefslogtreecommitdiffstats
path: root/source/x/x11
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-08-06 18:45:54 +0000
committer Eric Hameleers <alien@slackware.com>2020-08-07 09:00:00 +0200
commit23191cd52a495198c6dca001e0b5afa4d6a3a3ea (patch)
treebb811d90748af14506eab0cbb5d62025a1cb7bb1 /source/x/x11
parentd9ba0ee86d8726256aa0efab4434ae85e637d7fc (diff)
downloadcurrent-23191cd52a495198c6dca001e0b5afa4d6a3a3ea.tar.gz
current-23191cd52a495198c6dca001e0b5afa4d6a3a3ea.tar.xz
Thu Aug 6 18:45:54 UTC 202020200806184554
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.
Diffstat (limited to 'source/x/x11')
-rw-r--r--source/x/x11/build/libX112
-rw-r--r--source/x/x11/patch/libX11.patch1
-rw-r--r--source/x/x11/patch/libX11/libX11.fix_size.diff20
3 files changed, 1 insertions, 22 deletions
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;