Update to kbd-2.10.0

Signed-off-by: Vitezslav Crhonek <vcrhonek@redhat.com>
This commit is contained in:
Vitezslav Crhonek 2026-06-10 06:24:35 +02:00
commit 990654f736
4 changed files with 12 additions and 36 deletions

1
.gitignore vendored
View file

@ -10,3 +10,4 @@ terminus.tar.bz2
/kbd-latarcyrheb-32.tar.bz2
/kbdinfo.1
/kbd-2.9.0.tar.xz
/kbd-2.10.0.tar.xz

View file

@ -1,25 +0,0 @@
diff -up kbd-2.9.0/src/setfont.c.orig kbd-2.9.0/src/setfont.c
--- kbd-2.9.0/src/setfont.c.orig 2025-09-01 13:02:27.718045775 +0200
+++ kbd-2.9.0/src/setfont.c 2026-03-23 10:47:59.579868180 +0100
@@ -158,8 +158,8 @@ kbd_getopt(int argc, char **argv, const
return '?';
required_argument:
- kbd_warning(0, "option '%s' requires an argument", name);
- return '?';
+ optind--;
+ return '!';
}
int main(int argc, char *argv[])
@@ -296,6 +296,10 @@ int main(int argc, char *argv[])
kbd_error(EX_USAGE, 0, _("Too many input files."));
ifiles[ifilct++] = argv[optind++];
break;
+ case '!':
+ kbd_warning(0, "option '%s' requires an argument", argv[optind]);
+ usage(EX_USAGE, opthelp);
+ break;
}
}

View file

@ -4,8 +4,8 @@
%global kbd_datadir %{_exec_prefix}/lib/kbd
Name: kbd
Version: 2.9.0
Release: 3%{?dist}
Version: 2.10.0
Release: 1%{?dist}
Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
License: GPL-2.0-or-later
URL: http://www.kbd-project.org/
@ -34,13 +34,9 @@ Patch5: kbd-2.0.2-unicode-start-font.patch
Patch6: kbd-2.4.0-covscan-fixes.patch
# Patch7: adds vlock option to issue prompt before invokation of pam stack
Patch7: kbd-2.0.4-vlock-add-prompt-option.patch
# Patch8: fixes setfont segfault when option that needs an argument is passed
# with the argument blank, bz 2447892 (already upstream)
Patch8: kbd-2.9.0-fix-setfont-segfault.patch
BuildRequires: gcc, bison, flex, gettext, pam-devel, check-devel, automake
BuildRequires: console-setup, xkeyboard-config
BuildRequires: make
BuildRequires: gcc, bison, flex, gettext, pam-devel, check-devel, automake, make
BuildRequires: console-setup, xkeyboard-config, libxkbcommon-devel
Requires: %{name}-misc = %{version}-%{release}
Requires: %{name}-legacy = %{version}-%{release}
# Be sure that system is after UsrMove
@ -105,7 +101,8 @@ iconv -f iso-8859-1 -t utf-8 < "ChangeLog" > "ChangeLog_"
mv "ChangeLog_" "ChangeLog"
%build
%configure --prefix=%{_prefix} --datadir=%{kbd_datadir} --mandir=%{_mandir} --localedir=%{_datadir}/locale --enable-nls
%configure --prefix=%{_prefix} --datadir=%{kbd_datadir} \
--mandir=%{_mandir} --localedir=%{_datadir}/locale --enable-nls --enable-xkb
%make_build
%install
@ -187,6 +184,10 @@ fi
%{kbd_datadir}/keymaps/legacy
%changelog
* Wed Jun 10 2026 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.10.0-1
- Update to kbd-2.10.0
Resolves: #2481141
* Tue Mar 24 2026 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.9.0-3
- Fix setfont segmentation fault when argument for option is missing
Resolves: #2447892

View file

@ -1,5 +1,4 @@
SHA512 (kbd-latsun-fonts.tar.bz2) = b98da5df85017ef1bd297eb2255046d54dd805c84356db7533f24e49fb78c8e3999901a45a49cdf6a74c0002bba2e0aa8327469d78dd38b6e747103972c30584
SHA512 (kbd-latarcyrheb-32.tar.bz2) = 1870a708e16cf16f8343f02f7e97940e8404655078f92709a0b8a334be772faa99b4dbaca37e8d8c5b16d0d4d811fe6b102e4f76ae821148eb33075613dc95b8
SHA512 (kbdinfo.1) = 8696d55f6c15f0ee2c2936eca6180b18100a87b11f0efe809a9531bb1228c67cd096cbc8fa25d9ee496daab28892ee5f320cc4bc9c9d816ff666bb4f80271c99
SHA512 (kbd-2.8.0.tar.xz) = 66b532e782b6be3f53521a8d1c96f2ce895201dae48f8797c563be895dfdf4e9c03b9ccf39708d1b7dd1ffb13d526e499874e8e4ba74d22b507c1d32e4b410a3
SHA512 (kbd-2.9.0.tar.xz) = c98298596a9942d39d5ffcba551eca3895104ff4dda5ebf8cfef46c1e3f24ef6154cf6892a9022bc0bfc98b065169103ca1e308cb76706e5b5c0ae0035db0db7
SHA512 (kbd-2.10.0.tar.xz) = 1b7f55f0a1b34d9b6b4237a1ff3e10eedf4bdebe50e906a7acdea48f85b3c455e72737127491a0c494388b999797aa65411b20b44c3f5612fdeee4d8289f937c