summaryrefslogtreecommitdiff
path: root/source/x
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2022-01-16 21:33:27 +0000
committerEric Hameleers <alien@slackware.com>2022-01-17 08:59:55 +0100
commit54efc574732f81aa298dd8ea253200222d32f1b2 (patch)
tree501bb07527ca7cb2cd4534f2766da8bf40000266 /source/x
parent5ed13142b06050c1f45617acc956aadadcbe4359 (diff)
downloadcurrent-54efc574732f81aa298dd8ea253200222d32f1b2.tar.gz
Sun Jan 16 21:33:27 UTC 202220220116213327
a/aaa_libraries-15.0-x86_64-14.txz: Rebuilt. Upgraded: libexpat.so.1.8.3. a/kernel-generic-5.15.15-x86_64-1.txz: Upgraded. a/kernel-huge-5.15.15-x86_64-1.txz: Upgraded. a/kernel-modules-5.15.15-x86_64-1.txz: Upgraded. ap/cups-filters-1.28.11-x86_64-1.txz: Upgraded. ap/ksh93-1.0_20220114_e569f23e-x86_64-1.txz: Upgraded. ap/vim-8.2.4115-x86_64-1.txz: Upgraded. d/gdb-11.2-x86_64-1.txz: Upgraded. d/kernel-headers-5.15.15-x86-1.txz: Upgraded. k/kernel-source-5.15.15-noarch-1.txz: Upgraded. kde/kwayland-server-5.23.5-x86_64-2.txz: Rebuilt. Applied upstream patch: [PATCH] Store surface object in tablet cursor using QPointer. Thanks to ZhaoLin1457. l/expat-2.4.3-x86_64-1.txz: Upgraded. Fix issues with left shifts by >=29 places resulting in: a) realloc acting as free b) realloc allocating too few bytes c) undefined behavior Fix integer overflow on variable m_groupSize in function doProlog leading to realloc acting as free. Impact is denial of service or other undefined behavior. Prevent integer overflows near memory allocation at multiple places. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-45960 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-46143 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-22822 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-22823 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-22824 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-22825 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-22826 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-22827 (* Security fix *) l/libunwind-1.6.2-x86_64-1.txz: Upgraded. x/xterm-370-x86_64-3.txz: Rebuilt. Ship a sample XTerm.linux.console app-defaults file. Thanks to GazL. xap/vim-gvim-8.2.4115-x86_64-1.txz: Upgraded. xap/xsnow-3.4.3-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/x')
-rw-r--r--source/x/xterm/linux-console-xterm.ad2
-rwxr-xr-xsource/x/xterm/xterm.SlackBuild15
2 files changed, 8 insertions, 9 deletions
diff --git a/source/x/xterm/linux-console-xterm.ad b/source/x/xterm/linux-console-xterm.ad
index bd0095f6..12c4fdfe 100644
--- a/source/x/xterm/linux-console-xterm.ad
+++ b/source/x/xterm/linux-console-xterm.ad
@@ -1,7 +1,7 @@
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! These resources will, as much as possible, configure xterm to look
! like a linux console.
-!
+! To use this file, copy it to: /etc/X11/app-defaults/XTerm
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! Choose one below:
diff --git a/source/x/xterm/xterm.SlackBuild b/source/x/xterm/xterm.SlackBuild
index 47d15fb3..ff1aff97 100755
--- a/source/x/xterm/xterm.SlackBuild
+++ b/source/x/xterm/xterm.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xterm
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -111,13 +111,12 @@ make install DESTDIR=$PKG || exit 1
mkdir -p $PKG/usr/share/applications
cp xterm.desktop uxterm.desktop $PKG/usr/share/applications
-# Commented out. For now we will use upstream defaults.
-## Install a default XTerm app-defaults that looks like the Linux console.
-## Thanks to GazL.
-#cp -a $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.upstream.default
-#echo >> $PKG/etc/X11/app-defaults/XTerm
-#cat $CWD/linux-console-xterm.ad >> $PKG/etc/X11/app-defaults/XTerm
-#touch -r $PKG/etc/X11/app-defaults/XTerm.upstream.default $PKG/etc/X11/app-defaults/XTerm
+# Install a sample XTerm app-defaults that looks like the Linux console.
+# Thanks to GazL.
+cp -a $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.upstream.default
+cp -a $CWD/linux-console-xterm.ad $PKG/etc/X11/app-defaults/XTerm.linux.console
+chown root:root $PKG/etc/X11/app-defaults/XTerm.linux.console
+chmod 644 $PKG/etc/X11/app-defaults/XTerm.linux.console
# Install app-defaults as .new:
mv $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.new