summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2004-01-29 18:34:12 +0000
committerMartin Schlemmer <azarah@gentoo.org>2004-01-29 18:34:12 +0000
commit6fc3fca8e351141fc98c884ac2624c816ba6c3c9 (patch)
treeba07a9cf671f256dd067969c7a2cc12f2a021309 /sys-apps/kbd/files
parentkeyworded sparc and ~sparc (diff)
downloadgentoo-2-6fc3fca8e351141fc98c884ac2624c816ba6c3c9.tar.gz
gentoo-2-6fc3fca8e351141fc98c884ac2624c816ba6c3c9.tar.bz2
gentoo-2-6fc3fca8e351141fc98c884ac2624c816ba6c3c9.zip
Update version. Add proper patch from Andries for this version.
Diffstat (limited to 'sys-apps/kbd/files')
-rw-r--r--sys-apps/kbd/files/digest-kbd-1.121
-rw-r--r--sys-apps/kbd/files/kbd-1.12-find-map-fix.patch37
2 files changed, 38 insertions, 0 deletions
diff --git a/sys-apps/kbd/files/digest-kbd-1.12 b/sys-apps/kbd/files/digest-kbd-1.12
new file mode 100644
index 000000000000..b2e1581b948e
--- /dev/null
+++ b/sys-apps/kbd/files/digest-kbd-1.12
@@ -0,0 +1 @@
+MD5 7892c7010512a9bc6697a295c921da25 kbd-1.12.tar.gz 884827
diff --git a/sys-apps/kbd/files/kbd-1.12-find-map-fix.patch b/sys-apps/kbd/files/kbd-1.12-find-map-fix.patch
new file mode 100644
index 000000000000..ca24703fcb5b
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-1.12-find-map-fix.patch
@@ -0,0 +1,37 @@
+Oh, but I fixed it already. Patch below.
+
+Andries
+
+--- kbd-1.12.orig/src/findfile.c Fri Jan 16 20:45:31 2004
++++ kbd-1.12/src/findfile.c Wed Jan 28 23:29:35 2004
+@@ -70,6 +70,7 @@
+ FILE *fp = NULL;
+ DIR *d;
+ struct dirent *de;
++ struct stat statbuf;
+ char *ff, *fdir, *p, *q, **sp;
+ struct decompressor *dc;
+ int secondpass = 0;
+@@ -104,7 +105,6 @@
+ okdir = (ff && strcmp(de->d_name, fdir) == 0);
+
+ if ((secondpass && recdepth) || okdir) {
+- struct stat statbuf;
+ char *a;
+
+ a = xmalloc(strlen(dir) + strlen(de->d_name) + 2);
+@@ -137,6 +137,11 @@
+
+ sprintf(pathname, "%s/%s", dir, de->d_name);
+
++ /* Is this a regular file? */
++ if (stat(pathname, &statbuf) != 0 ||
++ !S_ISREG(statbuf.st_mode))
++ continue;
++
+ /* Does tail consist of a known suffix and possibly
+ a compression suffix? */
+ for(sp = suf; *sp; sp++) {
+
+
+[pasted and cut from another window, so with whitespace damage]