From d58cfe5819d23a78a0b4a693a4d893854a2583d1 Mon Sep 17 00:00:00 2001 From: Paul Nasrat Date: Jul 11 2006 15:56:14 +0000 Subject: Update --- diff --git a/rpm-4.4.2-gnuhash.patch b/rpm-4.4.2-gnuhash.patch index e25d80a..d4aa8af 100644 --- a/rpm-4.4.2-gnuhash.patch +++ b/rpm-4.4.2-gnuhash.patch @@ -1,6 +1,18 @@ ---- rpm-4.4.2/build/rpmfc.c.gnuhash 2006-07-11 07:05:43.000000000 -0400 -+++ rpm-4.4.2/build/rpmfc.c 2006-07-11 07:09:08.000000000 -0400 -@@ -879,6 +879,8 @@ +--- rpm-4.4.2/build/rpmfc.c.gnuhash 2006-07-11 07:32:22.000000000 -0400 ++++ rpm-4.4.2/build/rpmfc.c 2006-07-11 07:53:46.000000000 -0400 +@@ -12,6 +12,11 @@ + + #if HAVE_GELF_H + #include ++ ++#if !defined(DT_GNU_HASH) ++#define DT_GNU_HASH 0x6ffffef5 ++#endif ++ + #endif + + #include "debug.h" +@@ -879,6 +884,8 @@ int isDSO; int gotSONAME = 0; int gotDEBUG = 0; @@ -9,7 +21,7 @@ static int filter_GLIBC_PRIVATE = 0; static int oneshot = 0; -@@ -1051,6 +1053,12 @@ +@@ -1051,6 +1058,12 @@ default: /*@innercontinue@*/ continue; /*@notreached@*/ /*@switchbreak@*/ break; @@ -22,7 +34,7 @@ case DT_DEBUG: gotDEBUG = 1; /*@innercontinue@*/ continue; -@@ -1107,6 +1115,16 @@ +@@ -1107,6 +1120,16 @@ } /*@=branchstate =uniondef @*/ @@ -39,15 +51,3 @@ /* For DSO's, provide the basename of the file if DT_SONAME not found. */ if (!fc->skipProv && isDSO && !gotDEBUG && !gotSONAME) { depsp = &fc->provides; ---- rpm-4.4.2/rpmdb/legacy.c.gnuhash 2006-07-11 07:07:18.000000000 -0400 -+++ rpm-4.4.2/rpmdb/legacy.c 2006-07-11 07:07:44.000000000 -0400 -@@ -14,6 +14,9 @@ - #if !defined(DT_GNU_LIBLIST) - #define DT_GNU_LIBLIST 0x6ffffef9 - #endif -+#if !defined(DT_GNU_HASH) -+#define DT_GNU_HASH 0x6ffffef5 -+#endif - - #endif -