Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

Signed-off-by: Vitezslav Crhonek <vcrhonek@redhat.com>

.gitignore

@@ -9,4 +9,5 @@ terminus.tar.bz2
 /fr-dvorak.tar.bz2
 /kbd-latarcyrheb-32.tar.bz2
 /kbdinfo.1
-/kbd-2.7.1.tar.xz
+/kbd-2.9.0.tar.xz
+/kbd-2.10.0.tar.xz

kbd-2.4.0-covscan-fixes.patch

@@ -9,41 +9,3 @@ diff -up kbd-2.6.1/src/libkfont/psffontop.c.orig kbd-2.6.1/src/libkfont/psffonto
  			return -EX_DATAERR;
  		}
  		fontlen   = ((psfhdr->mode & PSF1_MODE512) ? 512 : 256);
-@@ -253,6 +254,7 @@ kfont_read_psffont(struct kfont_context
- 
- 		if (psfhdr.version > PSF2_MAXVERSION) {
- 			KFONT_ERR(ctx, _("Unsupported psf version (%d)"), psfhdr.version);
-+			free(inputbuf);
- 			return -EX_DATAERR;
- 		}
- 		fontlen   = assemble_uint32((unsigned char *)&psfhdr.length);
-@@ -263,16 +265,20 @@ kfont_read_psffont(struct kfont_context
- 		fontwidth = assemble_uint32((unsigned char *)&psfhdr.width);
- 		fontheight= assemble_uint32((unsigned char *)&psfhdr.height);
- 		utf8      = 1;
--	} else
-+	} else {
-+		free(inputbuf);
- 		return -EX_DATAERR; /* not psf */
-+	}
- 
- 	/* tests required - we divide by these */
- 	if (fontlen == 0) {
- 		KFONT_ERR(ctx, _("zero input font length?"));
-+		free(inputbuf);
- 		return -EX_DATAERR;
- 	}
- 	if (charsize == 0) {
- 		KFONT_ERR(ctx, _("zero input character size?"));
-+		free(inputbuf);
- 		return -EX_DATAERR;
- 	}
- 
-@@ -286,6 +292,7 @@ kfont_read_psffont(struct kfont_context
- 
- 	if (i > inputlth || (!hastable && i != inputlth)) {
- 		KFONT_ERR(ctx, _("Input file: bad input length (%d)"), inputlth);
-+		free(inputbuf);
- 		return -EX_DATAERR;
- 	}
- 

kbd.spec

@@ -4,8 +4,8 @@
 %global kbd_datadir %{_exec_prefix}/lib/kbd
 
 Name:           kbd
-Version:        2.7.1
-Release:        3%{?dist}
+Version:        2.10.0
+Release:        2%{?dist}
 Summary:        Tools for configuring the console (keyboard, virtual terminals, etc.)
 License:        GPL-2.0-or-later
 URL:            http://www.kbd-project.org/
@@ -17,13 +17,6 @@ Source3:        xml2lst.pl
 Source4:        vlock.pamd
 Source5:        kbdinfo.1
 Source6:        cz-map.patch
-# See https://github.com/legionus/kbd/pull/127 and
-# https://bugzilla.redhat.com/show_bug.cgi?id=2336875#c41 for next two sources
-# Not done as a patch as it'd be a binary diff
-# Georgian keyboard layout from Temuri Doghonadze
-Source7:        ge.map.gz
-# Georgian font from Gia Shervashidze
-Source8:        LatCyrHebKa-16_GIA.psfu.gz
 # Patch0: puts additional information into man pages
 Patch0:         kbd-1.15-keycodes-man.patch
 # Patch1: sparc modifications
@@ -42,9 +35,8 @@ 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
 
-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
@@ -109,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
@@ -144,10 +137,6 @@ install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/vlock
 mkdir -p $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/legacy
 mv $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/{amiga,atari,i386,include,mac,ppc,sun} $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/legacy
 
-# Install our Georgian font and layout
-install -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/legacy/i386/qwerty
-install -m 0644 %{SOURCE8} $RPM_BUILD_ROOT%{kbd_datadir}/consolefonts
-
 # Convert X keyboard layouts to console keymaps
 mkdir -p $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb
 perl xml2lst.pl < /usr/share/X11/xkb/rules/base.xml > layouts-variants.lst
@@ -180,11 +169,6 @@ fi
 
 %find_lang %{name}
 
-%check
-%ifnarch s390x ppc64le
-make check
-%endif
-
 %files -f %{name}.lang
 %license COPYING
 %doc ChangeLog AUTHORS README docs/doc/font-formats/*.html docs/doc/dvorak/*
@@ -200,6 +184,35 @@ make check
 %{kbd_datadir}/keymaps/legacy
 
 %changelog
+* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* 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
+
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Mon Sep 22 2025 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.9.0-1
+- Update to kbd-2.9.0
+  Resolves: #2393145
+
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Tue Jul 15 2025 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.8.0-2
+- Fix kfont_load_font(): setfont killed by SIGSEGV
+  Resolves: #2370214
+
+* Mon Jun 09 2025 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.8.0-1
+- Update to kbd-2.8.0
+  Resolves: #2369419
+
 * Mon Jan 27 2025 Adam Williamson <awilliam@redhat.com> - 2.7.1-3
 - Add Georgian layout and font (from upstream PR #127)
 

sources

@@ -1,4 +1,4 @@
 SHA512 (kbd-latsun-fonts.tar.bz2) = b98da5df85017ef1bd297eb2255046d54dd805c84356db7533f24e49fb78c8e3999901a45a49cdf6a74c0002bba2e0aa8327469d78dd38b6e747103972c30584
 SHA512 (kbd-latarcyrheb-32.tar.bz2) = 1870a708e16cf16f8343f02f7e97940e8404655078f92709a0b8a334be772faa99b4dbaca37e8d8c5b16d0d4d811fe6b102e4f76ae821148eb33075613dc95b8
 SHA512 (kbdinfo.1) = 8696d55f6c15f0ee2c2936eca6180b18100a87b11f0efe809a9531bb1228c67cd096cbc8fa25d9ee496daab28892ee5f320cc4bc9c9d816ff666bb4f80271c99
-SHA512 (kbd-2.7.1.tar.xz) = 9c541fdbb77e5b1a757848fb4c6f8bb5a61791220938cbfe899aa16b412a87e98fc97fc06ba39d0f983e4cc808d0dcd983560e12c7f36e4df683a3002c51af09
+SHA512 (kbd-2.10.0.tar.xz) = 1b7f55f0a1b34d9b6b4237a1ff3e10eedf4bdebe50e906a7acdea48f85b3c455e72737127491a0c494388b999797aa65411b20b44c3f5612fdeee4d8289f937c