[gentoo-commits] proj/hardened-dev:musl commit in: sys-apps/kbd/, sys-apps/kbd/files/

[gentoo-commits] proj/hardened-dev:musl commit in: sys-apps/kbd/, sys-apps/kbd/files/

[Anthony G. Basile]

commit:     95a6d016622b6abfd5be504ea818ea24befb5d90
Author:     Hinnerk van Bruinehsen <h.v.bruinehsen <AT> fu-berlin <DOT> de>
AuthorDate: Sun Aug 31 21:38:00 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Oct  2 21:13:33 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=95a6d016

version bump to kbd-2.0.2

Signed-of-by: Hinnerk van Bruinehsen <h.v.bruinehsen <AT> fu-berlin.de>

---
 sys-apps/kbd/files/kbd-2.0.0-tests.patch           |  31 +++++
 .../kbd/files/kbd-2.0.2-musl-headers-error.patch   | 147 +++++++++++++++++++++
 sys-apps/kbd/kbd-2.0.2-r99.ebuild                  |  64 +++++++++
 3 files changed, 242 insertions(+)

diff --git a/sys-apps/kbd/files/kbd-2.0.0-tests.patch b/sys-apps/kbd/files/kbd-2.0.0-tests.patch
new file mode 100644
index 0000000..7a4e186
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-2.0.0-tests.patch
@@ -0,0 +1,31 @@
+--- configure.ac
++++ configure.ac
+@@ -11,7 +11,13 @@
+ AC_CONFIG_SRCDIR([src/loadkeys.c])
+ AC_CONFIG_HEADERS(config.h)
+ 
+-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
++AC_ARG_ENABLE(tests,
++	AS_HELP_STRING(--enable-tests, [build tests]),
++	[BUILD_TESTS=$enableval],[BUILD_TESTS=no])
++AM_CONDITIONAL(BUILD_TESTS, test "$BUILD_TESTS" = "yes")
++if test "$BUILD_TESTS" = "yes"; then
++	PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
++fi
+ 
+ m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
+ AM_SILENT_RULES([yes])
+--- Makefile.am
++++ Makefile.am
+@@ -8,7 +8,10 @@
+ 	CREDITS \
+ 	contrib docs rc
+ 
+-SUBDIRS = src data po tests docs
++SUBDIRS = src data po docs
++if BUILD_TESTS
++SUBDIRS += tests
++endif
+ 
+ kbd-$(VERSION).tar.xz:
+ 	make distcheck

diff --git a/sys-apps/kbd/files/kbd-2.0.2-musl-headers-error.patch b/sys-apps/kbd/files/kbd-2.0.2-musl-headers-error.patch
new file mode 100644
index 0000000..69ac7d0
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-2.0.2-musl-headers-error.patch
@@ -0,0 +1,147 @@
+diff --git a/src/kbdinfo.c b/src/kbdinfo.c
+index e5f122d..dcdcac0 100644
+--- a/src/kbdinfo.c
++++ b/src/kbdinfo.c
+@@ -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, ...)               \
++       fprintf(stderr, ##__VA_ARGS__); \
++       exit(e);
++
+ static const char *action = NULL;
+ static const char *value  = NULL;
+ 
+diff --git a/src/kbdrate.c b/src/kbdrate.c
+index 2ab8388..5faff00 100644
+--- a/src/kbdrate.c
++++ b/src/kbdrate.c
+@@ -74,6 +74,7 @@ beats rebuilding the kernel!
+ #include <errno.h>
+ #include <sys/file.h>
+ #include <sys/ioctl.h>
++#include <fcntl.h>
+ #include <linux/kd.h>
+ 
+ #ifdef __sparc__
+diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c
+index 0262e24..606931e 100644
+--- a/src/libkeymap/dump.c
++++ b/src/libkeymap/dump.c
+@@ -13,6 +13,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <unistd.h>
++#include <sys/types.h>
+ 
+ #include "keymap.h"
+ 
+diff --git a/src/libkeymap/kmap.c b/src/libkeymap/kmap.c
+index 67be81e..e13498b 100644
+--- a/src/libkeymap/kmap.c
++++ b/src/libkeymap/kmap.c
+@@ -1,5 +1,6 @@
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/types.h>
+ 
+ #include "nls.h"
+ #include "kbd.h"
+diff --git a/src/libkeymap/summary.c b/src/libkeymap/summary.c
+index 46df90d..0912ae8 100644
+--- a/src/libkeymap/summary.c
++++ b/src/libkeymap/summary.c
+@@ -9,6 +9,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <sys/ioctl.h>
++#include <sys/types.h>
+ 
+ #include "keymap.h"
+ 
+diff --git a/src/openvt.c b/src/openvt.c
+index 075136f..49720d7 100644
+--- a/src/openvt.c
++++ b/src/openvt.c
+@@ -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"
+@@ -19,6 +20,8 @@
+ #include "compat/linux-limits.h"
+ #endif
+ 
++#define NAME_MAX 255
++
+ // There must be a universal way to find these!
+ #define TRUE (1)
+ #define FALSE (0)
+diff --git a/src/setvtrgb.c b/src/setvtrgb.c
+index f99badc..f1a631c 100644
+--- a/src/setvtrgb.c
++++ b/src/setvtrgb.c
+@@ -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, ...)               \
++       fprintf(stderr, ##__VA_ARGS__); \
++       exit(e);
++
+ static unsigned char *cmap;
+ 
+ /* Standard VGA terminal colors, matching those hardcoded in the Linux kernel's
+diff --git a/src/vlock/auth.c b/src/vlock/auth.c
+index da135ce..a3f365b 100644
+--- a/src/vlock/auth.c
++++ b/src/vlock/auth.c
+@@ -22,7 +22,6 @@
+ */
+ 
+ #include <errno.h>
+-#include <error.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+diff --git a/src/vlock/vlock.c b/src/vlock/vlock.c
+index c2c4158..fa2f386 100644
+--- a/src/vlock/vlock.c
++++ b/src/vlock/vlock.c
+@@ -23,7 +23,6 @@
+ 
+ #include <stdio.h>
+ #include <errno.h>
+-#include <error.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+diff --git a/src/vlock/vt.c b/src/vlock/vt.c
+index 4e5282b..f3ba85d 100644
+--- a/src/vlock/vt.c
++++ b/src/vlock/vt.c
+@@ -23,7 +23,6 @@
+ 
+ #include <stdio.h>
+ #include <errno.h>
+-#include <error.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <unistd.h>

diff --git a/sys-apps/kbd/kbd-2.0.2-r99.ebuild b/sys-apps/kbd/kbd-2.0.2-r99.ebuild
new file mode 100644
index 0000000..c92bcbb
--- /dev/null
+++ b/sys-apps/kbd/kbd-2.0.2-r99.ebuild
@@ -0,0 +1,64 @@
+# 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-2.0.2.ebuild,v 1.1 2014/08/01 10:35:43 vapier Exp $
+
+EAPI=5
+
+SCM=""
+if [[ ${PV} == "9999" ]] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="http://git.kernel.org/cgit/linux/kernel/git/legion/${PN}.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+inherit autotools eutils ${SCM}
+
+DESCRIPTION="Keyboard and console utilities"
+HOMEPAGE="http://kbd-project.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls pam test"
+
+RDEPEND="pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+
+	# Rename conflicting keymaps to have unique names, bug #293228
+	cd "${S}"/data/keymaps/i386 || die
+	mv dvorak/no.map dvorak/no-dvorak.map || die
+	mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die
+	mv olpc/es.map olpc/es-olpc.map || die
+	mv olpc/pt.map olpc/pt-olpc.map || die
+	mv qwerty/cz.map qwerty/cz-qwerty.map || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.0.0-tests.patch
+	epatch "${FILESDIR}"/${PN}-1.15.5-fix-struct_winsize-collision.patch
+	epatch "${FILESDIR}"/${PN}-2.0.2-musl-headers-error.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable pam vlock) \
+		$(use_enable test tests)
+}
+
+src_install() {
+	default
+	dohtml docs/doc/*.html
+}