rpm-etc_dir.patch

   1 diff -ur rpm-4.4.1/lib/rpmrc.c rpm-4.4.1-home_etc/lib/rpmrc.c
   2 --- rpm-4.4.1/lib/rpmrc.c       2005-01-17 19:46:23.000000000 +0100
   3 +++ rpm-4.4.1-home_etc/lib/rpmrc.c      2005-06-17 14:28:10.000000000 +0200
   4 @@ -1,6 +1,8 @@
   5  /*@-bounds@*/
   6  #include "system.h"
   7
   8 +#include <home_etc.h>
   9 +
  10  #include <stdarg.h>
  11  #if defined(__linux__) && defined(__powerpc__)
  12  #include <setjmp.h>
  13 @@ -1814,13 +1814,13 @@
  14                 rc = 1;
  15                 break;
  16             }
  17 -           if (strlen(home) > (sizeof(fn) - strlen(r))) {
  18 +           if (strlen(_HE(home)) > (sizeof(fn) - strlen(r))) {
  19                 rpmError(RPMERR_RPMRC, _("Cannot read %s, HOME is too large.\n"),
  20                                 r);
  21                 rc = 1;
  22                 break;
  23             }
  24 -           strcpy(fn, home);
  25 +           strcpy(fn, _HE(home));
  26             r++;
  27         }
  28         strncat(fn, r, sizeof(fn) - (strlen(fn) + 1));
  29 diff -ur rpm-4.4.1/rpmio/macro.c rpm-4.4.1-home_etc/rpmio/macro.c
  30 --- rpm-4.4.1/rpmio/macro.c     2005-01-26 04:39:58.000000000 +0100
  31 +++ rpm-4.4.1-home_etc/rpmio/macro.c    2005-06-17 14:25:02.415093480 +0200
  32 @@ -5,6 +5,8 @@
  33
  34  #include "system.h"
  35  #include <stdarg.h>
  36 +
  37 +#include <home_etc.h>
  38
  39  #if !defined(isblank)
  40  #define        isblank(_c)     ((_c) == ' ' || (_c) == '\t')
  41 @@ -1731,7 +1731,7 @@
  42         /* XXX Prepend the URL leader for globs that have stripped it off */
  43         maxb = 0;
  44         for (i = 0; i < gl.gl_pathc; i++) {
  45 -           if ((nb = strlen(&(gl.gl_pathv[i][0]))) > maxb)
  46 +           if ((nb = strlen(_HE(&(gl.gl_pathv[i][0])))) > maxb)
  47                 maxb = nb;
  48         }
  49
  50 @@ -1765,7 +1765,7 @@
  51             const char * globFile = &(gl.gl_pathv[i][0]);
  52             if (globRoot > globURL && globRoot[-1] == '/')
  53                 while (*globFile == '/') globFile++;
  54 -           strcpy(globRoot, globFile);
  55 +           strcpy(globRoot, _HE(globFile));
  56  if (_debug)
  57  fprintf(stderr, "*** rpmGlob argv[%d] \"%s\"\n", argc, globURL);
  58             argv[argc++] = xstrdup(globURL);
  59 --- rpm-4.4.1/lib/Makefile.am~  2005-06-17 15:08:29.901412560 +0200
  60 +++ rpm-4.4.1/lib/Makefile.am   2005-06-17 15:08:41.173698912 +0200
  61 @@ -44,7 +44,7 @@
  62  librpm_la_LDFLAGS = -release 4.4 $(LDFLAGS) \
  63         $(top_builddir)/rpmdb/librpmdb.la \
  64         $(top_builddir)/rpmio/librpmio.la \
  65 -       -lpopt \
  66 +       -lpopt -lhome_etc \
  67         @WITH_SELINUX_LIB@ \
  68         @INTLLIBS@
  69
  70 --- rpm-4.4.1/rpmio/Makefile.am~        2005-06-17 15:08:29.902412408 +0200
  71 +++ rpm-4.4.1/rpmio/Makefile.am 2005-06-17 15:09:10.987166576 +0200
  72 @@ -37,7 +37,7 @@
  73         @WITH_LUA_LIB@ \
  74         $(top_builddir)/file/src/libmagic.la \
  75         @WITH_ZLIB_LIB@ \
  76 -       -lneon -lpthread
  77 +       -lneon -lpthread -lhome_etc
  78  librpmio_la_LIBADD = # $(BEECRYPTLOBJS)
  79  librpmio_la_DEPENDENCIES = # .created
  80