!28 update to 2.5.1

From: @zhouwenpei 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng

kbd-1.15.3-dumpkeys-man.patch

@@ -1,18 +0,0 @@
-diff -up kbd-2.0.4/docs/man/man1/dumpkeys.1.in.orig kbd-2.0.4/docs/man/man1/dumpkeys.1.in
---- kbd-2.0.4/docs/man/man1/dumpkeys.1.in.orig	2017-01-11 11:12:22.884029413 +0100
-+++ kbd-2.0.4/docs/man/man1/dumpkeys.1.in	2017-01-11 11:12:47.537040194 +0100
-@@ -164,6 +164,14 @@ output of
- .BI \-S shape " " " " \-\-shape= shape
- .LP
- .TP
-+.B \-1 \-\-separate-lines
-+This forces
-+.B dumpkeys
-+to write one line per (modifier,keycode) pair. It prefixes the word
-+.I plain
-+for plain keycodes.
-+.LP
-+.TP
- .B \-t \-\-funcs-only
- When this option is given,
- .B dumpkeys

kbd-2.0.4-covscan-fixes.patch

@@ -1,13 +0,0 @@
-diff -Nur kbd-2.4.0/src/libkfont/kdmapop.c kbd-2.4.0-new/src/libkfont/kdmapop.c
---- kbd-2.4.0/src/libkfont/kdmapop.c	2020-04-27 23:53:01.000000000 +0800
-+++ kbd-2.4.0-new/src/libkfont/kdmapop.c	2021-12-07 16:18:53.166000000 +0800
-@@ -166,7 +166,8 @@
- 
- 		if (ioctl(fd, GIO_UNIMAP, &ud)) {
- 			KFONT_ERR(ctx, "ioctl(GIO_UNIMAP): %m");
--			return -1;
-+			free(ud.entries);
-+            return -1;
- 		}
- 		if (ct != ud.entry_ct)
- 			KFONT_ERR(ctx, _("strange... ct changed from %d to %d"), ct, ud.entry_ct);

kbd-2.4.0-covscan-fixes.patch

@@ -0,0 +1,49 @@
+diff -up kbd-2.4.0/src/libkfont/psffontop.c.orig kbd-2.4.0/src/libkfont/psffontop.c
+--- kbd-2.4.0/src/libkfont/psffontop.c.orig	2020-04-27 17:53:01.000000000 +0200
++++ kbd-2.4.0/src/libkfont/psffontop.c	2021-04-27 09:59:14.170153676 +0200
+@@ -235,6 +235,7 @@ kfont_read_psffont(struct kfont_context
+ 
+ 		if (psfhdr->mode > PSF1_MAXMODE) {
+ 			KFONT_ERR(ctx, _("Unsupported psf file mode (%d)"), psfhdr->mode);
++			free(psfhdr);
+ 			return -EX_DATAERR;
+ 		}
+ 		fontlen   = ((psfhdr->mode & PSF1_MODE512) ? 512 : 256);
+@@ -251,6 +252,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);
+@@ -260,16 +262,20 @@ kfont_read_psffont(struct kfont_context
+ 		ftoffset  = assemble_uint32((unsigned char *)&psfhdr.headersize);
+ 		fontwidth = assemble_uint32((unsigned char *)&psfhdr.width);
+ 		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;
+ 	}
+ 
+@@ -277,6 +283,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

@@ -1,7 +1,7 @@
 %global kbd_datadir %{_exec_prefix}/lib/kbd
 
 Name:           kbd
-Version:        2.4.0
+Version:        2.5.1
 Release:        1
 Summary:        Tools for managing Linux console(keyboard, virtual terminals, etc.)
 License:        GPLv2+
@@ -18,11 +18,10 @@ Source6:        cz-map.patch
 Patch0:         kbd-1.15-keycodes-man.patch
 Patch1:         kbd-1.15-sparc.patch
 Patch2:         kbd-1.15-unicode_start.patch
-Patch3:         kbd-1.15.3-dumpkeys-man.patch
+Patch3:         kbd-1.15.5-sg-decimal-separator.patch
-Patch4:         kbd-1.15.5-sg-decimal-separator.patch
+Patch4:         kbd-1.15.5-loadkeys-search-path.patch
-Patch5:         kbd-1.15.5-loadkeys-search-path.patch
+Patch5:         kbd-2.0.2-unicode-start-font.patch
-Patch6:         kbd-2.0.2-unicode-start-font.patch
+Patch6:         kbd-2.4.0-covscan-fixes.patch
-Patch7:         kbd-2.0.4-covscan-fixes.patch
 
 BuildRequires:  bison flex gettext pam-devel check-devel
 BuildRequires:  gcc console-setup xkeyboard-config automake 
@@ -61,11 +60,10 @@ cp -fp %{SOURCE6} .
 %patch0 -p1 -b .keycodes-man
 %patch1 -p1 -b .sparc
 %patch2 -p1 -b .unicode_start
-%patch3 -p1 -b .dumpkeys-man
+%patch3 -p1 -b .sg-decimal-separator
-%patch4 -p1 -b .sg-decimal-separator
+%patch4 -p1 -b .loadkeys-search-path
-%patch5 -p1 -b .loadkeys-search-path
+%patch5 -p1 -b .unicode-start-font
-%patch6 -p1 -b .unicode-start-font
+%patch6 -p1 -b .covscan-fixes.patch
-%patch7 -p1 -b .covscan-fixes.patch
 aclocal
 autoconf
 
@@ -172,6 +170,9 @@ make check
 %{_mandir}/man8/*.8.gz
 
 %changelog
+* Thu Nov 03 2022 zhouwenpei <zhouwenpei@h-partners.com> - 2.5.1-1
+- update to 2.5.1
+
 * Tue Dec 07 2021 wangkerong <wangkerong@huawei.com> - 2.4.0-1
 - update to 2.4.0