diff --git a/kbd-1.12-alias.patch b/kbd-1.12-alias.patch new file mode 100644 index 0000000..fbca4c1 --- /dev/null +++ b/kbd-1.12-alias.patch @@ -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)); + } + diff --git a/kbd.spec b/kbd.spec index f1973c0..fbef437 100644 --- a/kbd.spec +++ b/kbd.spec @@ -1,7 +1,7 @@ Summary: Tools for configuring the console (keyboard, virtual terminals, etc.) Name: kbd Version: 1.12 -Release: 7 +Release: 8 License: GPL Group: System Environment/Base 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 Patch5: kbd-1.12-Meta_utf8.patch Patch6: kbd-1.12-nostrip.patch +Patch7: kbd-1.12-alias.patch Obsoletes: console-tools Provides: console-tools Conflicts: util-linux < 2.11r-9 @@ -40,6 +41,7 @@ fonts, the virtual terminals and font files. %patch4 -p1 -b .man %patch5 -p1 -b .Meta_utf8 %patch6 -p1 -b .nostrip +%patch7 -p1 -b .alias # 7-bit maps are obsolete; so are non-euro maps pushd data/keymaps/i386 @@ -118,6 +120,9 @@ install -c -m644 $RPM_SOURCE_DIR/kbdrate.pam \ %config %{_sysconfdir}/pam.d/* %changelog +* Sat Mar 12 2005 Miloslav Trmac - 1.12-8 +- Fix violation of C alias rules (#150440) + * Sun Mar 6 2005 Miloslav Trmac - 1.12-7 - Don't run ldconfig - Don't strip executables