чување 9baa30f36ff943d14a7a26e34bd0ebd4fe298d1f
родитељ 62453ec0b264d39b65900258e6ead8466b7692ab
Аутор: Страхиња Радић <contact@strahinja.org>
Датум: Tue, 12 Jul 2022 20:52:53 +0200
Chroot up to vis
Signed-off-by: Страхиња Радић <contact@strahinja.org>
Diffstat:
измењених датотека: 5, додавања: 717(+), брисања: 18(-)
diff --git a/03-chroot.sh b/03-chroot.sh
@@ -182,7 +182,8 @@ mkpk_install()
CC=${G_TARGET}-gcc
CXX=${G_TARGET}-g++
CFLAGS='-O3 -march=native -mtune=native -pipe'
- export CC CXX CFLAGS
+ PATH=/${TLD}/bin:${PATH}
+ export CC CXX CFLAGS PATH
DESTDIR=../build
LDFLAGS='-Wl,-soname,libc.musl-${G_ARCH_EXT_ALT}.so.1'
@@ -1130,17 +1131,6 @@ mkpk_name()
printf "%s" "${pkg}"
}
-mkpk_install()
-{
- CC=/sucks/bin/gcc
- CXX=/sucks/bin/g++
- AR=/sucks/bin/ar
- AS=/sucks/bin/as
- RANLIB=/sucks/bin/ranlib
- LD=/sucks/bin/ld
- STRIP=/sucks/bin/strip
- export CC CXX AR AS RANLIB LD STRIP
-
CFLAGS='-O3 -march=native -mtune=native -pipe'
DESTDIR=/build
export CFLAGS DESTDIR
@@ -2768,13 +2758,22 @@ mkpk_install()
mkdir /cmake-build
cd /cmake-build
- cmake --install-prefix / ../${pkg} || exit 1
+ cmake -DCMAKE_INSTALL_PREFIX=/ \\
+ -DCMAKE_BUILD_TYPE=Release \\
+ ../${pkg} || exit 1
make -C /cmake-build ${JN} || exit 1
+
+ sed -i -e 's,/usr/local,,' \\
+ -e 's,/usr,,' \\
+ -e 's,//,,g' 00locale.sh
+
make -C /cmake-build install
+
+ rm -fr /cmake-build
}
!
mkpk ${pkg}
- remove_dir ${G_SRC}/${pkg}
+ #remove_dir ${G_SRC}/${pkg}
unpack_pkg ${pkg} /
msg warn "Note: If this is the first time you are running this"
msg warn "installation script, at this point you should recom-"
@@ -2919,7 +2918,7 @@ mkpk_install()
cd build-mksh
sh ../Build.sh || exit 1
- mkdir -pvv /build/bin
+ mkdir -pv /build/bin
mkdir -pv /build/share/doc/${pkg}/examples
ln -s ${pkg} /build/share/doc/mksh
mkdir -pv /build/share/man/man1
@@ -2950,6 +2949,426 @@ mkpk_install()
fi
end_substep
+begin_substep sled-0.10.8
+if [ -x /bin/sled ]; then
+ msg info "%s exists, skipping %s" /bin/sled ${pkg}
+elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
+ unpack_pkg ${pkg} /
+else
+ extract_pkg ${G_SRC} sled-v0.10.8 ${pkg}.tar.gz ${pkg}
+ (
+ cd_or_fail ${G_SRC}/${pkg}
+
+ cat <<! >MKPK
+mkpk_name()
+{
+ printf "%s" "${pkg}"
+}
+
+mkpk_install()
+{
+ SLED_CC='tcc -O2 -Wall -static -fcommon'
+ FALLBACKVER=${pkg##*-}
+ PREFIX=/build
+ export SLED_CC FALLBACKVER PREFIX
+ ./do -c install
+ true
+}
+!
+ mkpk ${pkg}
+ remove_dir ${G_SRC}/${pkg}
+ unpack_pkg ${pkg} /
+ ) || exit 1
+fi
+end_substep
+
+begin_substep iproute2-5.17.0
+if [ -x /bin/ss ]; then
+ msg info "%s exists, skipping %s" /bin/ss ${pkg}
+elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
+ unpack_pkg ${pkg} /
+else
+ extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.xz
+ (
+ cd_or_fail ${G_SRC}/${pkg}
+
+ cat <<! >MKPK
+mkpk_name()
+{
+ printf "%s" "${pkg}"
+}
+
+mkpk_install()
+{
+ CFLAGS='-O3 -march=native -mtune=native -pipe -static --static -fcommon'
+ LDFLAGS='-static --static -fcommon'
+ DESTDIR=/build
+ YACC=yacc
+ export CFLAGS LDFLAGS DESTDIR YACC
+
+ sed -i '/ARPD/d' Makefile
+ rm -f man/man8/arpd.8
+ sed -i 's/.m_ipt.o//' tc/Makefile
+ sed -i 's/^LDLIBS\\s*+=.*/& -lz/' Makefile
+
+ make NETNS_RUN_DIR=/run/netns ${JN}
+ make DOCDIR=/share/doc/${pkg} install
+}
+!
+ mkpk ${pkg}
+ remove_dir ${G_SRC}/${pkg}
+ unpack_pkg ${pkg} /
+ ) || exit 1
+fi
+end_substep
+
+begin_substep kbd-2.4.0
+if [ -x /bin/loadkeys ]; then
+ msg info "%s exists, skipping %s" /bin/loadkeys ${pkg}
+elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
+ unpack_pkg ${pkg} /
+else
+ extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.xz
+ (
+ cd_or_fail ${G_SRC}/${pkg}
+
+ apply_patch final-system -Np1 -i \
+ ${G_PAT}/kbd-lfs/kbd-2.3.0-backspace-1.patch
+
+ sed -i 's/\(RESIZECONS_PROGS=\)yes/\1no/g' \
+ configure
+ sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in
+
+ mv data/keymaps/i386/qwertz/cz.map \
+ data/keymaps/i386/qwertz/cz-qwertz.map
+ mv data/keymaps/i386/olpc/es.map \
+ data/keymaps/i386/olpc/es-olpc.map
+ mv data/keymaps/i386/olpc/pt.map \
+ data/keymaps/i386/olpc/pt-olpc.map
+ mv data/keymaps/i386/fgGIod/trf.map \
+ data/keymaps/i386/fgGIod/trf-fgGIod.map
+ mv data/keymaps/i386/colemak/en-latin9.map \
+ data/keymaps/i386/colemak/colemak.map
+
+ cd data/keymaps/i386
+ cp qwerty/pt-latin9.map qwerty/pt.map
+ cp qwerty/sv-latin1.map qwerty/se-latin1.map
+
+ mv azerty/fr.map azerty/fr-old.map
+ cp azerty/fr-latin9.map azerty/fr.map
+
+ cp azerty/fr-latin9.map azerty/fr-latin0.map # legacy alias
+ cd - >/dev/null 2>&1
+
+ cp -v ${G_FIL}/kbd-void/error.h .
+
+
+ cat <<! >MKPK
+mkpk_name()
+{
+ printf "%s" "${pkg}"
+}
+
+mkpk_install()
+{
+ CFLAGS='-O3 -march=native -mtune=native -pipe -static --static -fcommon'
+ LDFLAGS='-static --static -fcommon'
+ DESTDIR=/build
+ YACC=yacc
+ export CFLAGS LDFLAGS DESTDIR YACC
+
+ autoreconf -fvi || exit 1
+
+ sed -e '/^PKG_CHECK_MODULES.*/d' -i configure.ac
+ sed -e 's,tests ,,g' -i Makefile.am
+
+ ./configure --prefix=/ --disable-vlock || exit 1
+
+ make ${JN} || exit 1
+ make install
+
+ for f in sun amiga atari; do
+ rm -rf /build/share/kbd/keymaps/$f
+ done
+
+ find /build \\( -name libtswrap.a -o -name libtswrap.la \\
+ -o -name 'libtswrap.so*' \\) -exec rm {} \\;
+}
+!
+ mkpk ${pkg}
+ remove_dir ${G_SRC}/${pkg}
+ unpack_pkg ${pkg} /
+ ) || exit 1
+fi
+end_substep
+
+begin_substep make-4.3
+if [ -x /sucks/bin/make ]; then
+ msg info "%s exists, skipping %s" /sucks/bin/make ${pkg}
+elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
+ unpack_pkg ${pkg} /
+else
+ extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.gz
+ (
+ cd_or_fail ${G_SRC}/${pkg}
+
+ cat <<! >MKPK
+mkpk_name()
+{
+ printf "%s" "${pkg}"
+}
+
+mkpk_install()
+{
+ CFLAGS='-O3 -march=native -mtune=native'
+ LDFLAGS=''
+ DESTDIR=/build
+ export CFLAGS LDFLAGS DESTDIR
+
+ ./configure --prefix=/sucks
+ make ${JN}
+ make install
+}
+!
+ mkpk ${pkg}
+ remove_dir ${G_SRC}/${pkg}
+ unpack_pkg ${pkg} /
+ ) || exit 1
+fi
+end_substep
+
+begin_substep patch-2.7.6
+if [ -x /sucks/bin/patch ]; then
+ msg info "%s exists, skipping %s" /sucks/bin/patch ${pkg}
+elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
+ unpack_pkg ${pkg} /
+else
+ extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.xz
+ (
+ cd_or_fail ${G_SRC}/${pkg}
+
+ cat <<! >MKPK
+mkpk_name()
+{
+ printf "%s" "${pkg}"
+}
+
+mkpk_install()
+{
+ CFLAGS='-O3 -march=native -mtune=native'
+ LDFLAGS=''
+ DESTDIR=/build
+ export CFLAGS LDFLAGS DESTDIR
+
+ ./configure --prefix=/sucks
+ make ${JN}
+ make install
+}
+!
+ mkpk ${pkg}
+ remove_dir ${G_SRC}/${pkg}
+ unpack_pkg ${pkg} /
+ ) || exit 1
+fi
+end_substep
+
+begin_substep texinfo-6.8
+if [ -x /sucks/bin/texi2dvi ]; then
+ msg info "%s exists, skipping %s" /sucks/bin/texi2dvi ${pkg}
+elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
+ unpack_pkg ${pkg} /
+else
+ extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.xz
+ (
+ cd_or_fail ${G_SRC}/${pkg}
+
+ cat <<! >MKPK
+mkpk_name()
+{
+ printf "%s" "${pkg}"
+}
+
+mkpk_install()
+{
+ CFLAGS='-O3 -march=native -mtune=native'
+ LDFLAGS=''
+ DESTDIR=/build
+ export CFLAGS LDFLAGS DESTDIR
+
+ ./configure --prefix=/sucks --disable-static
+ make ${JN}
+ make install
+}
+!
+ mkpk ${pkg}
+ remove_dir ${G_SRC}/${pkg}
+ unpack_pkg ${pkg} /
+ ) || exit 1
+fi
+end_substep
+
+begin_substep strace-5.18
+if [ -x /bin/strace ]; then
+ msg info "%s exists, skipping %s" /bin/strace ${pkg}
+elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
+ unpack_pkg ${pkg} /
+else
+ extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.xz
+ (
+ cd_or_fail ${G_SRC}/${pkg}
+
+ cat <<! >MKPK
+mkpk_name()
+{
+ printf "%s" "${pkg}"
+}
+
+mkpk_install()
+{
+ CFLAGS='-O3 -march=native -mtune=native -static --static -fcommon'
+ LDFLAGS='-static --static -fcommon'
+ DESTDIR=/build
+ export CFLAGS LDFLAGS DESTDIR
+
+ ./configure --prefix=/ --enable-mpers=no
+
+ make ${JN}
+ make install-strip
+}
+!
+ mkpk ${pkg}
+ remove_dir ${G_SRC}/${pkg}
+ unpack_pkg ${pkg} /
+ ) || exit 1
+fi
+end_substep
+
+# Unfortunately, gives "Out of memory - too many lines in file"
+# https://github.com/n-t-roff/heirloom-ex-vi/issues/3
+# begin_substep vi-050325
+# if [ -x /bin/vi ]; then
+# msg info "%s exists, skipping %s" /bin/vi ${pkg}
+# elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
+# unpack_pkg ${pkg} /
+# else
+# extract_pkg ${G_SRC} ex-050325 ${pkg}.tar.bz2 ${pkg}
+# https://prdownloads.sourceforge.net/ex-vi/ex-050325.tar.bz2 vi-050325.tar.bz2 e668595254233e4d96811083a3e4e2f3
+# (
+# cd_or_fail ${G_SRC}/${pkg}
+#
+# cat <<! >MKPK
+# mkpk_name()
+# {
+# printf "%s" "${pkg}"
+# }
+#
+# mkpk_install()
+# {
+# CFLAGS='-O3 -march=native -mtune=native -static --static -fcommon'
+# LDFLAGS='-static --static -fcommon'
+# DESTDIR=/build
+# export CFLAGS LDFLAGS DESTDIR
+#
+#
+# sed -i -e '/^PREFIX/s,/usr/local,,' \\
+# -e '/^PRESERVEDIR/s,/var/preserve,/var/lib/vi' \\
+# -e '/^DESTDIR/s,=,= /build,' \\
+# Makefile
+# make PREFIX= PRESERVEDIR=/var/lib/vi DESTDIR=/build \\
+# TERMLIB='ncurses -lterminfo' INSTALL=/${TLD}/bin/install \\
+# FEATURES='-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' ${JN}
+# make PREFIX= PRESERVEDIR=/var/lib/vi DESTDIR=/build \\
+# TERMLIB='ncurses -lterminfo' INSTALL=/${TLD}/bin/install \\
+# FEATURES='-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' install
+#
+# mkdir -p /build/var/lib/vi
+# chmod 1777 /build/var/lib/vi
+# :>/build/var/lib/vi/preservedir
+# }
+# !
+# mkpk ${pkg}
+# remove_dir ${G_SRC}/${pkg}
+# unpack_pkg ${pkg} /
+# ) || exit 1
+# fi
+# end_substep
+
+begin_substep libtermkey-0.22
+if [ -e /lib/libtermkey ]; then
+ msg info "%s exists, skipping %s" /lib/libtermkey ${pkg}
+elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
+ unpack_pkg ${pkg} /
+else
+ extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.gz
+ (
+ cd_or_fail ${G_SRC}/${pkg}
+
+ cat <<! >MKPK
+mkpk_name()
+{
+ printf "%s" "${pkg}"
+}
+
+mkpk_install()
+{
+ CFLAGS='-O3 -march=native -mtune=native'
+ LDFLAGS=''
+ DESTDIR=/build
+ export CFLAGS LDFLAGS DESTDIR
+
+ sed -i -e '/^PREFIX/s,/usr/local,,' Makefile
+
+ make ${JN}
+ make DESTDIR=\${DESTDIR} install
+}
+!
+ mkpk ${pkg}
+ remove_dir ${G_SRC}/${pkg}
+ unpack_pkg ${pkg} /
+ ) || exit 1
+fi
+end_substep
+
+begin_substep vis-0.7
+if [ -x /bin/vis ]; then
+ msg info "%s exists, skipping %s" /bin/vis ${pkg}
+elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
+ unpack_pkg ${pkg} /
+else
+ extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.gz
+ (
+ cd_or_fail ${G_SRC}/${pkg}
+
+ cat <<! >MKPK
+mkpk_name()
+{
+ printf "%s" "${pkg}"
+}
+
+mkpk_install()
+{
+ CFLAGS='-O3 -march=native -mtune=native -static --static -fcommon'
+ LDFLAGS='-static --static -fcommon'
+ DESTDIR=/build
+ export CFLAGS LDFLAGS DESTDIR
+
+ ./configure --prefix=/
+
+ make ${JN}
+ make install-strip
+
+ ln -s vis /build/bin/vi
+ ln -s vis.1 /build/share/man/man1/vi.1
+}
+!
+ mkpk ${pkg}
+ remove_dir ${G_SRC}/${pkg}
+ unpack_pkg ${pkg} /
+ ) || exit 1
+fi
+end_substep
+
+if false; then
begin_substep sbase-20220709
if [ -e /bin/ls ] && [ ! -L /bin/ls ]; then
msg info "%s exists, skipping %s" /bin/ls ${pkg}
@@ -3047,15 +3466,20 @@ mkpk_install()
) || exit 1
fi
end_substep
-
+fi
msg info "Regenerating /etc/profile"
cat <<! >/etc/profile
+EDITOR=/bin/sledv
LC_ALL=
LANG=C.UTF-8
PATH=/local/bin:/bin:/sucks/bin:/plan9/bin:/${TLD}/bin
export LC_ALL LANG PATH
+for script in /etc/profile.d/*; do
+ [ -x \${script} ] && . \${script}
+done
+
# A more familiar ls
lc()
{
diff --git a/fil/kbd-void/error.h b/fil/kbd-void/error.h
@@ -0,0 +1,20 @@
+#ifndef ERROR_H
+#define ERROR_H
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <err.h>
+
+static inline void error(int status, int errnum, const char *fmt, ...)
+{
+ va_list ap;
+ void (*errfunc[2])(int, const char *, va_list) = { &verr, &verrx };
+ void (*warnfunc[2])(const char *, va_list) = { &vwarn, &vwarnx };
+ fflush(stdout);
+ va_start(ap, fmt);
+ if (status != 0)
+ errfunc[errnum==0](status, fmt, ap); /* does not return */
+ warnfunc[errnum==0](fmt, ap);
+ va_end(ap);
+}
+#endif
diff --git a/lib/fun.sh b/lib/fun.sh
@@ -351,7 +351,7 @@ mkpk()
-cnewer ../timestamp | sort | uniq) | \
xz -9 > ${G_SPKG}/$(mkpk_name).tar.xz && \
cd ${G_SPKG} && \
- md5sum $(mkpk_name).tar.xz >$(mkpk_name).md5 && \
+ /${TLD}/bin/md5sum $(mkpk_name).tar.xz >$(mkpk_name).md5 && \
{ cd - >/dev/null 2>&1; }
rm ../timestamp
fi
@@ -492,7 +492,7 @@ unpack_pkg()
local pkg=$1
shift
cd_or_fail ${G_SPKG}
- if ! md5sum -c ${pkg}.md5 >/dev/null 2>&1; then
+ if ! /${TLD}/bin/md5sum -c ${pkg}.md5 >/dev/null 2>&1; then
msg err "md5sum -c %s failed" ${G_SPKG}/${pkg}.tar.xz
exit 1
fi
diff --git a/lib/pkgs.tsv b/lib/pkgs.tsv
@@ -51,11 +51,13 @@ https://github.com/ericonr/argp-standalone/archive/refs/tags/1.4.1.tar.gz argp-s
https://github.com/facebook/zstd/releases/download/v1.5.0/zstd-1.5.0.tar.gz a6eb7fb1f2c21fa80030a47993853e92
https://github.com/libcheck/check/releases/download/0.15.2/check-0.15.2.tar.gz 50fcafcecde5a380415b12e9c574e0b2
https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz 294b921e6cf9ab0fbaea4b639f8fdbe8
+https://github.com/martanne/vis/releases/download/v0.7/vis-0.7.tar.gz a45ba03d1fa4785ee5693f9619f22e85
https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz 8998d77313d753a0c474d9bdf1738b2e
https://github.com/michaelforney/samurai/releases/download/1.2/samurai-1.2.tar.gz 3ad6771de19a93660fdb36dc67687727
https://github.com/pullmoll/musl-fts/archive/v1.2.7.tar.gz musl-fts-1.2.7.tar.gz bce0b5de0cf2519a74fbfacead60369d
https://github.com/pullmoll/musl-obstack/archive/v1.1.tar.gz musl-obstack-1.1.tar.gz 185975cc117dba8e6158cce847ba44d5
https://github.com/shadow-maint/shadow/releases/download/v4.11.1/shadow-4.11.1.tar.xz 5a95ec069aa91508167d02fecafaa912
+https://github.com/strace/strace/releases/download/v5.18/strace-5.18.tar.xz a563875472463638c19d6639e1c14875
https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.0.6.tar.gz zlib-ng-2.0.6.tar.gz 4ba0da231291632799948c5568906ce4
https://invisible-island.net/archives/byacc/byacc-20220128.tgz c861b313fb59857a5ca3475ce9d62c4e
https://invisible-island.net/archives/reflex/reflex-20210808.tgz 31ed4340e8b636cb2c1de2ad378a14e9
@@ -78,5 +80,8 @@ https://www.iana.org/time-zones/repository/releases/tzdata2022a.tar.gz 08166218
https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.17.13.tar.xz 1f0478b27e1ec649e33b6c3dc0f6a583
https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.17.13.tar.xz 1f0478b27e1ec649e33b6c3dc0f6a583
https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.62.tar.xz 342c7560ed2103899f6914d1de75a89f
+https://www.kernel.org/pub/linux/utils/kbd/kbd-2.4.0.tar.xz 3cac5be0096fcf7b32dcbd3c53831380
https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz e81e63acd80697d001c8d85c1acb38a0
+https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-5.17.0.tar.xz 8ade96ee93f37fba7e1beec89f1a54bf
+https://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz 08bf514d59660391c3a21b3977a16c8c
https://www.python.org/ftp/python/3.9.9/Python-3.9.9.tar.xz 11d12076311563252a995201248d17e5
diff --git a/pat-11.2.1/kbd-lfs/kbd-2.3.0-backspace-1.patch b/pat-11.2.1/kbd-lfs/kbd-2.3.0-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
