summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/kbd/Makefile11
-rw-r--r--package/kbd/patches/patch-src_kbdinfo_c46
-rw-r--r--package/kbd/patches/patch-src_kbdrate_c10
-rw-r--r--package/kbd/patches/patch-src_libkeymap_dump_c11
-rw-r--r--package/kbd/patches/patch-src_libkeymap_kmap_c7
-rw-r--r--package/kbd/patches/patch-src_libkeymap_summary_c11
-rw-r--r--package/kbd/patches/patch-src_openvt_c8
-rw-r--r--package/kbd/patches/patch-src_setvtrgb_c70
8 files changed, 171 insertions, 3 deletions
diff --git a/package/kbd/Makefile b/package/kbd/Makefile
index 0293849de..901ae6266 100644
--- a/package/kbd/Makefile
+++ b/package/kbd/Makefile
@@ -4,17 +4,22 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= kbd
-PKG_VERSION:= 1.15.3
+PKG_VERSION:= 2.0.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 8143e179a0f3c25646ce5085e8777200
+PKG_MD5SUM:= cc0ee9f2537d8636cae85a8c6541ed2e
PKG_DESCR:= keyboard utility
PKG_SECTION:= utils
-PKG_SITES:= ftp://ftp.altlinux.org/pub/people/legion/kbd/
+PKG_DEPENDS:= libcheck
+PKG_BUILDDEP:= check
+PKG_URL:= http://kbd-project.org/
+PKG_SITES:= http://kbd-project.org/download/
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,KBD,kbd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+CONFIGURE_ARGS+= --disable-vlock
+
kbd-install:
$(INSTALL_DIR) $(IDIR_KBD)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/loadkeys \
diff --git a/package/kbd/patches/patch-src_kbdinfo_c b/package/kbd/patches/patch-src_kbdinfo_c
new file mode 100644
index 000000000..cd322eb3c
--- /dev/null
+++ b/package/kbd/patches/patch-src_kbdinfo_c
@@ -0,0 +1,46 @@
+--- kbd-2.0.1.orig/src/kbdinfo.c 2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/kbdinfo.c 2014-03-24 13:24:51.000000000 +0100
+@@ -1,6 +1,6 @@
+ #include <stdio.h>
+ #include <errno.h>
+-#include <error.h>
++#include <err.h>
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <linux/kd.h>
+@@ -75,7 +75,7 @@ main(int argc, char **argv) {
+
+ if (!strcasecmp("GETMODE", action)) {
+ if (ioctl(fd, KDGETMODE, &mode) == -1)
+- error(EXIT_FAILURE, errno, "ioctl");
++ err(EXIT_FAILURE, "ioctl");
+
+ switch (mode) {
+ case KD_TEXT: rc = answer("text"); break;
+@@ -84,7 +84,7 @@ main(int argc, char **argv) {
+
+ } else if (!strcasecmp("GKBMODE", action)) {
+ if (ioctl(fd, KDGKBMODE, &mode) == -1)
+- error(EXIT_FAILURE, errno, "ioctl");
++ err(EXIT_FAILURE, "ioctl");
+
+ switch (mode) {
+ case K_RAW: rc = answer("raw"); break;
+@@ -95,7 +95,7 @@ main(int argc, char **argv) {
+
+ } else if (!strcasecmp("GKBMETA", action)) {
+ if (ioctl(fd, KDGKBMETA, &mode) == -1)
+- error(EXIT_FAILURE, errno, "ioctl");
++ err(EXIT_FAILURE, "ioctl");
+
+ switch (mode) {
+ case K_METABIT: rc = answer("metabit"); break;
+@@ -104,7 +104,7 @@ main(int argc, char **argv) {
+
+ } else if (!strcasecmp("GKBLED", action)) {
+ if (ioctl(fd, KDGKBLED, &flags) == -1)
+- error(EXIT_FAILURE, errno, "ioctl");
++ err(EXIT_FAILURE, "ioctl");
+
+ mode = (flags & 0x7);
+
diff --git a/package/kbd/patches/patch-src_kbdrate_c b/package/kbd/patches/patch-src_kbdrate_c
new file mode 100644
index 000000000..8d267789d
--- /dev/null
+++ b/package/kbd/patches/patch-src_kbdrate_c
@@ -0,0 +1,10 @@
+--- kbd-2.0.1.orig/src/kbdrate.c 2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/kbdrate.c 2014-03-24 12:40:34.000000000 +0100
+@@ -68,6 +68,7 @@ beats rebuilding the kernel!
+
+ */
+
++#include <fcntl.h>
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <stdlib.h>
diff --git a/package/kbd/patches/patch-src_libkeymap_dump_c b/package/kbd/patches/patch-src_libkeymap_dump_c
new file mode 100644
index 000000000..23c883910
--- /dev/null
+++ b/package/kbd/patches/patch-src_libkeymap_dump_c
@@ -0,0 +1,11 @@
+--- kbd-2.0.1.orig/src/libkeymap/dump.c 2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/dump.c 2014-03-24 12:18:50.000000000 +0100
+@@ -9,6 +9,8 @@
+ * This file is covered by the GNU General Public License,
+ * which should be included with kbd as the file COPYING.
+ */
++
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
diff --git a/package/kbd/patches/patch-src_libkeymap_kmap_c b/package/kbd/patches/patch-src_libkeymap_kmap_c
new file mode 100644
index 000000000..2016772ab
--- /dev/null
+++ b/package/kbd/patches/patch-src_libkeymap_kmap_c
@@ -0,0 +1,7 @@
+--- kbd-2.0.1.orig/src/libkeymap/kmap.c 2013-10-07 16:13:31.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/kmap.c 2014-03-24 12:17:45.000000000 +0100
+@@ -1,3 +1,4 @@
++#include <sys/types.h>
+ #include <stdlib.h>
+ #include <string.h>
+
diff --git a/package/kbd/patches/patch-src_libkeymap_summary_c b/package/kbd/patches/patch-src_libkeymap_summary_c
new file mode 100644
index 000000000..b6637f99f
--- /dev/null
+++ b/package/kbd/patches/patch-src_libkeymap_summary_c
@@ -0,0 +1,11 @@
+--- kbd-2.0.1.orig/src/libkeymap/summary.c 2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/summary.c 2014-03-24 12:23:53.000000000 +0100
+@@ -6,6 +6,8 @@
+ * This file is covered by the GNU General Public License,
+ * which should be included with kbd as the file COPYING.
+ */
++
++#include <sys/types.h>
+ #include <string.h>
+ #include <errno.h>
+ #include <sys/ioctl.h>
diff --git a/package/kbd/patches/patch-src_openvt_c b/package/kbd/patches/patch-src_openvt_c
new file mode 100644
index 000000000..efb8736cc
--- /dev/null
+++ b/package/kbd/patches/patch-src_openvt_c
@@ -0,0 +1,8 @@
+--- kbd-2.0.1.orig/src/openvt.c 2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/openvt.c 2014-03-24 12:48:07.000000000 +0100
+@@ -1,3 +1,5 @@
++#include <fcntl.h>
++#include <limits.h>
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <unistd.h>
diff --git a/package/kbd/patches/patch-src_setvtrgb_c b/package/kbd/patches/patch-src_setvtrgb_c
new file mode 100644
index 000000000..fc72c2409
--- /dev/null
+++ b/package/kbd/patches/patch-src_setvtrgb_c
@@ -0,0 +1,70 @@
+--- kbd-2.0.1.orig/src/setvtrgb.c 2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/setvtrgb.c 2014-03-24 13:10:47.000000000 +0100
+@@ -5,7 +5,7 @@
+ #include <sys/ioctl.h>
+ #include <linux/kd.h>
+ #include <errno.h>
+-#include <error.h>
++#include <err.h>
+ #include "kbd.h"
+ #include "getfd.h"
+ #include "nls.h"
+@@ -60,7 +60,7 @@ set_colormap(unsigned char *colormap)
+
+ /* Apply the color map to the tty via ioctl */
+ if (ioctl(fd, PIO_CMAP, colormap) == -1)
+- error(EXIT_FAILURE, errno, "ioctl");
++ err(EXIT_FAILURE, "ioctl");
+
+ close(fd);
+ }
+@@ -72,7 +72,7 @@ parse_file(FILE *fd, const char *filenam
+ unsigned int rows, cols, val;
+
+ if ((cmap = calloc(3 * 16, sizeof(unsigned char))) == NULL)
+- error(EXIT_FAILURE, errno, "calloc");
++ err(EXIT_FAILURE, "calloc");
+
+ for (rows = 0; rows < 3; rows++) {
+ cols = 0;
+@@ -80,26 +80,26 @@ parse_file(FILE *fd, const char *filenam
+ while (cols < 16) {
+ if ((c = fscanf(fd, "%u", &val)) != 1) {
+ if (c == EOF)
+- error(EXIT_FAILURE, errno, "fscanf");
++ err(EXIT_FAILURE, "fscanf");
+
+- error(EXIT_FAILURE, 0, _("Error: %s: Invalid value in field %u in line %u."),
++ err(EXIT_FAILURE, _("Error: %s: Invalid value in field %u in line %u."),
+ filename, rows + 1, cols + 1);
+ }
+
+ 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."),
++ err(EXIT_FAILURE, _("Error: %s: Insufficient number of fields in line %u."),
+ filename, rows + 1);
+ cols++;
+ }
+
+ if ((c = fgetc(fd)) == EOF)
+- error(EXIT_FAILURE, 0, _("Error: %s: Line %u has ended unexpectedly.\n"),
++ err(EXIT_FAILURE, _("Error: %s: Line %u has ended unexpectedly.\n"),
+ filename, rows + 1);
+
+ if (c != '\n')
+- error(EXIT_FAILURE, 0, _("Error: %s: Line %u is too long.\n"),
++ err(EXIT_FAILURE, _("Error: %s: Line %u is too long.\n"),
+ filename, rows + 1);
+ }
+ }
+@@ -141,7 +141,7 @@ main(int argc, char **argv) {
+
+ } else {
+ if ((fd = fopen(file, "r")) == NULL)
+- error(EXIT_FAILURE, errno, "fopen");
++ err(EXIT_FAILURE, "fopen");
+
+ parse_file(fd, file);
+ fclose(fd);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 12:30:52 +0000