summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/kbd/Makefile8
-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_openvt_c8
-rw-r--r--package/kbd/patches/patch-src_setvtrgb_c70
5 files changed, 4 insertions, 138 deletions
diff --git a/package/kbd/Makefile b/package/kbd/Makefile
index db3aa4508..48a725dd5 100644
--- a/package/kbd/Makefile
+++ b/package/kbd/Makefile
@@ -4,15 +4,15 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= kbd
-PKG_VERSION:= 2.0.2
-PKG_RELEASE:= 2
-PKG_HASH:= 9dfddabf96012e329c4bebb96a21aeef7c3872f624e96e8156ba542b82aeb912
+PKG_VERSION:= 2.0.3
+PKG_RELEASE:= 1
+PKG_HASH:= 7a899de1c0eb75f3aea737095a736f2375e1cbfbe693fc14a3fe0bfb4649fb5e
PKG_DESCR:= keyboard and font utilities
PKG_SECTION:= sys/hw
PKG_DEPENDS:= libcheck
PKG_BUILDDEP:= flex-host bison-host check
PKG_URL:= http://kbd-project.org/
-PKG_SITES:= http://kbd-project.org/download/
+PKG_SITES:= ftp://ftp.kernel.org/pub/linux/utils/kbd/
PKG_CFLINE_KBD:= default y if ADK_TARGET_WITH_INPUT
diff --git a/package/kbd/patches/patch-src_kbdinfo_c b/package/kbd/patches/patch-src_kbdinfo_c
deleted file mode 100644
index cd322eb3c..000000000
--- a/package/kbd/patches/patch-src_kbdinfo_c
+++ /dev/null
@@ -1,46 +0,0 @@
---- 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
deleted file mode 100644
index 8d267789d..000000000
--- a/package/kbd/patches/patch-src_kbdrate_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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_openvt_c b/package/kbd/patches/patch-src_openvt_c
deleted file mode 100644
index efb8736cc..000000000
--- a/package/kbd/patches/patch-src_openvt_c
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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
deleted file mode 100644
index fc72c2409..000000000
--- a/package/kbd/patches/patch-src_setvtrgb_c
+++ /dev/null
@@ -1,70 +0,0 @@
---- 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-12-28 05:55:43 +0000