[packages/rpm.git] / rpm-etc_dir.patch

--- rpm-4.4.1/lib/rpmrc.c.orig	2005-07-19 18:53:09.096470264 +0200
+++ rpm-4.4.1/lib/rpmrc.c	2005-07-19 19:00:48.610613496 +0200
@@ -1,6 +1,12 @@
 /*@-bounds@*/
 #include "system.h"
 
+#ifdef USE_HOME_ETC
+#include <home_etc.h>
+#else
+#define _HE(x) (x)
+#endif
+
 #include <stdarg.h>
 #if defined(__linux__) && defined(__powerpc__)
 #include <setjmp.h>
@@ -1815,13 +1821,13 @@
 		rc = 1;
 		break;
 	    }
-	    if (strlen(home) > (sizeof(fn) - strlen(r))) {
+	    if (strlen(_HE(home)) > (sizeof(fn) - strlen(r))) {
 		rpmError(RPMERR_RPMRC, _("Cannot read %s, HOME is too large.\n"),
 				r);
 		rc = 1;
 		break;
 	    }
-	    strcpy(fn, home);
+	    strcpy(fn, _HE(home));
 	    r++;
 	}
 	strncat(fn, r, sizeof(fn) - (strlen(fn) + 1));
--- rpm-4.4.1/rpmio/macro.c.orig	2005-07-19 18:53:09.358430440 +0200
+++ rpm-4.4.1/rpmio/macro.c	2005-07-19 19:04:25.098702304 +0200
@@ -6,6 +6,12 @@
 #include "system.h"
 #include <stdarg.h>
 
+#ifdef USE_HOME_ETC
+#include <home_etc.h>
+#else
+#define _HE(x) (x)
+#endif
+
 #if !defined(isblank)
 #define	isblank(_c)	((_c) == ' ' || (_c) == '\t')
 #endif
@@ -1732,7 +1738,7 @@
 	/* XXX Prepend the URL leader for globs that have stripped it off */
 	maxb = 0;
 	for (i = 0; i < gl.gl_pathc; i++) {
-	    if ((nb = strlen(&(gl.gl_pathv[i][0]))) > maxb)
+	    if ((nb = strlen(_HE(&(gl.gl_pathv[i][0])))) > maxb)
 		maxb = nb;
 	}
 	
@@ -1766,7 +1772,7 @@
 	    const char * globFile = &(gl.gl_pathv[i][0]);
 	    if (globRoot > globURL && globRoot[-1] == '/')
 		while (*globFile == '/') globFile++;
-	    strcpy(globRoot, globFile);
+	    strcpy(globRoot, _HE(globFile));
 if (_debug)
 fprintf(stderr, "*** rpmGlob argv[%d] \"%s\"\n", argc, globURL);
 	    argv[argc++] = xstrdup(globURL);
--- rpm-4.4.2/lib/Makefile.am.orig	2005-07-23 13:40:23.191135552 +0200
+++ rpm-4.4.2/lib/Makefile.am	2005-07-23 13:41:49.474018560 +0200
@@ -46,6 +46,7 @@
 	$(top_builddir)/rpmio/librpmio.la \
 	@WITH_POPT_LIB@ \
 	@WITH_SELINUX_LIB@ \
+	@HOME_ETC_LIB@ \
 	@INTLLIBS@
 
 getdate.c: getdate.y
--- rpm-4.4.2/rpmio/Makefile.am.orig	2005-07-23 13:40:23.194135096 +0200
+++ rpm-4.4.2/rpmio/Makefile.am	2005-07-23 13:42:06.205474992 +0200
@@ -40,6 +40,7 @@
 	@WITH_LUA_LIB@ \
 	@WITH_MAGIC_LIB@ \
 	@WITH_ZLIB_LIB@ \
+	@HOME_ETC_LIB@ \
 	-lpthread
 librpmio_la_LIBADD = # $(BEECRYPTLOBJS)
 librpmio_la_DEPENDENCIES = # .created
--- rpm-4.4.1/configure.ac.orig	2005-07-19 18:53:09.385426000 +0200
+++ rpm-4.4.1/configure.ac	2005-07-19 19:10:49.732229120 +0200
@@ -945,6 +945,14 @@
 fi
 AC_SUBST(WITH_SELINUX_LIB)
 
+withval=no
+AC_ARG_WITH(home_etc, [  --with-home_etc         build with home_etc support ])
+if test $withval != no ; then
+  AC_DEFINE(USE_HOME_ETC, 1, [Build with home_etc support?])
+  HOME_ETC_LIB="-lhome_etc"
+fi
+AC_SUBST(HOME_ETC_LIB)
+
 WITH_LUA_LIB=
 WITH_LUA_SUBDIR=
 WITH_LUA_INCLUDE=
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))) {
1f0d4608 JB	22	rpmError(RPMERR_RPMRC, _("Cannot read %s, HOME is too large.\n"),
411771bd	23	r);
1f0d4608 JB	24	rc = 1;
1f0d4608 JB	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"
1f0d4608 JB	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)
1f0d4608 JB	45	#define isblank(_c) ((_c) == ' ' \|\| (_c) == '\t')
99fd8697 JB	46	#endif
99fd8697 JB	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);
9a1dbca2 JB	65	--- rpm-4.4.2/lib/Makefile.am.orig 2005-07-23 13:40:23.191135552 +0200
	66	+++ rpm-4.4.2/lib/Makefile.am 2005-07-23 13:41:49.474018560 +0200
	67	@@ -46,6 +46,7 @@
1f0d4608	68	$(top_builddir)/rpmio/librpmio.la \
9a1dbca2	69	@WITH_POPT_LIB@ \
1f0d4608	70	@WITH_SELINUX_LIB@ \
9a1dbca2	71	+ @HOME_ETC_LIB@ \
1f0d4608 JB	72	@INTLLIBS@
1f0d4608 JB	73
9a1dbca2 JB	74	getdate.c: getdate.y
	75	--- rpm-4.4.2/rpmio/Makefile.am.orig 2005-07-23 13:40:23.194135096 +0200
	76	+++ rpm-4.4.2/rpmio/Makefile.am 2005-07-23 13:42:06.205474992 +0200
	77	@@ -40,6 +40,7 @@
1f0d4608	78	@WITH_LUA_LIB@ \
9a1dbca2	79	@WITH_MAGIC_LIB@ \
1f0d4608	80	@WITH_ZLIB_LIB@ \
9a1dbca2 JB	81	+ @HOME_ETC_LIB@ \
9a1dbca2 JB	82	-lpthread
1f0d4608 JB	83	librpmio_la_LIBADD = # $(BEECRYPTLOBJS)
1f0d4608 JB	84	librpmio_la_DEPENDENCIES = # .created
99fd8697 JB	85	--- rpm-4.4.1/configure.ac.orig 2005-07-19 18:53:09.385426000 +0200
	86	+++ rpm-4.4.1/configure.ac 2005-07-19 19:10:49.732229120 +0200
	87	@@ -945,6 +945,14 @@
	88	fi
	89	AC_SUBST(WITH_SELINUX_LIB)
	90
	91	+withval=no
	92	+AC_ARG_WITH(home_etc, [ --with-home_etc build with home_etc support ])
	93	+if test $withval != no ; then
	94	+ AC_DEFINE(USE_HOME_ETC, 1, [Build with home_etc support?])
	95	+ HOME_ETC_LIB="-lhome_etc"
	96	+fi
	97	+AC_SUBST(HOME_ETC_LIB)
	98	+
	99	WITH_LUA_LIB=
	100	WITH_LUA_SUBDIR=
	101	WITH_LUA_INCLUDE=