SOURCES (AC-branch): rpm-etc_dir.patch - removed macros file readi...

[baggins]

Author: baggins                      Date: Mon Aug 29 16:49:12 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- removed macros file reading from ~/etc, it's broken and the fix is to:
a) hack and whack glob(3) into oblivion - or -
b) just add ~/etc/.rpmmacros to global rpm config
and b) will be done

---- Files affected:
SOURCES:
   rpm-etc_dir.patch (1.5.2.1 -> 1.5.2.2) 

---- Diffs:

================================================================
Index: SOURCES/rpm-etc_dir.patch
diff -u SOURCES/rpm-etc_dir.patch:1.5.2.1 SOURCES/rpm-etc_dir.patch:1.5.2.2
--- SOURCES/rpm-etc_dir.patch:1.5.2.1	Mon Aug 15 20:29:46 2005
+++ SOURCES/rpm-etc_dir.patch	Mon Aug 29 18:49:07 2005
@@ -29,39 +29,6 @@
  	    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 @@
@@ -72,16 +39,6 @@
  	@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 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm-etc_dir.patch?r1=1.5.2.1&r2=1.5.2.2&f=u