Remove annoying setfont timeout on e.g. systems without fonts

kbd-2.0.2-remove-setfont-timeout.patch

@@ -0,0 +1,32 @@
+diff -up kbd-2.0.2/src/kdfontop.c.orig kbd-2.0.2/src/kdfontop.c
+--- kbd-2.0.2/src/kdfontop.c.orig	2015-12-14 10:10:32.482090065 +0100
++++ kbd-2.0.2/src/kdfontop.c	2015-12-14 10:14:33.839058195 +0100
+@@ -7,7 +7,6 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <stdlib.h>		/* free() */
+-#include <unistd.h>		/* usleep() */
+ #include <sys/ioctl.h>
+ #include <linux/kd.h>
+ #include "kdfontop.h"
+@@ -181,19 +180,7 @@ putfont(int fd, unsigned char *buf, int
+ 
+ 	/* Third attempt: PIO_FONT */
+ 	/* This will load precisely 256 chars, independent of count */
+-	int loop = 0;
+-
+-	/* we allow ourselves to hang here for ca 5 seconds, xdm may be playing tricks on us. */
+-	while ((loop++ < 20) && (i = ioctl(fd, PIO_FONT, buf)))
+-          {
+-	    if (loop <= 1)
+-	      fprintf(stderr, "putfont: PIO_FONT trying ...\n");
+-	    else
+-	      fprintf(stderr, ".");
+-	    usleep(250000);
+-	  }
+-	fprintf(stderr, "\n");
+-
++	i = ioctl(fd, PIO_FONT, buf);
+ 	if (i) {
+ 		fprintf(stderr, "%s: putfont: %d,%dx%d:  failed: %d\n", progname, count, width, height, i);
+ 		perror("putfont: PIO_FONT");

kbd.spec

@@ -1,6 +1,6 @@
 Name:           kbd
 Version:        2.0.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Tools for configuring the console (keyboard, virtual terminals, etc.)
 
 Group:          System Environment/Base
@@ -27,6 +27,8 @@ Patch5:         kbd-1.15.5-loadkeys-search-path.patch
 # Patch6: don't hardcode font used in unicode_start, take it from vconsole.conf,
 #   bz 1101007
 Patch6:         kbd-2.0.2-unicode-start-font.patch
+# Patch7: already upstream, bz 1289361
+Patch7:         kbd-2.0.2-remove-setfont-timeout.patch
 
 BuildRequires:  bison, flex, gettext, pam-devel, check-devel
 BuildRequires:  console-setup, xkeyboard-config
@@ -69,6 +71,7 @@ cp -fp %{SOURCE3} .
 %patch4 -p1 -b .sg-decimal-separator
 %patch5 -p1 -b .loadkeys-search-path
 %patch6 -p1 -b .unicode-start-font
+%patch7 -p1 -b .remove-setfont-timeout
 
 # 7-bit maps are obsolete; so are non-euro maps
 pushd data/keymaps/i386
@@ -184,6 +187,10 @@ gzip $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/fi-kotoistus.map
 /lib/kbd/keymaps/legacy
 
 %changelog
+* Mon Dec 14 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.0.2-8
+- Remove annoying setfont timeout on e.g. systems without fonts
+  Resolves: #1289361
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild