rpm-glob.patch

   1 --- rpm-5.1.4/rpmio/rpmrpc.c.org        2008-07-29 21:27:42.203871384 +0200
   2 +++ rpm-5.1.4/rpmio/rpmrpc.c    2008-07-29 21:27:58.080756454 +0200
   3 @@ -1757,14 +1757,14 @@
   4         return -2;
   5         /*@notreached@*/ break;
   6      }
   7 -    return glob(pattern, flags, errfunc, pglob);
   8 +    return rpm_glob(pattern, flags, errfunc, pglob);
   9  }
  10
  11  void Globfree(glob_t *pglob)
  12  {
  13  if (_rpmio_debug)
  14  fprintf(stderr, "*** Globfree(%p)\n", pglob);
  15 -    globfree(pglob);
  16 +    rpm_globfree(pglob);
  17  }
  18
  19  DIR * Opendir(const char * path)
  20 --- rpm-5.1.4/misc/librpmmisc.c.org     2008-07-29 21:26:19.710540550 +0200
  21 +++ rpm-5.1.4/misc/librpmmisc.c 2008-07-29 21:27:25.357426308 +0200
  22 @@ -71,7 +71,11 @@
  23  #include "fnmatch.h"
  24  #include "fnmatch.c"
  25  #ifndef __CYGWIN__
  26 +#define        glob            rpm_glob
  27 +#define        globfree        rpm_globfree
  28  #include "glob.h"
  29  #include "glob.c"
  30 +#undef glob
  31 +#undef globfree
  32  #endif
  33
  34 --- rpm/misc/librpmmisc.vers~   2007-11-13 03:16:23.000000000 +0100
  35 +++ rpm/misc/librpmmisc.vers    2008-07-29 21:32:35.023645681 +0200
  36 @@ -7,8 +7,10 @@
  37      db_strerror_rpmdb;
  38      db_create_rpmdb;
  39      fnmatch;
  40 -    glob;
  41 -    globfree;
  42 +    rpm_glob;
  43 +    rpm_glob64;
  44 +    rpm_globfree;
  45 +    rpm_globfree64;
  46      lua*;
  47      magic_*;
  48      rpmz_*;