rpms/libsemanage/devel .cvsignore, 1.44, 1.45 libsemanage-rhat.patch, 1.7, 1.8 libsemanage.spec, 1.62, 1.63 sources, 1.46, 1.47

[fedora-cvs-commits at redhat.com]

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26042

Modified Files:
	.cvsignore libsemanage-rhat.patch libsemanage.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	6 Jan 2006 16:07:00 -0000	1.44
+++ .cvsignore	13 Jan 2006 22:31:44 -0000	1.45
@@ -46,3 +46,5 @@
 libsemanage-1.5.6.tgz
 libsemanage-1.5.8.tgz
 libsemanage-1.5.9.tgz
+libsemanage-1.5.11.tgz
+libsemanage-1.5.14.tgz

libsemanage-rhat.patch:
 fcontext_record.c |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 deletions(-)

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libsemanage-rhat.patch	5 Jan 2006 16:10:57 -0000	1.7
+++ libsemanage-rhat.patch	13 Jan 2006 22:31:44 -0000	1.8
@@ -1,11 +1,45 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/database_llist.c libsemanage-1.5.4/src/database_llist.c
---- nsalibsemanage/src/database_llist.c	2006-01-04 12:18:17.000000000 -0500
-+++ libsemanage-1.5.4/src/database_llist.c	2006-01-04 16:26:39.000000000 -0500
-@@ -136,6 +136,7 @@
- 	if (dbase_llist_cache_prepend(handle, dbase, data) < 0)
- 		goto err;
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/fcontext_record.c libsemanage-1.5.9/src/fcontext_record.c
+--- nsalibsemanage/src/fcontext_record.c	2006-01-06 10:33:10.000000000 -0500
++++ libsemanage-1.5.9/src/fcontext_record.c	2006-01-06 13:40:38.000000000 -0500
+@@ -81,8 +81,18 @@
+ 	const semanage_fcontext_t* fcontext, 
+ 	const semanage_fcontext_key_t* key) {
  
-+	dbase->modified = 1;
- 	return STATUS_SUCCESS;
+-	return strcmp(fcontext->expr, key->expr) && 
+-		(fcontext->type == key->type);
++	int rv = strcmp(fcontext->expr, key->expr);
++	if (rv != 0)
++		return rv;
++	else {
++		if (fcontext->type < key->type)	
++			return -1;
++	
++		else if (key->type < fcontext->type)
++			return 1;
++	
++		else return 0;
++	}
+ }
+ hidden_def(semanage_fcontext_compare)
+ 
+@@ -90,8 +100,18 @@
+ 	const semanage_fcontext_t* fcontext,
+ 	const semanage_fcontext_t* fcontext2) {
+ 
+-	return strcmp(fcontext->expr, fcontext2->expr) &&
+-		(fcontext->type == fcontext2->type);
++	int rv = strcmp(fcontext->expr, fcontext2->expr);
++	if (rv != 0)
++		return rv;
++	else {
++		if (fcontext->type < fcontext2->type)
++			return -1;
++
++		else if (fcontext2->type < fcontext->type)
++			return 1;
++
++		else return 0;
++	}
+ }
+ hidden_def(semanage_fcontext_compare2)
  
- 	err:


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- libsemanage.spec	6 Jan 2006 16:07:00 -0000	1.62
+++ libsemanage.spec	13 Jan 2006 22:31:44 -0000	1.63
@@ -1,12 +1,13 @@
-%define libsepolver 1.11.7-1
-%define libselinuxver 1.29.4-1
+%define libsepolver 1.11.9-1
+%define libselinuxver 1.29.5-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 1.5.9
+Version: 1.5.14
 Release: 1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
+Patch: libsemanage-rhat.patch 
 
 BuildRoot: %{_tmppath}/%{name}-buildroot
 BuildRequires: libselinux-devel >= %{libselinuxver} 
@@ -39,6 +40,7 @@
 
 %prep
 %setup -q
+%patch -p 1 -b .rhat
 
 %build
 make clean
@@ -76,6 +78,19 @@
 
 %changelog
 
+* Fri Jan 13 2006 Dan Walsh <dwalsh at redhat.com> 1.5.14-1
+- Upgrade to latest from NSA
+	* Merged disallow port overlap patch from Ivan Gyurdiev.
+	* Merged join prereq and implementation patches from Ivan Gyurdiev.
+	* Merged join user extra data part 2 patch from Ivan Gyurdiev.
+	* Merged bugfix patch from Ivan Gyurdiev.
+	* Merged remove add_local/set_local patch from Ivan Gyurdiev.
+	* Merged user extra data part 1 patch from Ivan Gyurdiev.
+	* Merged size_t -> unsigned int patch from Ivan Gyurdiev.
+	* Merged calloc check in semanage_store patch from Ivan Gyurdiev,
+	  bug noticed by Steve Grubb.
+	* Merged cleanups after add/set removal patch from Ivan Gyurdiev.
+
 * Fri Jan 7 2006 Dan Walsh <dwalsh at redhat.com> 1.5.9-1
 - Upgrade to latest from NSA
 	* Merged const in APIs patch from Ivan Gyurdiev.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	6 Jan 2006 16:07:00 -0000	1.46
+++ sources	13 Jan 2006 22:31:44 -0000	1.47
@@ -1 +1 @@
-4b27bec1cb92dac96c2fda30b4c6cafe  libsemanage-1.5.9.tgz
+6a136bd40751507a05a6a6f0996cb4cc  libsemanage-1.5.14.tgz