Upgrade to Kbd-1.15.5. Fixes #3239.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10086 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

6 files changed, 34 insertions, 45 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index dcaec17fc..6e6bfbda7 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
       <para>2012-12-30</para>
       <itemizedlist>
         <listitem>
+          <para>[matthew] - Upgrade to Kbd-1.15.5.  Fixes
+          <ulink url="&lfs-ticket-root;3239">#3239</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[matthew] - All E2fsprogs tests pass now, so remove the
           &quot;-k&quot; flag from its invocation.</para>
         </listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 393bb2e60..4073f7017 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -112,9 +112,9 @@
     <listitem>
       <para>IPRoute2 &iproute2-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Kbd &kbd-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Kmod &kmod-version;</para>
     </listitem>
@@ -233,6 +233,10 @@
     </listitem>
 
     <listitem>
+      <para>&kbd-backspace-patch;</para>
+    </listitem>
+
+    <listitem>
       <para>&make-fixes-patch;</para>
     </listitem>
 
@@ -262,6 +266,14 @@
     </listitem>
 
     <listitem>
+      <para>kbd-1.15.3-backspace-1.patch</para>
+    </listitem>
+
+    <listitem>
+      <para>kbd-1.15.3-upstream_fixes-1.patch</para>
+    </listitem>
+
+    <listitem>
       <para>kmod-9-testsuite-1.patch</para>
     </listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index caf126c10..9afbcec14 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -51,14 +51,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Kbd Loadkeys Fix Patch - <token>&kbd-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&kbd-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&kbd-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&kbd-backspace-patch;"/></para>
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index 1b24c6bfa..ea4fdffc5 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -5,9 +5,6 @@
   %general-entities;
 ]>
 
-<!-- FIXME: upstream git has been persuaded by SuSe to build resizecons on x86_64,
-so the sed will need attention if that change is not removed before the next release -->
-
 <sect1 id="ch-system-kbd" role="wrap">
   <?dbhtml filename="kbd.html"?>
 
@@ -44,11 +41,6 @@ so the sed will need attention if that change is not removed before the next rel
   <sect2 role="installation">
     <title>Installation of Kbd</title>
 
-    <para>The behaviour of <command>loadkeys</command> when run without a
-    filename was broken in this release. The following patch fixes this:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&kbd-fixes-patch;</userinput></screen>
-
     <para>The behaviour of the Backspace and Delete keys is not consistent
     across the keymaps in the Kbd package. The following patch fixes this
     issue for i386 keymaps:</para>
@@ -58,29 +50,14 @@ so the sed will need attention if that change is not removed before the next rel
     <para>After patching, the Backspace key generates the character with code 127,
     and the Delete key generates a well-known escape sequence.</para>
 
-    <para>Fix a bug in the Spanish message translations which prevents kbd from
-    building with gettext-&gettext-version;:</para>
-
-<screen><userinput remap="pre">sed -i '/guardado\ el/s/\(^.*en\ %\)\(.*\)/\14\$\2/' po/es.po</userinput></screen>
-
-    <para>Remove the redundant <command>resizecons</command> program (32-bit x86
-    only, needs the defunct svgalib, which predates linux-2.6 and is incompatible
-    with modern KMS, to provide the video mode files - for normal use
-    <command>setfont</command> sizes the console appropriately) and its manpage.</para>
-
-    <para>The shipped version of <filename>configure.ac</filename> is newer than
-    <filename>aclocal.m4</filename>, so autotools will be run by <command>make</command>
-    which will overwrite the change to <filename>configure</filename>. Alter the date
-    and time of <filename>configure.ac</filename> - this uses the system timezone, so we
-    pick a time that is sufficiently old in all timezones.</para>
+    <para>Fix a bug that causes some keymaps not to be loaded correctly:</para>
 
-<screen><userinput remap="pre">sed -i 's/\(RESIZECONS_PROGS=\)yes/\1no/' configure &amp;&amp;
-sed -i 's/resizecons.8 //' man/man8/Makefile.in &amp;&amp;
-touch -d '2011-05-07 08:30' configure.ac</userinput></screen>
+<screen><userinput remap="pre">sed -i -e '326 s/if/while/' src/loadkeys.analyze.l</userinput></screen>
 
     <para>Prepare Kbd for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --datadir=/lib/kbd</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --datadir=/lib/kbd \
+  --disable-vlock</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -94,6 +71,15 @@ touch -d '2011-05-07 08:30' configure.ac</userinput></screen>
        </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>--disable-vlock</parameter></term>
+        <listitem>
+          <para>This option prevents the vlock utility from being built, as it
+          requires the PAM library, which isn't available in the chroot
+          environment.</para>
+       </listitem>
+      </varlistentry>
+
     </variablelist>
 
     <para>Compile the package:</para>
diff --git a/packages.ent b/packages.ent
index 5f3d57c06..c1f86d3d4 100644
--- a/packages.ent
+++ b/packages.ent
@@ -278,10 +278,10 @@
 <!ENTITY iproute2-ch6-du "7.3 MB">
 <!ENTITY iproute2-ch6-sbu "0.1 SBU">
 
-<!ENTITY kbd-version "1.15.3">
-<!ENTITY kbd-size "1,621 KB">
+<!ENTITY kbd-version "1.15.5">
+<!ENTITY kbd-size "1,690 KB">
 <!ENTITY kbd-url "http://ftp.altlinux.org/pub/people/legion/kbd/kbd-&kbd-version;.tar.gz">
-<!ENTITY kbd-md5 "8143e179a0f3c25646ce5085e8777200">
+<!ENTITY kbd-md5 "34c71feead8ab9c01ec638acea8cd877">
 <!ENTITY kbd-home "http://ftp.altlinux.org/pub/people/legion/kbd">
 <!ENTITY kbd-ch6-du "20 MB">
 <!ENTITY kbd-ch6-sbu "0.1 SBU">
diff --git a/patches.ent b/patches.ent
index 4de2d08e3..93395f110 100644
--- a/patches.ent
+++ b/patches.ent
@@ -26,11 +26,6 @@
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
-<!ENTITY kbd-fixes-patch "kbd-&kbd-version;-upstream_fixes-1.patch">
-<!ENTITY kbd-fixes-patch-md5 "58ae9bd7d546426cfaccf3eba16ad1a2">
-<!ENTITY kbd-fixes-patch-size "1.6 KB">
-
-
 <!ENTITY make-fixes-patch "make-&make-version;-upstream_fixes-3.patch">
 <!ENTITY make-fixes-patch-md5 "95027ab5b53d01699845d9b7e1dc878d">
 <!ENTITY make-fixes-patch-size "10 KB">