rpms/prelink/devel prelink-cache-sort-crash-rh197451.patch, NONE, 1.1 prelink.spec, 1.40, 1.41

[fedora-cvs-commits redhat com]

Author: aoliva

Update of /cvs/dist/rpms/prelink/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20913

Modified Files:
	prelink.spec 
Added Files:
	prelink-cache-sort-crash-rh197451.patch 
Log Message:
* Fri Jul 28 2006 Alexandre Oliva <aoliva redhat com> 0.3.9-2
- Avoid SEGFAULT when sorting cache entries (#197451)


prelink-cache-sort-crash-rh197451.patch:
 cache.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE prelink-cache-sort-crash-rh197451.patch ---
Index: src/cache.c
===================================================================
--- src/cache.c.orig	2006-06-20 10:36:40.000000000 -0300
+++ src/cache.c	2006-07-28 16:26:39.000000000 -0300
@@ -336,8 +336,8 @@ deps_cmp (const void *A, const void *B)
   struct prelink_entry *a = * (struct prelink_entry **) A;
   struct prelink_entry *b = * (struct prelink_entry **) B;
 
-  if (a == NULL && b != NULL)
-    return 1;
+  if (a == NULL)
+    return (b != NULL);
   if (a != NULL && b == NULL)
     return -1;
 


Index: prelink.spec
===================================================================
RCS file: /cvs/dist/rpms/prelink/devel/prelink.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- prelink.spec	12 Jul 2006 13:25:48 -0000	1.40
+++ prelink.spec	28 Jul 2006 20:07:53 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: An ELF prelinking utility
 Name: prelink
 Version: 0.3.9
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 %define date 20060712
@@ -18,6 +18,8 @@
 # For now
 ExclusiveArch: %{ix86} alpha sparc sparc64 s390 s390x x86_64 ppc ppc64
 
+Patch0: prelink-cache-sort-crash-rh197451.patch
+
 %description
 The prelink package contains a utility which modifies ELF shared libraries
 and executables, so that far less relocations need to be resolved at runtime
@@ -25,6 +27,7 @@
 
 %prep
 %setup -n prelink
+%patch0 -p0 -b .rh197451~
 
 %build
 %configure --disable-shared
@@ -90,6 +93,9 @@
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink/prelink.log
 
 %changelog
+* Fri Jul 28 2006 Alexandre Oliva <aoliva redhat com> 0.3.9-2
+- Avoid SEGFAULT when sorting cache entries (#197451)
+
 * Wed Jul 12 2006 Jakub Jelinek <jakub redhat com> 0.3.9-1
 - DT_GNU_HASH support
 - handle N_BNSYM and N_ENSYM stabs (#198203)