]> git.pld-linux.org Git - packages/rpm.git/blob - rpm-glob.patch
- added helperEVR-noassert patch (replace assert by error message;
[packages/rpm.git] / rpm-glob.patch
1 --- rpm-4.5/rpmio/rpmrpc.c~     2010-12-19 14:19:57.678043380 +0100
2 +++ rpm-4.5/rpmio/rpmrpc.c      2010-12-19 14:20:39.353812967 +0100
3 @@ -1711,6 +1711,17 @@
4  if (_rpmio_debug)
5  fprintf(stderr, "*** Glob(%s,0x%x,%p,%p)\n", pattern, (unsigned)flags, (void *)errfunc, pglob);
6  /*@=castfcnptr@*/
7 +
8 +    /* same as upstream glob with difference that gl_stat is Lstat now */
9 +    pglob->gl_closedir = closedir;
10 +    pglob->gl_readdir = readdir;
11 +    pglob->gl_opendir = opendir;
12 +    pglob->gl_lstat = Lstat;
13 +    pglob->gl_stat = Lstat;
14 +
15 +/*@=type@*/
16 +       flags |= GLOB_ALTDIRFUNC;
17 +
18      switch (ut) {
19      case URL_IS_HTTPS:
20      case URL_IS_HTTP:
21 --- rpm-4.5/configure.ac~       2010-12-19 13:46:37.917863585 +0100
22 +++ rpm-4.5/configure.ac        2010-12-19 13:50:49.826071048 +0100
23 @@ -1004,8 +1004,8 @@
24  #fi
25  #
26  #if test "$rpm_cv_glob" = yes; then
27 -    AC_DEFINE(USE_GNU_GLOB, 1, [Use the included glob.c?])
28 -    AC_LIBOBJ(glob)
29 +#    AC_DEFINE(USE_GNU_GLOB, 1, [Use the included glob.c?])
30 +#    AC_LIBOBJ(glob)
31      AC_LIBOBJ(fnmatch)
32  #fi
33  
34
This page took 0.042848 seconds and 3 git commands to generate.