- Upgrade to latest from NSA

Fixed bug in role hierarchy checker.
This commit is contained in:
Daniel J Walsh 2005-04-26 16:33:22 +00:00
parent c4ff628dd6
commit 7ae04558ee
4 changed files with 4 additions and 17 deletions

View File

@ -12,3 +12,4 @@ libsepol-1.5.1.tgz
libsepol-1.5.2.tgz libsepol-1.5.2.tgz
libsepol-1.5.3.tgz libsepol-1.5.3.tgz
libsepol-1.5.5.tgz libsepol-1.5.5.tgz
libsepol-1.5.6.tgz

View File

@ -1,24 +1,12 @@
diff --exclude-from=exclude -N -u -r nsalibsepol/src/genbools.c libsepol-1.5.5/src/genbools.c diff --exclude-from=exclude -N -u -r nsalibsepol/src/genbools.c libsepol-1.5.5/src/genbools.c
--- nsalibsepol/src/genbools.c 2005-03-29 21:55:26.000000000 -0500 --- nsalibsepol/src/genbools.c 2005-04-26 12:15:36.000000000 -0400
+++ libsepol-1.5.5/src/genbools.c 2005-04-25 15:25:55.000000000 -0400 +++ libsepol-1.5.5/src/genbools.c 2005-04-25 15:25:55.000000000 -0400
@@ -195,7 +195,7 @@ @@ -195,7 +195,7 @@
} }
if (evaluate_conds(&policydb) < 0) { if (evaluate_conds(&policydb) < 0) {
- __sepol_debug_printf("%s: Error while re-evaluating conditionals: %s\n", - __sepol_debug_printf("%s: Error while re-evaluating conditionals\n",
+ __sepol_debug_printf("%s: Error while re-evaluating conditionals\n", + __sepol_debug_printf("%s: Error while re-evaluating conditionals\n",
__FUNCTION__); __FUNCTION__);
errno = EINVAL; errno = EINVAL;
goto err; goto err;
diff --exclude-from=exclude -N -u -r nsalibsepol/src/hierarchy.c libsepol-1.5.5/src/hierarchy.c
--- nsalibsepol/src/hierarchy.c 2005-04-14 08:28:00.000000000 -0400
+++ libsepol-1.5.5/src/hierarchy.c 2005-04-25 15:21:51.000000000 -0400
@@ -269,7 +269,7 @@
char *parent;
hierarchy_args_t *a;
role_datum_t *r, *rp;
- ebitmap_t *eb;
+ ebitmap_t *eb=NULL;
a = (hierarchy_args_t *)args;
r = (role_datum_t *)d;

View File

@ -5,7 +5,6 @@ Release: 1
License: GPL License: GPL
Group: System Environment/Libraries Group: System Environment/Libraries
Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz
Patch: libsepol-rhat.patch
Prefix: %{_prefix} Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-buildroot BuildRoot: %{_tmppath}/%{name}-buildroot
Provides: libsepol.so Provides: libsepol.so
@ -37,7 +36,6 @@ needed for developing applications that manipulate binary policies.
%prep %prep
%setup -q %setup -q
%patch -p1 -b .rhat
%build %build
make CFLAGS="%{optflags}" make CFLAGS="%{optflags}"

View File

@ -1 +1 @@
07bf6ff3b2878e429030494f7b05cad6 libsepol-1.5.5.tgz 2e936fdd143703f1d16f2605c39e6f7c libsepol-1.5.6.tgz