*** empty log message ***
This commit is contained in:
parent
c3f6b70d94
commit
cde1f77237
@ -46,3 +46,5 @@ libsemanage-1.5.4.tgz
|
|||||||
libsemanage-1.5.6.tgz
|
libsemanage-1.5.6.tgz
|
||||||
libsemanage-1.5.8.tgz
|
libsemanage-1.5.8.tgz
|
||||||
libsemanage-1.5.9.tgz
|
libsemanage-1.5.9.tgz
|
||||||
|
libsemanage-1.5.11.tgz
|
||||||
|
libsemanage-1.5.14.tgz
|
||||||
|
@ -1,11 +1,45 @@
|
|||||||
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/database_llist.c libsemanage-1.5.4/src/database_llist.c
|
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/fcontext_record.c libsemanage-1.5.9/src/fcontext_record.c
|
||||||
--- nsalibsemanage/src/database_llist.c 2006-01-04 12:18:17.000000000 -0500
|
--- nsalibsemanage/src/fcontext_record.c 2006-01-06 10:33:10.000000000 -0500
|
||||||
+++ libsemanage-1.5.4/src/database_llist.c 2006-01-04 16:26:39.000000000 -0500
|
+++ libsemanage-1.5.9/src/fcontext_record.c 2006-01-06 13:40:38.000000000 -0500
|
||||||
@@ -136,6 +136,7 @@
|
@@ -81,8 +81,18 @@
|
||||||
if (dbase_llist_cache_prepend(handle, dbase, data) < 0)
|
const semanage_fcontext_t* fcontext,
|
||||||
goto err;
|
const semanage_fcontext_key_t* key) {
|
||||||
|
|
||||||
+ dbase->modified = 1;
|
- return strcmp(fcontext->expr, key->expr) &&
|
||||||
return STATUS_SUCCESS;
|
- (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:
|
|
||||||
|
@ -7,7 +7,6 @@ Release: 1
|
|||||||
License: GPL
|
License: GPL
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
|
Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
|
||||||
Patch: libsemanage-rhat.patch
|
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-buildroot
|
BuildRoot: %{_tmppath}/%{name}-buildroot
|
||||||
BuildRequires: libselinux-devel >= %{libselinuxver}
|
BuildRequires: libselinux-devel >= %{libselinuxver}
|
||||||
@ -40,7 +39,6 @@ needed for developing applications that manipulate binary policies.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch -p 1 -b .rhat
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make clean
|
make clean
|
||||||
|
Loading…
Reference in New Issue
Block a user