From e3ad42180c075e0c43dae1aad1621af8c7015377 Mon Sep 17 00:00:00 2001
From: CentOS Buildsys <bugs@centos.org>
Date: Jan 27 2014 12:27:02 +0000
Subject: import strace-4.8-7.el7.src.rpm


---

diff --git a/SOURCES/strace-rh1044044.patch b/SOURCES/strace-rh1044044.patch
new file mode 100644
index 0000000..2626411
--- /dev/null
+++ b/SOURCES/strace-rh1044044.patch
@@ -0,0 +1,20 @@
+diff -Nrup a/count.c b/count.c
+--- a/count.c	2012-04-27 17:38:24.000000000 -0600
++++ b/count.c	2013-12-18 09:23:32.823289640 -0700
+@@ -100,6 +100,16 @@ time_cmp(void *a, void *b)
+ static int
+ syscall_cmp(void *a, void *b)
+ {
++	const char *name_a = sysent[*((int *) a)].sys_name;
++	const char *name_b = sysent[*((int *) b)].sys_name;
++
++	if (name_a == name_b)
++		return 0;
++	if (!name_a)
++		return -1;
++	if (!name_b)
++		return 1;
++
+ 	return strcmp(sysent[*((int *) a)].sys_name,
+ 		      sysent[*((int *) b)].sys_name);
+ }
diff --git a/SPECS/strace.spec b/SPECS/strace.spec
index 3a6e96e..2f20421 100644
--- a/SPECS/strace.spec
+++ b/SPECS/strace.spec
@@ -1,7 +1,7 @@
 Summary: Tracks and displays system calls associated with a running process
 Name: strace
 Version: 4.8
-Release: 4%{?dist}
+Release: 7%{?dist}
 License: BSD
 Group: Development/Debuggers
 URL: http://sourceforge.net/projects/strace/
@@ -14,7 +14,7 @@ Patch1000: strace-strict-aliasing.patch
 Patch1001: strace-rh948577.patch
 Patch1002: strace-rh851457.patch
 Patch1003: strace-rh971352.patch
-
+Patch1004: strace-rh1044044.patch
 
 # In the past we had a separate strace64 package, these days the
 # stndard 64 bit build provides that functionality.  For tracing
@@ -58,6 +58,7 @@ This package provides the `strace32' program to trace 32-bit processes on
 %patch1001 -p1
 %patch1002 -p1
 %patch1003 -p1
+%patch1004 -p1
 
 %build
 %configure
@@ -101,6 +102,16 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 4.8-7
+- Mass rebuild 2014-01-24
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 4.8-6
+- Mass rebuild 2013-12-27
+
+* Wed Dec 18 2013 Jeff Law <law@redhat.com> 4.8-5
+- Don't pass NULL pointers to strcmp when sorting by syscall
+  name (#1044044)
+
 * Thu Oct 3 2013 Jeff Law <law@redhat.com> - 4.8-4
 - Build strace32 on ppc/s390 which can be installed alongside of strace
   on ppc64/s390x (#980229)