From f713820f4243593e47d8c7d08129df4d3059596f Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrel@fedoraproject.org>
Date: Fri, 14 Jul 2006 21:04:56 +0000
Subject: [PATCH] Fixed null pointer problem in rpmfcELF() DT_GNU_HASH
 handling.

---
 rpm-4.4.2-gnuhash.patch | 8 +++++---
 rpm.spec                | 5 ++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/rpm-4.4.2-gnuhash.patch b/rpm-4.4.2-gnuhash.patch
index d4aa8af..395ea37 100644
--- a/rpm-4.4.2-gnuhash.patch
+++ b/rpm-4.4.2-gnuhash.patch
@@ -1,5 +1,5 @@
---- 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
+--- rpm-4.4.2/build/rpmfc.c.gnuhash	2006-07-14 16:59:43.000000000 -0400
++++ rpm-4.4.2/build/rpmfc.c	2006-07-14 17:01:40.000000000 -0400
 @@ -12,6 +12,11 @@
  
  #if HAVE_GELF_H
@@ -34,7 +34,7 @@
                      case DT_DEBUG:    
  			gotDEBUG = 1;
  			/*@innercontinue@*/ continue;
-@@ -1107,6 +1120,16 @@
+@@ -1107,6 +1120,18 @@
      }
      /*@=branchstate =uniondef @*/
  
@@ -44,6 +44,8 @@
 +        ds = rpmdsSingle(RPMTAG_REQUIRENAME, "rtld(GNU_HASH)", "", 
 +                         RPMSENSE_FIND_REQUIRES);
 +        rpmdsMerge(&fc->requires, ds);
++        buf[0] = '\0';
++        t = buf;
 +        rpmfcSaveArg(&fc->ddict, rpmfcFileDep(t, fc->ix, ds));
 +        ds = rpmdsFree(ds);
 +    }
diff --git a/rpm.spec b/rpm.spec
index 8b3aac5..f9ee3ba 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -20,7 +20,7 @@ Name: rpm
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 28
+Release: 29
 Group: System Environment/Base
 Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
 Source1: mono-find-provides
@@ -595,6 +595,9 @@ exit 0
 %{__includedir}/popt.h
 
 %changelog
+* Fri Jul 14 2006 David Cantrell <dcantrell@redhat.com> - 4.4.2-29
+- Fixed null pointer problem in rpmfcELF() DT_GNU_HASH handling
+
 * Tue Jul 11 2006 Paul Nasrat <pnasrat@redhat.com> - 4.4.2-28
 - Detect and provide a requirement for DT_GNU_HASH