diff --git a/kbd-2.4.0-covscan-fixes.patch b/kbd-2.4.0-covscan-fixes.patch index 0ab6d53fd794843f9d709963d63ca3bcf4219a40..09bba9793129d773c6c2a13428b23e8d83fd01a1 100644 --- a/kbd-2.4.0-covscan-fixes.patch +++ b/kbd-2.4.0-covscan-fixes.patch @@ -1,7 +1,7 @@ -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 +diff -up kbd-2.6.1/src/libkfont/psffontop.c.orig kbd-2.6.1/src/libkfont/psffontop.c +--- kbd-2.6.1/src/libkfont/psffontop.c.orig 2023-06-23 10:29:44.000000000 +0200 ++++ kbd-2.6.1/src/libkfont/psffontop.c 2023-06-30 14:06:06.363944776 +0200 +@@ -236,6 +236,7 @@ kfont_read_psffont(struct kfont_context if (psfhdr->mode > PSF1_MAXMODE) { KFONT_ERR(ctx, _("Unsupported psf file mode (%d)"), psfhdr->mode); @@ -9,7 +9,7 @@ diff -up kbd-2.4.0/src/libkfont/psffontop.c.orig kbd-2.4.0/src/libkfont/psffonto return -EX_DATAERR; } fontlen = ((psfhdr->mode & PSF1_MODE512) ? 512 : 256); -@@ -251,6 +252,7 @@ kfont_read_psffont(struct kfont_context +@@ -253,6 +254,7 @@ kfont_read_psffont(struct kfont_context if (psfhdr.version > PSF2_MAXVERSION) { KFONT_ERR(ctx, _("Unsupported psf version (%d)"), psfhdr.version); @@ -17,9 +17,9 @@ diff -up kbd-2.4.0/src/libkfont/psffontop.c.orig kbd-2.4.0/src/libkfont/psffonto 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); +@@ -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 { @@ -39,11 +39,10 @@ diff -up kbd-2.4.0/src/libkfont/psffontop.c.orig kbd-2.4.0/src/libkfont/psffonto return -EX_DATAERR; } -@@ -277,6 +283,7 @@ kfont_read_psffont(struct kfont_context +@@ -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; } - \ No newline at end of file diff --git a/kbd-2.5.1.tar.xz b/kbd-2.5.1.tar.xz deleted file mode 100644 index 875cfdda44c1665cd03f343a97513ddabbf7c929..0000000000000000000000000000000000000000 Binary files a/kbd-2.5.1.tar.xz and /dev/null differ diff --git a/kbd-2.6.1.tar.xz b/kbd-2.6.1.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..51ac3f2b844be894561962afe9ea476651a9532c Binary files /dev/null and b/kbd-2.6.1.tar.xz differ diff --git a/kbd.spec b/kbd.spec index b56b1efd990866d72f22164edeb1d457be21f4e7..00fe918e71341beded56b45e79ce3ecaa79763bd 100644 --- a/kbd.spec +++ b/kbd.spec @@ -1,8 +1,8 @@ %global kbd_datadir %{_exec_prefix}/lib/kbd Name: kbd -Version: 2.5.1 -Release: 2 +Version: 2.6.1 +Release: 1 Summary: Tools for managing Linux console(keyboard, virtual terminals, etc.) License: GPLv2+ URL: https://www.kbd-project.org/ @@ -170,6 +170,9 @@ make check %{_mandir}/man8/*.8.gz %changelog +* Wed Jul 19 2023 zhouwenpei - 2.6.1-1 +- update to 2.6.1 + * Tue Apr 18 2023 liweiganga - 2.5.1-2 - update patch adding compose rules for converted cz layout