[libsemanage/f19] - Fix test suite to build

Daniel J Walsh dwalsh at fedoraproject.org
Mon Apr 22 14:31:34 UTC 2013


commit 7148ea97d8037c77cd1ebde7484c1f345deb890c
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Mon Apr 22 10:31:31 2013 -0400

    - Fix test suite to build

 libsemanage-rhat.patch |   28 ++++++++++++++++++++++++++++
 libsemanage.spec       |    7 ++++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/libsemanage-rhat.patch b/libsemanage-rhat.patch
index e69de29..132fc4d 100644
--- a/libsemanage-rhat.patch
+++ b/libsemanage-rhat.patch
@@ -0,0 +1,28 @@
+diff --git a/libsemanage/src/utilities.c b/libsemanage/src/utilities.c
+index 349a4be..a340fc8 100644
+--- a/libsemanage/src/utilities.c
++++ b/libsemanage/src/utilities.c
+@@ -140,6 +140,10 @@ int semanage_list_push(semanage_list_t ** list, char *data)
+ 
+ 	if (!data)
+ 		return EINVAL;
++
++	if (semanage_list_find(*list, data) != NULL)
++		return 0;
++
+ 	if (!(temp = malloc(sizeof(semanage_list_t))))
+ 		return ENOMEM;
+ 
+diff --git a/libsemanage/tests/Makefile b/libsemanage/tests/Makefile
+index f92455c..ad1869b 100644
+--- a/libsemanage/tests/Makefile
++++ b/libsemanage/tests/Makefile
+@@ -13,7 +13,7 @@ EXECUTABLE = libsemanage-tests
+ CC = gcc
+ CFLAGS = -c -g -o0 -Wall -W -Wundef -Wmissing-noreturn -Wmissing-format-attribute -Wno-unused-parameter
+ INCLUDE = -I$(TESTSRC) -I$(TESTSRC)/../include
+-LDFLAGS = -lcunit -lustr -lbz2
++LDFLAGS = -lcunit -lustr -lbz2 -lpthread
+ OBJECTS = $(SOURCES:.c=.o) 
+ 
+ all: $(EXECUTABLE) 
diff --git a/libsemanage.spec b/libsemanage.spec
index a11263e..eb37bd2 100644
--- a/libsemanage.spec
+++ b/libsemanage.spec
@@ -10,7 +10,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 2.1.10
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: libsemanage-%{version}.tgz
@@ -181,6 +181,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif # if with_python3
 
 %changelog
+* Mon Apr 22 2013 Dan Walsh <dwalsh at redhat.com> - 2.1.10-4
+- 
+* Thu Apr 11 2013 Dan Walsh <dwalsh at redhat.com> - 2.1.10-3
+- Fix test suite to build
+
 * Thu Feb 14 2013 Dan Walsh <dwalsh at redhat.com> - 2.1.10-2
 - Revert some changes which are causing the wrong policy version file to be created
 


More information about the scm-commits mailing list