Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kbd-2.6.0

Browse Source
This commit is contained in:
Rmys
2023-06-14 06:49:23 +00:00
committed by GitHub
parent c480a1967e
commit 71dccf0ada
2 changed files with 61 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/base/kbd/files/mandriva/kbd-2.4.0-covscan-fixes.patch
+49
View File
@@ -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;
}
system/base/kbd/pspec.xml
+12 -5
View File
@@ -12,10 +12,10 @@
<IsA>app:console</IsA>
<Summary>Keyboard and console utilities</Summary>
<Description>The kbd package contains keytable files and keyboard utilities compatible with kernel version 1.1.54 and later.</Description>
<Archive sha1sum="724c030926d125b5e430274e92c4236d8534d410" type="tarxz">https://www.kernel.org/pub/linux/utils/kbd/kbd-2.4.0.tar.xz</Archive>
<Archive sha1sum="17625849ecf4dedf755aefa06d78406b92c31743" type="tarbz2" target="kbd-2.4.0">https://sourceforge.net/projects/pisilinux/files/source/kbd-latarcyrheb-16-fixed.tar.bz2</Archive>
<Archive sha1sum="a5f6d9dff7a8a484cd5014ec7ffdf1eaed27084a" type="tarbz2" target="kbd-2.4.0">https://sourceforge.net/projects/pisilinux/files/source/kbd-latsun-fonts.tar.bz2</Archive>
<Archive sha1sum="d52f95fdc761cead041d23992f8802be5ac4bc12" type="tarbz2" target="kbd-2.4.0">https://sourceforge.net/projects/pisilinux/files/source/ro_maps.tar.bz2</Archive>
<Archive sha1sum="14f48b5411e84b99308e91e2e44c53c2521fe310" type="tarxz">https://www.kernel.org/pub/linux/utils/kbd/kbd-2.6.0.tar.xz</Archive>
<Archive sha1sum="17625849ecf4dedf755aefa06d78406b92c31743" type="tarbz2" target="kbd-2.6.0">https://sourceforge.net/projects/pisilinux/files/source/kbd-latarcyrheb-16-fixed.tar.bz2</Archive>
<Archive sha1sum="a5f6d9dff7a8a484cd5014ec7ffdf1eaed27084a" type="tarbz2" target="kbd-2.6.0">https://sourceforge.net/projects/pisilinux/files/source/kbd-latsun-fonts.tar.bz2</Archive>
<Archive sha1sum="d52f95fdc761cead041d23992f8802be5ac4bc12" type="tarbz2" target="kbd-2.6.0">https://sourceforge.net/projects/pisilinux/files/source/ro_maps.tar.bz2</Archive>
<BuildDependencies>
<Dependency>gettext</Dependency>
<Dependency>gzip</Dependency>
@@ -39,7 +39,7 @@
<Patch level="1">mandriva/kbd-1.15.5-loadkeys-search-path.patch</Patch>
<Patch level="1">mandriva/kbd-1.15.5-sg-decimal-separator.patch</Patch>
<Patch level="1">mandriva/kbd-2.0.2-unicode-start-font.patch</Patch>
<Patch level="1">mandriva/kbd-2.0.4-covscan-fixes.patch</Patch>
<Patch level="1">mandriva/kbd-2.4.0-covscan-fixes.patch</Patch>
<!-- <Patch level="1">mandriva/kbd-1.15.5-vlock-more-pam.patch</Patch> -->
<!-- Archlinux patches -->
@@ -89,6 +89,13 @@
</Package>
<History>
<Update release="8">
<Date>2023-06-13</Date>
<Version>2.6.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="7">
<Date>2021-06-12</Date>
<Version>2.4.0</Version>