From 23e0dfc32e41f02d4d07fd1bd455d67b54ef0531056e2fd7a32e74a4e2e415ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 3 May 2024 11:48:37 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main console-setup revision d8020a6cd881647a89fecb88853645b9 --- .gitattributes | 23 +++ console-setup-1.76-fsf-address.patch | 11 ++ console-setup-paths.patch | 249 +++++++++++++++++++++++++++ console-setup.changes | 73 ++++++++ console-setup.spec | 100 +++++++++++ console-setup_1.223.tar.xz | 3 + 6 files changed, 459 insertions(+) create mode 100644 .gitattributes create mode 100644 console-setup-1.76-fsf-address.patch create mode 100644 console-setup-paths.patch create mode 100644 console-setup.changes create mode 100644 console-setup.spec create mode 100644 console-setup_1.223.tar.xz diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/console-setup-1.76-fsf-address.patch b/console-setup-1.76-fsf-address.patch new file mode 100644 index 0000000..d05c626 --- /dev/null +++ b/console-setup-1.76-fsf-address.patch @@ -0,0 +1,11 @@ +--- console-setup/Keyboard/ckbcomp.orig 2012-06-26 12:04:16.612309745 +0200 ++++ console-setup/Keyboard/ckbcomp 2012-06-26 12:21:06.448385970 +0200 +@@ -15,7 +15,7 @@ + + # If you have not received a copy of the GNU General Public License + # along with this program, write to the Free Software Foundation, Inc., +-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + use warnings 'all'; + use strict; diff --git a/console-setup-paths.patch b/console-setup-paths.patch new file mode 100644 index 0000000..bf458bd --- /dev/null +++ b/console-setup-paths.patch @@ -0,0 +1,249 @@ +--- a/Keyboard/ckbcomp ++++ b/Keyboard/ckbcomp +@@ -3273,14 +3273,14 @@ if ($keycodes =~ /(^|\+|\|)ataritt(\([^\ + ########### READ ACM ############################################### + + if ($charmap) { +- for my $acmfile ("$installdir/share/consoletrans/${charmap}", +- "$installdir/share/consoletrans/${charmap}.gz", +- "$installdir/share/consoletrans/${charmap}.acm", +- "$installdir/share/consoletrans/${charmap}.acm.gz", +- "/usr/share/consoletrans/${charmap}", +- "/usr/share/consoletrans/${charmap}.gz", +- "/usr/share/consoletrans/${charmap}.acm", +- "/usr/share/consoletrans/${charmap}.acm.gz", ++ for my $acmfile ("$installdir/share/kbd/consoletrans/${charmap}", ++ "$installdir/share/kbd/consoletrans/${charmap}.gz", ++ "$installdir/share/kbd/consoletrans/${charmap}.acm", ++ "$installdir/share/kbd/consoletrans/${charmap}.acm.gz", ++ "/usr/share/kbd/consoletrans/${charmap}", ++ "/usr/share/kbd/consoletrans/${charmap}.gz", ++ "/usr/share/kbd/consoletrans/${charmap}.acm", ++ "/usr/share/kbd/consoletrans/${charmap}.acm.gz", + "${charmap}") { + if (-f $acmfile) { + $acm = $acmfile; +--- a/Keyboard/compose_translator ++++ b/Keyboard/compose_translator +@@ -51,10 +51,10 @@ my %uni2acm; + my %acm2uni; + if ($acm) { + for my $acmfile ("${acm}", "${acm}.gz", "${acm}.acm", "${acm}.acm.gz", +- "/usr/share/consoletrans/${acm}", +- "/usr/share/consoletrans/${acm}.gz", +- "/usr/share/consoletrans/${acm}.acm", +- "/usr/share/consoletrans/${acm}.acm.gz",) { ++ "/usr/share/kbd/consoletrans/${acm}", ++ "/usr/share/kbd/consoletrans/${acm}.gz", ++ "/usr/share/kbd/consoletrans/${acm}.acm", ++ "/usr/share/kbd/consoletrans/${acm}.acm.gz",) { + if (-f $acmfile) { + $acm = $acmfile; + last; +--- a/Makefile ++++ b/Makefile +@@ -11,9 +11,9 @@ include Fonts/Makefile + ~ := main + + prefix := /usr/local +-# etcdir must be either /etc or +-etcdir := $(prefix)/etc + bootprefix := $(patsubst %/usr,%/,$(prefix:%/=%)) ++# etcdir must be either /etc or /usr/etc ++etcdir := $(bootprefix)/etc + mandir := $(prefix)/share/man + + acmfiles := $(wildcard $./acm/*.acm) +@@ -26,8 +26,8 @@ build-common: gzipped-acmfiles + + .PHONY: install-common + install-common: build-common +- install -d $(bootprefix)/bin/ +- install setupcon $(bootprefix)/bin/ ++ install -d $(prefix)/bin/ ++ install setupcon $(prefix)/bin/ + install -d $(etcdir)/default + install -m 644 config/keyboard $(etcdir)/default/ + install -m 644 config/console-setup $(etcdir)/default/ +@@ -39,10 +39,11 @@ install-common: build-common + + .PHONY: install-common-linux + install-common-linux: build-linux +- install -d $(prefix)/share/consolefonts/ +- install -m 644 Fonts/*.psf.gz $(prefix)/share/consolefonts/ +- install -d $(prefix)/share/consoletrans +- install -m 644 acm/*.acm.gz $(prefix)/share/consoletrans/ ++ install -d $(prefix)/share/kbd ++ install -d $(prefix)/share/kbd/consolefonts/ ++ install -m 644 Fonts/*.psf.gz $(prefix)/share/kbd/consolefonts/ ++ install -d $(prefix)/share/kbd/consoletrans ++ install -m 644 acm/*.acm.gz $(prefix)/share/kbd/consoletrans/ + install -d $(etcdir)/console-setup + install -m 644 Keyboard/compose.*.inc $(etcdir)/console-setup/ + install -m 644 Keyboard/remap.inc $(etcdir)/console-setup/ +@@ -53,8 +54,8 @@ install-common-freebsd: build-freebsd + install -m 644 Fonts/*.fnt $(prefix)/share/syscons/fonts/ + install -d $(prefix)/share/syscons/scrnmaps/ + install -m 644 Fonts/*.scm $(prefix)/share/syscons/scrnmaps/ +- install -d $(prefix)/share/consoletrans +- install -m 644 acm/*.acm $(prefix)/share/consoletrans/ ++ install -d $(prefix)/share/kbd/consoletrans ++ install -m 644 acm/*.acm $(prefix)/share/kbd/consoletrans/ + install -d $(etcdir)/console-setup + install -m 644 Fonts/terminfo $(etcdir)/console-setup/ + install -m 644 Fonts/termcap $(etcdir)/console-setup/ +@@ -99,10 +100,10 @@ install-mini-freebsd: install-common ins + + common-uninstall: | build-linux build-mini-linux build-freebsd build-mini-freebsd + -for font in Fonts/*.psf.gz; do \ +- rm $(prefix)/share/consolefonts/$${font##*/}; \ ++ rm $(prefix)/share/kbd/consolefonts/$${font##*/}; \ + done + -for acm in acm/*.acm.gz acm/*.acm; do \ +- rm $(prefix)/share/consoletrans/$${acm##*/}; \ ++ rm $(prefix)/share/kbd/consoletrans/$${acm##*/}; \ + done + -for font in Fonts/*.fnt; do \ + rm $(prefix)/share/syscons/fonts/$${font##*/}; \ +@@ -119,7 +120,7 @@ common-uninstall: | build-linux build-mi + -rm $(etcdir)/default/keyboard + -rm $(etcdir)/default/console-setup + -rm $(prefix)/bin/ckbcomp +- -rm $(bootprefix)/bin/setupcon ++ -rm $(prefix)/bin/setupcon + + .PHONY: uninstall-linux + uninstall-linux: build-linux common-uninstall +--- a/man/ckbcomp.1 ++++ b/man/ckbcomp.1 +@@ -46,7 +46,7 @@ Print a usage message and exit. + .BI -charmap\ charmap + The encoding to use for the output keymap. There should be an + character mapping table defining this encoding in +-.IR /usr/local/share/consoletrans . ++.IR /usr/share/kbd/consoletrans . + Definitions of the following charmaps are provided: + .nh + .BR ARMSCII-8 , +@@ -86,8 +86,9 @@ for files included by the keymap descrip + multiple times. If a file can not be found in any of the specified + directories, it will be searched also in some other standard + locations, such as +-.IR /usr/local/etc/console-setup/ckb , +-.IR /usr/local/share/X11/xkb ++.IR /etc/console-setup/ckb , ++.IR /usr/local/share/X11/xkb , ++.IR /usr/share/X11/xkb + and + .IR /etc/X11/xkb + +@@ -167,9 +168,9 @@ Specifies the layout variant used to cho + Adds an option used to choose component names. + + .SH FILES +-.I /usr/local/share/consoletrans ++.I /usr/share/kbd/consoletrans + .br +-.I /usr/local/etc/console-setup/ckb ++.I /etc/console-setup/ckb + .br + .I /usr/share/X11/xkb + .br +--- a/man/console-setup.5 ++++ b/man/console-setup.5 +@@ -403,16 +403,16 @@ Completely covered by the following font + The standard location of the + .B console-setup + configuration file is +-.IR /usr/local/etc/default/console-setup . ++.IR /etc/default/console-setup . + The keyboard configuration is in +-.IR /usr/local/etc/default/keyboard . ++.IR /etc/default/keyboard . + Fonts that can be used with the variable + .B FONT + are usually installed in +-.IR /usr/share/consolefonts/ " or " /usr/share/syscons/fonts/ . ++.IR /usr/share/kbd/consolefonts/ " or " /usr/share/consolefonts/ . + Translation maps that can be used with the variable CONSOLE_MAP are + usually installed in +-.IR /usr/share/consoletrans/ " or " /usr/share/syscons/scrnmaps/ . ++.IR /usr/share/kbd/consoletrans/ " or " /usr/share/consoletrans/ . + + .SH NOTES + The aim of the Terminus font is to reduce the eyes-fatigue when one +--- a/man/keyboard.5 ++++ b/man/keyboard.5 +@@ -154,12 +154,12 @@ on FreeBSD. + The standard location of the + .B keyboard + file is +-.IR /usr/local/etc/default/keyboard . ++.IR /etc/default/keyboard . + Description of all available keyboard models, layouts, variants and + options is available in +-.IR /usr/local/share/X11/xkb/rules/base.lst . ++.IR /usr/share/X11/xkb/rules/base.lst . + In most cases, in +-.IR /usr/share/keymaps/ " or " /usr/share/syscons/keymaps/ ++.IR /usr/share/kbd/keymaps/ + you will find several keymaps that can be used with the variable + .BR KMAP . + +--- a/man/setupcon.1 ++++ b/man/setupcon.1 +@@ -22,11 +22,11 @@ the console. Most of the time you invok + without arguments. The keyboard configuration is specified in + .I ~/.keyboard + or +-.IR /usr/local/etc/default/keyboard . ++.IR /etc/default/keyboard . + The font configuration is specified in + .I ~/.console-setup + or +-.IR /usr/local/etc/default/console-setup . ++.IR /etc/default/console-setup . + Consult + .BR keyboard (5) + and +@@ -162,13 +162,13 @@ Display usage information. + .br + .I ~/.keyboard + .br +-.I /usr/local/etc/default/console-setup ++.I /etc/default/console-setup + .br +-.I /usr/local/etc/default/keyboard ++.I /etc/default/keyboard + .br +-.I /usr/local/etc/default/console-setup.VARIANT ++.I /etc/default/console-setup.VARIANT + .br +-.I /usr/local/etc/default/keyboard.VARIANT ++.I /etc/default/keyboard.VARIANT + .br + .I /etc/console-setup/ + +--- a/setupcon ++++ b/setupcon +@@ -644,9 +644,9 @@ esac + # mapdir, fontdir, stdfont, stdfontfallback + case "$kernel" in + linux) +- mapdir=share/consoletrans ++ mapdir=share/kbd/consoletrans + stdmap=$CHARMAP.acm.gz +- fontdir=share/consolefonts ++ fontdir=share/kbd/consolefonts + stdfont=$CODESET-$FONTFACE$FONTSIZE.psf.gz + # [A-WXYZa-wyz] is a funny way to say [A-Za-wyz]. In some locales + # [A-Z] includes x and we don't want this. +@@ -716,7 +716,7 @@ fi + # FONTMAPFILE + FONTMAPFILE='' + if [ "$kernel" = linux -a -n "$FONT_MAP" ]; then +- FONTMAPFILE=`findfile share/consoletrans "$FONT_MAP"` ++ FONTMAPFILE=`findfile share/kbd/consoletrans "$FONT_MAP"` + fi + + # XKBMODEL diff --git a/console-setup.changes b/console-setup.changes new file mode 100644 index 0000000..e197361 --- /dev/null +++ b/console-setup.changes @@ -0,0 +1,73 @@ +------------------------------------------------------------------- +Sun Oct 1 11:32:44 UTC 2023 - Antonio Teixeira + +- Update to version 1.223: + * Updated translations + +------------------------------------------------------------------- +Tue May 16 07:49:19 UTC 2023 - Frederic Crozat + +- Update to version 1.220: + * updated translations + +------------------------------------------------------------------- +Sun Jan 1 10:13:39 UTC 2023 - Stefan Dirsch + +- removed buildrequires to kbd to resolve kbd/console-setup build + cycle + +------------------------------------------------------------------- +Fri Dec 30 12:16:39 UTC 2022 - Alexei Sorokin + +- Update to version 1.215: + * See https://salsa.debian.org/installer-team/console-setup/-/blob/debian/1.215/debian/changelog +- Make a bdf2psf package like in Fedora. +- Suggest xkeyboard-config. +- Replace console-setup-1.76-paths.patch with + console-setup-paths.patch. +- Move the fonts to /usr/share/kbd/ to be discoverable by vconsole. +- Drop console-setup-1.134-perl526.patch, + console-setup-1.134-reproducible.patch, u_fix-iso-left-tab.patch, + 0001-ckbcomp-Fix-check-for-non-ascii.patch: fixed upstream. +- Fix the RPM Group. + +------------------------------------------------------------------- +Mon Dec 12 09:54:28 UTC 2022 - Fabian Vogt + +- Add patch to fix Caps_Lock mapping for us.map and others (bsc#1202853): + * 0001-ckbcomp-Fix-check-for-non-ascii.patch + +------------------------------------------------------------------- +Thu Jan 24 13:39:33 UTC 2019 - sndirsch@suse.com + +- u_fix-iso-left-tab.patch + * fix Shift-Tab mapping (bsc#1122361) + +------------------------------------------------------------------- +Fri Jan 5 06:40:43 UTC 2018 - bwiedemann@suse.com + +- Add console-setup-1.134-reproducible.patch to make package build + reproducible (boo#1062303) + +------------------------------------------------------------------- +Sun Sep 24 08:50:06 UTC 2017 - coolo@suse.com + +- add console-setup-1.134-perl526.patch to work with perl 5.26, + fixed upstream in 1.143 + +------------------------------------------------------------------- +Thu Jan 28 10:11:45 UTC 2016 - sndirsch@suse.com + +- removed unneeded requires to kbd in order to resolve build cycle + kbd <-> console-setup (bnc#963942) + +------------------------------------------------------------------- +Thu Nov 26 00:45:25 UTC 2015 - zaitor@opensuse.org + +- Update to version 1.134 + +------------------------------------------------------------------- +Fri Jul 17 10:49:37 UTC 2015 - sndirsch@suse.com + +- package created; it's required by kbd in order to convert xkb + layouts from xkeyboard-config to console keymaps (FATE#318426) diff --git a/console-setup.spec b/console-setup.spec new file mode 100644 index 0000000..44fe1b9 --- /dev/null +++ b/console-setup.spec @@ -0,0 +1,100 @@ +# +# spec file for package console-setup +# +# Copyright (c) 2023 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: console-setup +Version: 1.223 +Release: 0 +Summary: Tools for configuring the console using X Window System key maps +License: GPL-2.0-or-later AND MIT AND SUSE-Public-Domain +Group: System/Console +URL: https://salsa.debian.org/installer-team/console-setup +Source: https://deb.debian.org/debian/pool/main/c/%{name}/%{name}_%{version}.tar.xz +# PATCH-FIX-OPENSUSE console-setup-1.76-fsf-address.patch -- Fix the FSF address. +Patch0: console-setup-1.76-fsf-address.patch +# PATCH-FIX-OPENSUSE console-setup-paths.patch -- Change installing paths to SUSE-style. +Patch1: console-setup-paths.patch +BuildRequires: perl +BuildRequires: perl(encoding) +Suggests: xkeyboard-config +BuildArch: noarch + +%description +This package provides the console with the same keyboard +configuration scheme that X Window System has. +Besides the keyboard, the package also configures the font on the +console. It includes a rich collection of fonts and supports +several languages that would be otherwise unsupported on the +console (such as Armenian, Georgian, Lao and Thai). + +%package -n bdf2psf +Summary: Generate console fonts from BDF source fonts + +%description -n bdf2psf +This package provides a command-line converter that can be used in +scripts to build console fonts from BDF sources automatically. +The converter comes with a collection of font encodings that cover +many of the world's languages. The output font can use a different +character encoding from the input. When the source font does not +define a glyph for a particular symbol in the encoding table, that +glyph position in the console font is not wasted but used for +another symbol. + +%prep +%autosetup -p1 + +cp -a debian/changelog ChangeLog +cp -a debian/copyright COPYING + +%build +%make_build build-linux + +%install +make prefix=%{buildroot}%{_prefix} install-linux +# we don't want another set of keyboard descriptions, we want to use descriptions from +# xkeyboard-config (require it?), so removing it +# or maybe have these from tarball it in optional subpackage? +rm -r %{buildroot}%{_sysconfdir}/console-setup/ + +install -Dpm 0755 Fonts/bdf2psf %{buildroot}%{_bindir}/bdf2psf +install -Dpm 0644 man/bdf2psf.1 %{buildroot}%{_mandir}/man1/bdf2psf.1 + +mkdir -p %{buildroot}%{_datadir}/bdf2psf/ +cp -a Fonts/fontsets/ Fonts/*.equivalents Fonts/*.set \ + %{buildroot}%{_datadir}/bdf2psf/ + +%files +%license COPYING copyright.fonts copyright.xkb Fonts/copyright +%doc ChangeLog README +%config(noreplace) %{_sysconfdir}/default/console-setup +%config(noreplace) %{_sysconfdir}/default/keyboard +%{_bindir}/ckbcomp +%{_bindir}/setupcon +%dir %{_datadir}/kbd +%{_datadir}/kbd/consolefonts/ +%{_datadir}/kbd/consoletrans/ +%{_mandir}/man1/setupcon.1%{?ext_man} +%{_mandir}/man1/ckbcomp.1%{?ext_man} +%{_mandir}/man5/keyboard.5%{?ext_man} +%{_mandir}/man5/console-setup.5%{?ext_man} + +%files -n bdf2psf +%{_bindir}/bdf2psf +%{_datadir}/bdf2psf/ +%{_mandir}/man1/bdf2psf.1%{?ext_man} + +%changelog diff --git a/console-setup_1.223.tar.xz b/console-setup_1.223.tar.xz new file mode 100644 index 0000000..a97d3d2 --- /dev/null +++ b/console-setup_1.223.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1e63bd6fedf56d984826fcfcfd5fee3dc96dcc89cf9dfeda44707aded56c0be +size 2597240