From 7feb970589e08c456d4cc18523fc1a021923542a Mon Sep 17 00:00:00 2001
From: Miloslav Trmac <mitr@fedoraproject.org>
Date: Tue, 17 May 2005 09:24:22 +0000
Subject: [PATCH] - Fix another violation of C aliasing rules (#157720, patch
 by Jan     Kratochvil)

---
 kbd-1.12-alias.patch | 30 ++++++++++++++++++++++++++++--
 kbd.spec             |  7 +++++--
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/kbd-1.12-alias.patch b/kbd-1.12-alias.patch
index fbca4c1..30be4fa 100644
--- a/kbd-1.12-alias.patch
+++ b/kbd-1.12-alias.patch
@@ -1,5 +1,6 @@
---- 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
+diff -u kbd-1.12/src/psffontop.c kbd-1.12/src/psffontop.c
+--- kbd-1.12/src/psffontop.c	2005-03-12 00:48:30.075310872 +0100
++++ kbd-1.12/src/psffontop.c	2005-05-14 10:49:59.000000000 +0900
 @@ -59,7 +59,6 @@
  
  static unsigned int
@@ -19,3 +20,28 @@
  	return (u1 | (u2 << 8));
  }
  
+@@ -110,7 +109,6 @@
+  */
+ static void
+ get_uni_entry(char **inptr, char **endptr, struct unicode_list *up, int utf8) {
+-	unsigned char **in = (unsigned char **) inptr;
+ 	unsigned char uc;
+ 	unicode unichar;
+ 	int inseq = 0;
+@@ -126,14 +124,14 @@
+ 			exit(EX_DATAERR);
+ 		}
+ 		if (utf8) {
+-			uc = *(*in)++;
++			uc = *(*inptr)++;
+ 			if (uc == PSF2_SEPARATOR)
+ 				break;
+ 			if (uc == PSF2_STARTSEQ) {
+ 				inseq = 1;
+ 				continue;
+ 			}
+-			--(*in);
++			--(*inptr);
+ 			unichar = assemble_utf8(inptr, *endptr - *inptr);
+ 		} else {
+ 			unichar = assemble_ucs2(inptr, *endptr - *inptr);
diff --git a/kbd.spec b/kbd.spec
index fbef437..2430909 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: 8
+Release: 9
 License: GPL
 Group: System Environment/Base
 Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2
@@ -120,8 +120,11 @@ install -c -m644 $RPM_SOURCE_DIR/kbdrate.pam \
 %config %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue May 17 2005 Miloslav Trmac <mitr@redhat.com> - 1.12-9
+- Fix another violation of C aliasing rules (#157720, patch by Jan Kratochvil)
+
 * Sat Mar 12 2005 Miloslav Trmac <mitr@redhat.com> - 1.12-8
-- Fix violation of C alias rules (#150440)
+- Fix violation of C aliasing rules (#150440)
 
 * Sun Mar  6 2005 Miloslav Trmac <mitr@redhat.com> - 1.12-7
 - Don't run ldconfig