Add fix from upstream for loadkey syntax errors #447440 by gglaboussole.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 164 insertions, 16 deletions

diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog
index ca80c64227bc..7b4774c53bbf 100644
--- a/sys-apps/kbd/ChangeLog
+++ b/sys-apps/kbd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/kbd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.107 2012/12/06 06:07:48 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.108 2013/01/20 17:23:16 vapier Exp $
+
+*kbd-1.15.5-r1 (20 Jan 2013)
+
+  20 Jan 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/kbd-1.15.5-loadkeys-parse.patch, +kbd-1.15.5-r1.ebuild:
+  Add fix from upstream for loadkey syntax errors #447440 by gglaboussole.
 
 *kbd-1.15.5 (06 Dec 2012)
 
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index c7ac33f4b62e..10d3e39d83b7 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -17,6 +17,7 @@ AUX kbd-1.12-unimap.patch 642 SHA256 f1364a306636661ebcca73d91ca179be811b6b4ccd0
 AUX kbd-1.12-xcompile.patch 680 SHA256 78d29c76075cf5ee347461e28ae0ac25a06ce446151d91ec661c3a2d33da4191 SHA512 d4f530706b521bd831b04e09d320a183a69740bc540889ae9f1ec1bdd47deff49c0ea85d9b497d4e6835ecb5039371cd2462ceab87a99c5c88272c1b6d3d30ed WHIRLPOOL 345c6c64b725ff998b33666d4940ae72fb9484f34b6e5e9f891efd9c66d046e8b5dc17342bb4532872bbc160a3cc8ee656a93a1a7d7ccd360984c62e93418221
 AUX kbd-1.13-dont-use-error.patch 414 SHA256 9f9e7e860362b7e5402c1c0af55ff301e0542e34aacc71167f9252f50a4f74ca SHA512 26143bb24b3be67b7c3192a2f0bbd22c41fa125ea398fdb5201b51e99207b40bdd12ae0f9e423a8a652cce08631f0a1c659453f4d72dd480a05654078ce951ae WHIRLPOOL ba96cee5b4c07ed1657cf0aedd1a52a474918f6395ad1b3934278f84a6f2bfec6614323773b75e0a09ca03073618436c759597d65be9e8145d316b3d4bde4b0b
 AUX kbd-1.14.1-missing-configure.patch 444 SHA256 0a2a530ac1d2baa03c7cc12e10a242bbc9d128304136f5dba4909d3df2b16eb1 SHA512 daae8e7a0d2a01c66f28964c2208047f561a5587b6ab9ae13f6db217856689f41ea5886367805adbd8e1c77c562727d7013360dd42db6a00a534fbd92031df2d WHIRLPOOL c7efb5d02cd25ccb2dcd376a5c13c32b3972d9ba8e868bbab0b94d8bd9e107e5f4c082242f00335f4786ebca9beb484af64e0681f9b6049348cbdfec8ba01d8c
+AUX kbd-1.15.5-loadkeys-parse.patch 2163 SHA256 8fa928854ee1e3298df99e600cfdb08ccf8b44b7a7fc42423569fecc9365aa22 SHA512 c338c5f5ee9054f3dfc62646f9e8a47a577fc55dbc4723a04f006afa6c966ac5b056b744c49d4bdfcd80d69e64af20b0f71cc9cfff23db9f017adb32bd6d9d7d WHIRLPOOL 26b1adadc347b534675c7426eb9aca535556b81cffdd1ccd7ef50c603e127c1f9f6774af1b8050c67fc81daefe0c33da4593f74d3b77c47a089d6772363153e8
 DIST kbd-1.12.tar.gz 884827 SHA256 f3bc6747dba7d1a35cd125ca0bd4649f88704be211cf7e47d36b43c7f44ce803 SHA512 b0c86b7ccb5e03edfeacf12153fe045aca496aaaf1638bd680fc23db23e59c0acf14868597c4f3e4b60ddb405843cbea010e06176c453a191c067517a117f26b WHIRLPOOL 78d1835617707fe000ca09cd9cff3dfee4a4b8d92d28f695df8b8c83145612a4663e47deb879765edc7eb34920987843a3b720fd4f1279f326771b5ea05a9c8f
 DIST kbd-1.13.tar.bz2 667373 SHA256 c8a5be1a606d925c3229fa91d3e9dde4e0b61b2c755aff8e699b855f1a402bf6
 DIST kbd-1.14.1.tar.gz 1010836 SHA256 e97ed7ec4ec937a27ac2e72789e76db4b661f7ce2c2b7b68524f55ee69dce491
@@ -35,24 +36,25 @@ EBUILD kbd-1.15.2-r1.ebuild 1053 SHA256 5d84fd24ef7a28d30e8f4d8bfc4d1070b0961889
 EBUILD kbd-1.15.2.ebuild 741 SHA256 e2bf3e2adf94dbc883210370e26c7ac1dc142319577feb5273bf5d71fc2c070a SHA512 e88d9893022b5ec36510ac16c1f574104e2f977affbbfb5648a9cc78ae9fb0f5eea1ff637ccfa8bbbae4b668779e10cffd1f9db2fa48746834b369143b58920d WHIRLPOOL 127c4b133f971df18900889d9a1830603607f4d58846c457fa1246fca55c7bf90fb988857750f51cd162ca13274e1d160cef5ee83ecd7e5804e8e1e508c281c9
 EBUILD kbd-1.15.3.ebuild 1195 SHA256 b473b3bf11a909387e2fd1e7dfc0a3c95aca0ee64ef47bc765dc11e83514a878 SHA512 10b1f622264216e25daa5e1649fdf6e2c50a19c8eb4b1ed629063cfe804acc6e5d09c36fab6e5c2b88a95e6e82aaf8ee17ebc37f2b12d8ab0b7695962d1ee326 WHIRLPOOL 9753479528bef090c30a2522447ab2793b2f485743edeeff2fe87e8c6fb826dfc3d87dd4c668b1863e76d01242ebdecc26ee55effe61b9676115852dab7957ee
 EBUILD kbd-1.15.4.ebuild 1089 SHA256 3e7a4c3e020721021849e2b7477f5bdbb6ab8af9286c3ea112b831572230d86d SHA512 b579a6474402546acd5cc4f50fc5e4a38382d6d5133af2aee8dc96e63ed5b8cdae5ea7ece56608cd14913974ad8cef3a33773905fbce836dd4574ab6e20cb8e9 WHIRLPOOL 20ad81b7dfc85dbfcc4cc49a688a25c9eef05a8018ccd9d375cb964be177b3425bdab2f2c79dbc522b18bf9a99e73cc3d351216b185503e521c66de4b36fa57a
+EBUILD kbd-1.15.5-r1.ebuild 1154 SHA256 2fc545a037fc8d508d5bf5b603dc867fdf843032f11fde9a4fa9f35832b1ac06 SHA512 0e7795d8e61130ade5b47a9792cd2ccd7243d8da252673c2d91cd7bd579dd6a745a9ff2bccf0a2a9b0bb08c5e2c537e750e28668f01a7e14814643eab78dfaca WHIRLPOOL 6b66f7f1cab8dac89aa7a0acc467f86dc4ccf705815068e3d737be9927a12264ec9d44aa06707eb3204197ffdb093c5bf23d4233b26cad2d5d9154d9e085ff8c
 EBUILD kbd-1.15.5.ebuild 1060 SHA256 75ad193dbb5ec82033b6adc51b7b0d0728bf37f9066ae7c2cbe8b89a953d7ecf SHA512 5befeb232ab8aa28faa07268dc4bfa4e6d90d8fb29d5ba777fa651ba3c28a965b3c8a04d9fef2a05373787f0c96e1ab043c41fdf6861f3beefd165423c4d51a6 WHIRLPOOL 25025efe0d2c8b02c6462736bc7471d21524e56f3618eb0f49df182f0bb780c50f2a225cdca8712bf2f8de5cf4ff2ed344efae623b0dea0be926e35451460967
 EBUILD kbd-1.15.ebuild 832 SHA256 2376f968fe6add3c593c7c4b1cecc4c72e02f900c7d1361b921851676c8c6992 SHA512 3c3d824a309514fbd1a66b305532a43d225664f96670e9f46c5c07946ab5fa44a9db925433e05c10a726605056ed3c653a6fd9511f3a6ed00470983e342babc4 WHIRLPOOL 36c01101ade4b77e6d419d2b26d2c403bfded06d7afd7723cec02f99f7d6bde00aab3b4f89feaa615d57f25d3b473a0f00f8d35f9f1338d65ded81e60605dccd
-MISC ChangeLog 14924 SHA256 febd381d440e2a30480af33222e270fa3e1e751d02a01dde92caaa95f5a41cc0 SHA512 6dba4cae0cad0896b36b28e3cdfd4296a1df596c7d83bf29b9accf22c5eed0c2b954b24304e36c405dc9ef240a0432a8a5c1ecf5a8d03344503b691fee2c3e1f WHIRLPOOL 8f95bd36c5210850ad6632099f013ec374f658094eda0d5fdb1c7e55c13675d62e8e0875c10081cf0e8dbd26d5200a3ca34fb1994808d06a3b76e950db65b0ba
+MISC ChangeLog 15145 SHA256 0dd574ce52ed0f3499472d7f83bb8a997134b56de5775bf3bee171c21d623d00 SHA512 9449ac2b8b98582838bb6d73c98105066181369d601394ada00804b834b9b17a161f3269b7670d12d3ba0e59b47a07ba0739307d81265f26928dcdd32f9e2947 WHIRLPOOL 8883a5139b1991dc88566cb0140d6efe8737ff6fcadd3996f3917817e4a4e0bb0f04e1bf4d82276536a9467e35c22042b9dcf51b00a322b681dbb3a5e72936ea
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQwDZPAAoJELEHsLL7fEFWJCQP/ivYxy5vxONl1+wxXLw1D9Ma
-zCuMCoc/1JcFdTsXENJNnwH7fB76qdey8WCc5kVTKRjDtcA2vpjc/kxkxZygt6JC
-HArVV/c1y5iP+pcO7lYD5YfHJS+rBCOFiR5rp/A5LgQMKZd13UCWhsqXlIyZ3M/2
-sQ2CYRIWmQABnQaZIezIwkgBHYJRvtReeIUppyyN9ZvipzLDhI4orLvH/nFxJuzU
-WX+d8hsl0GUtuBuFYsJ1F3D2xJXaEI26O5nPhXoiFlmPJXgG6NMDK+KVv14PZ6OU
-rOsfDavPYNYlmgm9erKGdtNREGcLdqXseeEPDjF7+68udzYCOgl09e1HbrVq3VcK
-UOpA7yxXf5Z+PFmAL1ymYy4fDPRFwXjj34N+Q+6CiRoCOqARKs5dD0cQrjeQ/ry7
-COk18N86TSA94iVXT1ZXsHOV/pYxRg7fZogGudg3ieM2qKVBFpZb77+eyFmNCbY+
-Vwo+zXZoaFKgLBdfqTCjqDOunfn/wAzONKUfEHQy3Ytw/6IplqQeMMKO+rsrlnGl
-NIWkaDMIlUoRjgSG93Y6wXkLIUvronA1zH0HvT0RKTwohjM+OdOx0HDSAU8WRQxm
-yUPWUf/iw5A1Mtt6MxZ3gsfEPhKrxJRCJdjCAOnQwWds7UQIcTxO6n6mIw9VDTOL
-AIJ8qCNL752udWa5llwd
-=Mud6
+iQIcBAEBCAAGBQJQ/CjvAAoJELEHsLL7fEFW0FcP/0c+KvNpdv6FfTpst0HHr3LL
+W0arrgyjNQvwVU/YX0P0KdoClLh/FivM5hJBaZ87K/pbS4TIht5sTBPifirGlpfo
+aVdLX2ZnyBbhiq6YBbQpxkOK3aoHcwv2BI9kClOkvYOAP5vCdGEQUcg44AYLbLnK
+Th1iaYiZ4C0MdF6nY1HRepW/xSepDPtS8hp4CwT6GIMPxFosLpYjQrH2KYWH++sb
+rc+SywEMPIe/8HbbIzf2xh9DHzK5g5WRbppk/A9Jh43ox2xnYuS+btTlJ+wNAwTS
+df8lkwlFGIBGRpVBwiygqLjD2dNsxsxLQzY4XLmk/YoI+L10R+9Wj/JJCBGKT7af
+iFYTIOt8JE9EKBlK0fFJyWORnZSuUkELLJkQZE1ZurkTfk+VS22n3Vpdbp2X6Ksh
+e/3ViCpZhhGzUxNEmtGnoBPvTzipWfgO0+2rSJXqhijuH9Igp2yUBp1OYOjqzzuj
+8m8r88Nx2tGoWbPrhM9S4WI2vWM8kZ4eMkm4jQV1J5Zm2XUZM1ggJ73zbvxr+gD4
+tZaX50snfR07Hnd4rqjD1nyH/YHSg0QaBCM1CZ0ARs5wtJOvNYAjTE/HPsoEiF17
+MML8KGECdZk8fhzP666U64WlifWMgdXQm3xy5oIJNz6uUGD9GftPV/gOr0othCNv
++SnRpFQZlnsw60J6izMh
+=WLKf
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch b/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch
new file mode 100644
index 000000000000..c78a22780840
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch
@@ -0,0 +1,90 @@
+https://bugs.gentoo.org/447440
+
+From 7e06e56157e8431d02e1377cdc44230944203d88 Mon Sep 17 00:00:00 2001
+From: Alexey Gladkov <gladkov.alexey@gmail.com>
+Date: Tue, 11 Dec 2012 14:24:44 +0400
+Subject: [PATCH] Fix regression in 16117ce6ab
+
+Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
+---
+ src/loadkeys.analyze.l | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/src/loadkeys.analyze.l b/src/loadkeys.analyze.l
+index c18dcea..f817c78 100644
+--- a/src/loadkeys.analyze.l
++++ b/src/loadkeys.analyze.l
+@@ -307,8 +307,10 @@ To                      to|To|TO
+ 				char *s = xstrndup(yytext+1, strlen(yytext)-2);
+ 				/* use static pathname to store *s ? */
+ 				open_include(s);
+-				yy_pop_state();
+-				state_ptr--;
++				while (state_ptr > 0) {
++					yy_pop_state();
++					state_ptr--;
++				}
+ 			}
+ <INCLSTR>[^"]|\"\"|\"[^"\n]*{Eol}	{
+ 				yyerror(_("expected filename between quotes"));
+@@ -323,7 +325,7 @@ To                      to|To|TO
+ 			}
+ {Eol}			{
+ 				line_nr++;
+-				if (state_ptr > 0) {
++				while (state_ptr > 0) {
+ 					yy_pop_state();
+ 					state_ptr--;
+ 				}
+@@ -428,8 +430,10 @@ To                      to|To|TO
+ 			}
+ <STR>\"			{
+ 				*p = '\0';
+-				yy_pop_state();
+-				state_ptr--;
++				while (state_ptr > 0) {
++					yy_pop_state();
++					state_ptr--;
++				}
+ 				return(STRLITERAL);
+ 			}
+ .			{
+--- a/src/loadkeys.analyze.c
++++ b/src/loadkeys.analyze.c
+@@ -1359,8 +1359,10 @@ YY_RULE_SETUP
+ 				char *s = xstrndup(yytext+1, strlen(yytext)-2);
+ 				/* use static pathname to store *s ? */
+ 				open_include(s);
+-				yy_pop_state();
+-				state_ptr--;
++				while (state_ptr > 0) {
++					yy_pop_state();
++					state_ptr--;
++				}
+ 			}
+ 	YY_BREAK
+ case 3:
+@@ -1393,7 +1395,7 @@ YY_RULE_SETUP
+ #line 324 "loadkeys.analyze.l"
+ {
+ 				line_nr++;
+-				if (state_ptr > 0) {
++				while (state_ptr > 0) {
+ 					yy_pop_state();
+ 					state_ptr--;
+ 				}
+@@ -1670,8 +1670,10 @@ YY_RULE_SETUP
+ #line 429 "loadkeys.analyze.l"
+ {
+ 				*p = '\0';
+-				yy_pop_state();
+-				state_ptr--;
++				while (state_ptr > 0) {
++					yy_pop_state();
++					state_ptr--;
++				}
+ 				return(STRLITERAL);
+ 			}
+ 	YY_BREAK
+-- 
+1.8.0.2
diff --git a/sys-apps/kbd/kbd-1.15.5-r1.ebuild b/sys-apps/kbd/kbd-1.15.5-r1.ebuild
new file mode 100644
index 000000000000..b10ac319354f
--- /dev/null
+++ b/sys-apps/kbd/kbd-1.15.5-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.15.5-r1.ebuild,v 1.1 2013/01/20 17:23:16 vapier Exp $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="Keyboard and console utilities"
+HOMEPAGE="http://freshmeat.net/projects/kbd/"
+SRC_URI="ftp://ftp.altlinux.org/pub/people/legion/kbd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls pam"
+
+RDEPEND="pam? ( virtual/pam )"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	default
+	cd "${S}"
+
+	# broken file ... upstream git punted it
+	rm po/es.po
+
+	# Rename conflicting keymaps to have unique names, bug #293228
+	cd "${S}"/data/keymaps/i386
+	mv dvorak/no.map dvorak/no-dvorak.map
+	mv fgGIod/trf.map fgGIod/trf-fgGIod.map
+	mv olpc/es.map olpc/es-olpc.map
+	mv olpc/pt.map olpc/pt-olpc.map
+	mv qwerty/cz.map qwerty/cz-qwerty.map
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-loadkeys-parse.patch #447440
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable pam vlock)
+}
+
+src_install() {
+	default
+	dohtml doc/*.html
+}