* [gentoo-commits] proj/hardened-dev:musl commit in: sys-apps/kbd/files/, sys-apps/kbd/
@ 2013-07-06 3:22 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2013-07-06 3:22 UTC (permalink / raw
To: gentoo-commits
commit: 803521a2c7ce25c0f65b6c81bad7d70d23072d33
Author: layman <layman <AT> localhost>
AuthorDate: Sat Jul 6 02:43:06 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jul 6 03:23:00 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=803521a2
sys-apps/kbd: fix sys/types.h and error.h issues
Package-Manager: portage-2.1.12.2
RepoMan-Options: --force
---
sys-apps/kbd/ChangeLog | 434 +++++++++++++++++++++
| 115 ++++++
sys-apps/kbd/kbd-1.15.3-r99.ebuild | 50 +++
sys-apps/kbd/metadata.xml | 5 +
4 files changed, 604 insertions(+)
diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog
new file mode 100644
index 0000000..7b4774c
--- /dev/null
+++ b/sys-apps/kbd/ChangeLog
@@ -0,0 +1,434 @@
+# ChangeLog for sys-apps/kbd
+# 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)
+
+ 06 Dec 2012; Mike Frysinger <vapier@gentoo.org> +kbd-1.15.5.ebuild:
+ Version bump.
+
+*kbd-1.15.4 (02 Dec 2012)
+
+ 02 Dec 2012; Mike Frysinger <vapier@gentoo.org> +kbd-1.15.4.ebuild:
+ Version bump.
+
+ 11 Oct 2011; Jeroen Roovers <jer@gentoo.org> kbd-1.15.3.ebuild:
+ Stable for HPPA (bug #329693).
+
+ 09 Oct 2011; Raúl Porcel <armin76@gentoo.org> kbd-1.15.3.ebuild:
+ alpha/ia64/m68k/s390/sh/sparc stable wrt #329693
+
+ 04 Oct 2011; Joseph Jezak <josejx@gentoo.org> kbd-1.15.3.ebuild:
+ Marked ppc/ppc64 stable for bug #329693.
+
+ 03 Oct 2011; Markus Meier <maekke@gentoo.org> kbd-1.15.3.ebuild:
+ arm stable, bug #329693
+
+ 24 Sep 2011; Tony Vroon <chainsaw@gentoo.org> kbd-1.15.3.ebuild:
+ Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo, Ian
+ "idella4" Delaney & Elijah "Armageddon" El Lazkani in bug #329693.
+
+ 21 Sep 2011; Andreas Schuerch <nativemad@gentoo.org> kbd-1.15.3.ebuild:
+ x86 stable, see bug 329693
+
+*kbd-1.15.3 (16 May 2011)
+
+ 16 May 2011; Mike Frysinger <vapier@gentoo.org> +kbd-1.15.3.ebuild:
+ Version bump.
+
+ 08 Oct 2010; Mart Raudsepp <leio@gentoo.org> kbd-1.12-r8.ebuild,
+ kbd-1.13-r1.ebuild:
+ Drop to ~mips
+
+*kbd-1.15.2-r1 (11 Jun 2010)
+
+ 11 Jun 2010; Pacho Ramos <pacho@gentoo.org> +kbd-1.15.2-r1.ebuild:
+ Revision bump to rename conflicting keymaps to have unique names, bug
+ #293228 (with Chainsaw permission).
+
+*kbd-1.15.2 (11 Apr 2010)
+
+ 11 Apr 2010; Mike Frysinger <vapier@gentoo.org> +kbd-1.15.2.ebuild:
+ Version bump.
+
+ 24 Jan 2010; Raúl Porcel <armin76@gentoo.org> kbd-1.15.ebuild:
+ ia64/s390/sh/sparc stable wrt #259129
+
+ 26 Nov 2009; Markus Meier <maekke@gentoo.org> kbd-1.15.ebuild:
+ arm stable, bug #259129
+
+ 25 Nov 2009; Markus Meier <maekke@gentoo.org> kbd-1.15.ebuild:
+ amd64 stable, bug #259129
+
+ 11 Nov 2009; Jeroen Roovers <jer@gentoo.org> kbd-1.15.ebuild:
+ Stable for HPPA (bug #259129).
+
+ 07 Nov 2009; Tobias Klausmann <klausman@gentoo.org> kbd-1.15.ebuild:
+ Stable on alpha, bug #259129
+
+ 07 Nov 2009; Christian Faulhammer <fauli@gentoo.org> kbd-1.15.ebuild:
+ stable x86, bug 259129
+
+ 18 Oct 2009; Mike Frysinger <vapier@gentoo.org> kbd-1.15.1.ebuild:
+ Drop -Werror from build #289589 by Raúl Porcel.
+
+*kbd-1.15.1 (11 Oct 2009)
+
+ 11 Oct 2009; Mike Frysinger <vapier@gentoo.org> +kbd-1.15.1.ebuild:
+ Version bump.
+
+ 11 Jul 2009; Raúl Porcel <armin76@gentoo.org> kbd-1.15.ebuild:
+ Revert to ~alpha, bug #259129
+
+ 06 Mar 2009; Jeroen Roovers <jer@gentoo.org> kbd-1.15.ebuild:
+ Reverting to ~hppa (bug #259129 comment #12).
+
+ 06 Mar 2009; Jeroen Roovers <jer@gentoo.org> kbd-1.15.ebuild:
+ Stable for HPPA (bug #259129).
+
+ 26 Feb 2009; Thomas Anderson <gentoofan23@gentoo.org> kbd-1.15.ebuild:
+ Revert stable amd64 keyword due to breakage with kbd moving to /usr/bin from
+ /bin
+
+ 24 Feb 2009; Thomas Anderson <gentoofan23@gentoo.org> kbd-1.15.ebuild:
+ stable amd64, bug 259129
+
+ 22 Feb 2009; Tobias Klausmann <klausman@gentoo.org> kbd-1.15.ebuild:
+ Stable on alpha, bug #259129
+
+ 16 Feb 2009; Brent Baude <ranger@gentoo.org> kbd-1.15.ebuild:
+ stable ppc64, bug 259129
+
+ 16 Feb 2009; Brent Baude <ranger@gentoo.org> kbd-1.15.ebuild:
+ stable ppc, bug 259129
+
+ 08 Dec 2008; Raúl Porcel <armin76@gentoo.org> kbd-1.15.ebuild:
+ Re-add kbio patch to 1.15, since sparc fails to build without it
+
+*kbd-1.15 (01 Dec 2008)
+
+ 01 Dec 2008; Mike Frysinger <vapier@gentoo.org> +kbd-1.15.ebuild:
+ Version bump.
+
+ 17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+ files/kbd-1.12-debian.patch:
+ Fix patch with absolute paths.
+
+ 23 Sep 2008; Markus Rothe <corsair@gentoo.org> kbd-1.14.1-r1.ebuild:
+ Stable on ppc
+
+ 25 May 2008; Markus Rothe <corsair@gentoo.org> kbd-1.14.1-r1.ebuild:
+ Stable on ppc64
+
+ 10 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+ kbd-1.14.1-r1.ebuild:
+ Fix building on sparc #217068 by David Dolbel.
+
+*kbd-1.14.1-r1 (01 Apr 2008)
+
+ 01 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+ +files/kbd-1.14.1-missing-configure.patch, -kbd-1.14.1.ebuild,
+ +kbd-1.14.1-r1.ebuild:
+ Fix from Charles Clément for missing binaries #215610 by Massimo Maggi.
+
+*kbd-1.14.1 (30 Mar 2008)
+
+ 30 Mar 2008; Mike Frysinger <vapier@gentoo.org> +kbd-1.14.1.ebuild:
+ Version bump #215280 by timofonic.
+
+ 19 Nov 2007; Joshua Kinard <kumba@gentoo.org> kbd-1.13-r1.ebuild:
+ Stable on mips, per #195687.
+
+ 22 Oct 2007; Raúl Porcel <armin76@gentoo.org> kbd-1.13-r1.ebuild:
+ alpha/ia64/sparc stable wrt #195687
+
+ 15 Oct 2007; Jeroen Roovers <jer@gentoo.org> kbd-1.13-r1.ebuild:
+ Stable for HPPA (bug #195687).
+
+ 14 Oct 2007; Markus Rothe <corsair@gentoo.org> kbd-1.13-r1.ebuild:
+ Stable on ppc64; bug #195687
+
+ 13 Oct 2007; Christoph Mende <angelos@gentoo.org> kbd-1.13-r1.ebuild:
+ Stable on amd64 wrt bug #195687
+
+ 13 Oct 2007; nixnut <nixnut@gentoo.org> kbd-1.13-r1.ebuild:
+ Stable on ppc wrt bug 195687
+
+ 13 Oct 2007; Dawid Węgliński <cla@gentoo.org> kbd-1.13-r1.ebuild:
+ Stable on x86 (bug #195687)
+
+*kbd-1.13-r1 (26 Aug 2007)
+
+ 26 Aug 2007; Mike Frysinger <vapier@gentoo.org>
+ files/kbd-1.13-dont-use-error.patch, +kbd-1.13-r1.ebuild:
+ Fix from Alexey Gladkov so our patch doesnt break things #184037.
+
+*kbd-1.13 (28 Jun 2007)
+
+ 28 Jun 2007; Mike Frysinger <vapier@gentoo.org>
+ +files/kbd-1.13-dont-use-error.patch, +kbd-1.13.ebuild:
+ Version bump.
+
+ 15 Nov 2006; Markus Rothe <corsair@gentoo.org> kbd-1.12-r8.ebuild:
+ Stable on ppc64; bug #153556
+
+ 02 Nov 2006; Timothy Redaelli <drizzt@gentoo.org> kbd-1.12-r8.ebuild:
+ Stable for ppc (bug #153556).
+
+ 02 Nov 2006; Jeroen Roovers <jer@gentoo.org> kbd-1.12-r8.ebuild:
+ Stable for HPPA (bug #153556).
+
+ 01 Nov 2006; Bryan Østergaard <kloeri@gentoo.org> kbd-1.12-r8.ebuild:
+ Stable on Alpha + ia64, bug 153556.
+
+ 31 Oct 2006; Torsten Veller <tove@gentoo.org> kbd-1.12-r8.ebuild:
+ Stable on x86 (#153556)
+
+ 31 Oct 2006; Danny van Dyk <kugelfang@gentoo.org> kbd-1.12-r8.ebuild:
+ Marked stable on amd64.
+
+ 31 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> kbd-1.12-r8.ebuild:
+ Stable on sparc wrt #153556
+
+ 23 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+ +files/kbd-1.12-kbio.patch, kbd-1.12-r8.ebuild:
+ Build fix: sparc newer linux-headers lack asm/kbio
+
+ 14 Oct 2006; Aron Griffis <agriffis@gentoo.org> kbd-1.12-r7.ebuild:
+ Mark 1.12-r7 stable on ia64
+
+ 26 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> kbd-1.12-r7.ebuild:
+ Stable on hppa wrt #146511
+
+ 14 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> kbd-1.12-r7.ebuild:
+ Stable on sparc wrt #146511
+
+ 09 Sep 2006; Torsten Veller <tove@gentoo.org> kbd-1.12-r7.ebuild:
+ Stable on x86 (#146511)
+
+ 09 Sep 2006; Thomas Cort <tcort@gentoo.org> kbd-1.12-r7.ebuild:
+ Stable on amd64 wrt Bug #146511.
+
+ 08 Sep 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
+ kbd-1.12-r7.ebuild:
+ stable on ppc (Bug #146511)
+
+ 06 Sep 2006; Markus Rothe <corsair@gentoo.org> kbd-1.12-r7.ebuild:
+ Stable on ppc64; bug #146511
+
+*kbd-1.12-r8 (24 Aug 2006)
+
+ 24 Aug 2006; Roy Marples <uberlord@gentoo.org>
+ +files/kbd-1.12-unimap.patch, +kbd-1.12-r8.ebuild:
+ Fix the Debian patch mangling the unimaps directory.
+
+*kbd-1.12-r7 (28 Jun 2006)
+
+ 28 Jun 2006; <solar@gentoo.org> +files/kbd-1.12-xcompile.patch,
+ +kbd-1.12-r7.ebuild:
+ - fix cross-compile failing for powerpc targets bug #133856
+
+ 10 Jun 2006; Mike Frysinger <vapier@gentoo.org>
+ +files/kbd-1.12-configure-LANG.patch, kbd-1.12-r6.ebuild:
+ Fix building in et_EE locale #128253 by J.
+
+*kbd-1.12-r6 (16 Mar 2006)
+
+ 16 Mar 2006; Mike Frysinger <vapier@gentoo.org> +kbd-1.12-r6.ebuild:
+ Drop the italian euro keymap patch #75970.
+
+ 08 Feb 2006; Joel Martin <kanaka@gentoo.org> kbd-1.12-r5.ebuild:
+ Don't run test programs when cross-compiling. Export CC for cross-compiling.
+
+ 12 Jul 2005; Joseph Jezak <josejx@gentoo.org> kbd-1.12-r5.ebuild:
+ Marked ppc stable.
+
+ 07 Jul 2005; Markus Rothe <corsair@gentoo.org> kbd-1.12-r5.ebuild:
+ Stable on ppc64
+
+ 04 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> kbd-1.12-r5.ebuild:
+ Stable on sparc
+
+ 02 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+ +files/kbd-1.12-jp-escape.patch, kbd-1.12-r5.ebuild:
+ Touch up the jp106 map #71870 by OKUMURA N. Shin-ya.
+
+ 31 May 2005; Sven Wegener <swegener@gentoo.org> kbd-1.12-r3.ebuild,
+ kbd-1.12-r4.ebuild, kbd-1.12-r5.ebuild:
+ Let portage handle the stripping of binaries.
+
+*kbd-1.12-r5 (19 May 2005)
+
+ 19 May 2005; Martin Schlemmer <azarah@gentoo.org>
+ +files/kbd-1.12-Meta_utf8.patch, +files/kbd-1.12-alias.patch,
+ +files/kbd-1.12-setfont-man.patch, +kbd-1.12-r5.ebuild:
+ Add patches from fedora.
+
+ 02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+ Change encoding to UTF-8 for GLEP 31 compliance
+
+*kbd-1.12-r4 (29 Dec 2004)
+
+ 29 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+ files/kbd-1.12-cz-qwerty-map.patch, +files/kbd-1.12-it-euro-map.patch,
+ files/kbd-1.12-kbd_repeat-v2.patch, +kbd-1.12-r4.ebuild:
+ Add patch by Tupone Alfredo for italian maps to support the euro #75970.
+
+*kbd-1.12-r3 (26 Oct 2004)
+
+ 26 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+ +files/kbd-1.12-cz-qwerty-map.patch, +files/kbd-1.12-debian.patch,
+ +kbd-1.12-r3.ebuild:
+ Fix cz keymaps #19010 by kavol@email.cz. Include svorak keymap #55643 by
+ David Holm. Grab some updates from debian.
+
+ 16 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> kbd-1.12-r2.ebuild:
+ use emake
+
+ 16 Jun 2004; Aron Griffis <agriffis@gentoo.org> -kbd-1.06-r1.ebuild,
+ -kbd-1.08-r4.ebuild, kbd-1.08-r5.ebuild, -kbd-1.12-r1.ebuild,
+ kbd-1.12-r2.ebuild, -kbd-1.12.ebuild:
+ - Fix bug 53984: Mark 1.12-r2 stable everywhere so we don't have to
+ workaround the /bin/kbd_mode vs. /usr/bin/kbd_mode issue in
+ baselayout
+ - Fix bugs 42859 and 46456: Unpack manually to avoid the issue of a
+ UTF-8 filename in the tarball
+ - Trim old ebuilds
+
+ 11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> kbd-1.12-r2.ebuild:
+ Stable on alpha.
+
+ 02 Jun 2004; Travis Tilley <lv@gentoo.org> kbd-1.12-r2.ebuild:
+ stable on amd64
+
+ 01 Jun 2004; Tom Gall <tgall@gentoo.org> kbd-1.12-r2.ebuild:
+ stable on ppc64 bug #52651
+
+*kbd-1.12-r2 (08 Feb 2004)
+
+ 08 Feb 2004; Martin Schlemmer <azarah@gentoo.org> kbd-1.12-r2.ebuild,
+ files/kbd-1.12-kbd_repeat-v2.patch:
+ Update patch from Andries again.
+
+*kbd-1.12-r1 (08 Feb 2004)
+
+ 08 Feb 2004; Martin Schlemmer <azarah@gentoo.org> kbd-1.12-r1.ebuild,
+ files/kbd-1.12-kbd_repeat.patch:
+ Sparc have not yet fixed struct kbd_rate to use 'period' and not 'rate'. Patch
+ by Andries Brouwer <Andries.Brouwer@cwi.nl>.
+
+*kbd-1.12 (29 Jan 2004)
+
+ 29 Jan 2004; Martin Schlemmer <azarah@gentoo.org> kbd-1.12.ebuild,
+ files/kbd-1.12-find-map-fix.patch:
+ Update version. Add proper patch from Andries for this version.
+
+*kbd-1.08-r5 (29 Jan 2004)
+
+ 29 Jan 2004; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r5.ebuild,
+ files/kbd-1.08-find-map-fix.patch:
+ Fixes a problem where loadkeys matches dvorak the dir, and not the
+ .map file.
+
+ 19 Jan 2004; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r4.ebuild:
+ Mark stable, as latest stable baselayout depends on it, bug #38585.
+
+ 04 Nov 2003; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r4.ebuild:
+ Fix to compile on Sparc again, bug #25517.
+
+*kbd-1.08-r4 (31 Oct 2003)
+
+ 31 Oct 2003; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r4.ebuild,
+ files/kbd-1.06-othervt.patch, files/kbd-1.08-nowarn.patch,
+ files/kbd-1.08-sparc.patch, files/kbd-1.08-terminal.patch:
+ Add '--tty' switch to setfont, thanks to Krzysztof Kotlenga
+ <pocek@polbrokers.ods.org>, bug #32279. Also add a few patches from Redhat,
+ and update our Sparc patch with a more simple one.
+
+*kbd-1.08-r3 (24 Sep 2003)
+
+ 24 Sep 2003; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r3.ebuild,
+ files/kbd-1.08-po-install-locations.patch:
+ Locales do not use DATADIR corretly, and thus install to /share, and not
+ /usr/share, bug #26384.
+
+*kbd-1.08-r2 (02 Aug 2003)
+
+ 06 Aug 2003; Pieter Van den Abeele <pvdabeel@gentoo.org> kbd-1.08-r2.ebuild,
+ marked -ppc for now: loading a non-us keymap fails with 'flex input failed'
+
+ 02 Aug 2003; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r2.ebuild,
+ files/kbd-1.08-kbd_repeat.patch:
+ A better fix from Keith M Wesolowski <wesolows@gentoo.org> (bug #25517).
+
+ 02 Aug 2003; Martin Schlemmer <azarah@gentoo.org>
+ files/kbd-1.08-sparc-fixes.patch:
+ Sparc64 fixes, bug #25517 again.
+
+ 31 Jul 2003; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r1.ebuild:
+ Fix struct kbd_rate not being fixed for sparc to use 'period' and not 'rate',
+ bug #25517.
+
+*kbd-1.08-r1 (29 Jul 2003)
+
+ 06 Aug 2003; Pieter Van den Abeele <pvdabeel@gentoo.org> kbd-1.08-r2.ebuild,
+ marked -ppc for now: loading a non-us keymap fails with 'flex input failed'
+
+ 29 Jul 2003; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r1.ebuild:
+ New configure script is even more broken than before - we should not add the
+ prefix to the paths we pass --datadir and --mandir, else it looks for data in
+ /usr/usr/share ... (bug #25448).
+ Thanks to Nicolai Lissner <nlissne@linux01.gwdg.de> who did have the right
+ solution (did not check bug again until now, so missed his feedback).
+
+*kbd-1.08 (28 Jul 2003)
+
+ 28 Jul 2003; Martin Schlemmer <azarah@gentoo.org> Manifest, kbd-1.08.ebuild:
+ New version.
+
+ 20 May 2003; Joshua Kinard <kumba@gentoo.org> kbd-1.06-r1.ebuild:
+ Added fix to ebuild to use CFLAGS from /etc/make.conf. Fixes Bug #21320.
+
+ 21 Feb 2003; Zach Welch <zwelch@gentoo.org> kbd-1.06-r1.ebuild :
+ Added arm to keywords.
+
+ 09 Feb 2003; Guy Martin <gmsoft@gentoo.org> kbd-1.06-r1.ebuild :
+ Added hppa to keywords.
+
+ 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+ 22 Mar 2002; Daniel Robbins <drobbins@gentoo.org> kbd-1.06-r1.ebuild :
+
+ 14 Jul 2002; phoen][x <phoenix@gentoo.org> kbd-1.06.ebuild :
+ Added LICENSE, KEYWORDS, SLOT.
+
+ 14 Jul 2002; phoen][x <phoenix@gentoo.org> kbd-1.06-r1.ebuild :
+ Added LICENSE, KEYWORDS, SLOT.
+ Fixed Matthew Kennedy's patch which was totally broken in every way and
+ killed this ebuild.
+
+*kbd-1.06-r1 (22 Mar 2002)
+
+ 19 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+ Added mips to keywords
+
+ 22 Mar 2002; Seemant Kulleen <seemant@gentoo.org> kbd-1.06-r1.ebuild :
+ Added USE dependent nls support from a patch sent in by Matthew Kennedy.
+
+*kbd-1.06 (1 Feb 2002)
+
+ 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+
+ This changelog is targetted to users. This means that the comments should be
+ well explained and written in clean English.
+
+ Every new version or revision of the package has to be marked by a '*'
+ seperator line as above. Changements since the last revision have to be
+ added to the top of the file, underneath the initial copyright and cvs header
+ omments, in exactly the same format as this comment.
--git a/sys-apps/kbd/files/kbd-1.15.3-musl-headers-error.patch b/sys-apps/kbd/files/kbd-1.15.3-musl-headers-error.patch
new file mode 100644
index 0000000..ad52a63
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-1.15.3-musl-headers-error.patch
@@ -0,0 +1,115 @@
+diff -Naur kbd-1.15.3.orig/src/dumpkeys.c kbd-1.15.3/src/dumpkeys.c
+--- kbd-1.15.3.orig/src/dumpkeys.c 2011-05-07 20:33:42.000000000 +0000
++++ kbd-1.15.3/src/dumpkeys.c 2013-07-06 02:20:41.660131968 +0000
+@@ -12,6 +12,7 @@
+ #include <linux/kd.h>
+ #include <linux/keyboard.h>
+ #include <sys/ioctl.h>
++#include <sys/types.h>
+ #include <string.h>
+ #include <errno.h>
+ #include "ksyms.h"
+diff -Naur kbd-1.15.3.orig/src/kbdinfo.c kbd-1.15.3/src/kbdinfo.c
+--- kbd-1.15.3.orig/src/kbdinfo.c 2011-05-07 20:33:42.000000000 +0000
++++ kbd-1.15.3/src/kbdinfo.c 2013-07-06 02:29:12.057160508 +0000
+@@ -1,6 +1,5 @@
+ #include <stdio.h>
+ #include <errno.h>
+-#include <error.h>
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <linux/kd.h>
+@@ -9,6 +8,10 @@
+ #include "nls.h"
+ #include "version.h"
+
++#define error(e, n, s) \
++ perror(s); \
++ exit(e); \
++
+ static const char *action = NULL;
+ static const char *value = NULL;
+
+diff -Naur kbd-1.15.3.orig/src/kbdrate.c kbd-1.15.3/src/kbdrate.c
+--- kbd-1.15.3.orig/src/kbdrate.c 2011-05-07 20:33:42.000000000 +0000
++++ kbd-1.15.3/src/kbdrate.c 2013-07-06 02:21:53.121135964 +0000
+@@ -74,6 +74,7 @@
+ #include <errno.h>
+ #include <sys/file.h>
+ #include <sys/ioctl.h>
++#include <fcntl.h>
+
+ #ifdef __sparc__
+ #include <asm/param.h>
+diff -Naur kbd-1.15.3.orig/src/loadkeys.c kbd-1.15.3/src/loadkeys.c
+--- kbd-1.15.3.orig/src/loadkeys.c 2011-05-07 20:33:42.000000000 +0000
++++ kbd-1.15.3/src/loadkeys.c 2013-07-06 02:21:02.148133114 +0000
+@@ -79,6 +79,7 @@
+ #include <ctype.h>
+ #include <sys/param.h>
+ #include <sys/ioctl.h>
++#include <sys/types.h>
+ #include <linux/kd.h>
+ #include <linux/keyboard.h>
+ #include <unistd.h>
+diff -Naur kbd-1.15.3.orig/src/openvt.c kbd-1.15.3/src/openvt.c
+--- kbd-1.15.3.orig/src/openvt.c 2011-05-07 20:33:42.000000000 +0000
++++ kbd-1.15.3/src/openvt.c 2013-07-06 02:22:11.080136968 +0000
+@@ -10,6 +10,7 @@
+ #include <sys/vt.h>
+ #include <sys/wait.h>
+ #include <sys/file.h>
++#include <fcntl.h>
+
+ #include "version.h"
+ #include "xmalloc.h"
+diff -Naur kbd-1.15.3.orig/src/setvtrgb.c kbd-1.15.3/src/setvtrgb.c
+--- kbd-1.15.3.orig/src/setvtrgb.c 2011-05-07 20:33:42.000000000 +0000
++++ kbd-1.15.3/src/setvtrgb.c 2013-07-06 02:34:26.390178084 +0000
+@@ -5,12 +5,15 @@
+ #include <sys/ioctl.h>
+ #include <linux/kd.h>
+ #include <errno.h>
+-#include <error.h>
+ #include "kbd.h"
+ #include "getfd.h"
+ #include "nls.h"
+ #include "version.h"
+
++#define error(e, n, s) \
++ perror(s); \
++ exit(e); \
++
+ static unsigned char *cmap;
+
+ /* Standard VGA terminal colors, matching those hardcoded in the Linux kernel's
+@@ -82,25 +85,21 @@
+ if (c == EOF)
+ error(EXIT_FAILURE, errno, "fscanf");
+
+- error(EXIT_FAILURE, 0, _("Error: %s: Invalid value in field %u in line %u."),
+- filename, rows + 1, cols + 1);
++ error(EXIT_FAILURE, 0, "setvtrgb");
+ }
+
+ cmap[rows + cols * 3] = (unsigned char) val;
+
+ if (cols < 15 && fgetc(fd) != ',')
+- error(EXIT_FAILURE, 0, _("Error: %s: Insufficient number of fields in line %u."),
+- filename, rows + 1);
++ error(EXIT_FAILURE, 0, "setvtrgb");
+ cols++;
+ }
+
+ if ((c = fgetc(fd)) == EOF)
+- error(EXIT_FAILURE, 0, _("Error: %s: Line %u has ended unexpectedly.\n"),
+- filename, rows + 1);
++ error(EXIT_FAILURE, 0, "setvtrgb");
+
+ if (c != '\n')
+- error(EXIT_FAILURE, 0, _("Error: %s: Line %u is too long.\n"),
+- filename, rows + 1);
++ error(EXIT_FAILURE, 0, "setvtrgb");
+ }
+ }
+
diff --git a/sys-apps/kbd/kbd-1.15.3-r99.ebuild b/sys-apps/kbd/kbd-1.15.3-r99.ebuild
new file mode 100644
index 0000000..4a732dd
--- /dev/null
+++ b/sys-apps/kbd/kbd-1.15.3-r99.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.3.ebuild,v 1.7 2011/10/11 16:44:58 jer Exp $
+
+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"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-musl-headers-error.patch
+
+ # 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
+
+
+ # bundled timestamps are broken
+ find "${S}" -type f -exec touch -r "${S}"/configure {} +
+}
+
+src_compile() {
+ econf $(use_enable nls) || die
+ emake || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc AUTHORS ChangeLog INSTALL NEWS README
+ dohtml doc/*.html
+}
diff --git a/sys-apps/kbd/metadata.xml b/sys-apps/kbd/metadata.xml
new file mode 100644
index 0000000..96a2d58
--- /dev/null
+++ b/sys-apps/kbd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/hardened-dev:musl commit in: sys-apps/kbd/files/, sys-apps/kbd/
@ 2014-01-18 14:32 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2014-01-18 14:32 UTC (permalink / raw
To: gentoo-commits
commit: 0bfd3f914541ef0e3c2a19c42d37e5b47f39fcf3
Author: layman <layman <AT> localhost>
AuthorDate: Thu Jan 16 13:52:35 2014 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 14:31:54 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=0bfd3f91
sys-apps/kbd: bump and fix struct winsize collision
---
.../kbd-1.15.5-fix-struct_winsize-collision.patch | 11 +++
sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch | 90 ++++++++++++++++++++++
| 0
...kbd-1.15.3-r99.ebuild => kbd-1.15.5-r99.ebuild} | 36 +++++----
4 files changed, 120 insertions(+), 17 deletions(-)
diff --git a/sys-apps/kbd/files/kbd-1.15.5-fix-struct_winsize-collision.patch b/sys-apps/kbd/files/kbd-1.15.5-fix-struct_winsize-collision.patch
new file mode 100644
index 0000000..2936090
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-1.15.5-fix-struct_winsize-collision.patch
@@ -0,0 +1,11 @@
+diff -Naur kbd-1.15.5.orig/src/resizecons.c kbd-1.15.5/src/resizecons.c
+--- kbd-1.15.5.orig/src/resizecons.c 2012-12-01 21:41:38.000000000 +0000
++++ kbd-1.15.5/src/resizecons.c 2014-01-16 13:48:25.793935059 +0000
+@@ -82,7 +82,6 @@
+ #include <sys/perm.h>
+ #else
+ #include <linux/types.h>
+-#include <linux/termios.h>
+ #endif
+ #include <linux/vt.h>
+ #include "paths.h"
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 0000000..c78a227
--- /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/files/kbd-1.15.3-musl-headers-error.patch b/sys-apps/kbd/files/kbd-1.15.5-musl-headers-error.patch
similarity index 100%
rename from sys-apps/kbd/files/kbd-1.15.3-musl-headers-error.patch
rename to sys-apps/kbd/files/kbd-1.15.5-musl-headers-error.patch
diff --git a/sys-apps/kbd/kbd-1.15.3-r99.ebuild b/sys-apps/kbd/kbd-1.15.5-r99.ebuild
similarity index 57%
rename from sys-apps/kbd/kbd-1.15.3-r99.ebuild
rename to sys-apps/kbd/kbd-1.15.5-r99.ebuild
index 4a732dd..45ac2ed 100644
--- a/sys-apps/kbd/kbd-1.15.3-r99.ebuild
+++ b/sys-apps/kbd/kbd-1.15.5-r99.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.15.3.ebuild,v 1.7 2011/10/11 16:44:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.15.5-r1.ebuild,v 1.6 2014/01/09 13:37:41 polynomial-c Exp $
+
+EAPI="4"
inherit eutils
@@ -10,17 +12,15 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+IUSE="nls pam"
-RDEPEND=""
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
+RDEPEND="pam? ( virtual/pam )"
+DEPEND="${RDEPEND}"
src_unpack() {
- unpack ${A}
+ default
cd "${S}"
- epatch "${FILESDIR}"/${P}-musl-headers-error.patch
# broken file ... upstream git punted it
rm po/es.po
@@ -32,19 +32,21 @@ src_unpack() {
mv olpc/es.map olpc/es-olpc.map
mv olpc/pt.map olpc/pt-olpc.map
mv qwerty/cz.map qwerty/cz-qwerty.map
+}
-
- # bundled timestamps are broken
- find "${S}" -type f -exec touch -r "${S}"/configure {} +
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-loadkeys-parse.patch #447440
+ epatch "${FILESDIR}"/${P}-musl-headers-error.patch
+ epatch "${FILESDIR}"/${P}-fix-struct_winsize-collision.patch
}
-src_compile() {
- econf $(use_enable nls) || die
- emake || die
+src_configure() {
+ econf \
+ $(use_enable nls) \
+ $(use_enable pam vlock)
}
src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog INSTALL NEWS README
+ default
dohtml doc/*.html
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-18 14:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-06 3:22 [gentoo-commits] proj/hardened-dev:musl commit in: sys-apps/kbd/files/, sys-apps/kbd/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2014-01-18 14:32 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox