1) added buildarch_compat tables

2) fixed malloc problem in rpmrc parsing

CVS patchset: 1795
CVS date: 1997/08/24 18:12:05

diff --git a/lib-rpmrc.in b/lib-rpmrc.in
index 44a9fad..ff49b4b 100644 (file)
--- a/lib-rpmrc.in
+++ b/lib-rpmrc.in
@@ -115,3 +115,15 @@ arch_compat: sparc: noarch
 arch_compat: ppc: noarch
 
 os_compat:   IRIX64: IRIX
+
+buildarch_compat: i986: i886
+buildarch_compat: i886: i786
+buildarch_compat: i786: i686
+buildarch_compat: i686: i586
+buildarch_compat: i586: i486
+buildarch_compat: i486: i386
+buildarch_compat: i386: noarch
+
+buildarch_compat: sparc: noarch
+
+buildarch_compat: alpha: noarch

diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 83d3cb9..3f414d2 100644 (file)
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -762,7 +762,7 @@ static void rpmSetVarArch(int var, char * val, char * arch) {
            if (next->value) free(next->value);
            if (next->arch) free(next->arch);
        } else if (next->arch || arch) {
-           next->next = malloc(sizeof(*malloc));
+           next->next = malloc(sizeof(*next->next));
            next = next->next;
            next->next = NULL;
        }