[Frugalware-darcs] frugalware-current: kbd-1.12-17-i686

[VMiklos]

[kbd-1.12-17-i686
VMiklos <[EMAIL PROTECTED]>**20060318213502
 added -find_map_fix.patch for dvorak support
] {
hunk ./source/base/kbd/FrugalBuild 1
-# Last Modified: Sat, 04 Mar 2006 18:24:40 +0100
+# Last Modified: Sat, 18 Mar 2006 22:19:51 +0100
hunk ./source/base/kbd/FrugalBuild 7
-pkgrel=16
+pkgrel=17
hunk ./source/base/kbd/FrugalBuild 9
+url="http://www.ibiblio.org/pub/Linux/system/keyboards/";
hunk ./source/base/kbd/FrugalBuild 11
-depends=('sed' 'bash' 'glibc' 'bootsplash')
+depends=('sed' 'bash')
+rodepends=('bootsplash')
hunk ./source/base/kbd/FrugalBuild 18
-       $pkgname-$pkgver-alias.patch fontconfig fontconfig.en rc.font \
+       $pkgname-$pkgver-{alias,find_map_fix}.patch fontconfig fontconfig.en 
rc.font \
hunk ./source/base/kbd/FrugalBuild 21
-          '2a266a3fc520371bba9050ea8fa13f4592892e83' \
-          '45e7873f885568afc79ddc3bb76043f6b6f70d2e' \
-          'c4349670a04110f9921a339b283c64715caefb94' \
-          '573be433c7e8864f17c7328b6e4114c89c908019' \
-          '7b1e17e399608f54ff70ac22cf8e697e01ea6b23' \
-          'd385735e880bea9f8444dfbc5144007eaaffee32' \
-          '6c0f9f8eae09b57687c43a8298fea5deb6b6e4a5' \
-          'beceda61cdf168e4063873a9ea6312dbc8284613' \
-          'b9c50c54c7f3b1efce7858a39b0dd7490cc742a3' \
-          '84e361527f415ef4d560b3e6affea0d463d544de')
+         '2a266a3fc520371bba9050ea8fa13f4592892e83' \
+         '420fd29fc06e3518dac3fac8003c8ac71ae3b28e' \
+         '45e7873f885568afc79ddc3bb76043f6b6f70d2e' \
+         'c4349670a04110f9921a339b283c64715caefb94' \
+         '573be433c7e8864f17c7328b6e4114c89c908019' \
+         '7b1e17e399608f54ff70ac22cf8e697e01ea6b23' \
+         'd385735e880bea9f8444dfbc5144007eaaffee32' \
+         '6c0f9f8eae09b57687c43a8298fea5deb6b6e4a5' \
+         'beceda61cdf168e4063873a9ea6312dbc8284613' \
+         'b9c50c54c7f3b1efce7858a39b0dd7490cc742a3' \
+         '84e361527f415ef4d560b3e6affea0d463d544de')
addfile ./source/base/kbd/kbd-1.12-find_map_fix.patch
hunk ./source/base/kbd/kbd-1.12-find_map_fix.patch 1
+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]
}
_______________________________________________
Frugalware-darcs mailing list
Frugalware-darcs@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-darcs