Wed Nov 8 22:04:25 UTC 202320231108220425

a/kbd-2.6.3-x86_64-1.txz: Upgraded. Thanks to Robby Workman. a/kernel-firmware-20231107_2340796-noarch-1.txz: Upgraded. a/kernel-generic-6.1.62-x86_64-1.txz: Upgraded. a/kernel-huge-6.1.62-x86_64-1.txz: Upgraded. a/kernel-modules-6.1.62-x86_64-1.txz: Upgraded. ap/sudo-1.9.15p1-x86_64-1.txz: Upgraded. This is a bugfix release: Fixed a bug introduced in sudo 1.9.15 that prevented LDAP-based sudoers from being able to read the ldap.conf file. d/kernel-headers-6.1.62-x86-1.txz: Upgraded. k/kernel-source-6.1.62-noarch-1.txz: Upgraded. kde/plasma-wayland-protocols-1.11.0-x86_64-1.txz: Upgraded. l/liburing-2.5-x86_64-1.txz: Upgraded. xap/mozilla-thunderbird-115.4.2-x86_64-1.txz: Upgraded. This is a bugfix release. For more information, see: https://www.mozilla.org/en-US/thunderbird/115.4.2/releasenotes/ xap/xlockmore-5.74-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
author: Patrick J Volkerding <volkerdi@slackware.com> 2023-11-08 22:04:25 +0000
committer: Eric Hameleers <alien@slackware.com> 2023-11-08 23:36:11 +0100
commit: d387e58ecc1078f05ee9e618aef86b008b52ed89 (patch)
tree: 78360deed7291fc2e51e379795a2b9d0d95d27d9 /source
parent: 69753b9a1da83d78dab7943e3fcdb428ee74a254 (diff)
download: current-d387e58ecc1078f05ee9e618aef86b008b52ed89.tar.gz
current-d387e58ecc1078f05ee9e618aef86b008b52ed89.tar.xz
26 files changed, 479 insertions, 757 deletions
diff --git a/source/a/kbd/doinst.sh b/source/a/kbd/doinst.sh
new file mode 100644
index 000000000..babc7759d
--- /dev/null
+++ b/source/a/kbd/doinst.sh
@@ -0,0 +1,28 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+# Leave any new rc.font with the same permissions as the old one:
+# This is a kludge, but it's because there's no --reference option
+# on busybox's 'chmod':
+if [ -e etc/rc.d/rc.font ]; then
+  if [ -x etc/rc.d/rc.font ]; then
+    chmod 755 etc/rc.d/rc.font.new
+  else
+    chmod 644 etc/rc.d/rc.font.new
+  fi
+fi
+# Then config() it:
+config etc/rc.d/rc.font.new
+
+config etc/pam.d/vlock.new
+
diff --git a/source/a/kbd/fix-euro2.patch b/source/a/kbd/fix-euro2.patch
new file mode 100644
index 000000000..572cba740
--- /dev/null
+++ b/source/a/kbd/fix-euro2.patch
@@ -0,0 +1,9 @@
+--- kbd-1.15.5/data/keymaps/i386/include/euro2.map.old	2013-05-08 15:00:25.917752313 +0200
++++ kbd-1.15.5/data/keymaps/i386/include/euro2.map	2013-05-08 15:00:54.943957367 +0200
+@@ -2,5 +2,5 @@
+ # [Say: "loadkeys euro2" to get Euro and cent with AltGr (right alt)
+ #  on the positions where many keyboards have E and C.
+ #  To get it displayed, use a latin0 (i.e., latin9) font.]
+-altgr keycode  18 = currency
++altgr keycode  18 = euro
+ altgr keycode  46 = cent
diff --git a/source/a/kbd/kbd-2.6.3-backspace-1.patch b/source/a/kbd/kbd-2.6.3-backspace-1.patch
new file mode 100644
index 000000000..8fec17180
--- /dev/null
+++ b/source/a/kbd/kbd-2.6.3-backspace-1.patch
@@ -0,0 +1,250 @@
+Submitted By: Matt Burgess
+Date: 2008-12-06
+Initial Package Version: 1.15
+Upstream Status: Not submitted, possibly incomplete
+Description: Makes Backspace and Delete keys consistent in all i386 keymaps.
+Makes the Backspace key send character code 127, and Delete send a well known
+escape sequence. Obsoletes the /etc/kbd/bs-sends-del file for i386.
+
+Original patch for 1.12 by Alexander Patrakov.
+Updated for 1.13 (drop ru.map, the change is upstream, and add ru_win.map,
+ru-cp1251.map) by Ken Moffat <ken at linuxfromscratch dot org>.
+Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
+
+diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map
+--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map	2008-06-20 12:36:01.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map	2008-12-03 22:27:55.000000000 +0000
+@@ -43,7 +43,7 @@
+ 		keycode  11 = three		numbersign
+ 		keycode  12 = two		at
+ 		keycode  13 = one		exclam
+-		keycode  14 = BackSpace		Delete
++		keycode  14 = Delete		Delete
+ ! --------------------------------------------------------------------------
+ ! Row 3
+ ! --------------------------------------------------------------------------
+diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map
+--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map	2008-06-20 12:36:01.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map	2008-12-03 22:28:13.000000000 +0000
+@@ -43,7 +43,7 @@
+ 		keycode  11 = slash		question
+ 		keycode  12 = bracketleft	braceleft
+ 		keycode  13 = bracketright	braceright
+-		keycode  14 = BackSpace		Delete
++		keycode  14 = Delete		Delete
+ ! --------------------------------------------------------------------------
+ ! Row 3
+ ! --------------------------------------------------------------------------
+diff -Naur kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map
+--- kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map	2008-10-23 20:03:58.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map	2008-12-03 22:40:32.000000000 +0000
+@@ -51,7 +51,7 @@
+ 	alt     keycode  12 = Meta_minus      
+ keycode  13 = minus            underscore      
+ 	alt     keycode  13 = Meta_equal      
+-keycode  14 = BackSpace           Delete          
++keycode  14 = Delete           Delete          
+ 	alt     keycode  14 = Meta_Delete     
+ keycode  15 = Tab              Meta_Tab             
+ 	alt     keycode  15 = Meta_Tab        
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map	2008-12-03 22:42:14.000000000 +0000
+@@ -205,7 +205,7 @@
+ #	edit this if you want the key above <Enter> to delete symbols above
+ # cursor, not before.
+ keycode  14 = \
+-	      BackSpace	       BackSpace	BackSpace	 BackSpace  \
++	      Delete	       Delete		Delete		 Delete	     \
+ 	      Delete	       Delete		Delete		 Delete	     \
+ 	      Meta_BackSpace   Meta_BackSpace	Meta_BackSpace Meta_BackSpace \
+ 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete  
+@@ -506,7 +506,7 @@
+ 
+ # Edit this if you want strict VT100 emulation.
+ string F111 = "\033[3$"
+-keycode 111 = Delete	       F111		Delete		 F111	   \
++keycode 111 = Remove	       F111		Remove		 F111	   \
+ 	      Remove	       Remove		Remove		 Remove	    \
+ 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete \
+ 	      Boot	       Boot		Boot		 Boot
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map kbd-1.15/data/keymaps/i386/qwerty/lt.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/lt.map	2008-12-03 22:42:58.000000000 +0000
+@@ -204,7 +204,7 @@
+ #	edit this if you want the key above <Enter> to delete symbols above
+ # cursor, not before.
+ keycode  14 = \
+-	      BackSpace	       BackSpace	BackSpace	 BackSpace  \
++	      Delete	       Delete		Delete		 Delete	     \
+ 	      Delete	       Delete		Delete		 Delete	     \
+ 	      Meta_BackSpace   Meta_BackSpace	Meta_BackSpace Meta_BackSpace \
+ 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete  
+@@ -505,7 +505,7 @@
+ 
+ # Edit this if you want strict VT100 emulation.
+ string F111 = "\033[3$"
+-keycode 111 = Delete	       F111		Delete		 F111	   \
++keycode 111 = Remove	       F111		Remove		 F111	   \
+ 	      Remove	       Remove		Remove		 Remove	    \
+ 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete \
+ 	      Boot	       Boot		Boot		 Boot
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map	2008-06-20 12:36:00.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map	2008-12-03 22:44:25.000000000 +0000
+@@ -3,7 +3,7 @@
+ # Send comments to Kjetil T. Homme <kjetilho@ifi.uio.no>
+ include "linux-with-alt-and-altgr"
+ 	plain keycode  83 = KP_Comma
+-	plain keycode 111 = Delete		# "Remove" originally, weird...
++	plain keycode 111 = Remove
+ strings as usual
+ 
+ 	keycode   1 = Escape
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map kbd-1.15/data/keymaps/i386/qwerty/ru1.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ru1.map	2008-12-03 22:45:32.000000000 +0000
+@@ -143,8 +143,8 @@
+ 
+ # The keycode "0xFF" is too dangerous for many programs (including emacs).
+ # So let it be bracket instead of Hard Sign.
+-# altgr		keycode  27 = 	+0xDF
+-# altgr	shift 	keycode  27 = 	+0xFF
++altgr		keycode  27 = 	+0xDF
++altgr	shift 	keycode  27 = 	+0xFF
+ 	control	keycode  27 =	Control_bracketright
+ altgr	control	keycode  27 =	Control_bracketright
+ 	alt	keycode  27 =	Meta_bracketright
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map kbd-1.15/data/keymaps/i386/qwerty/ru2.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ru2.map	2008-12-03 22:46:15.000000000 +0000
+@@ -46,7 +46,7 @@
+ 	alt	keycode  12 =	Meta_minus
+ 		keycode  13 =	equal	plus		equal	plus
+ 	alt	keycode  13 =	Meta_equal
+-		keycode  14 =	BackSpace BackSpace	BackSpace BackSpace
++		keycode  14 =	Delete Delete	Delete Delete
+ 	alt	keycode  14 =	Meta_Delete
+ 		keycode  15 =	Tab	Tab		Tab	Tab	
+ 	alt	keycode  15 =	Meta_Tab	
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map	2008-12-03 22:47:12.000000000 +0000
+@@ -39,7 +39,7 @@
+ 	alt	keycode  12 =	Meta_minus
+ 		keycode  13 =	equal	plus		equal	plus
+ 	alt	keycode  13 =	Meta_equal
+-		keycode  14 =	BackSpace
++		keycode  14 =	Delete
+ 	alt	keycode  14 =	Meta_Delete
+ 		keycode  15 =	Tab
+ 	alt	keycode  15 =	Meta_Tab	
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map	2008-12-03 22:48:10.000000000 +0000
+@@ -89,8 +89,8 @@
+ altgr	alt     keycode  13 =    Meta_equal
+ 	shift alt keycode  13 = 	Meta_plus
+ altgr	shift alt keycode  13 = 	Meta_plus
+-		keycode  14 = 	BackSpace  BackSpace  BackSpace  BackSpace
+-#		keycode  14 = 	Delete  Delete  Delete  Delete
++#		keycode  14 = 	BackSpace  BackSpace  BackSpace  BackSpace
++		keycode  14 = 	Delete  Delete  Delete  Delete
+ 	alt	keycode  14 =	Meta_Delete
+ altgr	alt     keycode  14 = 	Meta_Delete
+ 		keycode  15 =	Tab	Tab		Tab	Tab	
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map kbd-1.15/data/keymaps/i386/qwerty/ru_win.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ru_win.map	2008-12-03 22:49:17.000000000 +0000
+@@ -42,7 +42,7 @@
+ 	alt	keycode  12 =	Meta_minus
+ 		keycode  13 =	equal	plus		equal	plus
+ 	alt	keycode  13 =	Meta_equal
+-		keycode  14 =	BackSpace BackSpace	BackSpace BackSpace
++		keycode  14 =	Delete Delete	Delete Delete
+ 	alt	keycode  14 =	Meta_Delete
+ 		keycode  15 =	Tab	Tab		Tab	Tab	
+ 	alt	keycode  15 =	Meta_Tab	
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map	2008-12-03 22:50:18.000000000 +0000
+@@ -345,7 +345,7 @@
+ 	keycode 109 = Next	Scroll_Forward
+ 	keycode 110 = Insert
+ 
+-	keycode 111 = Delete		# "Remove" originally, weird...
++	keycode 111 = Remove
+ control alt	keycode 111 = Boot
+ control altgr	keycode 111 = Boot
+ 
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map	2008-12-03 22:50:44.000000000 +0000
+@@ -374,6 +374,6 @@
+ 	keycode 109 = Next	Scroll_Forward
+ 	keycode 110 = Insert
+ 
+-	keycode 111 = Delete		# "Remove" originally, weird...
++	keycode 111 = Remove
+ control alt	keycode 111 = Boot
+ control altgr	keycode 111 = Boot
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map	2008-12-03 22:52:09.000000000 +0000
+@@ -49,7 +49,7 @@
+ 	alt     keycode  12 = Meta_minus
+ keycode  13 = minus            underscore
+ 	alt     keycode  13 = Meta_equal
+-keycode  14 = BackSpace           Delete
++keycode  14 = Delete           Delete
+ 	alt     keycode  14 = Meta_Delete
+ keycode  15 = Tab              Meta_Tab
+ 	alt     keycode  15 = Meta_Tab
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map kbd-1.15/data/keymaps/i386/qwerty/ua.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ua.map	2008-12-03 22:52:52.000000000 +0000
+@@ -249,7 +249,7 @@
+ 	shift ctrll ctrlr keycode  13 = plus
+ 	alt ctrll ctrlr keycode  13 = Meta_equal
+ 	shift alt ctrll ctrlr keycode  13 = Meta_plus
+-keycode  14 = BackSpace           Delete          
++keycode  14 = Delete           Delete          
+ 	control	keycode  14 = BackSpace       
+ 	alt	keycode  14 = Meta_Delete     
+ 	ctrlr	keycode  14 = BackSpace
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map	2008-12-03 22:53:36.000000000 +0000
+@@ -250,7 +250,7 @@
+ 	shift ctrll ctrlr keycode  13 = plus
+ 	alt ctrll ctrlr keycode  13 = Meta_equal
+ 	shift alt ctrll ctrlr keycode  13 = Meta_plus
+-keycode  14 = BackSpace           Delete          
++keycode  14 = Delete           Delete          
+ 	control	keycode  14 = BackSpace       
+ 	alt	keycode  14 = Meta_Delete     
+ 	ctrlr	keycode  14 = BackSpace
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map	2008-12-03 22:54:06.000000000 +0000
+@@ -260,7 +260,7 @@
+ 	shift ctrll ctrlr keycode  13 = plus
+ 	alt ctrll ctrlr keycode  13 = Meta_equal
+ 	shift alt ctrll ctrlr keycode  13 = Meta_plus
+-keycode  14 = BackSpace           Delete          
++keycode  14 = Delete           Delete          
+ 	control	keycode  14 = BackSpace       
+ 	alt	keycode  14 = Meta_Delete     
+ 	ctrlr	keycode  14 = BackSpace
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map	2008-12-03 22:54:23.000000000 +0000
+@@ -260,7 +260,7 @@
+ 	shift ctrll ctrlr keycode  13 = plus
+ 	alt ctrll ctrlr keycode  13 = Meta_equal
+ 	shift alt ctrll ctrlr keycode  13 = Meta_plus
+-keycode  14 = BackSpace           Delete          
++keycode  14 = Delete           Delete          
+ 	control	keycode  14 = BackSpace       
+ 	alt	keycode  14 = Meta_Delete     
+ 	ctrlr	keycode  14 = BackSpace
diff --git a/source/a/kbd/kbd.SlackBuild b/source/a/kbd/kbd.SlackBuild
index 6d394a44f..771423717 100755
--- a/source/a/kbd/kbd.SlackBuild
+++ b/source/a/kbd/kbd.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/bin/sh
 
-# Copyright 2005-2021  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2020, 2023  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=kbd
-VERSION=1.15.3
-BUILD=${BUILD:-6}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -47,174 +47,139 @@ fi
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-kbd
+PKG=$TMP/package-$PKGNAM
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-
-# Add some extra fonts:
-( cd $PKG ; explodepkg $CWD/sources/extraf.tgz )
-
-# Extract source:
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/sources/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
-find . -perm 666 -exec chmod 644 {} \+
-find . -perm 664 -exec chmod 644 {} \+
-find . -perm 600 -exec chmod 644 {} \+
-find . -perm 444 -exec chmod 644 {} \+
-find . -perm 400 -exec chmod 644 {} \+
-find . -perm 440 -exec chmod 644 {} \+
-find . -perm 777 -exec chmod 755 {} \+
-find . -perm 775 -exec chmod 755 {} \+
-find . -perm 511 -exec chmod 755 {} \+
-find . -perm 711 -exec chmod 755 {} \+
-find . -perm 555 -exec chmod 755 {} \+
-
-# Apply patches:
-# These are taken from Fedora's SRPM:
-zcat $CWD/sources/kbd-1.15.2-po.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/sources/kbd-1.15-keycodes-man.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/sources/kbd-1.15-unicode_start.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/sources/kbd-1.15-resizecon-x86_64.patch.gz | patch -p1 --verbose || exit 1
-
-# This is from Mandriva's SRPM:
-zcat $CWD/sources/kbd-1.15.3-fix-es-translation.patch.gz | patch -p1 --verbose || exit 1
-
-# This is from Fedora's spec file:
-# 7-bit maps are obsolete; so are non-euro maps
-( cd data/keymaps/i386
-  mv qwerty/fi.map qwerty/fi-old.map
-  cp -fav qwerty/fi-latin9.map qwerty/fi.map
-  cp -fav qwerty/pt-latin9.map qwerty/pt.map
-  cp -fav qwerty/sv-latin1.map qwerty/se-latin1.map
-  mv -fv azerty/fr.map azerty/fr-old.map
-  cp -fav azerty/fr-latin9.map azerty/fr.map
-  cp -fav azerty/fr-latin9.map azerty/fr-latin0.map # legacy alias
-
-  # Rename conflicting keymaps
-  mv -fv dvorak/no.map dvorak/no-dvorak.map
-  mv -fv fgGIod/trf.map fgGIod/trf-fgGIod.map
-  mv -fv olpc/es.map olpc/es-olpc.map
-  mv -fv olpc/pt.map olpc/pt-olpc.map
-  mv -fv qwerty/cz.map qwerty/cz-qwerty.map )
-
-# Apply a euro fix for the nl.map from alienBOB:
-zcat $CWD/sources/nl.euro.diff.gz | patch -p1 || exit 1
-
-# Configure:
-CFLAGS="-fcommon" \
-./configure \
-   --prefix=/usr \
-   --localedir=/usr/share/locale/ \
-   --mandir=/usr/man \
-   --docdir=/usr/doc/$PKGNAM-$VERSION \
-   --datadir=/usr/share/kbd \
-   --enable-nls || exit 1
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \+
+
+# Thanks, LFS
+zcat $CWD/kbd-2.6.3-backspace-1.patch.gz | patch -p1 --verbose || exit 1
 
-# Build:
-make $NUMJOBS || exit 1
+# Thanks, Arch
+zcat $CWD/fix-euro2.patch.gz | patch -p1 --verbose || exit 1
 
-# Install into package:
+# Don't include resizecons or manpage:
+# "it requires the defunct svgalib to provide the video mode files - for
+# normal use setfont sizes the console appropriately"
+# Thanks again LFS
+sed -i '/RESIZECONS_PROGS=/s/yes/no/' configure
+sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in
+
+# 7-bit maps are obsolete; so are non-euro maps
+cp -fav data/keymaps/i386/qwerty/pt-latin9.map \
+        data/keymaps/i386/qwerty/pt.map
+cp -fav data/keymaps/i386/qwerty/sv-latin1.map \
+        data/keymaps/i386/qwerty/se-latin1.map
+mv -fv data/keymaps/i386/azerty/fr.map \
+       data/keymaps/i386/azerty/fr-old.map
+cp -fav data/keymaps/i386/azerty/fr-latin9.map \
+        data/keymaps/i386/azerty/fr.map
+
+# legacy alias
+cp -fav data/keymaps/i386/azerty/fr-latin9.map \
+        data/keymaps/i386/azerty/fr-latin0.map
+
+# Rename conflicting keymaps
+mv -fv data/keymaps/i386/colemak/en-latin9.map \
+       data/keymaps/i386/colemak/colemak.map
+mv -fv data/keymaps/i386/fgGIod/trf.map \
+       data/keymaps/i386/fgGIod/trf-fgGIod.map
+mv -fv data/keymaps/i386/olpc/es.map \
+       data/keymaps/i386/olpc/es-olpc.map
+mv -fv data/keymaps/i386/olpc/pt.map \
+       data/keymaps/i386/olpc/pt-olpc.map
+mv -fv data/keymaps/i386/qwerty/cz.map \
+       data/keymaps/i386/qwerty/cz-qwerty.map
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --localedir=/usr/share/locale/ \
+  --datadir=/usr/share/kbd \
+  --enable-nls \
+  --enable-optional-progs \
+  --enable-libkeymap \
+  --disable-tests \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+# Build and install:
+make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
-# This is where it's always been in Slackware, so let's move it back:
-( cd $PKG
-  mkdir -vpm755 bin
-  mv -fv usr/bin/loadkeys bin/
-  cd usr/bin ; ln -vsf ../../bin/loadkeys . )
 
-# Build/install resizecons:
-( cd src
-  make resizecons || exit 1
-  cp resizecons $PKG/usr/bin
-) || exit 1
+# ro_win.map.gz is useless:
+rm -f $PKG/usr/share/kbd/keymaps/i386/qwerty/ro_win.map.gz
 
-# ro_win.map.gz is useless
-rm -fv $PKG/usr/share/kbd/keymaps/i386/qwerty/ro_win.map.gz
+# Install PAM configuration for vlock
+mkdir -p $PKG/etc/pam.d
+cat $CWD/vlock.pamd > $PKG/etc/pam.d/vlock.new
 
-# The rhpl keyboard layout table is indexed by kbd layout names, so we need a
-# Korean keyboard
-ln -vfs us.map.gz $PKG/usr/share/kbd/keymaps/i386/qwerty/ko.map.gz
+# Add some extra fonts:
+( cd $PKG ; explodepkg $CWD/sources/extraf.tgz )
+
+# Make sure kbdinfo manpage is installed:
+if [ ! -r $PKG/usr/man/man1/kbdinfo.1 ]; then
+  cp -a ./docs/man/man1/kbdinfo.1 $PKG/usr/man/man1
+fi
 
 # Install the setup script that will be run from the Slackware installer:
 mkdir -pm755 $PKG/var/log/setup
 install -vpm755 $CWD/setup.setconsolefont $PKG/var/log/setup/
 install -vpm755 $CWD/setconsolefont $PKG/usr/bin/
 
-# Copy docs:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  COPYING* README* doc/* \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-rm -f $PKG/usr/doc/$PKGNAM-$VERSION/kbd.FAQ.sgml
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
-  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
-# Additional keymaps:
-# This is the keymap for Speakup (http://linux-speakup.org) users:
-cat $CWD/sources/speakupmap.map.gz > $PKG/usr/share/kbd/keymaps/i386/qwerty/speakupmap.map.gz
-# Another keymap for Speakup from Thomas Ward, for JFW users.
-tar xvf $CWD/sources/speakup-jfw.tar.gz
-( cd speakup-jfw
-  cat speakup-jfw.map | gzip -9c > $PKG/usr/share/kbd/keymaps/i386/qwerty/speakup-jfw.map.gz
-  cat readme > $PKG/usr/share/kbd/keymaps/i386/qwerty/speakup-jfw.readme )
-
 # Create the default run control script which will set the
 # console font to the "default"...  though this might not be
 # the same state as if setfont were not used at all.
 # For that reason, default the script to non-executable.
 mkdir -pm755 $PKG/etc/rc.d
 cat << EOF > $PKG/etc/rc.d/rc.font.new
-#!/bin/bash
+#!/bin/sh
 #
 # This selects your default screen font from among the ones in
 # /usr/share/kbd/consolefonts.
 #
 setfont -v
 EOF
-chmod 644 $PKG/etc/rc.d/rc.font.new
+chmod 0644 $PKG/etc/rc.d/rc.font.new
 
-# Create package post-install script:
-mkdir -p $PKG/install
-cat << EOF > $PKG/install/doinst.sh
-
-config() {
-  NEW="\$1"
-  OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r \$OLD ]; then
-    mv \$NEW \$OLD
-  elif [ "\$(cat \$OLD | md5sum)" = "\$(cat \$NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm \$NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-# Leave any new rc.font with the same permissions as the old one:
-# This is a kludge, but it's because there's no --reference option
-# on busybox's 'chmod':
-if [ -e etc/rc.d/rc.font ]; then
-  if [ -x etc/rc.d/rc.font ]; then
-    chmod 755 etc/rc.d/rc.font.new
-  else
-    chmod 644 etc/rc.d/rc.font.new
-  fi
-fi
-# Then config() it:
-config etc/rc.d/rc.font.new
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
-EOF
+# Strip binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
 # Compress and link manpages, if any:
 if [ -d $PKG/usr/man ]; then
@@ -225,21 +190,27 @@ if [ -d $PKG/usr/man ]; then
           ln -s $( readlink $eachpage ).gz $eachpage.gz
           rm $eachpage
         done
-        gzip -9 *.?
+        gzip -9 *.*
       )
     done
   )
 fi
 
-# Install package description:
-install -vpm644 $CWD/slack-desc $PKG/install/
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a AUTHORS COPYING CREDITS NEWS README $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
-# Strip binaries:
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/a/kbd/kbd.url b/source/a/kbd/kbd.url
new file mode 100644
index 000000000..8a29cba8b
--- /dev/null
+++ b/source/a/kbd/kbd.url
@@ -0,0 +1 @@
+https://www.kernel.org/pub/linux/utils/kbd/
diff --git a/source/a/kbd/setconsolefont b/source/a/kbd/setconsolefont
index c35f0c1de..b73192a11 100644
--- a/source/a/kbd/setconsolefont
+++ b/source/a/kbd/setconsolefont
@@ -6,11 +6,15 @@
 # correctly in the installer.
 # 2010-04-28, add LatKaCyrHeb-14.psfu.gz <volkerdi>
 # 25-Mar-2018, generate font list on the fly <David Woodfall>
+# 02-Oct-2023, don't run setfont if no font was previously loaded <volkerdi>
 
 if [ "$TMP" = "" ]; then
   TMP=/var/log/setup/tmp
 fi
 
+# Has this script loaded a font?
+FONT_LOADED=false
+
 get_font_list() {
   LS_FONTS=$(/bin/ls $T_PX/usr/share/kbd/consolefonts/*.gz \
     | rev | cut -f 1 -d / | rev | tail -n +10 | sed "s%$% ''%g" | tr '\n' ' ')
@@ -29,12 +33,16 @@ load_font() {
   if [ ! $? = 0 ]; then
     if [ -r $T_PX/usr/share/kbd/consolefonts/$1 ]; then
       $CHROOT setfont $T_PX/usr/share/kbd/consolefonts/$* 1> /dev/null 2> /dev/null
+      FONT_LOADED=true
     elif [ -r $T_PX/usr/lib/kbd/consolefonts/$1 ]; then
       $CHROOT setfont $T_PX/usr/lib/kbd/consolefonts/$* 1> /dev/null 2> /dev/null
+      FONT_LOADED=true
     elif [ -r /var/adm/mount/live/usr/lib/kbd/consolefonts/$1 ]; then
       $CHROOT setfont /var/adm/mount/live/usr/lib/kbd/consolefonts/$* 1> /dev/null 2> /dev/null
+      FONT_LOADED=true
     else # load default font
       $CHROOT setfont
+      FONT_LOADED=true
     fi
   fi
 }
@@ -67,7 +75,9 @@ out some custom screen fonts?" 5 60
 like it, you can make it your new default screen font. You'll be able \
 to try as many of these as you like.\" 21 65 12 -- $ALL_FONTS 2> $REPLY"
     if [ ! $? = 0 ]; then
-      load_font
+      if [ "$FONT_LOADED" = "true" ]; then
+        load_font
+      fi
       exit
     fi
     FONT=`cat $REPLY`
diff --git a/source/a/kbd/sources/kbd-1.15-keycodes-man.patch b/source/a/kbd/sources/kbd-1.15-keycodes-man.patch
deleted file mode 100644
index d18a8c8b5..000000000
--- a/source/a/kbd/sources/kbd-1.15-keycodes-man.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -up kbd-1.15/man/man1/showkey.1_old kbd-1.15/man/man1/showkey.1
---- kbd-1.15/man/man1/showkey.1_old	2008-03-13 17:46:23.000000000 +0100
-+++ kbd-1.15/man/man1/showkey.1	2008-12-10 12:31:38.000000000 +0100
-@@ -80,6 +80,19 @@ corresponds to what the keyboard hardwar
- to know the scan codes sent by various keys it is better to boot a
- 2.4 kernel. Since 2.6.9 there also is the boot option atkbd.softraw=0
- that tells the 2.6 kernel to return the actual scan codes.
-+
-+.SH NOTES
-+The raw scan codes are available only on AT and PS/2 keyboards,
-+and even then they are disabled unless the
-+.B atkbd.softraw=0
-+kernel parameter is used.
-+When the raw scan codes are not available, the kernel uses a fixed built-in
-+table to produce scan codes from keycodes.  Thus,
-+.BR setkeycodes (8)
-+can affect the output of
-+.B showkey
-+in scan code dump mode.
-+
- .SH "SEE ALSO"
- .BR loadkeys (1),
- .BR dumpkeys (1),
-diff -up kbd-1.15/man/man8/setkeycodes.8_old kbd-1.15/man/man8/setkeycodes.8
---- kbd-1.15/man/man8/setkeycodes.8_old	2008-12-10 12:31:56.000000000 +0100
-+++ kbd-1.15/man/man8/setkeycodes.8	2008-12-10 12:37:36.000000000 +0100
-@@ -41,6 +41,10 @@ to showkey(1), the command
- will assign the keycode 112 to it, and then loadkeys(1) can be used
- to define the function of this key.
- 
-+USB keyboards have standardized keycodes and
-+.B setkeycodes
-+doesn't affect them at all.
-+
- .SH "2.6 KERNELS"
- In 2.6 kernels key codes lie in the range 1-255, instead of 1-127.
- (It might be best to confine oneself to the range 1-239.)
-@@ -54,6 +58,14 @@ None.
- .SH BUGS
- The keycodes of X have nothing to do with those of Linux.
- Unusual keys can be made visible under Linux, but not under X.
-+
-+.B setkeycodes
-+affects only the "first" input device
-+that has modifiable scancode-to-keycode mapping.
-+If there is more than one such device,
-+.B setkeycodes
-+cannot change the mapping of other devices than the "first" one.
-+
- .SH "SEE ALSO"
- .I "dumpkeys (1), loadkeys (1), showkey (1), getkeycodes (8)"
- 
diff --git a/source/a/kbd/sources/kbd-1.15-resizecon-x86_64.patch b/source/a/kbd/sources/kbd-1.15-resizecon-x86_64.patch
deleted file mode 100644
index 5e8350a86..000000000
--- a/source/a/kbd/sources/kbd-1.15-resizecon-x86_64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up kbd-1.15/configure_old kbd-1.15/configure
---- kbd-1.15/configure_old	2009-01-08 15:11:04.000000000 +0100
-+++ kbd-1.15/configure	2009-01-08 15:11:45.000000000 +0100
-@@ -7637,8 +7637,9 @@ fi
- 
- 
- case $host_cpu in
--	i?86*) RESIZECONS_PROGS=yes ;;
--	*)     RESIZECONS_PROGS=no ;;
-+	i?86*)   RESIZECONS_PROGS=yes ;;
-+	x86_64*) RESIZECONS_PROGS=yes ;;
-+	*)       RESIZECONS_PROGS=no ;;
- esac
-  if test "$RESIZECONS_PROGS" = "yes"; then
-   RESIZECONS_PROGS_TRUE=
diff --git a/source/a/kbd/sources/kbd-1.15-unicode_start.patch b/source/a/kbd/sources/kbd-1.15-unicode_start.patch
deleted file mode 100644
index d3dab3fe3..000000000
--- a/source/a/kbd/sources/kbd-1.15-unicode_start.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up kbd-1.15/src/unicode_start_old kbd-1.15/src/unicode_start
---- kbd-1.15/src/unicode_start_old	2009-01-08 13:34:10.000000000 +0100
-+++ kbd-1.15/src/unicode_start	2009-01-08 14:02:12.000000000 +0100
-@@ -72,6 +72,9 @@ stty iutf8
- # have a Unicode map attached, or explicitly specified, e.g.,
- # by giving `def.uni' as a second argument.
- 
-+DEFAULT_UNICODE_FONT=LatArCyrHeb-16
-+# Also drdos8x16 is a good candidate.
-+
- case "$#" in
- 	2)
- 		setfont "$1" -u "$2"
-@@ -80,6 +83,7 @@ case "$#" in
- 		setfont "$1"
- 		;;
- 	0)
-+		setfont $DEFAULT_UNICODE_FONT
- 		;;
- 	*)
- 		echo "usage: unicode_start [font [unicode map]]"
diff --git a/source/a/kbd/sources/kbd-1.15.2-po.patch b/source/a/kbd/sources/kbd-1.15.2-po.patch
deleted file mode 100644
index a32a793f4..000000000
--- a/source/a/kbd/sources/kbd-1.15.2-po.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./po/Makefile.in.in.orig	2010-04-10 16:34:12.000000000 -0500
-+++ ./po/Makefile.in.in	2010-04-29 00:19:10.000000000 -0500
-@@ -22,8 +22,9 @@
- 
- prefix = @prefix@
- exec_prefix = @exec_prefix@
--datadir = @datadir@
--localedir = $(datadir)/locale
-+datadir       = @datadir@
-+localedir     = @localedir@
-+gnulocaledir  = @localedir@
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
diff --git a/source/a/kbd/sources/kbd-1.15.3-fix-es-translation.patch b/source/a/kbd/sources/kbd-1.15.3-fix-es-translation.patch
deleted file mode 100644
index 2d76cd9f3..000000000
--- a/source/a/kbd/sources/kbd-1.15.3-fix-es-translation.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kbd-1.15.3//po/es.po kbd-1.15.3.tpg//po/es.po
---- kbd-1.15.3//po/es.po	2011-05-14 21:12:49.000000000 +0000
-+++ kbd-1.15.3.tpg//po/es.po	2011-06-19 12:29:55.000000000 +0000
-@@ -1363,7 +1363,7 @@
- #: src/setfont.c:682
- #, c-format
- msgid "Saved %d-char %dx%d font file on %s\n"
--msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n"
-+msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n"
- 
- #: src/setkeycodes.c:21
- #, c-format
diff --git a/source/a/kbd/sources/nl.euro.diff b/source/a/kbd/sources/nl.euro.diff
deleted file mode 100644
index 655a7e228..000000000
--- a/source/a/kbd/sources/nl.euro.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./data/keymaps/i386/qwerty/nl.map.orig	2004-01-03 09:01:22.000000000 -0800
-+++ ./data/keymaps/i386/qwerty/nl.map	2004-05-29 21:16:31.000000000 -0700
-@@ -12,6 +12,7 @@
- keymaps 0-6,8-9,12
- alt_is_meta
- include "qwerty-layout"
-+  altgr        keycode  18 = euro
-   altgr        keycode  19 = paragraph
-   altgr        keycode  31 = ssharp
-   altgr        keycode  44 = guillemotleft
diff --git a/source/a/kbd/sources/speakupmap.map b/source/a/kbd/sources/speakupmap.map
deleted file mode 100644
index 9c73e35df..000000000
--- a/source/a/kbd/sources/speakupmap.map
+++ /dev/null
@@ -1,308 +0,0 @@
-# us.map
-# with some additions from quinlan@spectrum.cs.bucknell.edu (Daniel Quinlan)
-# 14 Mar 1994
-keymaps 0-2,4-6,8,9,12,13
-keycode   1 = Escape           Escape          
-	alt     keycode   1 = Meta_Escape     
-keycode   2 = one              exclam          
-	alt     keycode   2 = Meta_one        
-	alt shift keycode 2 = Meta_exclam
-keycode   3 = two              at               at              
-	control keycode   3 = nul        
-	control shift keycode 3 = nul     
-	alt     keycode   3 = Meta_two        
-	alt shift keycode 3 = Meta_at
-keycode   4 = three            numbersign      
-	control keycode   4 = Escape          
-	alt     keycode   4 = Meta_three      
-	alt shift keycode 4 = Meta_numbersign
-keycode   5 = four             dollar           dollar          
-	control keycode   5 = Control_backslash
-	alt     keycode   5 = Meta_four      
-	alt shift keycode 5 = Meta_dollar 
-keycode   6 = five             percent         
-	control keycode   6 = Control_bracketright
-	alt     keycode   6 = Meta_five  
-	alt shift keycode 6 = Meta_percent     
-keycode   7 = six              asciicircum     
-	control keycode   7 = Control_asciicircum
-	alt     keycode   7 = Meta_six    
-	alt shift keycode 7 = Meta_asciicircum    
-keycode   8 = seven            ampersand        braceleft       
-	control keycode   8 = Control_underscore
-	alt     keycode   8 = Meta_seven      
-keycode   9 = eight            asterisk         bracketleft     
-	control keycode   9 = Delete          
-	alt     keycode   9 = Meta_eight      
-keycode  10 = nine             parenleft        bracketright    
-	alt     keycode  10 = Meta_nine       
-keycode  11 = zero             parenright       braceright      
-	alt     keycode  11 = Meta_zero       
-keycode  12 = minus            underscore       backslash       
-	control keycode  12 = Control_underscore
-	control shift keycode 12 = Control_underscore
-	alt     keycode  12 = Meta_minus      
-keycode  13 = equal            plus            
-	alt     keycode  13 = Meta_equal      
-keycode  14 = Delete           Delete          
-	alt     keycode  14 = Meta_Delete     
-keycode  15 = Tab              Tab             
-	alt     keycode  15 = Meta_Tab        
-keycode  16 = q               
-keycode  17 = w               
-keycode  18 = e               
-keycode  19 = r               
-keycode  20 = t               
-keycode  21 = y               
-keycode  22 = u               
-keycode  23 = i               
-keycode  24 = o               
-keycode  25 = p               
-keycode  26 = bracketleft      braceleft       
-	control keycode  26 = Escape          
-	alt     keycode  26 = Meta_bracketleft
-	alt shift keycode 26 = Meta_braceleft
-keycode  27 = bracketright     braceright       asciitilde      
-	control keycode  27 = Control_bracketright
-	alt     keycode  27 = Meta_bracketright
-	alt shift keycode 27 = Meta_braceright
-keycode  28 = Return          
-	alt     keycode  28 = 0x080d          
-keycode  29 = Control         
-keycode  30 = a               
-keycode  31 = s               
-keycode  32 = d               
-keycode  33 = f               
-keycode  34 = g               
-keycode  35 = h               
-keycode  36 = j               
-keycode  37 = k               
-keycode  38 = l               
-keycode  39 = semicolon        colon           
-	alt     keycode  39 = Meta_semicolon  
-keycode  40 = apostrophe       quotedbl        
-	control keycode  40 = Control_g       
-	alt     keycode  40 = Meta_apostrophe 
-keycode  41 = grave            asciitilde      
-	control keycode  41 = nul             
-	alt     keycode  41 = Meta_grave      
-keycode  42 = Shift           
-keycode  43 = backslash        bar             
-	control keycode  43 = Control_backslash
-	alt     keycode  43 = Meta_backslash  
-	alt shift keycode 43 = Meta_bar
-keycode  44 = z               
-keycode  45 = x               
-keycode  46 = c               
-keycode  47 = v               
-keycode  48 = b               
-keycode  49 = n               
-keycode  50 = m               
-keycode  51 = comma            less            
-	alt     keycode  51 = Meta_comma      
-	alt shift keycode 51 = Meta_less
-keycode  52 = period           greater         
-	alt     keycode  52 = Meta_period     
-	alt shift keycode 52 = Meta_greater
-keycode  53 = slash            question        
-	control keycode  53 = Delete          
-	alt     keycode  53 = Meta_slash      
-keycode  54 = Shift           
-keycode  55 = 0x0d26     
-#keycode  55 = KP_Multiply     
-	altgr	keycode 55 = 0x0406
-keycode  56 = Alt             
-keycode  57 = space            space           
-	control keycode  57 = nul             
-	alt     keycode  57 = Meta_space      
-keycode  58 = Caps_Lock       
-keycode  59 = F1               F11              Console_13      
-	control keycode  59 = F1              
-	alt     keycode  59 = Console_1       
-	control	alt     keycode  59 = Console_1       
-keycode  60 = F2               F12              Console_14      
-	control keycode  60 = F2              
-	alt     keycode  60 = Console_2       
-	control	alt     keycode  60 = Console_2       
-keycode  61 = F3               F13              Console_15      
-	control keycode  61 = F3              
-	alt     keycode  61 = Console_3       
-	control	alt     keycode  61 = Console_3       
-keycode  62 = F4               F14              Console_16      
-	control keycode  62 = F4              
-	alt     keycode  62 = Console_4       
-	control	alt     keycode  62 = Console_4       
-keycode  63 = F5               F15              Console_17      
-	control keycode  63 = F5              
-	alt     keycode  63 = Console_5       
-	control	alt     keycode  63 = Console_5       
-keycode  64 = F6               F16              Console_18      
-	control keycode  64 = F6              
-	alt     keycode  64 = Console_6       
-	control	alt     keycode  64 = Console_6       
-keycode  65 = F7               F17              Console_19      
-	control keycode  65 = F7              
-	alt     keycode  65 = Console_7       
-	control	alt     keycode  65 = Console_7       
-keycode  66 = F8               F18              Console_20      
-	control keycode  66 = F8              
-	alt     keycode  66 = Console_8       
-	control	alt     keycode  66 = Console_8       
-keycode  67 = F9               F19              Console_21      
-	control keycode  67 = F9              
-	alt     keycode  67 = Console_9       
-	control	alt     keycode  67 = Console_9       
-keycode  68 = F10              F20              Console_22      
-	control keycode  68 = F10             
-	alt     keycode  68 = Console_10      
-	control	alt     keycode  68 = Console_10      
-keycode  69 = Num_Lock        
-keycode  70 = Scroll_Lock      Show_Memory      Show_Registers  
-	control keycode  70 = Show_State      
-	alt     keycode  70 = Scroll_Lock     
-keycode  71 = 0x0d0b
-		altgr	keycode 71 = 0x0d0f
-#keycode  71 = KP_7            
-	alt     keycode  71 = Ascii_7         
-keycode  72 = 0x0d0a
-	altgr keycode 72 = 0x0d20
-#keycode  72 = KP_8            
-	alt     keycode  72 = Ascii_8         
-keycode  73 = 0x0d0c
-		altgr	keycode 73 = 0x0d0d
-#keycode  73 = KP_9            
-	alt     keycode  73 = Ascii_9         
-keycode  74 = 0x0d1e
-	altgr keycode 74 = 0x0d24
-keycode  75 = 0x0d08
-	altgr keycode 75 = 0x0d22
-#keycode  75 = KP_4            
-	alt     keycode  75 = Ascii_4         
-keycode  76 = 0x0d07
-#keycode  76 = KP_5            
-	altgr	keycode  76 = 0x0d12
-	alt     keycode  76 = Ascii_5         
-keycode  77 = 0x0d09
-	altgr keycode 77 = 0x0d23
-#keycode  77 = KP_6            
-	alt     keycode  77 = Ascii_6         
-#keycode  78 = KP_Add          
-keycode  78 = 0x0d14
-	altgr keycode 78 = 0x0d21
-keycode  79 = 0x0d05	
-#keycode  79 = KP_1            
-	altgr	keycode 79 = 0x0d10
-	alt     keycode  79 = Ascii_1         
-keycode  80 = 0x0d04
-#keycode  80 = KP_2            
-	altgr	keycode  80 = 0x0d11
-	alt     keycode  80 = Ascii_2         
-keycode  81 = 0x0d06		
-	altgr 	keycode 81 = 0x0d0e
-#keycode  81 = KP_3            
-	alt     keycode  81 = Ascii_3         
-#keycode  82 = 0x0d14
-keycode  82 = AltGr
-#keycode  82 = KP_0            
-	alt     keycode  82 = Ascii_0         
-#keycode  83 = KP_Period       
-keycode  83 = 0x0d1b
-	altgr	keycode 83 = 0x0d1d
-	altgr   control keycode  83 = Boot            
-	control alt     keycode  83 = Boot            
-keycode  84 = Last_Console    
-keycode  85 =
-keycode  86 = less             greater          bar             
-	alt     keycode  86 = Meta_less       
-keycode  87 = F11              F11              Console_23      
-	control keycode  87 = F11             
-	alt     keycode  87 = Console_11      
-	control	alt     keycode  87 = Console_11      
-keycode  88 = F12              F12              Console_24      
-	control keycode  88 = F12             
-	alt     keycode  88 = Console_12      
-	control	alt     keycode  88 = Console_12      
-keycode  89 =
-keycode  90 =
-keycode  91 =
-keycode  92 =
-keycode  93 =
-keycode  94 =
-keycode  95 =
-keycode  96 = 0x0d03
-	altgr	keycode 96 = 0x0d1c
-#keycode  96 = KP_Enter        
-keycode  97 = Control         
-keycode  98 = 0x0d27
-#keycode  98 = KP_Divide       
-	altgr	keycode  98 = 0x0d28
-#keycode  99 = Control_backslash
-keycode 99 = 0x0d25
-	control keycode  99 = Control_backslash
-	alt     keycode  99 = Control_backslash
-keycode 100 = Alt           
-keycode 101 = Break           
-keycode 102 = Find            
-keycode 103 = Up              
-keycode 104 = Prior           
-	shift   keycode 104 = Scroll_Backward 
-keycode 105 = Left            
-        alt     keycode 105 = Decr_Console
-keycode 106 = Right
-        alt     keycode 106 = Incr_Console
-keycode 107 = Select          
-keycode 108 = Down            
-keycode 109 = Next            
-	shift   keycode 109 = Scroll_Forward  
-keycode 110 = Insert          
-keycode 111 = Remove          
-	altgr   control keycode 111 = Boot            
-	control alt     keycode 111 = Boot            
-keycode 112 =
-keycode 113 =
-keycode 114 =
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 =
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 =
-keycode 126 =
-keycode 127 =
-string F1 = "\033[[A"
-string F2 = "\033[[B"
-string F3 = "\033[[C"
-string F4 = "\033[[D"
-string F5 = "\033[[E"
-string F6 = "\033[17~"
-string F7 = "\033[18~"
-string F8 = "\033[19~"
-string F9 = "\033[20~"
-string F10 = "\033[21~"
-string F11 = "\033[23~"
-string F12 = "\033[24~"
-string F13 = "\033[25~"
-string F14 = "\033[26~"
-string F15 = "\033[28~"
-string F16 = "\033[29~"
-string F17 = "\033[31~"
-string F18 = "\033[32~"
-string F19 = "\033[33~"
-string F20 = "\033[34~"
-string Find = "\033[1~"
-string Insert = "\033[2~"
-string Remove = "\033[3~"
-string Select = "\033[4~"
-string Prior = "\033[5~"
-string Next = "\033[6~"
-string F21 = ""
-string F22 = ""
-string F23 = ""
-string F24 = ""
-string F25 = ""
-string F26 = ""
diff --git a/source/a/kbd/vlock.pamd b/source/a/kbd/vlock.pamd
new file mode 100644
index 000000000..d2d47e5b2
--- /dev/null
+++ b/source/a/kbd/vlock.pamd
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth       include      system-auth
+account    required     pam_permit.so
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index deb617681..21fef9ef3 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,14 @@
+Wed Nov  8 21:01:19 UTC 2023
+  Include the original keymaps from the kbd package, as well as the official
+  loadkeys binary and supporting libraries. Some keymaps seem to get broken
+  or mangled from being converted to a binary keymap and loaded with the
+  busybox loadkmap tool.
+  If a keymap is specified on the kernel command line, like: kbd=azerty
+  then after loading it, save the name to /tmp/Pkeymap so that setup knows
+  about it.
+  Construct the list of keymaps on the fly from the /usr/share/kbd/keymaps/i386
+  directory.
++--------------------------+
 Wed Sep 20 08:08:08 UTC 2023
   Changes for AArch64 architecture:
   /sbin/probe: Updated reserved file system labels for Hardware Models with
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index 53d9e2620..e4044ca65 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -970,6 +970,7 @@ a/hdparm \
 a/hwdata \
 a/inih \
 a/jfsutils \
+a/kbd \
 a/kmod \
 a/lvm2 \
 a/lzip \
@@ -1093,6 +1094,7 @@ cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_USRBIN} \
         bash \
         ddrescue \
         ldd \
+        loadkeys \
         lzip \
         neofetch \
         plzip \
@@ -1247,6 +1249,14 @@ cp --remove-destination -fa${VERBOSE1} \
   ter-732b.psf.gz \
   $PKG/$ARCH-installer-filesystem/usr/share/kbd/consolefonts
 
+# Get the standard set of keymaps:
+cd $TMP/extract-packages/usr/share/kbd/keymaps
+mkdir -p $PKG/$ARCH-installer-filesystem/usr/share/kbd/keymaps
+cp --remove-destination -fa${VERBOSE1} \
+  i386 \
+  include \
+  $PKG/$ARCH-installer-filesystem/usr/share/kbd/keymaps
+
 # Copy binaries from /usr/sbin into the installer's /usr/sbin/
 cd $TMP/extract-packages/usr/sbin
 cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_USRSBIN} \
@@ -1369,6 +1379,8 @@ cp  -fa${VERBOSE1} \
         libhistory*.so* \
         libidn2*.so* \
         libjson-c.so* \
+        libkbdfile.so* \
+        libkeymap.so* \
         liblz.so* \
         liblz4.so* \
         liblzo*.so* \
diff --git a/source/installer/sources/initrd/etc/keymaps.tar b/source/installer/sources/initrd/etc/keymaps.tar
deleted file mode 100644
index 2ae6004b7..000000000
--- a/source/installer/sources/initrd/etc/keymaps.tar
+++ /dev/null
diff --git a/source/installer/sources/initrd/etc/rc.d/rc.S b/source/installer/sources/initrd/etc/rc.d/rc.S
index ce8c32d5c..dec350d0a 100755
--- a/source/installer/sources/initrd/etc/rc.d/rc.S
+++ b/source/installer/sources/initrd/etc/rc.d/rc.S
@@ -250,11 +250,23 @@ if ! cat /proc/cmdline | grep -q 'kbd=' 2> /dev/null ; then
 else
   for ARG in `cat /proc/cmdline` ; do
     if [ "`echo $ARG | cut -f1 -d=`" = "kbd" ]; then
-      BMAP="`echo $ARG | cut -f2 -d=`.bmap"
+      # A keymap was specified on the kernel command line such as: kbd=azerty
+      MAPSELECT="$(echo $ARG | cut -f2 -d=)"
+      # If it ends in .gz, strip that off:
+      if [ "$(echo $MAPSELECT | rev | cut -f 1 -d . | rev)" = "gz" ]; then
+        MAPSELECT=$(basename $MAPSELECT .gz)
+      fi
+      # If it doesn't end in .map, add that:
+      if [ ! "$(echo $MAPSELECT | rev | cut -f 1 -d . | rev)" = "map" ]; then
+        MAPSELECT=${MAPSELECT}.map
+      fi
+      # Load the keymap:
+      loadkeys -q $MAPSELECT
+      # Let the setup script know about this:
+      echo $MAPSELECT > /tmp/Pkeymap
+      unset MAPSELECT
     fi 
   done
-  tar xzOf /etc/keymaps.tar.gz $BMAP | loadkmap
-  unset BMAP
 fi
 clear
 
diff --git a/source/installer/sources/initrd/usr/lib/setup/SeTkeymap b/source/installer/sources/initrd/usr/lib/setup/SeTkeymap
index e8ac96396..ce1e6d778 100755
--- a/source/installer/sources/initrd/usr/lib/setup/SeTkeymap
+++ b/source/installer/sources/initrd/usr/lib/setup/SeTkeymap
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 1993, 1999, 2002 Patrick Volkerding, Moorhead, MN.
-# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2023  Patrick J. Volkerding, Sebeka, MN, USA
 # Use and redistribution covered by the same terms as the "setup" script.
 TMP=/var/log/setup/tmp
 RDIR=/dev/tty4
@@ -8,183 +8,30 @@ if [ ! -d $TMP ]; then
   mkdir -p $TMP
 fi
 while [ 0 ]; do
+
+# Construct the list of available keymaps:
+MAPLIST="$(cd /usr/share/kbd/keymaps/i386 ; find azerty bepo carpalx colemak dvorak fgGIod neo olpc qwerty qwertz | grep / | grep .map.gz$ | rev | cut -f 2- -d . | rev | less | sort | less | sed "s|^|\"|g" | sed "s|$|\" \"\" |g" | tr -d "\n")"
+
+cat << EOF > $TMP/select_keymap.sh
 dialog --title "KEYBOARD MAP SELECTION" --menu "You may select one \
 of the following keyboard maps. If you do not select a keyboard \
 map, 'us.map' (the US keyboard map) is the default. Use the UP/DOWN \
 arrow keys and PageUp/PageDown to scroll \
 through the whole list of choices." \
 22 55 11 \
-"qwerty/us.map" "" \
-"qwerty/uk.map" "" \
-"azerty/azerty.map" "" \
-"azerty/be-latin1.map" "" \
-"azerty/fr-latin0.map" "" \
-"azerty/fr-latin1.map" "" \
-"azerty/fr-latin9.map" "" \
-"azerty/fr-old.map" "" \
-"azerty/fr-pc.map" "" \
-"azerty/fr.map" "" \
-"azerty/wangbe.map" "" \
-"azerty/wangbe2.map" "" \
-"colemak/en-latin9.map" "" \
-"dvorak/ANSI-dvorak.map" "" \
-"dvorak/dvorak-fr.map" "" \
-"dvorak/dvorak-l.map" "" \
-"dvorak/dvorak-r.map" "" \
-"dvorak/dvorak.map" "" \
-"dvorak/no-dvorak.map" "" \
-"fgGIod/tr_f-latin5.map" "" \
-"fgGIod/trf-fgGIod.map" "" \
-"olpc/es-olpc.map" "" \
-"olpc/pt-olpc.map" "" \
-"qwerty/bashkir.map" "" \
-"qwerty/bg-cp1251.map" "" \
-"qwerty/bg-cp855.map" "" \
-"qwerty/bg_bds-cp1251.map" "" \
-"qwerty/bg_bds-utf8.map" "" \
-"qwerty/bg_pho-cp1251.map" "" \
-"qwerty/bg_pho-utf8.map" "" \
-"qwerty/br-abnt.map" "" \
-"qwerty/br-abnt2.map" "" \
-"qwerty/br-latin1-abnt2.map" "" \
-"qwerty/br-latin1-us.map" "" \
-"qwerty/by-cp1251.map" "" \
-"qwerty/by.map" "" \
-"qwerty/bywin-cp1251.map" "" \
-"qwerty/cf.map" "" \
-"qwerty/cz-cp1250.map" "" \
-"qwerty/cz-lat2-prog.map" "" \
-"qwerty/cz-lat2.map" "" \
-"qwerty/cz-qwerty.map" "" \
-"qwerty/defkeymap.map" "" \
-"qwerty/defkeymap_V1.0.map" "" \
-"qwerty/dk-latin1.map" "" \
-"qwerty/dk.map" "" \
-"qwerty/emacs.map" "" \
-"qwerty/emacs2.map" "" \
-"qwerty/es-cp850.map" "" \
-"qwerty/es.map" "" \
-"qwerty/et-nodeadkeys.map" "" \
-"qwerty/et.map" "" \
-"qwerty/fi-latin1.map" "" \
-"qwerty/fi-latin9.map" "" \
-"qwerty/fi-old.map" "" \
-"qwerty/fi.map" "" \
-"qwerty/gr-pc.map" "" \
-"qwerty/gr.map" "" \
-"qwerty/hu101.map" "" \
-"qwerty/il-heb.map" "" \
-"qwerty/il-phonetic.map" "" \
-"qwerty/il.map" "" \
-"qwerty/is-latin1-us.map" "" \
-"qwerty/is-latin1.map" "" \
-"qwerty/it-ibm.map" "" \
-"qwerty/it.map" "" \
-"qwerty/it2.map" "" \
-"qwerty/jp106.map" "" \
-"qwerty/kazakh.map" "" \
-"qwerty/ky_alt_sh-UTF-8.map" "" \
-"qwerty/kyrgyz.map" "" \
-"qwerty/la-latin1.map" "" \
-"qwerty/lt.baltic.map" "" \
-"qwerty/lt.l4.map" "" \
-"qwerty/lt.map" "" \
-"qwerty/mk-cp1251.map" "" \
-"qwerty/mk-utf.map" "" \
-"qwerty/mk.map" "" \
-"qwerty/mk0.map" "" \
-"qwerty/nl.map" "" \
-"qwerty/nl2.map" "" \
-"qwerty/no-latin1.map" "" \
-"qwerty/no.map" "" \
-"qwerty/pc110.map" "" \
-"qwerty/pl.map" "" \
-"qwerty/pl1.map" "" \
-"qwerty/pl2.map" "" \
-"qwerty/pl3.map" "" \
-"qwerty/pl4.map" "" \
-"qwerty/pt-latin1.map" "" \
-"qwerty/pt-latin9.map" "" \
-"qwerty/pt.map" "" \
-"qwerty/ro.map" "" \
-"qwerty/ro_std.map" "" \
-"qwerty/ru-cp1251.map" "" \
-"qwerty/ru-ms.map" "" \
-"qwerty/ru-yawerty.map" "" \
-"qwerty/ru.map" "" \
-"qwerty/ru1.map" "" \
-"qwerty/ru2.map" "" \
-"qwerty/ru3.map" "" \
-"qwerty/ru4.map" "" \
-"qwerty/ru_win.map" "" \
-"qwerty/ruwin_alt-CP1251.map" "" \
-"qwerty/ruwin_alt-KOI8-R.map" "" \
-"qwerty/ruwin_alt-UTF-8.map" "" \
-"qwerty/ruwin_cplk-CP1251.map" "" \
-"qwerty/ruwin_cplk-KOI8-R.map" "" \
-"qwerty/ruwin_cplk-UTF-8.map" "" \
-"qwerty/ruwin_ct_sh-CP1251.map" "" \
-"qwerty/ruwin_ct_sh-KOI8-R.map" "" \
-"qwerty/ruwin_ct_sh-UTF-8.map" "" \
-"qwerty/ruwin_ctrl-CP1251.map" "" \
-"qwerty/ruwin_ctrl-KOI8-R.map" "" \
-"qwerty/ruwin_ctrl-UTF-8.map" "" \
-"qwerty/se-fi-ir209.map" "" \
-"qwerty/se-fi-lat6.map" "" \
-"qwerty/se-ir209.map" "" \
-"qwerty/se-lat6.map" "" \
-"qwerty/se-latin1.map" "" \
-"qwerty/sk-prog-qwerty.map" "" \
-"qwerty/sk-qwerty.map" "" \
-"qwerty/speakup-jfw.map" "" \
-"qwerty/speakupmap.map" "" \
-"qwerty/sr-cy.map" "" \
-"qwerty/sv-latin1.map" "" \
-"qwerty/tj_alt-UTF8.map" "" \
-"qwerty/tr_q-latin5.map" "" \
-"qwerty/tralt.map" "" \
-"qwerty/trf.map" "" \
-"qwerty/trq.map" "" \
-"qwerty/ttwin_alt-UTF-8.map" "" \
-"qwerty/ttwin_cplk-UTF-8.map" "" \
-"qwerty/ttwin_ct_sh-UTF-8.map" "" \
-"qwerty/ttwin_ctrl-UTF-8.map" "" \
-"qwerty/ua-cp1251.map" "" \
-"qwerty/ua-utf-ws.map" "" \
-"qwerty/ua-utf.map" "" \
-"qwerty/ua-ws.map" "" \
-"qwerty/ua.map" "" \
-"qwerty/uk.map" "" \
-"qwerty/us-acentos.map" "" \
-"qwerty/us.map" "" \
-"qwertz/croat.map" "" \
-"qwertz/cz-us-qwertz.map" "" \
-"qwertz/cz.map" "" \
-"qwertz/de-latin1-nodeadkeys.map" "" \
-"qwertz/de-latin1.map" "" \
-"qwertz/de-mobii.map" "" \
-"qwertz/de.map" "" \
-"qwertz/de_CH-latin1.map" "" \
-"qwertz/de_alt_UTF-8.map" "" \
-"qwertz/fr_CH-latin1.map" "" \
-"qwertz/fr_CH.map" "" \
-"qwertz/hu.map" "" \
-"qwertz/sg-latin1-lk450.map" "" \
-"qwertz/sg-latin1.map" "" \
-"qwertz/sg.map" "" \
-"qwertz/sk-prog-qwertz.map" "" \
-"qwertz/sk-qwertz.map" "" \
-"qwertz/slovene.map" "" \
+"qwerty/us.map" "" "qwerty/uk.map" "" $MAPLIST \
  2> $TMP/SeTkeymap
+EOF
+ sh $TMP/select_keymap.sh
  if [ ! $? = 0 ]; then
-  rm -f $TMP/SeTkeymap
+  rm -f $TMP/SeTkeymap $TMP/select_keymap.sh
   exit
  fi
- MAPNAME="`cat $TMP/SeTkeymap`"
- MAPNAME="`basename $MAPNAME`"
+ rm -f $TMP/select_keymap.sh
+ MAPNAME="$(cat $TMP/SeTkeymap)"
+ MAPNAME="$(basename $MAPNAME)"
  echo $MAPNAME > $TMP/SeTkeymap
- BMAP="`basename $MAPNAME .map`.bmap"
- tar xzOf /etc/keymaps.tar.gz $BMAP > /dev/null && tar xzOf /etc/keymaps.tar.gz $BMAP | loadkmap
+ loadkeys -q $MAPNAME
 
  while [ 0 ]; do
   # Match the dialog colors a little while doing the keyboard test:
@@ -214,7 +61,7 @@ EOF
   rm -f $TMP/$MAPNAME
   rm -f $TMP/SeTkeymap $TMP/Pkeymap
   # Clear bad selection:
-  tar xzOf /etc/keymaps.tar.gz us.bmap > /dev/null && tar xzOf /etc/keymaps.tar.gz us.bmap | loadkmap
+  loadkeys -q us.map
   continue;
  fi
 done
diff --git a/source/k/kernel-configs/config-generic-6.1.61 b/source/k/kernel-configs/config-generic-6.1.62
index ecb30db4e..90b000d3b 100644
--- a/source/k/kernel-configs/config-generic-6.1.61
+++ b/source/k/kernel-configs/config-generic-6.1.62
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.61 Kernel Configuration
+# Linux/x86 6.1.62 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-generic-6.1.61.x64 b/source/k/kernel-configs/config-generic-6.1.62.x64
index 2bf69f151..d7e272a42 100644
--- a/source/k/kernel-configs/config-generic-6.1.61.x64
+++ b/source/k/kernel-configs/config-generic-6.1.62.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.61 Kernel Configuration
+# Linux/x86 6.1.62 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-generic-smp-6.1.61-smp b/source/k/kernel-configs/config-generic-smp-6.1.62-smp
index fe8dd4c26..599a2e612 100644
--- a/source/k/kernel-configs/config-generic-smp-6.1.61-smp
+++ b/source/k/kernel-configs/config-generic-smp-6.1.62-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.61 Kernel Configuration
+# Linux/x86 6.1.62 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-6.1.61 b/source/k/kernel-configs/config-huge-6.1.62
index 61a9b9863..6e6850d9c 100644
--- a/source/k/kernel-configs/config-huge-6.1.61
+++ b/source/k/kernel-configs/config-huge-6.1.62
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.61 Kernel Configuration
+# Linux/x86 6.1.62 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-6.1.61.x64 b/source/k/kernel-configs/config-huge-6.1.62.x64
index 55650b2da..37f7022f2 100644
--- a/source/k/kernel-configs/config-huge-6.1.61.x64
+++ b/source/k/kernel-configs/config-huge-6.1.62.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.61 Kernel Configuration
+# Linux/x86 6.1.62 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-smp-6.1.61-smp b/source/k/kernel-configs/config-huge-smp-6.1.62-smp
index a2e722851..c2c4f4bbf 100644
--- a/source/k/kernel-configs/config-huge-smp-6.1.61-smp
+++ b/source/k/kernel-configs/config-huge-smp-6.1.62-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.61 Kernel Configuration
+# Linux/x86 6.1.62 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/n/bind/default.named b/source/n/bind/default.named
index 5c59298df..0a96196d1 100644
--- a/source/n/bind/default.named
+++ b/source/n/bind/default.named
@@ -14,7 +14,7 @@ NAMED_OPTIONS="-u $NAMED_USER"
 # If this is set to YES, then before starting named the startup script
 # will make sure that /etc/rndc.key (if it exists) and the enitre contents
 # of /var/named are chowned to $NAMED_USER:$NAMED_GROUP. If some of these
-# files are improperly owned, named will refuse to start or may now work
+# files are improperly owned, named will refuse to start or may not work
 # properly. This is also a useful setting when upgrading from an older BIND
 # package that would run as root.
 #
author	Patrick J Volkerding <volkerdi@slackware.com>	2023-11-08 22:04:25 +0000
committer	Eric Hameleers <alien@slackware.com>	2023-11-08 23:36:11 +0100
commit	d387e58ecc1078f05ee9e618aef86b008b52ed89 (patch)
tree	78360deed7291fc2e51e379795a2b9d0d95d27d9 /source
parent	69753b9a1da83d78dab7943e3fcdb428ee74a254 (diff)
download	current-d387e58ecc1078f05ee9e618aef86b008b52ed89.tar.gz current-d387e58ecc1078f05ee9e618aef86b008b52ed89.tar.xz