rpms/kbd
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fix violation of C alias rules (#150440)

Browse Source
This commit is contained in:
Miloslav Trmac 2005-03-11 23:56:14 +00:00
parent 2524ec4837
commit 2e2e7a72aa
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
kbd-1.12-alias.patch Normal file
View File

@ -0,0 +1,21 @@
--- kbd-1.12/src/psffontop.c.alias 2005-03-12 00:47:45.296118344 +0100
+++ kbd-1.12/src/psffontop.c 2005-03-12 00:48:30.075310872 +0100
@@ -59,7 +59,6 @@
static unsigned int
assemble_ucs2(char **inptr, int cnt) {
- unsigned char **in = (unsigned char **) inptr;
unsigned int u1, u2;
if (cnt < 2) {
@@ -68,8 +67,8 @@
exit(EX_DATAERR);
}
- u1 = *(*in)++;
- u2 = *(*in)++;
+ u1 = (unsigned char)*(*inptr)++;
+ u2 = (unsigned char)*(*inptr)++;
return (u1 | (u2 << 8));
}

7
kbd.spec
View File

@ -1,7 +1,7 @@
Summary: Tools for configuring the console (keyboard, virtual terminals, etc.) Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
Name: kbd Name: kbd
Version: 1.12 Version: 1.12
Release: 7 Release: 8
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2 Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2
@ -19,6 +19,7 @@ Patch3: kbd-1.08-rukbd.patch
Patch4: kbd-1.12-setfont-man.patch Patch4: kbd-1.12-setfont-man.patch
Patch5: kbd-1.12-Meta_utf8.patch Patch5: kbd-1.12-Meta_utf8.patch
Patch6: kbd-1.12-nostrip.patch Patch6: kbd-1.12-nostrip.patch
Patch7: kbd-1.12-alias.patch
Obsoletes: console-tools Obsoletes: console-tools
Provides: console-tools Provides: console-tools
Conflicts: util-linux < 2.11r-9 Conflicts: util-linux < 2.11r-9
@ -40,6 +41,7 @@ fonts, the virtual terminals and font files.
%patch4 -p1 -b .man %patch4 -p1 -b .man
%patch5 -p1 -b .Meta_utf8 %patch5 -p1 -b .Meta_utf8
%patch6 -p1 -b .nostrip %patch6 -p1 -b .nostrip
%patch7 -p1 -b .alias
# 7-bit maps are obsolete; so are non-euro maps # 7-bit maps are obsolete; so are non-euro maps
pushd data/keymaps/i386 pushd data/keymaps/i386
@ -118,6 +120,9 @@ install -c -m644 $RPM_SOURCE_DIR/kbdrate.pam \
%config %{_sysconfdir}/pam.d/* %config %{_sysconfdir}/pam.d/*
%changelog %changelog
* Sat Mar 12 2005 Miloslav Trmac <mitr@redhat.com> - 1.12-8
- Fix violation of C alias rules (#150440)
* Sun Mar 6 2005 Miloslav Trmac <mitr@redhat.com> - 1.12-7 * Sun Mar 6 2005 Miloslav Trmac <mitr@redhat.com> - 1.12-7
- Don't run ldconfig - Don't run ldconfig
- Don't strip executables - Don't strip executables