rpms/libselinux/devel libselinux-rhat.patch, 1.56, 1.57 libselinux.spec, 1.117, 1.118

[fedora-cvs-commits at redhat.com]

Author: dwalsh

Update of /cvs/dist/rpms/libselinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16153

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Fri Sep 12 2005 Dan Walsh <dwalsh at redhat.com> 1.26-6
- Fix patch call


libselinux-rhat.patch:
 include/selinux/selinux.h |    6 +++++
 src/get_context_list.c    |   34 +++++++++++++++++++++++++++++
 src/matchpathcon.c        |   26 ++++++++++++++++++----
 src/selinux_config.c      |   53 ++++++++++++++++++++++++++--------------------
 4 files changed, 92 insertions(+), 27 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- libselinux-rhat.patch	16 Sep 2005 19:53:29 -0000	1.56
+++ libselinux-rhat.patch	19 Sep 2005 17:36:11 -0000	1.57
@@ -14,6 +14,50 @@
    selinux_policy_root reads the /etc/selinux/config file and returns 
    the directory path under which the compiled policy file and context 
    configuration files exist.
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/get_context_list.c libselinux-1.26/src/get_context_list.c
+--- nsalibselinux/src/get_context_list.c	2005-08-11 22:41:15.000000000 -0400
++++ libselinux-1.26/src/get_context_list.c	2005-09-16 16:22:03.000000000 -0400
+@@ -288,6 +288,40 @@
+ 	return strcmp(c1->con, c2->con);
+ }
+ 
++int get_ordered_context_list_with_level (const char *user, 
++					 const char *level, 
++					 security_context_t fromcon, 
++					 security_context_t **list)
++{
++    int rc;
++    int freefrom = 0;
++    context_t con;
++
++    if (!level) 
++	    return get_ordered_context_list (user, fromcon, list);
++
++    if (!fromcon) {
++	rc = getcon(&fromcon);
++	if (rc < 0)
++		return rc;
++	freefrom = 1;
++    }
++
++    con=context_new(fromcon);
++    if (con) {
++	    context_range_set(con, level);
++	    rc = get_ordered_context_list (user, context_str(con), list);
++	    context_free(con);
++    } 
++    else
++	    rc=-1;
++
++    if (freefrom) 
++	    freecon(fromcon);
++
++    return rc;
++}
++
+ int get_ordered_context_list (const char *user, 
+ 			      security_context_t fromcon, 
+ 			      security_context_t **list)
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-1.26/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2005-08-24 09:07:11.000000000 -0400
 +++ libselinux-1.26/src/matchpathcon.c	2005-09-16 15:54:01.000000000 -0400


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- libselinux.spec	16 Sep 2005 19:53:29 -0000	1.117
+++ libselinux.spec	19 Sep 2005 17:36:11 -0000	1.118
@@ -1,12 +1,11 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.26
-Release: 6
+Version: 1.27.1
+Release: 1
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
 Prereq: libsetrans 
-Patch: libselinux-rhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 
@@ -36,7 +35,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make CFLAGS="-g %{optflags}"