]>
Commit | Line | Data |
---|---|---|
99fd8697 JB |
1 | --- rpm-4.4.1/lib/rpmrc.c.orig 2005-07-19 18:53:09.096470264 +0200 |
2 | +++ rpm-4.4.1/lib/rpmrc.c 2005-07-19 19:00:48.610613496 +0200 | |
3 | @@ -1,6 +1,12 @@ | |
1f0d4608 JB |
4 | /*@-bounds@*/ |
5 | #include "system.h" | |
6 | ||
99fd8697 | 7 | +#ifdef USE_HOME_ETC |
1f0d4608 | 8 | +#include <home_etc.h> |
99fd8697 JB |
9 | +#else |
10 | +#define _HE(x) (x) | |
11 | +#endif | |
1f0d4608 JB |
12 | + |
13 | #include <stdarg.h> | |
14 | #if defined(__linux__) && defined(__powerpc__) | |
15 | #include <setjmp.h> | |
99fd8697 | 16 | @@ -1815,13 +1821,13 @@ |
1f0d4608 JB |
17 | rc = 1; |
18 | break; | |
19 | } | |
411771bd | 20 | - if (strlen(home) > (sizeof(fn) - strlen(r))) { |
1f0d4608 JB |
21 | + if (strlen(_HE(home)) > (sizeof(fn) - strlen(r))) { |
22 | rpmError(RPMERR_RPMRC, _("Cannot read %s, HOME is too large.\n"), | |
411771bd | 23 | r); |
1f0d4608 JB |
24 | rc = 1; |
25 | break; | |
411771bd | 26 | } |
1f0d4608 JB |
27 | - strcpy(fn, home); |
28 | + strcpy(fn, _HE(home)); | |
29 | r++; | |
411771bd | 30 | } |
1f0d4608 | 31 | strncat(fn, r, sizeof(fn) - (strlen(fn) + 1)); |
99fd8697 JB |
32 | --- rpm-4.4.1/rpmio/macro.c.orig 2005-07-19 18:53:09.358430440 +0200 |
33 | +++ rpm-4.4.1/rpmio/macro.c 2005-07-19 19:04:25.098702304 +0200 | |
34 | @@ -6,6 +6,12 @@ | |
1f0d4608 JB |
35 | #include "system.h" |
36 | #include <stdarg.h> | |
1f0d4608 | 37 | |
99fd8697 JB |
38 | +#ifdef USE_HOME_ETC |
39 | +#include <home_etc.h> | |
40 | +#else | |
41 | +#define _HE(x) (x) | |
42 | +#endif | |
43 | + | |
1f0d4608 JB |
44 | #if !defined(isblank) |
45 | #define isblank(_c) ((_c) == ' ' || (_c) == '\t') | |
99fd8697 JB |
46 | #endif |
47 | @@ -1732,7 +1738,7 @@ | |
1f0d4608 JB |
48 | /* XXX Prepend the URL leader for globs that have stripped it off */ |
49 | maxb = 0; | |
50 | for (i = 0; i < gl.gl_pathc; i++) { | |
51 | - if ((nb = strlen(&(gl.gl_pathv[i][0]))) > maxb) | |
52 | + if ((nb = strlen(_HE(&(gl.gl_pathv[i][0])))) > maxb) | |
53 | maxb = nb; | |
54 | } | |
55 | ||
99fd8697 | 56 | @@ -1766,7 +1772,7 @@ |
1f0d4608 JB |
57 | const char * globFile = &(gl.gl_pathv[i][0]); |
58 | if (globRoot > globURL && globRoot[-1] == '/') | |
59 | while (*globFile == '/') globFile++; | |
60 | - strcpy(globRoot, globFile); | |
61 | + strcpy(globRoot, _HE(globFile)); | |
62 | if (_debug) | |
63 | fprintf(stderr, "*** rpmGlob argv[%d] \"%s\"\n", argc, globURL); | |
64 | argv[argc++] = xstrdup(globURL); | |
99fd8697 JB |
65 | --- rpm-4.4.1/lib/Makefile.am.orig 2005-07-19 18:53:08.705529696 +0200 |
66 | +++ rpm-4.4.1/lib/Makefile.am 2005-07-19 19:04:59.525468640 +0200 | |
1f0d4608 JB |
67 | @@ -44,7 +44,7 @@ |
68 | librpm_la_LDFLAGS = -release 4.4 $(LDFLAGS) \ | |
69 | $(top_builddir)/rpmdb/librpmdb.la \ | |
70 | $(top_builddir)/rpmio/librpmio.la \ | |
71 | - -lpopt \ | |
99fd8697 | 72 | + -lpopt @HOME_ETC_LIB@ \ |
1f0d4608 JB |
73 | @WITH_SELINUX_LIB@ \ |
74 | @INTLLIBS@ | |
75 | ||
99fd8697 JB |
76 | --- rpm-4.4.1/rpmio/Makefile.am.orig 2005-07-19 18:53:09.387426032 +0200 |
77 | +++ rpm-4.4.1/rpmio/Makefile.am 2005-07-19 19:04:42.440066016 +0200 | |
1f0d4608 JB |
78 | @@ -37,7 +37,7 @@ |
79 | @WITH_LUA_LIB@ \ | |
80 | $(top_builddir)/file/src/libmagic.la \ | |
81 | @WITH_ZLIB_LIB@ \ | |
82 | - -lneon -lpthread | |
99fd8697 | 83 | + -lneon -lpthread @HOME_ETC_LIB@ |
1f0d4608 JB |
84 | librpmio_la_LIBADD = # $(BEECRYPTLOBJS) |
85 | librpmio_la_DEPENDENCIES = # .created | |
86 | ||
99fd8697 JB |
87 | --- rpm-4.4.1/configure.ac.orig 2005-07-19 18:53:09.385426000 +0200 |
88 | +++ rpm-4.4.1/configure.ac 2005-07-19 19:10:49.732229120 +0200 | |
89 | @@ -945,6 +945,14 @@ | |
90 | fi | |
91 | AC_SUBST(WITH_SELINUX_LIB) | |
92 | ||
93 | +withval=no | |
94 | +AC_ARG_WITH(home_etc, [ --with-home_etc build with home_etc support ]) | |
95 | +if test $withval != no ; then | |
96 | + AC_DEFINE(USE_HOME_ETC, 1, [Build with home_etc support?]) | |
97 | + HOME_ETC_LIB="-lhome_etc" | |
98 | +fi | |
99 | +AC_SUBST(HOME_ETC_LIB) | |
100 | + | |
101 | WITH_LUA_LIB= | |
102 | WITH_LUA_SUBDIR= | |
103 | WITH_LUA_INCLUDE= |